Merge branch 'master' into fix-link-paths

Author: jeffcooper86

components/footer/footer.jsx

@@ -12,7 +12,7 @@ export default (props) => {
         <section className="footer__left">
           <Link className="footer__link" to="/guides/get-started">Get Started</Link>
           <Link className="footer__link" to="/organization">Organization</Link>
-          <Link className="footer__link" to="/contribute">Contribute</Link>
+          <Link className="footer__link" to="/support">Support</Link>
           <Link className="footer__link" to="/guides/why-webpack#comparison">Comparison</Link>
         </section>
 
@@ -24,7 +24,7 @@ export default (props) => {
 
         <section className="footer__right">
           <Link className="footer__link" to="/branding">Branding</Link>
-          <Link className="footer__link" to="//gitter.im/webpack/webpack">Support</Link>
+          <Link className="footer__link" to="//gitter.im/webpack/webpack">Gitter</Link>
           <Link className="footer__link" to="https://github.com/webpack/webpack/releases">Changelog</Link>
           <Link className="footer__link" to="/license">License</Link>
           <CC />

content/configuration/dev-server.md

@@ -10,7 +10,7 @@ contributors:
 
 webpack-dev-server can be used to quickly develop an application. See the ["How to Develop?"](/guides/development) to get started.
 
-This page describes the options that effect the behavior of webpack-dev-server (short: dev-server).
+This page describes the options that affect the behavior of webpack-dev-server (short: dev-server).
 
 T> Options that are compatible with [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) have 🔑 next to them.
 
@@ -132,7 +132,7 @@ headers: {
 
 `boolean` `object`
 
-When using the [HTML5 History API](https://developer.mozilla.org/en-US/docs/Web/API/History), the `index.html` page will likely have be served in place of any `404` responses. Enable this by passing:
+When using the [HTML5 History API](https://developer.mozilla.org/en-US/docs/Web/API/History), the `index.html` page will likely have to be served in place of any `404` responses. Enable this by passing:
 
 ```js
 historyApiFallback: true

content/configuration/entry-context.md

@@ -25,7 +25,7 @@ By default the current directory is used, but it's recommended to pass a value i
 
 ## `entry`
 
-`string | [string] | object { <key>: string | [string] }`
+`string | [string] | object { <key>: string | [string] } | function: () => string`
 
 The point or points to enter the application. At this point the application starts executing. If an array is passed all items will be executed.
 
@@ -41,4 +41,16 @@ entry: {
 }
 ```
 
+Dynamically entry.
+
+```js
+entry: () => './demo'
+```
+
+or
+
+```js
+entry: () => new Promise((resolve) => resolve('./demo'))
+```
+
 When combining with the [`output.library`](/configuration/output#output-library) option: If an array is passed only the last item is exported.

content/configuration/externals.md

@@ -7,8 +7,8 @@ contributors:
   - pksjce
 ---
 
-`externals` configuration in webpack provides a way of not including a dependency in the bundle. Instead the created bundle relies on that dependency to be present in the consumers environment.
-This typically applies to library developers though application developers can make good use of this feature too.
+`externals` configuration in webpack provides a way of not including a dependency in the bundle. Instead, the created bundle relies on that dependency to be present in the consumer's environment.
+This typically applies to library developers, though application developers can make good use of this feature as well.
 
 ## `externals`
 

content/contribute.md

@@ -1,5 +1,12 @@
 ---
 title: Development
+contributors:
+  - rouzbeh84
 ---
 
-These guides cover what you need to know in order to develop webpack. WIP!
+These guides cover what you need to know in order to develop webpack.
+
+*   [Release Process](./release-process)
+*   [Plugin Patterns](./plugin-patterns)
+*   [How To Write A Plugin](./how-to-write-a-plugin)
+*   [How To Write A Loader](./how-to-write-a-loader)

content/development/index.md

@@ -92,16 +92,16 @@ function component () {
 We also need to change `index.html` to expect a single bundled js file.
 
 ```diff
-<html>
-  <head>
-    <title>webpack 2 demo</title>
--   <script src="https://unpkg.com/[email protected]"></script>
-  </head>
-  <body>
--   <script src="app/index.js"></script>
-+   <script src="dist/bundle.js"></script>
-  </body>
-</html>
+ <html>
+   <head>
+     <title>webpack 2 demo</title>
+-    <script src="https://unpkg.com/[email protected]"></script>
+   </head>
+   <body>
+-    <script src="app/index.js"></script>
++    <script src="dist/bundle.js"></script>
+   </body>
+ </html>
 ```
 
 Here, `index.js` explicitly requires `lodash` to be present, and binds it as `_` (no global scope pollution).

content/guides/get-started.md

@@ -110,7 +110,7 @@ Hint: In combination with long term caching you may need to use the [`ChunkManif
 
 ###  Move common modules into the parent chunk
 
-With Code Splitting multiple child chunks of a chunk can have common modules. You can move these common modules into the parent (This reduces overall size, but has a negative effect on the initial load time. It can be useful if it is expected that a user need to download many sibling chunks).
+With [Code Splitting](/guides/code-splitting) multiple child chunks of an entry chunk can have common dependencies. To prevent duplication these can be moved into the parent. This reduces overall size, but does have a negative effect on the initial load time. If it is expected that users will need to download many sibling chunks, i.e. children of the entry chunk, then this should improve load time overall.
 
 ```javascript
 new webpack.optimize.CommonsChunkPlugin({

content/plugins/commons-chunk-plugin.md

@@ -1,14 +1,15 @@
 ---
 title: DefinePlugin
-contributurs:
+contributors:
   - simon04
+  - rouzbeh84
 ---
 
 ``` javascript
 new webpack.DefinePlugin(definitions)
 ```
 
-The `DefinePlugin` allows you to create global constants which can be configured at **compile** time. This can be useful for allowing different behaviour between development builds and release builds. For example, you might use a global constant to determine whether logging takes place; perhaps you perform logging in your development build but not in the release build. That's the sort of scenario the `DefinePlugin` facilitates.
+The `DefinePlugin` allows you to create global constants which can be configured at **compile** time. This can be useful for allowing different behavior between development builds and release builds. If you perform logging in your development build but not in the release build you might use a global constant to determine whether logging takes place. That's where `DefinePlugin` shines, set it and forget it rules for development and release builds.
 
 **Example:**
 
@@ -27,7 +28,7 @@ console.log("Running App version " + VERSION);
 if(!BROWSER_SUPPORTS_HTML5) require("html5shiv");
 ```
 
-T> Note that because the plugin does a direct text replacement, the value given to it must include actual quotes inside of the string itself. Typically, this is done either with alternate quotes, such as `'"production"'`, or by using `JSON.stringify('production')`.
+T> Note that because the plugin does a direct text replacement, the value given to it must include **actual quotes** inside of the string itself. Typically, this is done either with either alternate quotes, such as `'"production"'`, or by using `JSON.stringify('production')`.
 
 Each key passed into `DefinePlugin` is an identifier or multiple identifiers joined with `.`.
 
@@ -36,7 +37,7 @@ Each key passed into `DefinePlugin` is an identifier or multiple identifiers joi
 * If the value is an object all keys are defined the same way.
 * If you prefix `typeof` to the key, it's only defined for typeof calls.
 
-The values will be inlined into the code which allows a minification pass to remove the redundant conditional.
+The values will be inlined into the code allowing a minification pass to remove the redundant conditional.
 
 **Example:**
 
@@ -47,7 +48,8 @@ if (!PRODUCTION) {
 if (PRODUCTION) {
   console.log('Production log')
 }
-`````
+```
+
 After passing through webpack with no minification results in:
 
 ``` javascript
@@ -66,6 +68,7 @@ console.log('Production log')
 ```
 
 ## Use Case: Feature Flags
+
 Enable/disable features in production/development build using [feature flags](https://en.wikipedia.org/wiki/Feature_toggle).
 
 ```javascript
@@ -76,6 +79,7 @@ new webpack.DefinePlugin({
 ```
 
 ## Use Case: Service URLs
+
 Use a different service URL in production/development builds:
 
 ```javascript

content/plugins/define-plugin.md

@@ -3,13 +3,14 @@ title: EnvironmentPlugin
 contributors:
   - simon04
   - einarlove
+  - rouzbeh84
 ---
 
-The `EnvironmentPlugin` is a shorthand for using the [`DefinePlugin`](/plugins/define-plugin) on [`process.env`](https://nodejs.org/api/process.html#process_process_env) keys.
+The `EnvironmentPlugin` is shorthand for using the [`DefinePlugin`](/plugins/define-plugin) on [`process.env`](https://nodejs.org/api/process.html#process_process_env) keys.
 
 ## Usage
 
-The `EnvironmentPlugin` accepts either an array of keys.
+The `EnvironmentPlugin` accepts either an array of keys or an object mapping its keys to their default values.
 
 ```javascript
 new webpack.EnvironmentPlugin(['NODE_ENV', 'DEBUG'])
@@ -30,7 +31,7 @@ T> Not specifying the environment variable raises an "`EnvironmentPlugin` - `${k
 
 Alternatively, the `EnvironmentPlugin` supports an object, which maps keys to their default values. The default value for a key is taken if the key is undefined in `process.env`.
 
-```js
+```javascript
 new webpack.EnvironmentPlugin({
   NODE_ENV: 'development', // use 'development' unless process.env.NODE_ENV is defined
   DEBUG: false
@@ -47,7 +48,7 @@ T> To specify an unset default value, use `null` instead of `undefined`.
 
 Let's investigate the result when running the previous `EnvironmentPlugin` configuration on a test file `entry.js`:
 
-```js
+```javascript
 if (process.env.NODE_ENV === 'production') {
   console.log('Welcome to production');
 }
@@ -58,7 +59,7 @@ if (process.env.DEBUG) {
 
 When executing `NODE_ENV=production webpack` in the terminal to build, `entry.js` becomes this:
 
-```js
+```javascript
 if ('production' === 'production') { // <-- 'production' from NODE_ENV is taken
   console.log('Welcome to production');
 }
@@ -69,11 +70,11 @@ if (false) { // <-- default value is taken
 
 Running `DEBUG=false webpack` yields:
 
-```js
+```javascript
 if ('development' === 'production') { // <-- default value is taken
   console.log('Welcome to production');
 }
 if ('false') { // <-- 'false' from DEBUG is taken
   console.log('Debugging output');
 }
-```
+```

content/plugins/environment-plugin.md

@@ -3,20 +3,23 @@ title: Plugins
 contributors:
   - simon04
   - gonzoyumo
+  - rouzbeh84
 ---
 
 webpack has a rich plugin interface. Most of the features within webpack itself use this plugin interface. This makes webpack **flexible**.
 
 |Name|Description|
 |:--:|:----------|
 |[`CommonsChunkPlugin`](/plugins/commons-chunk-plugin)|Generates chunks of common modules shared between entry points and splits them into separate  bundles, e.g., `1vendor.bundle.js` && `app.bundle.js`|
-|[`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin)|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
 |[`ComponentWebpackPlugin`](/plugins/component-webpack-plugin)|Use components with webpack|
 |[`CompressionWebpackPlugin`](/plugins/compression-webpack-plugin)|Prepare compressed versions of assets to serve them with Content-Encoding|
-|[`I18nWebpackPlugin`](/plugins/i18n-webpack-plugin)|Adds i18n support to your bundles|
+|[`DefinePlugin`](/plugins/define-plugin)|Allows global constants configured at compile time, useful for allowing different behavior between dev/release builds|
+|[`EnvironmentPlugin`](/plugins/environment-plugin)|Shorthand for using the [`DefinePlugin`](./define-plugin) on `process.env` keys.|
+|[`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin)|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
 |[`HtmlWebpackPlugin`](/plugins/html-webpack-plugin)| Simplifies creation of HTML files (`index.html`) to serve your bundles|
+|[`I18nWebpackPlugin`](/plugins/i18n-webpack-plugin)|Adds i18n support to your bundles|
+|[`LimitChunkCountPlugin`](/plugins/limit-chunk-count-plugin)| Set min/max limits for chunking to fine tune and control chunking|
 |[`NormalModuleReplacementPlugin`](/plugins/normal-module-replacement-plugin)|Replaces resource that matches a regexp|
 
-
 ![Awesome](../assets/awesome-badge.svg)
 For more third-party plugins, see the list from [awesome-webpack](https://github.com/webpack-contrib/awesome-webpack#webpack-plugins).