root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/eslint-no-inner-declarations-warnings

This commit is contained in:
Tobias Koppers 2016-10-30 00:29:33 +02:00 committed by GitHub
parent 6b39a5325c 6843bc41b2
commit 44d7a0a742
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/UmdMainTemplatePlugin.js
View File

@ -164,7 +164,7 @@ UmdMainTemplatePlugin.prototype.apply = function(compilation) {
" for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n" +
" }\n"
) +
"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, "\n});\n");
"})(this, function(" + externalsArguments(externals) + ") {\nreturn ", "webpack/universalModuleDefinition"), source, ";\n})");
}.bind(this));
mainTemplate.plugin("global-hash-paths", function(paths) {
if(this.name) paths = paths.concat(this.name);