Merge pull request webpack#988 from researchgate/crossorigin-loading

sokra · sokra · commit 26512c564fc9 · 2015-04-20T19:55:17.000+02:00
Possibility to load chunks with crossorigin
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -33,6 +33,7 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 		var filename = this.outputOptions.filename || "bundle.js";
 		var chunkFilename = this.outputOptions.chunkFilename || "[id]." + filename;
 		var chunkMaps = chunk.getChunkMaps();
+		var crossOriginLoading = this.outputOptions.crossOriginLoading;
 		return this.asString([
 			"// \"0\" is the signal for \"already loaded\"",
 			"if(installedChunks[chunkId] === 0)",
@@ -50,6 +51,7 @@ JsonpMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 				"script.type = 'text/javascript';",
 				"script.charset = 'utf-8';",
 				"script.async = true;",
+				crossOriginLoading ? "script.crossOrigin = '" + crossOriginLoading + "';" : "",
 				"script.src = " + this.requireFn + ".p + " +
 					this.applyPluginsWaterfall("asset-path", JSON.stringify(chunkFilename), {
 						hash: "\" + " + this.renderCurrentHashCode(hash) + " + \"",
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -34,6 +34,7 @@ function WebpackOptionsDefaulter() {
 	this.set("output.sourceMapFilename", "[file].map[query]");
 	this.set("output.hotUpdateChunkFilename", "[id].[hash].hot-update.js");
 	this.set("output.hotUpdateMainFilename", "[hash].hot-update.json");
+	this.set("output.crossOriginLoading", false);
 	this.set("output.hashFunction", "md5");
 	this.set("output.hashDigest", "hex");
 	this.set("output.hashDigestLength", 20);
