Skip to content

Commit 7112943

Browse files
sokrasokra
authored
Merge pull request webpack#6298 from EugeneHlushko/refactor/indexof-to-includes
Refactor/indexof to includes
2 parents e3c2f73 + 2aab060 commit 7112943

21 files changed

+51
-59
lines changed

‎lib/BannerPlugin.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,9 @@ class BannerPlugin {
5353
query = filename.substr(querySplit);
5454
filename = filename.substr(0, querySplit);
5555
}
56-
57-
if(filename.indexOf("/") < 0) {
58-
basename = filename;
59-
} else {
60-
basename = filename.substr(filename.lastIndexOf("/") + 1);
61-
}
56+
basename = filename.includes("/") ?
57+
filename.substr(filename.lastIndexOf("/") + 1) :
58+
filename;
6259

6360
const comment = compilation.getPath(banner, {
6461
hash,

‎lib/Chunk.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,7 @@ class Chunk {
207207
}
208208

209209
addToCollection(collection, item) {
210-
if(item === this) {
211-
return false;
212-
}
213-
214-
if(collection.indexOf(item) > -1) {
210+
if(item === this || collection.includes(item)) {
215211
return false;
216212
}
217213

‎lib/Compiler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ class Compiler extends Tapable {
372372
plugins.forEach(plugin => plugin.apply(childCompiler));
373373
}
374374
for(const name in this.hooks) {
375-
if(["make", "compile", "emit", "afterEmit", "invalid", "done", "thisCompilation"].indexOf(name) < 0) {
375+
if(!["make", "compile", "emit", "afterEmit", "invalid", "done", "thisCompilation"].includes(name)) {
376376
if(childCompiler.hooks[name])
377377
childCompiler.hooks[name].taps = this.hooks[name].taps.slice();
378378
}

‎lib/ConstPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const ParserHelpers = require("./ParserHelpers");
99

1010
const getQuery = (request) => {
1111
const i = request.indexOf("?");
12-
return request.indexOf("?") < 0 ? "" : request.substr(i);
12+
return request.includes("?") ? request.substr(i) : "";
1313
};
1414

1515
class ConstPlugin {

‎lib/ErrorHelpers.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const webpackOptionsFlag = "WEBPACK_OPTIONS";
1111
exports.cutOffByFlag = (stack, flag) => {
1212
stack = stack.split("\n");
1313
for(let i = 0; i < stack.length; i++)
14-
if(stack[i].indexOf(flag) >= 0)
14+
if(stack[i].includes(flag))
1515
stack.length = i;
1616
return stack.join("\n");
1717
};
@@ -24,7 +24,7 @@ exports.cutOffMultilineMessage = (stack, message) => {
2424
stack = stack.split("\n");
2525
message = message.split("\n");
2626

27-
return stack.reduce((acc, line, idx) => line.indexOf(message[idx]) < 0 ? acc.concat(line) : acc, []).join("\n");
27+
return stack.reduce((acc, line, idx) => line.includes(message[idx]) ? acc : acc.concat(line), []).join("\n");
2828
};
2929

3030
exports.cutOffMessage = (stack, message) => {

‎lib/FlagDependencyUsagePlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
const addToSet = (a, b) => {
88
b.forEach(item => {
9-
if(a.indexOf(item) < 0)
9+
if(!a.includes(item))
1010
a.push(item);
1111
});
1212
return a;

‎lib/HotModuleReplacement.runtime.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ module.exports = function() {
1919
var fn = function(request) {
2020
if(me.hot.active) {
2121
if(installedModules[request]) {
22-
if(installedModules[request].parents.indexOf(moduleId) < 0)
22+
if(!installedModules[request].parents.includes(moduleId))
2323
installedModules[request].parents.push(moduleId);
2424
} else {
2525
hotCurrentParents = [moduleId];
2626
hotCurrentChildModule = request;
2727
}
28-
if(me.children.indexOf(request) < 0)
28+
if(!me.children.includes(request))
2929
me.children.push(request);
3030
} else {
3131
console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
@@ -305,7 +305,7 @@ module.exports = function() {
305305
parentId: parentId
306306
};
307307
}
308-
if(outdatedModules.indexOf(parentId) >= 0) continue;
308+
if(outdatedModules.includes(parentId)) continue;
309309
if(parent.hot._acceptedDependencies[moduleId]) {
310310
if(!outdatedDependencies[parentId])
311311
outdatedDependencies[parentId] = [];
@@ -332,7 +332,7 @@ module.exports = function() {
332332
function addAllToSet(a, b) {
333333
for(var i = 0; i < b.length; i++) {
334334
var item = b[i];
335-
if(a.indexOf(item) < 0)
335+
if(!a.includes(item))
336336
a.push(item);
337337
}
338338
}
@@ -517,7 +517,7 @@ module.exports = function() {
517517
dependency = moduleOutdatedDependencies[i];
518518
cb = module.hot._acceptedDependencies[dependency];
519519
if(cb) {
520-
if(callbacks.indexOf(cb) >= 0) continue;
520+
if(callbacks.includes(cb)) continue;
521521
callbacks.push(cb);
522522
}
523523
}

‎lib/Module.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ class Module extends DependenciesBlock {
253253
if(this.isProvided(exportName)) {
254254
if(this.buildMeta.exportsType === "namespace")
255255
return Template.numberToIdentifer(idx);
256-
else if(this.buildMeta.exportsType === "named" && this.usedExports.indexOf("default") < 0)
256+
else if(this.buildMeta.exportsType === "named" && !this.usedExports.includes("default"))
257257
return Template.numberToIdentifer(idx);
258258
}
259259
return exportName;
@@ -262,7 +262,7 @@ class Module extends DependenciesBlock {
262262
isProvided(exportName) {
263263
if(!Array.isArray(this.buildMeta.providedExports))
264264
return null;
265-
return this.buildMeta.providedExports.indexOf(exportName) >= 0;
265+
return this.buildMeta.providedExports.includes(exportName);
266266
}
267267

268268
toString() {

‎lib/ProvidePlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ProvidePlugin {
3333
}
3434
parser.hooks.expression.for(name).tap("ProvidePlugin", expr => {
3535
let nameIdentifier = name;
36-
const scopedName = name.indexOf(".") >= 0;
36+
const scopedName = name.includes(".");
3737
let expression = `require(${JSON.stringify(request[0])})`;
3838
if(scopedName) {
3939
nameIdentifier = `__webpack_provided_${name.replace(/\./g, "_dot_")}`;

‎lib/RuleSet.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ module.exports = class RuleSet {
229229
newRule.oneOf = RuleSet.normalizeRules(rule.oneOf, refs, `${ident}-oneOf`);
230230

231231
const keys = Object.keys(rule).filter((key) => {
232-
return ["resource", "resourceQuery", "compiler", "test", "include", "exclude", "issuer", "loader", "options", "query", "loaders", "use", "rules", "oneOf"].indexOf(key) < 0;
232+
return !["resource", "resourceQuery", "compiler", "test", "include", "exclude", "issuer", "loader", "options", "query", "loaders", "use", "rules", "oneOf"].includes(key);
233233
});
234234
keys.forEach((key) => {
235235
newRule[key] = rule[key];
@@ -301,7 +301,7 @@ module.exports = class RuleSet {
301301
}
302302

303303
const keys = Object.keys(item).filter(function(key) {
304-
return ["options", "query"].indexOf(key) < 0;
304+
return !["options", "query"].includes(key);
305305
});
306306

307307
keys.forEach(function(key) {
@@ -393,7 +393,7 @@ module.exports = class RuleSet {
393393

394394
// apply
395395
const keys = Object.keys(rule).filter((key) => {
396-
return ["resource", "resourceQuery", "compiler", "issuer", "rules", "oneOf", "use", "enforce"].indexOf(key) < 0;
396+
return !["resource", "resourceQuery", "compiler", "issuer", "rules", "oneOf", "use", "enforce"].includes(key);
397397
});
398398
keys.forEach((key) => {
399399
result.push({

0 commit comments

Comments
 (0)