Merge branch 'master' of https://github.com/webpack/webpack.js.org into update-support

Author: scottdj92

.travis.yml

@@ -8,7 +8,6 @@ node_js:
 script:
   - bash ./scripts/deploy.sh
 sudo: required
-cache: yarn
 install:
   - npm i yarn -g
   - yarn

components/organization/projects.json

@@ -256,7 +256,7 @@
 		"repo": "webpack/i18n-webpack-plugin",
 		"npm": "i18n-webpack-plugin",
 		"description": "Embed localization into your bundle.",
-		"maintainer": "EcutDavid"
+		"maintainer": ""
 	},
 	{
 		"repo": "webpack/json5-loader",

content/api/cli.md

@@ -176,7 +176,7 @@ These options allow you to bind [modules](/configuration/module/) as allowed by
 
 | Parameter          | Explanation                        | Usage                       |
 |--------------------|------------------------------------|-----------------------------|
-| --module-bind      | Bind an extension to a loader      | --module-bind /\.js$/=babel |
+| --module-bind      | Bind an extension to a loader      | --module-bind /\.js$/=babel-loader |
 | --module-bind-post | Bind an extension to a post loader |                             |
 | --module-bind-pre  | Bind an extension to a pre loader  |                             |
 

content/concepts/loaders.md

@@ -100,7 +100,7 @@ T> Use `module.rules` whenever possible, as this will reduce boilerplate in your
 Optionally, you could also use loaders through the CLI:
 
 ```sh
-webpack --module-bind jade --module-bind 'css=style!css'
+webpack --module-bind jade-loader --module-bind 'css=style-loader!css-loader'
 ```
 
 This uses the `jade-loader` for `.jade` files, and the [`style-loader`](/loaders/style-loader) and [`css-loader`](/loaders/css-loader) for `.css` files.

content/configuration/devtool.md

@@ -26,6 +26,8 @@ Choose a style of [source mapping](http://blog.teamtreehouse.com/introduction-so
  source-map                   | --    | --      | yes        | original source
  nosources-source-map         | --    | --      | yes        | without source content
 
+T> `+` means faster, `-` slower and `o` about the same time
+
 Some of these values are suited for development and some for production. For development you typically want fast Source Maps at the cost of bundle size, but for production you want separate Source Maps that are accurate.
 
 W> There are some issues with Source Maps in Chrome. [We need your help!](https://github.com/webpack/webpack/issues/3165).

content/guides/code-splitting-css.md

@@ -44,12 +44,13 @@ webpack can help with this problem by bundling the CSS separately using the `Ext
 
 Install the [`ExtractTextWebpackPlugin`](/plugins/extract-text-webpack-plugin) plugin as follows
 ```
-npm i --save-dev extract-text-webpack-plugin@beta
+npm i --save-dev extract-text-webpack-plugin
 ```
 
-To use this plugin, it needs to be added to the `webpack.config.js` file in two steps.
+To use this plugin, it needs to be added to the `webpack.config.js` file in three steps.
 
 ```diff
++var ExtractTextPlugin = require('extract-text-webpack-plugin');
 module.exports = {
     module: {
          rules: [{

content/guides/comparison.md

@@ -13,7 +13,7 @@ webpack is not the only module bundler out there. If you are choosing between us
 | Feature | webpack/webpack | jrburke/requirejs | substack/node-browserify | jspm/jspm-cli | rollup/rollup | brunch/brunch |
 |---------|-----------------|-------------------|--------------------------|---------------|---------------|---------------|
 | Additional chunks are loaded on demand | **yes** | **yes** | no | [System.import](https://github.com/systemjs/systemjs/blob/master/docs/system-api.md#systemimportmodulename--normalizedparentname---promisemodule) | no | no |
-| AMD `define` | **yes** | **yes** | [deamdify](https://github.com/jaredhanson/deamdify) | yes | [rollup-plugin-amd](https://github.com/brunch/uglify-js-brunch) | yes |
+| AMD `define` | **yes** | **yes** | [deamdify](https://github.com/jaredhanson/deamdify) | yes | [rollup-plugin-amd](https://github.com/piuccio/rollup-plugin-amd) | yes |
 | AMD `require` | **yes** | **yes** | no | yes | no | yes |
 | AMD `require` loads on demand | **yes** | with manual configuration | no | yes | no | no |
 | CommonJS `exports` | **yes** | only wrapping in `define` | **yes** | yes | [commonjs-plugin](https://github.com/rollup/rollup-plugin-commonjs) | yes |

content/guides/lazy-load-react.md

@@ -83,8 +83,12 @@ class LazilyLoad extends React.Component {
   }
 
   componentDidUpdate(previous) {
-    if (this.props.modules === previous.modules) return null;
-    this.load();
+    const shouldLoad = !!Object.keys(this.props.modules).filter((key)=> {
+        return this.props.modules[key] !== previous.modules[key];
+    }).length;
+    if (shouldLoad) {
+        this.load();
+    }
   }
 
   componentWillUnmount() {

content/guides/migrating.md

@@ -257,9 +257,9 @@ It's no longer necessary to specify it in configuration.
 
 ## `ExtractTextWebpackPlugin` - breaking change
 
-[ExtractTextPlugin](https://github.com/webpack/extract-text-webpack-plugin) 1.0.0 does not work with webpack v2. You will need to install ExtractTextPlugin v2 explicitly.
+[ExtractTextPlugin](https://github.com/webpack/extract-text-webpack-plugin) requires version 2 to work with webpack 2.
 
-`npm install --save-dev extract-text-webpack-plugin@beta`
+`npm install --save-dev extract-text-webpack-plugin`
 
  The configuration changes for this plugin are mainly syntactical.
 

package.json

@@ -31,7 +31,7 @@
     "fetch": "scripts/fetch.sh",
     "init:generated": "mkdirp ./generated/loaders && mkdirp ./generated/plugins ",
     "lint": "run-s lint:*",
-    "lint:links": "hyperlink -r --exclude https://opencollective.com/webpack/*/*/website build/index.html",
+    "lint:links": "hyperlink -r --exclude https://opencollective.com/webpack/*/*/website build/index.html | ./scripts/check-links.js --skip 10",
     "lint:js": "eslint . --ext .js --ext .jsx",
     "lint:md": "eslint . --ext .md",
     "lint:markdown": "markdownlint --config ./.markdownlintrc **/*.md *.md ./content/**/*.md",
@@ -56,6 +56,7 @@
     "babel-preset-react": "^6.11.1",
     "copy-webpack-plugin": "^4.0.1",
     "css-loader": "^0.25.0",
+    "duplexer": "^0.1.1",
     "eslint": "3.6.0",
     "eslint-loader": "^1.5.0",
     "eslint-plugin-markdown": "^1.0.0-beta.2",
@@ -88,6 +89,8 @@
     "sitemap-static": "^0.3.1",
     "style-loader": "^0.13.1",
     "tap-min": "^1.1.0",
+    "tap-parser": "^5.3.3",
+    "through2": "^2.0.3",
     "url-loader": "^0.5.7",
     "webpack": "^1.13.2",
     "webpack-dev-server": "^1.16.1",

scripts/check-links.js

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+// Check piped links while allowing a fixed amount to fail
+// Adapted from tap-json.
+var parser = require('tap-parser');
+var through = require('through2');
+var duplexer = require('duplexer');
+var minimist = require('minimist');
+
+process.stdin
+  .pipe(checkLinks())
+  .pipe(process.stdout);
+
+function checkLinks(args) {
+  var argv = minimist(process.argv.slice(2));
+  var skip = argv.skip || 0;
+
+  var tap = parser();
+  var out = through.obj();
+  var dup = duplexer(tap, out);
+
+  var data = [];
+  var name = null;
+
+  tap.on('complete', function(res) {
+    const failures = res.failures;
+
+    if (failures.length > 0) {
+      console.log(formatFailures(failures));
+    }
+
+    // Fail hard only if over skip threshold
+    if (failures.length > skip) {
+      process.exit(1);
+    }
+  });
+
+  return dup;
+}
+
+function formatFailures(failures) {
+  return failures.map(function(failure) {
+    return failure.name + '\n' + failure.diag.actual + ' at ' + failure.diag.at;
+  }).join('\n\n');
+}

scripts/fetch.sh

@@ -7,11 +7,13 @@ cp -rf ./content/loaders/ ./generated/loaders
 mkdir -p ./generated/plugins
 cp -rf ./content/plugins/ ./generated/plugins
 
-# Fetches github.com/webpack/*-loader repositories
-./scripts/fetch_package_names.js "webpack" "-loader" | ./scripts/fetch_package_files.js "README.md" "./generated/loaders"
+# Fetches github.com/webpack/*-loader repositories.
+# Skipped because they are below contrib now.
+# ./scripts/fetch_package_names.js "webpack" "-loader" | ./scripts/fetch_package_files.js "README.md" "./generated/loaders"
 
-# Fetches github.com/webpack/*-webpack-plugin repositories
-./scripts/fetch_package_names.js "webpack" "-webpack-plugin" | ./scripts/fetch_package_files.js "README.md" "./generated/plugins"
+# Fetches github.com/webpack/*-webpack-plugin repositories.
+# Skipped because they are below contrib now.
+# ./scripts/fetch_package_names.js "webpack" "-webpack-plugin" | ./scripts/fetch_package_files.js "README.md" "./generated/plugins"
 
 # Fetches github.com/webpack-contrib/*-loader repositories
 ./scripts/fetch_package_names.js "webpack-contrib" "-loader" | ./scripts/fetch_package_files.js "README.md" "./generated/loaders"