opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed some bugs

This commit is contained in:
Tobias Koppers 2013-02-13 13:00:01 +01:00
parent a3f73ae66f
commit 3315480432
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Compilation.js
View File

@ -447,19 +447,19 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
this.chunkTemplate.updateHash(hash);
this.moduleTemplate.updateHash(hash);
var i, chunk;
for(i = 0; i < this.modules.length; i++) {
var module = this.modules[i];
if(module.assets) {
Object.keys(module.assets).forEach(function(name) {
this.assets[name] = module.assets[name];
}, this);
}
}
for(i = 0; i < this.chunks.length; i++) {
var chunk = this.chunks[i];
chunk.updateHash(hash);
}
this.hash = hash = hash.digest("hex");
for(i = 0; i < this.modules.length; i++) {
var module = this.modules[i];
if(module.assets) {
Object.keys(module.assets).forEach(function(name) {
this.assets[name.replace(REGEXP_HASH, hash)] = module.assets[name];
}, this);
}
}
for(i = 0; i < this.chunks.length; i++) {
chunk = this.chunks[i];
chunk.files = [];

2
lib/ConsolePlugin.js
View File

@ -11,6 +11,6 @@ module.exports = ConsolePlugin;
ConsolePlugin.prototype.apply = function(compiler) {
function ignore() { return true; }
compiler.parser.plugin("expression console", function(expr) {
return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(path.join(__dirname, "..", "..", "buildin", "console.js")) + ")");
return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(path.join(__dirname, "..", "buildin", "console.js")) + ")");
});
};

2
lib/NormalModuleFactory.js
View File

@ -70,7 +70,7 @@ NormalModuleFactory.prototype.create = function(context, dependency, callback) {
this.resolveRequestArray.bind(this, context, this.preLoaders.match(resource), this.resolvers.loader)
], function(err, results) {
if(err) return callback(err);
loaders = results[0].concat(results[1]).concat(loaders).concat(results[2]);
loaders = results[0].concat(loaders).concat(results[1]).concat(results[2]);
onDoneResolving.call(this);
}.bind(this));
}

2
lib/RequestShortener.js
View File

@ -30,7 +30,7 @@ RequestShortener.prototype.shorten = function(request) {
if(this.buildinsAsModule)
request = request.replace(this.buildinsRegExp, "!(webpack)");
request = request.replace(this.currentDirectoryRegExp, "!.");
request = request.replace(this.parentDirectoryRegExp, "!.");
request = request.replace(this.parentDirectoryRegExp, "!..");
if(!this.buildinsAsModule)
request = request.replace(this.buildinsRegExp, "!(webpack)");
request = request.replace(/\\/g, "/");