Merge pull request webpack#6116 from webpack/optimize/concat-module

sokra · web-flow · commit e1ce43b5b350 · 2017-12-13T15:05:58.000+01:00
shorter code in concatenated module
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -625,7 +625,7 @@ class ConcatenatedModule extends Module {
 		// add harmony compatibility flag (must be first because of possible circular dependencies)
 		const usedExports = this.rootModule.usedExports;
 		if(usedExports === true) {
-			result.add(`Object.defineProperty(${this.exportsArgument}, "__esModule", { value: true });\n`);
+			result.add(`__webpack_require__.r(${this.exportsArgument});\n`);
 		}
 
 		// define required namespace objects (must be before evaluation modules)
diff --git a/test/statsCases/commons-plugin-issue-4980/expected.txt b/test/statsCases/commons-plugin-issue-4980/expected.txt
@@ -3,7 +3,7 @@ Child
     Hash: e6af0e572727ae2b753c
     Time: Xms
                              Asset       Size  Chunks             Chunk Names
-                            app.js  687 bytes       0  [emitted]  app
+                            app.js  656 bytes       0  [emitted]  app
     vendor.054b9142e1966b5880c5.js  619 bytes       1  [emitted]  vendor
                         runtime.js   7.03 KiB       2  [emitted]  runtime
     [./constants.js] 87 bytes {1} [built]
@@ -12,7 +12,7 @@ Child
     Hash: bb2d69615a180135bcde
     Time: Xms
                              Asset       Size  Chunks             Chunk Names
-                            app.js  704 bytes       0  [emitted]  app
+                            app.js  673 bytes       0  [emitted]  app
     vendor.054b9142e1966b5880c5.js  619 bytes       1  [emitted]  vendor
                         runtime.js   7.03 KiB       2  [emitted]  runtime
     [./constants.js] 87 bytes {1} [built]
diff --git a/test/statsCases/parse-error/expected.txt b/test/statsCases/parse-error/expected.txt
@@ -1,5 +1,5 @@
   Asset      Size  Chunks  Chunk Names
-main.js  3.12 KiB       0  main
+main.js  3.09 KiB       0  main
    [0] ./index.js + 1 modules 35 bytes {0} [built]
    [1] ./b.js 169 bytes {0} [built] [failed] [1 error]
 

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ class ConcatenatedModule extends Module {`
`625`	`625`	`// add harmony compatibility flag (must be first because of possible circular dependencies)`
`626`	`626`	`const usedExports = this.rootModule.usedExports;`
`627`	`627`	`if(usedExports === true) {`
`628`		- result.add(`Object.defineProperty(${this.exportsArgument}, "__esModule", { value: true });\n`);
	`628`	+ result.add(`__webpack_require__.r(${this.exportsArgument});\n`);
`629`	`629`	`}`
`630`	`630`
`631`	`631`	`// define required namespace objects (must be before evaluation modules)`