Merge remote-tracking branch 'upstream/master'

Author: dear-lizhihua

content/configuration/target.md

@@ -20,8 +20,9 @@ Tells webpack which environment the application is targeting. The following valu
 | `target`      | Description            |
 | ------------- |------------------------|
 | `async-node`| Compile for usage in a Node.js-like environment (uses `fs` and `vm` to load chunks asynchronously)    |
-| `electron`      | Compile for [Electron](http://electron.atom.io/) renderer process, provide a target using `JsonpTemplatePlugin`, `FunctionModulePlugin` for browser environments and `NodeTargetPlugin` and `ExternalsPlugin` for CommonJS and Electron built-in modules. |
-| `electron-renderer` | Compile for [Electron](http://electron.atom.io/) for `renderer-process` |
+| `electron`      | Alias for `electron-main` |
+| `electron-main`      | Compile for [Electron](http://electron.atom.io/) for main process. |
+| `electron-renderer`      | Compile for [Electron](http://electron.atom.io/) for renderer process, providing a target using `JsonpTemplatePlugin`, `FunctionModulePlugin` for browser environments and `NodeTargetPlugin` and `ExternalsPlugin` for CommonJS and Electron built-in modules. |
 | `node` | Compile for usage in a Node.js-like environment (uses Node.js `require` to load chunks) |
 |`node-webkit`|  Compile for usage in WebKit and uses JSONP for chunk loading. Allows importing of built-in Node.js modules and [`nw.gui`](http://docs.nwjs.io/en/latest/) (experimental) |
 |`web`| Compile for usage in a browser-like environment **(default)** |

content/guides/production-build.md

@@ -67,7 +67,7 @@ module.exports = {
 };
 ```
 
-The `DefinePlugin` performs search-and-replace operations on the original source code. Any occurrence of `process.env.NODE_ENV` in the imported code is replaced by by `"production"`. Thus, checks like `if (process.env.NODE_ENV !== 'production') console.log('...')` are evaluated to `if (false) console.log('...')` and finally minified away using `UglifyJS`.
+The `DefinePlugin` performs search-and-replace operations on the original source code. Any occurrence of `process.env.NODE_ENV` in the imported code is replaced by `"production"`. Thus, checks like `if (process.env.NODE_ENV !== 'production') console.log('...')` are evaluated to `if (false) console.log('...')` and finally minified away using `UglifyJS`.
 
 T> Technically, `NODE_ENV` is a system environment variable that Node.js exposes into running scripts. It is used by convention to determine development-vs-production behavior, by both server tools, build scripts, and client-side libraries. Contrary to expectations, `process.env.NODE_ENV` is not set to `"production"` __within__ the build script `webpack.config.js`, see [#2537](https://github.com/webpack/webpack/issues/2537). Thus, conditionals like `process.env.NODE_ENV === 'production' ? '[name].[hash].bundle.js' : '[name].bundle.js'` do not work as expected. See how to specify the [environment in webpack configuration](/configuration/environment).
 

content/plugins/index.md

@@ -2,6 +2,7 @@
 title: Plugins
 contributors:
   - simon04
+  - gonzoyumo
 ---
 
 webpack has a rich plugin interface. Most of the features within webpack itself use this plugin interface. This makes webpack **flexible**.
@@ -14,6 +15,7 @@ webpack has a rich plugin interface. Most of the features within webpack itself
 |[`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|
 |[`HtmlWebpackPlugin`](/plugins/html-webpack-plugin)| Simplifies creation of HTML files (`index.html`) to serve your bundles|
+|[`NormalModuleReplacementPlugin`](/plugins/normal-module-replacement-plugin)|Replaces resource that matches a regexp|
 
 
 ![Awesome](../assets/awesome-badge.svg)

content/plugins/normal-module-replacement-plugin.md

@@ -0,0 +1,87 @@
+---
+title: NormalModuleReplacementPlugin
+contributors:
+  - gonzoyumo
+---
+## Install
+
+The `NormalModuleReplacementPlugin` is a built-in webpack plugin.
+
+
+## Usage
+
+``` javascript
+new webpack.NormalModuleReplacementPlugin(resourceRegExp, newResource)
+```
+
+The `NormalModuleReplacementPlugin` allows you to replace resources that match `resourceRegExp` with `newResource`. If `newResource` is relative, it is resolved relative to the previous resource. If `newResource` is a function, it is expected to overwrite the request attribute of the supplied resource.
+
+This can be useful for allowing different behaviour between builds.
+
+## Basic example
+
+Replace a specific module when building for development environment ([read more](/configuration/environment)).
+
+
+Say you have a config file `some/path/config.development.module.js` and a special version for production in `some/path/config.production.module.js`
+
+Just add the following plugin when building for production:
+
+``` javascript
+new webpack.NormalModuleReplacementPlugin(
+  /some\/path\/config\.development\.js/,
+  './config.production.js'
+);
+```
+
+## Advanced example
+
+Conditional build depending on an environment var ([read more](/configuration/environment)).
+
+Say you want a configuration with specific values for different build targets.
+
+``` javascript
+module.exports = function(env) {
+  var appTarget = env.APP_TARGET || 'VERSION_A';
+  return {
+    plugins: [
+      new webpack.NormalModuleReplacementPlugin(/(.*)-APP_TARGET(\.*)/, function(resource) {
+        resource.request = resource.request.replace(/-APP_TARGET/, `-${appTarget}`);
+      })
+    ]
+  }
+  
+}
+```
+
+Create the two config files:
+
+**app/config-VERSION_A.js:**
+``` javascript
+export default {
+  title : 'I am version A'
+}
+```
+**app/config-VERSION_B.js:**
+``` javascript
+export default {
+  title : 'I am version B'
+}
+```
+Then import that config using the keyword you're looking for in the regexp:
+
+``` javascript
+import config from 'app/config-APP_TARGET';
+console.log(config.title);
+```
+
+And now you just get the right config imported depending on which target you're building for:
+
+``` shell
+webpack --env.APP_TARGET VERSION_A
+=> 'I am version A'
+
+webpack --env.APP_TARGET VERSION_B
+=> 'I am version B'
+
+```