Merge pull request webpack#1868 from waysact/1800/subresource-integrity

sokra · sokra · commit dcc08e7a317c · 2016-01-09T13:16:40.000+01:00
[WIP] Hooks for subresource integrity
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -26,26 +26,13 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 		}
 		return source;
 	});
-	mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
+	mainTemplate.plugin("jsonp-script", function(_, chunk, hash) {
 		var filename = this.outputOptions.filename;
 		var chunkFilename = this.outputOptions.chunkFilename;
 		var chunkMaps = chunk.getChunkMaps();
 		var crossOriginLoading = this.outputOptions.crossOriginLoading;
 		var chunkLoadTimeout = this.outputOptions.chunkLoadTimeout || 120000;
 		return this.asString([
-			"if(installedChunks[chunkId] === 0)",
-			this.indent([
-				"return Promise.resolve()"
-			]),
-			"",
-			"// an Promise means \"currently loading\".",
-			"if(installedChunks[chunkId]) {",
-			this.indent([
-				"return installedChunks[chunkId][2];"
-			]),
-			"}",
-			"// start chunk loading",
-			"var head = document.getElementsByTagName('head')[0];",
 			"var script = document.createElement('script');",
 			"script.type = 'text/javascript';",
 			"script.charset = 'utf-8';",
@@ -88,6 +75,25 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 				"}"
 			]),
 			"};",
+		]);
+	});
+	mainTemplate.plugin("require-ensure", function(_, chunk, hash) {
+		var chunkFilename = this.outputOptions.chunkFilename;
+		return this.asString([
+			"if(installedChunks[chunkId] === 0)",
+			this.indent([
+				"return Promise.resolve()"
+			]),
+			"",
+			"// an Promise means \"currently loading\".",
+			"if(installedChunks[chunkId]) {",
+			this.indent([
+				"return installedChunks[chunkId][2];"
+			]),
+			"}",
+			"// start chunk loading",
+			"var head = document.getElementsByTagName('head')[0];",
+			this.applyPluginsWaterfall("jsonp-script", "", chunk, hash),
 			"head.appendChild(script);",
 			"",
 			"var promise = new Promise(function(resolve, reject) {",
