Skip to content

Commit 5b5775f

Browse files
sokrasokra
committed
Merge pull request webpack#1903 from kennyt/fix/lint-warnings
Fix no-redeclare in code and switch to error mode
2 parents 660c2c4 + 14edaaa commit 5b5775f

17 files changed

Lines changed: 187 additions & 138 deletions

‎.eslintrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"nodeca/indent": [2, "tabs", 1 ],
1414
"eol-last": 1,
1515
"no-shadow": 0,
16-
"no-redeclare": 1,
16+
"no-redeclare": 2,
1717
"no-extra-bind": 1,
1818
"no-empty": 0,
1919
"no-process-exit": 1,

‎bin/convert-argv.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@ module.exports = function(optimist, argv, convertOptions) {
4444
return a.concat(i);
4545
}, []);
4646

47+
var i;
4748
if(argv.config) {
4849
configPath = path.resolve(argv.config);
49-
for(var i = extensions.length - 1; i >= 0; i--) {
50+
for(i = extensions.length - 1; i >= 0; i--) {
5051
var tmpExt = extensions[i];
5152
if(configPath.indexOf(tmpExt, configPath.length - tmpExt.length) > -1) {
5253
ext = tmpExt;
@@ -57,7 +58,7 @@ module.exports = function(optimist, argv, convertOptions) {
5758
ext = path.extname(configPath);
5859
}
5960
} else {
60-
for(var i = 0; i < configFiles.length; i++) {
61+
for(i = 0; i < configFiles.length; i++) {
6162
var webpackConfig = configFiles[i].path;
6263
if(fs.existsSync(webpackConfig)) {
6364
ext = configFiles[i].ext;

‎lib/HotModuleReplacement.runtime.js‎

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,20 @@ module.exports = function() {
231231
if(hotStatus !== "ready") throw new Error("apply() is only allowed in ready status");
232232
options = options || {};
233233

234+
var cb;
235+
var i;
236+
var j;
237+
var module;
238+
var moduleId;
239+
234240
function getAffectedStuff(module) {
235241
var outdatedModules = [module];
236242
var outdatedDependencies = {};
237243

238244
var queue = outdatedModules.slice();
239245
while(queue.length > 0) {
240246
var moduleId = queue.pop();
241-
var module = installedModules[moduleId];
247+
module = installedModules[moduleId];
242248
if(!module || module.hot._selfAccepted)
243249
continue;
244250
if(module.hot._selfDeclined) {
@@ -284,7 +290,7 @@ module.exports = function() {
284290
var appliedUpdate = {};
285291
for(var id in hotUpdate) {
286292
if(Object.prototype.hasOwnProperty.call(hotUpdate, id)) {
287-
var moduleId = toModuleId(id);
293+
moduleId = toModuleId(id);
288294
var result = getAffectedStuff(moduleId);
289295
if(!result) {
290296
if(options.ignoreUnaccepted)
@@ -298,7 +304,7 @@ module.exports = function() {
298304
}
299305
appliedUpdate[moduleId] = hotUpdate[moduleId];
300306
addAllToSet(outdatedModules, result[0]);
301-
for(var moduleId in result[1]) {
307+
for(moduleId in result[1]) {
302308
if(Object.prototype.hasOwnProperty.call(result[1], moduleId)) {
303309
if(!outdatedDependencies[moduleId])
304310
outdatedDependencies[moduleId] = [];
@@ -310,8 +316,8 @@ module.exports = function() {
310316

311317
// Store self accepted outdated modules to require them later by the module system
312318
var outdatedSelfAcceptedModules = [];
313-
for(var i = 0; i < outdatedModules.length; i++) {
314-
var moduleId = outdatedModules[i];
319+
for(i = 0; i < outdatedModules.length; i++) {
320+
moduleId = outdatedModules[i];
315321
if(installedModules[moduleId] && installedModules[moduleId].hot._selfAccepted)
316322
outdatedSelfAcceptedModules.push({
317323
module: moduleId,
@@ -321,18 +327,19 @@ module.exports = function() {
321327

322328
// Now in "dispose" phase
323329
hotSetStatus("dispose");
330+
var idx;
324331
var queue = outdatedModules.slice();
325332
while(queue.length > 0) {
326-
var moduleId = queue.pop();
327-
var module = installedModules[moduleId];
333+
moduleId = queue.pop();
334+
module = installedModules[moduleId];
328335
if(!module) continue;
329336

330337
var data = {};
331338

332339
// Call dispose handlers
333340
var disposeHandlers = module.hot._disposeHandlers;
334-
for(var j = 0; j < disposeHandlers.length; j++) {
335-
var cb = disposeHandlers[j];
341+
for(j = 0; j < disposeHandlers.length; j++) {
342+
cb = disposeHandlers[j];
336343
cb(data);
337344
}
338345
hotCurrentModuleData[moduleId] = data;
@@ -344,24 +351,26 @@ module.exports = function() {
344351
delete installedModules[moduleId];
345352

346353
// remove "parents" references from all children
347-
for(var j = 0; j < module.children.length; j++) {
354+
for(j = 0; j < module.children.length; j++) {
348355
var child = installedModules[module.children[j]];
349356
if(!child) continue;
350-
var idx = child.parents.indexOf(moduleId);
357+
idx = child.parents.indexOf(moduleId);
351358
if(idx >= 0) {
352359
child.parents.splice(idx, 1);
353360
}
354361
}
355362
}
356363

357364
// remove outdated dependency from module children
358-
for(var moduleId in outdatedDependencies) {
365+
var dependency;
366+
var moduleOutdatedDependencies;
367+
for(moduleId in outdatedDependencies) {
359368
if(Object.prototype.hasOwnProperty.call(outdatedDependencies, moduleId)) {
360-
var module = installedModules[moduleId];
361-
var moduleOutdatedDependencies = outdatedDependencies[moduleId];
362-
for(var j = 0; j < moduleOutdatedDependencies.length; j++) {
363-
var dependency = moduleOutdatedDependencies[j];
364-
var idx = module.children.indexOf(dependency);
369+
module = installedModules[moduleId];
370+
moduleOutdatedDependencies = outdatedDependencies[moduleId];
371+
for(j = 0; j < moduleOutdatedDependencies.length; j++) {
372+
dependency = moduleOutdatedDependencies[j];
373+
idx = module.children.indexOf(dependency);
365374
if(idx >= 0) module.children.splice(idx, 1);
366375
}
367376
}
@@ -373,27 +382,27 @@ module.exports = function() {
373382
hotCurrentHash = hotUpdateNewHash;
374383

375384
// insert new code
376-
for(var moduleId in appliedUpdate) {
385+
for(moduleId in appliedUpdate) {
377386
if(Object.prototype.hasOwnProperty.call(appliedUpdate, moduleId)) {
378387
modules[moduleId] = appliedUpdate[moduleId];
379388
}
380389
}
381390

382391
// call accept handlers
383392
var error = null;
384-
for(var moduleId in outdatedDependencies) {
393+
for(moduleId in outdatedDependencies) {
385394
if(Object.prototype.hasOwnProperty.call(outdatedDependencies, moduleId)) {
386-
var module = installedModules[moduleId];
387-
var moduleOutdatedDependencies = outdatedDependencies[moduleId];
395+
module = installedModules[moduleId];
396+
moduleOutdatedDependencies = outdatedDependencies[moduleId];
388397
var callbacks = [];
389-
for(var i = 0; i < moduleOutdatedDependencies.length; i++) {
390-
var dependency = moduleOutdatedDependencies[i];
391-
var cb = module.hot._acceptedDependencies[dependency];
398+
for(i = 0; i < moduleOutdatedDependencies.length; i++) {
399+
dependency = moduleOutdatedDependencies[i];
400+
cb = module.hot._acceptedDependencies[dependency];
392401
if(callbacks.indexOf(cb) >= 0) continue;
393402
callbacks.push(cb);
394403
}
395-
for(var i = 0; i < callbacks.length; i++) {
396-
var cb = callbacks[i];
404+
for(i = 0; i < callbacks.length; i++) {
405+
cb = callbacks[i];
397406
try {
398407
cb(outdatedDependencies);
399408
} catch(err) {
@@ -405,9 +414,9 @@ module.exports = function() {
405414
}
406415

407416
// Load self accepted modules
408-
for(var i = 0; i < outdatedSelfAcceptedModules.length; i++) {
417+
for(i = 0; i < outdatedSelfAcceptedModules.length; i++) {
409418
var item = outdatedSelfAcceptedModules[i];
410-
var moduleId = item.module;
419+
moduleId = item.module;
411420
hotCurrentParents = [moduleId];
412421
try {
413422
$require$(moduleId);

‎lib/ModuleFilenameHelpers.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,24 @@ function asRegExp(test) {
4747
}
4848

4949
ModuleFilenameHelpers.createFilename = function createFilename(module, moduleFilenameTemplate, requestShortener) {
50+
var absoluteResourcePath;
51+
var hash;
52+
var identifier;
53+
var moduleId;
54+
var shortIdentifier;
5055
if(!module) module = "";
5156
if(typeof module === "string") {
52-
var shortIdentifier = requestShortener.shorten(module);
53-
var identifier = shortIdentifier;
54-
var moduleId = "";
55-
var absoluteResourcePath = module.split("!").pop();
56-
var hash = getHash(identifier);
57+
shortIdentifier = requestShortener.shorten(module);
58+
identifier = shortIdentifier;
59+
moduleId = "";
60+
absoluteResourcePath = module.split("!").pop();
61+
hash = getHash(identifier);
5762
} else {
58-
var shortIdentifier = module.readableIdentifier(requestShortener);
59-
var identifier = requestShortener.shorten(module.identifier());
60-
var moduleId = module.id;
61-
var absoluteResourcePath = module.resourcePath || module.identifier().split("!").pop();
62-
var hash = getHash(identifier);
63+
shortIdentifier = module.readableIdentifier(requestShortener);
64+
identifier = requestShortener.shorten(module.identifier());
65+
moduleId = module.id;
66+
absoluteResourcePath = module.resourcePath || module.identifier().split("!").pop();
67+
hash = getHash(identifier);
6368
}
6469
var resource = shortIdentifier.split("!").pop();
6570
var loaders = getBefore(shortIdentifier, "!");

0 commit comments

Comments
 (0)