Skip to content

Commit 3201dc3

Browse files
sokrasokra
committed
Merge branch 'webpack-1'
Conflicts: lib/NormalModuleFactory.js package.json
2 parents 235c58c + 6b60662 commit 3201dc3

File tree

4 files changed

+53
-49
lines changed

4 files changed

+53
-49
lines changed

‎lib/Compilation.js‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,12 @@ Compilation.prototype.processModuleDependencies = function(module, callback) {
171171
};
172172

173173
Compilation.prototype.addModuleDependencies = function(module, dependencies, bail, cacheGroup, recursive, callback) {
174-
var start = this.profile && +new Date();
174+
var _this = this;
175+
var start = _this.profile && +new Date();
175176

176177
var factories = [];
177178
for(var i = 0; i < dependencies.length; i++) {
178-
var factory = this.dependencyFactories.get(dependencies[i][0].constructor);
179+
var factory = _this.dependencyFactories.get(dependencies[i][0].constructor);
179180
if(!factory) {
180181
return callback(new Error("No module factory available for dependency type: " + dependencies[i][0].constructor.name));
181182
}
@@ -187,27 +188,27 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
187188
return !!d.critical;
188189
});
189190
if(criticalDependencies.length > 0) {
190-
this.warnings.push(new CriticalDependenciesWarning(module, criticalDependencies));
191+
_this.warnings.push(new CriticalDependenciesWarning(module, criticalDependencies));
191192
}
192193

193194
var errorAndCallback = function errorAndCallback(err) {
194195
err.dependencies = dependencies;
195196
err.origin = module;
196197
module.dependenciesErrors.push(err);
197-
this.errors.push(err);
198+
_this.errors.push(err);
198199
if(bail) {
199200
callback(err);
200201
} else {
201202
callback();
202203
}
203-
}.bind(this);
204+
};
204205
var warningAndCallback = function warningAndCallback(err) {
205206
err.dependencies = dependencies;
206207
err.origin = module;
207208
module.dependenciesWarnings.push(err);
208-
this.warnings.push(err);
209+
_this.warnings.push(err);
209210
callback();
210-
}.bind(this);
211+
};
211212

212213
var factory = item[0];
213214
factory.create(module.context, dependencies[0], function(err, dependantModule) {
@@ -230,7 +231,7 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
230231
if(!dependantModule) {
231232
return process.nextTick(callback);
232233
}
233-
if(this.profile) {
234+
if(_this.profile) {
234235
if(!dependantModule.profile) {
235236
dependantModule.profile = {};
236237
}
@@ -239,10 +240,10 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
239240
}
240241

241242
dependantModule.issuer = module.identifier();
242-
var newModule = this.addModule(dependantModule, cacheGroup);
243+
var newModule = _this.addModule(dependantModule, cacheGroup);
243244

244245
if(!newModule) { // from cache
245-
dependantModule = this.getModule(dependantModule);
246+
dependantModule = _this.getModule(dependantModule);
246247

247248
if(dependantModule.optional) {
248249
dependantModule.optional = isOptional();
@@ -253,7 +254,7 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
253254
dependantModule.addReason(module, dep);
254255
});
255256

256-
if(this.profile) {
257+
if(_this.profile) {
257258
if(!module.profile) {
258259
module.profile = {};
259260
}
@@ -267,7 +268,7 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
267268
}
268269

269270
if(newModule instanceof Module) {
270-
if(this.profile) {
271+
if(_this.profile) {
271272
newModule.profile = dependantModule.profile;
272273
}
273274

@@ -280,13 +281,13 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
280281
dependantModule.addReason(module, dep);
281282
});
282283

283-
if(this.profile) {
284+
if(_this.profile) {
284285
var afterBuilding = +new Date();
285286
module.profile.building = afterBuilding - afterFactory;
286287
}
287288

288289
if(recursive) {
289-
return process.nextTick(this.processModuleDependencies.bind(this, dependantModule, callback));
290+
return process.nextTick(_this.processModuleDependencies.bind(_this, dependantModule, callback));
290291
} else {
291292
return process.nextTick(callback);
292293
}
@@ -299,25 +300,25 @@ Compilation.prototype.addModuleDependencies = function(module, dependencies, bai
299300
dependantModule.addReason(module, dep);
300301
});
301302

302-
this.buildModule(dependantModule, function(err) {
303+
_this.buildModule(dependantModule, function(err) {
303304
if(err) {
304305
return errorOrWarningAndCallback(err);
305306
}
306307

307-
if(this.profile) {
308+
if(_this.profile) {
308309
var afterBuilding = +new Date();
309310
dependantModule.profile.building = afterBuilding - afterFactory;
310311
}
311312

312313
if(recursive) {
313-
this.processModuleDependencies(dependantModule, callback);
314+
_this.processModuleDependencies(dependantModule, callback);
314315
} else {
315316
return callback();
316317
}
317-
}.bind(this));
318+
});
318319

319-
}.bind(this));
320-
}.bind(this), function(err) {
320+
});
321+
}, function(err) {
321322
if(err) {
322323
return callback(err);
323324
}

‎lib/NodeStuffPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
8989
compiler.parser.plugin("expression module", function() {
9090
var moduleJsPath = path.join(__dirname, "..", "buildin", "module.js");
9191
if(this.state.module.context) {
92-
moduleJsPath = path.relative(this.state.module.context, moduleJsPath);
92+
moduleJsPath = "./" + path.relative(this.state.module.context, moduleJsPath).replace(/\\/g, "/");
9393
}
9494
return ModuleParserHelpers.addParsedVariable(this, "module", "require(" + JSON.stringify(moduleJsPath) + ")(module)");
9595
});

‎lib/NormalModuleFactory.js‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ function NormalModuleFactory(context, resolvers, parser, options) {
1818
this.postLoaders = new LoadersList(options.postLoaders);
1919
this.context = context || "";
2020
this.plugin("factory", function() {
21+
var _this = this;
2122
return function(result, callback) {
22-
var resolver = this.applyPluginsWaterfall("resolver", null);
23+
var resolver = _this.applyPluginsWaterfall("resolver", null);
2324

2425
// Ignored
2526
if(!resolver) return callback();
@@ -34,13 +35,13 @@ function NormalModuleFactory(context, resolvers, parser, options) {
3435
if(typeof data.source === "function")
3536
return callback(null, data);
3637

37-
this.applyPluginsAsyncWaterfall("after-resolve", data, function(err, result) {
38+
_this.applyPluginsAsyncWaterfall("after-resolve", data, function(err, result) {
3839
if(err) return callback(err);
3940

4041
// Ignored
4142
if(!result) return callback();
4243

43-
var createdModule = this.applyPluginsBailResult("create-module", result);
44+
var createdModule = _this.applyPluginsBailResult("create-module", result);
4445
if(!createdModule) {
4546
createdModule = new NormalModule(
4647
result.request,
@@ -52,14 +53,15 @@ function NormalModuleFactory(context, resolvers, parser, options) {
5253
);
5354
}
5455

55-
createdModule = this.applyPluginsWaterfall("module", createdModule);
56+
createdModule = _this.applyPluginsWaterfall("module", createdModule);
5657

5758
return callback(null, createdModule);
58-
}.bind(this));
59-
}.bind(this));
60-
}.bind(this);
59+
});
60+
});
61+
};
6162
});
6263
this.plugin("resolver", function() {
64+
var _this = this;
6365
return function(data, callback) {
6466
var context = data.context;
6567
var request = data.request;
@@ -72,13 +74,13 @@ function NormalModuleFactory(context, resolvers, parser, options) {
7274

7375
async.parallel([
7476
function(callback) {
75-
this.resolveRequestArray(context, elements, this.resolvers.loader, callback);
76-
}.bind(this),
77+
_this.resolveRequestArray(context, elements, _this.resolvers.loader, callback);
78+
},
7779
function(callback) {
7880
if(resource === "" || resource[0] === "?")
7981
return callback(null, resource);
80-
this.resolvers.normal.resolve(context, resource, callback);
81-
}.bind(this)
82+
_this.resolvers.normal.resolve(context, resource, callback);
83+
}
8284
], function(err, results) {
8385
if(err) return callback(err);
8486
var loaders = results[0];
@@ -98,26 +100,26 @@ function NormalModuleFactory(context, resolvers, parser, options) {
98100
resourcePath = resourcePath.substr(0, queryIndex);
99101

100102
if(noPrePostAutoLoaders)
101-
return onDoneResolving.call(this);
103+
return onDoneResolving();
102104
if(noAutoLoaders) {
103105
async.parallel([
104-
this.resolveRequestArray.bind(this, context, noPostAutoLoaders ? [] : this.postLoaders.match(resourcePath), this.resolvers.loader),
105-
this.resolveRequestArray.bind(this, context, this.preLoaders.match(resourcePath), this.resolvers.loader)
106+
_this.resolveRequestArray.bind(_this, context, noPostAutoLoaders ? [] : _this.postLoaders.match(resourcePath), _this.resolvers.loader),
107+
_this.resolveRequestArray.bind(_this, context, _this.preLoaders.match(resourcePath), _this.resolvers.loader)
106108
], function(err, results) {
107109
if(err) return callback(err);
108110
loaders = results[0].concat(loaders).concat(results[1]);
109-
onDoneResolving.call(this);
110-
}.bind(this));
111+
onDoneResolving();
112+
});
111113
} else {
112114
async.parallel([
113-
this.resolveRequestArray.bind(this, context, noPostAutoLoaders ? [] : this.postLoaders.match(resourcePath), this.resolvers.loader),
114-
this.resolveRequestArray.bind(this, context, this.loaders.match(resourcePath), this.resolvers.loader),
115-
this.resolveRequestArray.bind(this, context, this.preLoaders.match(resourcePath), this.resolvers.loader)
115+
_this.resolveRequestArray.bind(_this, context, noPostAutoLoaders ? [] : _this.postLoaders.match(resourcePath), _this.resolvers.loader),
116+
_this.resolveRequestArray.bind(_this, context, _this.loaders.match(resourcePath), _this.resolvers.loader),
117+
_this.resolveRequestArray.bind(_this, context, _this.preLoaders.match(resourcePath), _this.resolvers.loader)
116118
], function(err, results) {
117119
if(err) return callback(err);
118120
loaders = results[0].concat(loaders).concat(results[1]).concat(results[2]);
119-
onDoneResolving.call(this);
120-
}.bind(this));
121+
onDoneResolving();
122+
});
121123
}
122124

123125
function onDoneResolving() {
@@ -128,11 +130,11 @@ function NormalModuleFactory(context, resolvers, parser, options) {
128130
rawRequest: request,
129131
loaders: loaders,
130132
resource: resource,
131-
parser: this.parser
133+
parser: _this.parser
132134
});
133135
}
134-
}.bind(this));
135-
}.bind(this);
136+
});
137+
};
136138
});
137139
}
138140
module.exports = NormalModuleFactory;
@@ -141,9 +143,10 @@ NormalModuleFactory.prototype = Object.create(Tapable.prototype);
141143
NormalModuleFactory.prototype.constructor = NormalModuleFactory;
142144

143145
NormalModuleFactory.prototype.create = function(context, dependency, callback) {
146+
var _this = this;
144147
context = context || this.context;
145148
var request = dependency.request;
146-
this.applyPluginsAsyncWaterfall("before-resolve", {
149+
_this.applyPluginsAsyncWaterfall("before-resolve", {
147150
context: context,
148151
request: request,
149152
dependency: dependency
@@ -153,14 +156,14 @@ NormalModuleFactory.prototype.create = function(context, dependency, callback) {
153156
// Ignored
154157
if(!result) return callback();
155158

156-
var factory = this.applyPluginsWaterfall("factory", null);
159+
var factory = _this.applyPluginsWaterfall("factory", null);
157160

158161
// Ignored
159162
if(!factory) return callback();
160163

161164
factory(result, callback);
162165

163-
}.bind(this));
166+
});
164167
};
165168

166169
NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray(context, array, resolver, callback) {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"optimist": "~0.6.0",
1717
"supports-color": "^3.1.0",
1818
"tapable": "~0.1.8",
19-
"uglify-js": "~2.5.0",
19+
"uglify-js": "~2.6.0",
2020
"watchpack": "^0.2.1",
2121
"webpack-core": "~0.6.0"
2222
},

0 commit comments

Comments
 (0)