escape __WEBPACK_EXTERNAL_MODULE_ through Template.toIdentifier

timse · timse · commit 3515fddb5342 · 2017-02-20T19:17:51.000+11:00
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
@@ -6,6 +6,7 @@
 "use strict";
 
 const ConcatSource = require("webpack-sources").ConcatSource;
+const Template = require("./Template");
 
 class AmdMainTemplatePlugin {
 	constructor(name) {
@@ -21,7 +22,7 @@ class AmdMainTemplatePlugin {
 				typeof m.request === "object" ? m.request.amd : m.request
 			));
 			const externalsArguments = externals.map((m) =>
-				`__WEBPACK_EXTERNAL_MODULE_${m.id}__`
+				Template.toIdentifier(`__WEBPACK_EXTERNAL_MODULE_${m.id}__`)
 			).join(", ");
 
 			if(this.name) {
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -7,6 +7,7 @@ const Module = require("./Module");
 const OriginalSource = require("webpack-sources").OriginalSource;
 const RawSource = require("webpack-sources").RawSource;
 const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
+const Template = require("./Template");
 
 class ExternalModule extends Module {
 	constructor(request, type) {
@@ -64,7 +65,7 @@ class ExternalModule extends Module {
 	}
 
 	getSourceForAmdOrUmdExternal(id, optional, request) {
-		const externalVariable = `__WEBPACK_EXTERNAL_MODULE_${id}__`;
+		const externalVariable = Template.toIdentifier(`__WEBPACK_EXTERNAL_MODULE_${id}__`);
 		const missingModuleError = optional ? this.checkExternalVariable(externalVariable, request) : "";
 		return `${missingModuleError}module.exports = ${externalVariable};`;
 	}
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -4,6 +4,7 @@
 */
 var ConcatSource = require("webpack-sources").ConcatSource;
 var OriginalSource = require("webpack-sources").OriginalSource;
+var Template = require("./Template");
 
 function accessorToObjectAccess(accessor) {
 	return accessor.map(function(a) {
@@ -87,7 +88,7 @@ UmdMainTemplatePlugin.prototype.apply = function(compilation) {
 
 		function externalsArguments(modules) {
 			return modules.map(function(m) {
-				return "__WEBPACK_EXTERNAL_MODULE_" + m.id + "__";
+				return Template.toIdentifier("__WEBPACK_EXTERNAL_MODULE_" + m.id + "__");
 			}).join(", ");
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ const Module = require("./Module");`
`7`	`7`	`const OriginalSource = require("webpack-sources").OriginalSource;`
`8`	`8`	`const RawSource = require("webpack-sources").RawSource;`
`9`	`9`	`const WebpackMissingModule = require("./dependencies/WebpackMissingModule");`
	`10`	`+const Template = require("./Template");`
`10`	`11`
`11`	`12`	`class ExternalModule extends Module {`
`12`	`13`	`constructor(request, type) {`
`@@ -64,7 +65,7 @@ class ExternalModule extends Module {`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`getSourceForAmdOrUmdExternal(id, optional, request) {`
`67`		- const externalVariable = `__WEBPACK_EXTERNAL_MODULE_${id}__`;
	`68`	+ const externalVariable = Template.toIdentifier(`__WEBPACK_EXTERNAL_MODULE_${id}__`);
`68`	`69`	`const missingModuleError = optional ? this.checkExternalVariable(externalVariable, request) : "";`
`69`	`70`	return `${missingModuleError}module.exports = ${externalVariable};`;
`70`	`71`	`}`