better source maps

sokra · sokra · commit f3012a4d8d0d · 2014-02-12T08:57:26.000+01:00
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -35,7 +35,7 @@ MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependency
 	}
 	var source = new ConcatSource();
 	source.add("/******/ (function(modules) { // webpackBootstrap\n");
-	source.add(new PrefixSource("/******/ \t", new OriginalSource(this.asString(buf), "webpackBootstrap " + hash)));
+	source.add(new PrefixSource("/******/ \t", new OriginalSource(this.asString(buf), "webpack/bootstrap " + hash)));
 	source.add("\n/******/ })\n");
 	source.add("/************************************************************************/\n");
 	source.add("/******/ (");
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -42,8 +42,8 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 								str = module.readableIdentifier(requestShortener);
 							else
 								str = requestShortener.shorten(source);
-							while(str.indexOf("?") >= 0 && str.indexOf("?") < str.lastIndexOf("!"))
-								str = str.replace(/\?/, "(query)");
+							str = str.split("!");
+							str = str.pop() + (str.length > 0 ? " " + str.join("!") : "");
 							var idx;
 							while((idx = sourceMap.sources.indexOf(str) >= 0) && (idx < i)) {
 								str += "*";
diff --git a/lib/UmdMainTemplateDecorator.js b/lib/UmdMainTemplateDecorator.js
@@ -33,7 +33,7 @@ UmdMainTemplateDecorator.prototype.render = function(hash, chunk, moduleTemplate
 		) +
 		"		}\n" +
 		"	}\n" +
-		"})(this)\n", "webpackUniversalModuleDefinition"), source);
+		"})(this)\n", "webpack/universalModuleDefinition"), source);
 };
 UmdMainTemplateDecorator.prototype.updateHash = function(hash) {
 	hash.update("umd");

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ MainTemplate.prototype.render = function(hash, chunk, moduleTemplate, dependency`
`35`	`35`	`}`
`36`	`36`	`var source = new ConcatSource();`
`37`	`37`	`source.add("/******/ (function(modules) { // webpackBootstrap\n");`
`38`		`- source.add(new PrefixSource("/******/ \t", new OriginalSource(this.asString(buf), "webpackBootstrap " + hash)));`
	`38`	`+ source.add(new PrefixSource("/******/ \t", new OriginalSource(this.asString(buf), "webpack/bootstrap " + hash)));`
`39`	`39`	`source.add("\n/******/ })\n");`
`40`	`40`	`source.add("/************************************************************************/\n");`
`41`	`41`	`source.add("/******/ (");`