Merge branch 'master' of github.com:webpack/webpack into examples-dll-readme-update2

aretecode · aretecode · commit 914fe2c92353 · 2017-04-21T15:47:19.000-07:00
diff --git a/examples/common-chunk-and-vendor-chunk/README.md b/examples/common-chunk-and-vendor-chunk/README.md
@@ -3,31 +3,31 @@ This example shows how to create an explicit vendor chunk as well as a common ch
 To better understand, here are the entry points and which utility modules they depend on:
 
 - `pageA`
- - `utility1`
- - `utility2`
+  - `utility1`
+  - `utility2`
 - `pageB`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 - `pageC`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 
 Given this configuration, webpack will produce the following bundles:
 
 - `vendor`
- - webpack runtime
- - `vendor1`
- - `vendor2`
+  - webpack runtime
+  - `vendor1`
+  - `vendor2`
 - `common`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 - `pageA`
- - `pageA`
- - `utility1`
+  - `pageA`
+  - `utility1`
 - `pageB`
- - `pageB`
+  - `pageB`
 - `pageC`
- - `pageC`
+  - `pageC`
 
 With this bundle configuration, you would load your third party libraries, then your common application code, then your page-specific application code.
 
diff --git a/examples/common-chunk-and-vendor-chunk/template.md b/examples/common-chunk-and-vendor-chunk/template.md
@@ -3,31 +3,31 @@ This example shows how to create an explicit vendor chunk as well as a common ch
 To better understand, here are the entry points and which utility modules they depend on:
 
 - `pageA`
- - `utility1`
- - `utility2`
+  - `utility1`
+  - `utility2`
 - `pageB`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 - `pageC`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 
 Given this configuration, webpack will produce the following bundles:
 
 - `vendor`
- - webpack runtime
- - `vendor1`
- - `vendor2`
+  - webpack runtime
+  - `vendor1`
+  - `vendor2`
 - `common`
- - `utility2`
- - `utility3`
+  - `utility2`
+  - `utility3`
 - `pageA`
- - `pageA`
- - `utility1`
+  - `pageA`
+  - `utility1`
 - `pageB`
- - `pageB`
+  - `pageB`
 - `pageC`
- - `pageC`
+  - `pageC`
 
 With this bundle configuration, you would load your third party libraries, then your common application code, then your page-specific application code.
 
diff --git a/lib/DelegatedModule.js b/lib/DelegatedModule.js
@@ -67,6 +67,8 @@ class DelegatedModule extends Module {
 					str += `[${JSON.stringify(this.request)}]`;
 					break;
 			}
+
+			str += ";";
 		}
 
 		if(this.useSourceMap) {
diff --git a/test/configCases/plugins/provide-plugin/harmony.js b/test/configCases/plugins/provide-plugin/harmony.js
@@ -0,0 +1,3 @@
+export default "ECMAScript 2015";
+export const alias = "ECMAScript Harmony";
+export const year = 2015;
diff --git a/test/configCases/plugins/provide-plugin/index.js b/test/configCases/plugins/provide-plugin/index.js
@@ -25,3 +25,12 @@ it("should provide a module for a property request", function() {
 	var x = dddeeefff;
 	x.should.be.eql("fff");
 });
+
+it("should provide ES2015 modules", function() {
+	(es2015.default).should.be.eql("ECMAScript 2015");
+	(es2015.alias).should.be.eql("ECMAScript Harmony");
+	(es2015.year).should.be.eql(2015);
+	(es2015_name).should.be.eql("ECMAScript 2015");
+	(es2015_alias).should.be.eql("ECMAScript Harmony");
+	(es2015_year).should.be.eql(2015);
+});
diff --git a/test/configCases/plugins/provide-plugin/webpack.config.js b/test/configCases/plugins/provide-plugin/webpack.config.js
@@ -6,6 +6,10 @@ module.exports = {
 			"bbb.ccc": "./bbbccc",
 			"dddeeefff": ["./ddd", "eee", "3-f"],
 			"process.env.NODE_ENV": "./env",
+			es2015: "./harmony",
+			es2015_name: ["./harmony", "default"],
+			es2015_alias: ["./harmony", "alias"],
+			es2015_year: ["./harmony", "year"],
 		})
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ class DelegatedModule extends Module {`
`67`	`67`	str += `[${JSON.stringify(this.request)}]`;
`68`	`68`	`break;`
`69`	`69`	`}`
	`70`	`+`
	`71`	`+ str += ";";`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`if(this.useSourceMap) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default "ECMAScript 2015";`
	`2`	`+export const alias = "ECMAScript Harmony";`
	`3`	`+export const year = 2015;`