Merge branch 'master' into next

sokra · sokra · commit 99ef4539c49c · 2017-12-04T20:04:20.000+01:00
# Conflicts:
#	test/statsCases/tree-shaking/expected.txt
diff --git a/lib/dependencies/RequireIncludeDependency.js b/lib/dependencies/RequireIncludeDependency.js
@@ -13,6 +13,14 @@ class RequireIncludeDependency extends ModuleDependency {
 		this.range = range;
 	}
 
+	getReference() {
+		if(!this.module) return null;
+		return {
+			module: this.module,
+			importedNames: [] // This doesn't use any export
+		};
+	}
+
 	get type() {
 		return "require.include";
 	}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "3.9.1",
+  "version": "3.10.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.",
   "dependencies": {
diff --git a/test/statsCases/tree-shaking/expected.txt b/test/statsCases/tree-shaking/expected.txt
@@ -1,7 +1,7 @@
-Hash: 2500e9cab76400ff4f51
+Hash: 96b4fcc6d81c4d2d8435
 Time: Xms
     Asset      Size  Chunks             Chunk Names
-bundle.js  7.03 KiB       0  [emitted]  main
+bundle.js  7.26 KiB       0  [emitted]  main
    [0] ./a.js 13 bytes {0} [built]
        [exports: a]
        [only some exports used: a]
@@ -12,7 +12,7 @@ bundle.js  7.03 KiB       0  [emitted]  main
        [only some exports used: c]
    [3] ./unknown2.js 0 bytes {0} [built]
        [only some exports used: y]
-   [4] ./index.js 276 bytes {0} [built]
+   [4] ./index.js 315 bytes {0} [built]
        [no exports]
    [5] ./reexport-known.js 49 bytes {0} [built]
        [exports: a, b]
@@ -26,4 +26,7 @@ bundle.js  7.03 KiB       0  [emitted]  main
    [8] ./reexport-star-unknown.js 68 bytes {0} [built]
        [only some exports used: a, c]
    [9] ./edge.js 45 bytes {0} [built]
-       [only some exports used: y]
+       [only some exports used: y]
+  [10] ./require.include.js 36 bytes {0} [built]
+       [exports: a, default]
+       [no exports used]
diff --git a/test/statsCases/tree-shaking/index.js b/test/statsCases/tree-shaking/index.js
@@ -5,3 +5,5 @@ import { a as a4, c as c4 } from "./reexport-star-unknown";
 import { y } from "./edge";
 
 console.log(a1, a2, a3, a4, c2, c4, y);
+
+require.include("./require.include");
diff --git a/test/statsCases/tree-shaking/require.include.js b/test/statsCases/tree-shaking/require.include.js
@@ -0,0 +1,2 @@
+export var a = 1;
+export default 2;

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,14 @@ class RequireIncludeDependency extends ModuleDependency {`
`13`	`13`	`this.range = range;`
`14`	`14`	`}`
`15`	`15`
	`16`	`+ getReference() {`
	`17`	`+ if(!this.module) return null;`
	`18`	`+ return {`
	`19`	`+ module: this.module,`
	`20`	`+ importedNames: [] // This doesn't use any export`
	`21`	`+ };`
	`22`	`+ }`
	`23`	`+`
`16`	`24`	`get type() {`
`17`	`25`	`return "require.include";`
`18`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "3.9.1",`
	`3`	`+ "version": "3.10.0",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"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.",`
`6`	`6`	`"dependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export var a = 1;`
	`2`	`+export default 2;`