webpack 4.1.0 → 4.4.0

package/lib/webworker/WebWorkerMainTemplatePlugin.js

@@ -1,154 +1,177 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Template = require("../Template");
-
-class WebWorkerMainTemplatePlugin {
-	apply(mainTemplate) {
-		const needChunkOnDemandLoadingCode = chunk => {
-			for (const chunkGroup of chunk.groupsIterable) {
-				if (chunkGroup.getNumberOfChildren() > 0) return true;
-			}
-			return false;
-		};
-		mainTemplate.hooks.localVars.tap(
-			"WebWorkerMainTemplatePlugin",
-			(source, chunk) => {
-				if (needChunkOnDemandLoadingCode(chunk)) {
-					return Template.asString([
-						source,
-						"",
-						"// object to store loaded chunks",
-						'// "1" means "already loaded"',
-						"var installedChunks = {",
-						Template.indent(chunk.ids.map(id => `${id}: 1`).join(",\n")),
-						"};"
-					]);
-				}
-				return source;
-			}
-		);
-		mainTemplate.hooks.requireEnsure.tap(
-			"WebWorkerMainTemplatePlugin",
-			(_, chunk, hash) => {
-				const chunkFilename = mainTemplate.outputOptions.chunkFilename;
-				return Template.asString([
-					"promises.push(Promise.resolve().then(function() {",
-					Template.indent([
-						'// "1" is the signal for "already loaded"',
-						"if(!installedChunks[chunkId]) {",
-						Template.indent([
-							"importScripts(" +
-								mainTemplate.getAssetPath(JSON.stringify(chunkFilename), {
-									hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
-									hashWithLength: length =>
-										`" + ${mainTemplate.renderCurrentHashCode(
-											hash,
-											length
-										)} + "`,
-									chunk: {
-										id: '" + chunkId + "'
-									}
-								}) +
-								");"
-						]),
-						"}"
-					]),
-					"}));"
-				]);
-			}
-		);
-		mainTemplate.hooks.bootstrap.tap(
-			"WebWorkerMainTemplatePlugin",
-			(source, chunk, hash) => {
-				if (needChunkOnDemandLoadingCode(chunk)) {
-					const chunkCallbackName =
-						mainTemplate.outputOptions.chunkCallbackName;
-					const globalObject = mainTemplate.outputOptions.globalObject;
-					return Template.asString([
-						source,
-						`${globalObject}[${JSON.stringify(
-							chunkCallbackName
-						)}] = function webpackChunkCallback(chunkIds, moreModules) {`,
-						Template.indent([
-							"for(var moduleId in moreModules) {",
-							Template.indent(
-								mainTemplate.renderAddModule(
-									hash,
-									chunk,
-									"moduleId",
-									"moreModules[moduleId]"
-								)
-							),
-							"}",
-							"while(chunkIds.length)",
-							Template.indent("installedChunks[chunkIds.pop()] = 1;")
-						]),
-						"};"
-					]);
-				}
-				return source;
-			}
-		);
-		mainTemplate.hooks.hotBootstrap.tap(
-			"WebWorkerMainTemplatePlugin",
-			(source, chunk, hash) => {
-				const hotUpdateChunkFilename =
-					mainTemplate.outputOptions.hotUpdateChunkFilename;
-				const hotUpdateMainFilename =
-					mainTemplate.outputOptions.hotUpdateMainFilename;
-				const hotUpdateFunction = mainTemplate.outputOptions.hotUpdateFunction;
-				const globalObject = mainTemplate.outputOptions.globalObject;
-				const currentHotUpdateChunkFilename = mainTemplate.getAssetPath(
-					JSON.stringify(hotUpdateChunkFilename),
-					{
-						hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
-						hashWithLength: length =>
-							`" + ${mainTemplate.renderCurrentHashCode(hash, length)} + "`,
-						chunk: {
-							id: '" + chunkId + "'
-						}
-					}
-				);
-				const currentHotUpdateMainFilename = mainTemplate.getAssetPath(
-					JSON.stringify(hotUpdateMainFilename),
-					{
-						hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
-						hashWithLength: length =>
-							`" + ${mainTemplate.renderCurrentHashCode(hash, length)} + "`
-					}
-				);
-
-				return (
-					source +
-					"\n" +
-					`var parentHotUpdateCallback = ${globalObject}[${JSON.stringify(
-						hotUpdateFunction
-					)}];\n` +
-					`${globalObject}[${JSON.stringify(hotUpdateFunction)}] = ` +
-					Template.getFunctionContent(
-						require("./WebWorkerMainTemplate.runtime.js")
-					)
-						.replace(/\/\/\$semicolon/g, ";")
-						.replace(/\$require\$/g, mainTemplate.requireFn)
-						.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
-						.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
-						.replace(/\$hash\$/g, JSON.stringify(hash))
-				);
-			}
-		);
-		mainTemplate.hooks.hash.tap("WebWorkerMainTemplatePlugin", hash => {
-			hash.update("webworker");
-			hash.update("3");
-			hash.update(`${mainTemplate.outputOptions.publicPath}`);
-			hash.update(`${mainTemplate.outputOptions.filename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
-			hash.update(`${mainTemplate.outputOptions.chunkCallbackName}`);
-			hash.update(`${mainTemplate.outputOptions.globalObject}`);
-		});
-	}
-}
-module.exports = WebWorkerMainTemplatePlugin;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Template = require("../Template");
+
+class WebWorkerMainTemplatePlugin {
+	apply(mainTemplate) {
+		const needChunkOnDemandLoadingCode = chunk => {
+			for (const chunkGroup of chunk.groupsIterable) {
+				if (chunkGroup.getNumberOfChildren() > 0) return true;
+			}
+			return false;
+		};
+		mainTemplate.hooks.localVars.tap(
+			"WebWorkerMainTemplatePlugin",
+			(source, chunk) => {
+				if (needChunkOnDemandLoadingCode(chunk)) {
+					return Template.asString([
+						source,
+						"",
+						"// object to store loaded chunks",
+						'// "1" means "already loaded"',
+						"var installedChunks = {",
+						Template.indent(chunk.ids.map(id => `${id}: 1`).join(",\n")),
+						"};"
+					]);
+				}
+				return source;
+			}
+		);
+		mainTemplate.hooks.requireEnsure.tap(
+			"WebWorkerMainTemplatePlugin",
+			(_, chunk, hash) => {
+				const chunkFilename = mainTemplate.outputOptions.chunkFilename;
+				const chunkMaps = chunk.getChunkMaps();
+				return Template.asString([
+					"promises.push(Promise.resolve().then(function() {",
+					Template.indent([
+						'// "1" is the signal for "already loaded"',
+						"if(!installedChunks[chunkId]) {",
+						Template.indent([
+							"importScripts(" +
+								mainTemplate.getAssetPath(JSON.stringify(chunkFilename), {
+									hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
+									hashWithLength: length =>
+										`" + ${mainTemplate.renderCurrentHashCode(
+											hash,
+											length
+										)} + "`,
+									chunk: {
+										id: '" + chunkId + "',
+										contentHash: {
+											javascript: `" + ${JSON.stringify(
+												chunkMaps.contentHash.javascript
+											)}[chunkId] + "`
+										},
+										contentHashWithLength: {
+											javascript: length => {
+												const shortContentHashMap = {};
+												const contentHash = chunkMaps.contentHash.javascript;
+												for (const chunkId of Object.keys(contentHash)) {
+													if (typeof contentHash[chunkId] === "string") {
+														shortContentHashMap[chunkId] = contentHash[
+															chunkId
+														].substr(0, length);
+													}
+												}
+												return `" + ${JSON.stringify(
+													shortContentHashMap
+												)}[chunkId] + "`;
+											}
+										}
+									},
+									contentHashType: "javascript"
+								}) +
+								");"
+						]),
+						"}"
+					]),
+					"}));"
+				]);
+			}
+		);
+		mainTemplate.hooks.bootstrap.tap(
+			"WebWorkerMainTemplatePlugin",
+			(source, chunk, hash) => {
+				if (needChunkOnDemandLoadingCode(chunk)) {
+					const chunkCallbackName =
+						mainTemplate.outputOptions.chunkCallbackName;
+					const globalObject = mainTemplate.outputOptions.globalObject;
+					return Template.asString([
+						source,
+						`${globalObject}[${JSON.stringify(
+							chunkCallbackName
+						)}] = function webpackChunkCallback(chunkIds, moreModules) {`,
+						Template.indent([
+							"for(var moduleId in moreModules) {",
+							Template.indent(
+								mainTemplate.renderAddModule(
+									hash,
+									chunk,
+									"moduleId",
+									"moreModules[moduleId]"
+								)
+							),
+							"}",
+							"while(chunkIds.length)",
+							Template.indent("installedChunks[chunkIds.pop()] = 1;")
+						]),
+						"};"
+					]);
+				}
+				return source;
+			}
+		);
+		mainTemplate.hooks.hotBootstrap.tap(
+			"WebWorkerMainTemplatePlugin",
+			(source, chunk, hash) => {
+				const hotUpdateChunkFilename =
+					mainTemplate.outputOptions.hotUpdateChunkFilename;
+				const hotUpdateMainFilename =
+					mainTemplate.outputOptions.hotUpdateMainFilename;
+				const hotUpdateFunction = mainTemplate.outputOptions.hotUpdateFunction;
+				const globalObject = mainTemplate.outputOptions.globalObject;
+				const currentHotUpdateChunkFilename = mainTemplate.getAssetPath(
+					JSON.stringify(hotUpdateChunkFilename),
+					{
+						hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
+						hashWithLength: length =>
+							`" + ${mainTemplate.renderCurrentHashCode(hash, length)} + "`,
+						chunk: {
+							id: '" + chunkId + "'
+						}
+					}
+				);
+				const currentHotUpdateMainFilename = mainTemplate.getAssetPath(
+					JSON.stringify(hotUpdateMainFilename),
+					{
+						hash: `" + ${mainTemplate.renderCurrentHashCode(hash)} + "`,
+						hashWithLength: length =>
+							`" + ${mainTemplate.renderCurrentHashCode(hash, length)} + "`
+					}
+				);
+
+				return (
+					source +
+					"\n" +
+					`var parentHotUpdateCallback = ${globalObject}[${JSON.stringify(
+						hotUpdateFunction
+					)}];\n` +
+					`${globalObject}[${JSON.stringify(hotUpdateFunction)}] = ` +
+					Template.getFunctionContent(
+						require("./WebWorkerMainTemplate.runtime.js")
+					)
+						.replace(/\/\/\$semicolon/g, ";")
+						.replace(/\$require\$/g, mainTemplate.requireFn)
+						.replace(/\$hotMainFilename\$/g, currentHotUpdateMainFilename)
+						.replace(/\$hotChunkFilename\$/g, currentHotUpdateChunkFilename)
+						.replace(/\$hash\$/g, JSON.stringify(hash))
+				);
+			}
+		);
+		mainTemplate.hooks.hash.tap("WebWorkerMainTemplatePlugin", hash => {
+			hash.update("webworker");
+			hash.update("3");
+			hash.update(`${mainTemplate.outputOptions.publicPath}`);
+			hash.update(`${mainTemplate.outputOptions.filename}`);
+			hash.update(`${mainTemplate.outputOptions.chunkFilename}`);
+			hash.update(`${mainTemplate.outputOptions.chunkCallbackName}`);
+			hash.update(`${mainTemplate.outputOptions.globalObject}`);
+		});
+	}
+}
+module.exports = WebWorkerMainTemplatePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.1.0",
+  "version": "4.4.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "node-libs-browser": "^2.0.0",
     "schema-utils": "^0.4.2",
     "tapable": "^1.0.0",
-    "uglifyjs-webpack-plugin": "^1.1.1",
+    "uglifyjs-webpack-plugin": "^1.2.4",
     "watchpack": "^1.5.0",
     "webpack-sources": "^1.0.1"
   },
@@ -34,9 +34,10 @@
     "coveralls": "^2.11.2",
     "css-loader": "^0.28.3",
     "es6-promise-polyfill": "^1.1.1",
-    "eslint": "^4.3.0",
-    "eslint-plugin-node": "^5.1.1",
-    "eslint-plugin-prettier": "^2.3.1",
+    "eslint": "^4.19.1",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-prettier": "^2.6.0",
     "express": "~4.13.1",
     "file-loader": "^1.1.6",
     "glob": "^7.1.2",
@@ -50,7 +51,7 @@
     "lodash": "^4.17.4",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
-    "prettier": "^1.8.2",
+    "prettier": "^1.11.1",
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
@@ -102,9 +103,9 @@
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
     "lint-files": "npm run lint && npm run schema-lint",
-    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "lint": "eslint lib bin hot buildin \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\"",
     "fix": "npm run lint -- --fix",
-    "pretty-files": "prettier \"lib/**.*\" \"bin/**.*\" \"hot/**.*\" \"buildin/**.*\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" --write",
+    "pretty-files": "prettier \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" --write",
     "schema-lint": "mocha test/*.lint.js --opts test/lint-mocha.opts",
     "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
     "cover": "npm run cover:init && npm run cover:all && npm run cover:report",