Merge branch 'master' into DefinePlugin-type

Author: sokra

.eslintrc.js

@@ -61,7 +61,7 @@ module.exports = {
 				browser: true
 			},
 			globals: {
-				Promise: false,
+				Promise: false
 			},
 			parserOptions: {
 				ecmaVersion: 5
@@ -71,6 +71,9 @@ module.exports = {
 			files: ["test/**/*.js"],
 			env: {
 				"jest/globals": true
+			},
+			globals: {
+				nsObj: false
 			}
 		}
 	]

README.md

@@ -92,16 +92,19 @@ within webpack itself use this plugin interface. This makes webpack very
 
 |Name|Status|Install Size|Description|
 |:--:|:----:|:----------:|:----------|
-|[extract-text-webpack-plugin][extract]|![extract-npm]|![extract-size]|Extracts Text (CSS) from your bundles into a separate file (app.bundle.css)|
+|[mini-css-extract-plugin][mini-css]|![mini-css-npm]|![mini-css-size]|Extracts CSS into separate files. It creates a CSS file per JS file which contains CSS.|
 |[compression-webpack-plugin][compression]|![compression-npm]|![compression-size]|Prepares compressed versions of assets to serve them with Content-Encoding|
 |[i18n-webpack-plugin][i18n]|![i18n-npm]|![i18n-size]|Adds i18n support to your bundles|
 |[html-webpack-plugin][html-plugin]|![html-plugin-npm]|![html-plugin-size]| Simplifies creation of HTML files (`index.html`) to serve your bundles|
-
+|[extract-text-webpack-plugin][extract]|![extract-npm]|![extract-size]|Extract text from a bundle, or bundles, into a separate file|
 
 [common-npm]: https://img.shields.io/npm/v/webpack.svg
 [extract]: https://github.com/webpack/extract-text-webpack-plugin
 [extract-npm]: https://img.shields.io/npm/v/extract-text-webpack-plugin.svg
 [extract-size]: https://packagephobia.now.sh/badge?p=extract-text-webpack-plugin
+[mini-css]: https://github.com/webpack-contrib/mini-css-extract-plugin
+[mini-css-npm]: https://img.shields.io/npm/v/mini-css-extract-plugin.svg
+[mini-css-size]: https://packagephobia.now.sh/badge?p=mini-css-extract-plugin
 [component]: https://github.com/webpack/component-webpack-plugin
 [component-npm]: https://img.shields.io/npm/v/component-webpack-plugin.svg
 [component-size]: https://packagephobia.now.sh/badge?p=component-webpack-plugin

_SETUP.md

@@ -27,7 +27,7 @@ yarn link webpack
 yarn test
 ```
 
-### To run only intergration tests use
+### To run only integration tests use
 
 ```bash
 yarn test:integration

declarations.d.ts

@@ -7,7 +7,6 @@ declare namespace NodeJS {
 	}
 }
 
-
 declare module "neo-async" {
 	export interface Dictionary<T> {
 		[key: string]: T;

examples/many-pages/README.md

@@ -1,6 +1,6 @@
 # Info
 
-This example illustrates webpack's algorthim for automatic deduplication using `optimization.splitChunks`.
+This example illustrates webpack's algorithm for automatic deduplication using `optimization.splitChunks`.
 
 This example application contains 7 pages, each of them importing 1-3 modules from the `node_modules` folder (vendor libs) and 0-3 modules from the `stuff` folder (application modules). In reallity an application is probably more complex, but the same mechanisms apply.
 
@@ -41,7 +41,7 @@ module.exports = {
 			chunks: "all",
 			maxInitialRequests: 20, // for HTTP2
 			maxAsyncRequests: 20, // for HTTP2
-			minSize: 40 // for example only: choosen to match 2 modules
+			minSize: 40 // for example only: chosen to match 2 modules
 			// omit minSize in real use case to use the default of 30kb
 		}
 	}

examples/many-pages/template.md

@@ -1,6 +1,6 @@
 # Info
 
-This example illustrates webpack's algorthim for automatic deduplication using `optimization.splitChunks`.
+This example illustrates webpack's algorithm for automatic deduplication using `optimization.splitChunks`.
 
 This example application contains 7 pages, each of them importing 1-3 modules from the `node_modules` folder (vendor libs) and 0-3 modules from the `stuff` folder (application modules). In reallity an application is probably more complex, but the same mechanisms apply.
 

examples/many-pages/webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
 			chunks: "all",
 			maxInitialRequests: 20, // for HTTP2
 			maxAsyncRequests: 20, // for HTTP2
-			minSize: 40 // for example only: choosen to match 2 modules
+			minSize: 40 // for example only: chosen to match 2 modules
 			// omit minSize in real use case to use the default of 30kb
 		}
 	}

hot/dev-server.js

@@ -40,10 +40,10 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot apply update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + err.stack || err.message);
+					log("warning", "[HMR] " + (err.stack || err.message));
 					window.___location.reload();
 				} else {
-					log("warning", "[HMR] Update failed: " + err.stack || err.message);
+					log("warning", "[HMR] Update failed: " + (err.stack || err.message));
 				}
 			});
 	};

hot/only-dev-server.js

@@ -72,11 +72,11 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot check for update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + err.stack || err.message);
+					log("warning", "[HMR] " + (err.stack || err.message));
 				} else {
 					log(
 						"warning",
-						"[HMR] Update check failed: " + err.stack || err.message
+						"[HMR] Update check failed: " + (err.stack || err.message)
 					);
 				}
 			});

hot/poll.js

@@ -23,10 +23,13 @@ if (module.hot) {
 					var status = module.hot.status();
 					if (["abort", "fail"].indexOf(status) >= 0) {
 						log("warning", "[HMR] Cannot apply update.");
-						log("warning", "[HMR] " + err.stack || err.message);
+						log("warning", "[HMR] " + (err.stack || err.message));
 						log("warning", "[HMR] You need to restart the application!");
 					} else {
-						log("warning", "[HMR] Update failed: " + err.stack || err.message);
+						log(
+							"warning",
+							"[HMR] Update failed: " + (err.stack || err.message)
+						);
 					}
 				});
 		}