Modernizing codebase by refactoring indexOf methods

infernojs · Oct 30, 2023 · b8396c6 · b8396c6
1 parent 5184994
commit b8396c6
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 88 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,7 @@ Inferno v9 requires following features to be present in the executing runtime:
 
 - `Promise`
 - `String.prototype.includes()`
+- `String.prototype.startsWith()`
 - `Array.prototype.includes()`
 - `Object.spread()`
 

diff --git a/fixtures/browser/package-lock.json b/fixtures/browser/package-lock.json
diff --git a/fixtures/packaging/build-all.js b/fixtures/packaging/build-all.js
@@ -21,7 +21,7 @@ function addResult(tool, environment, result) {
 }
 
 function buildFixture(tool, environment) {
-  const isWindows = os.type().indexOf('Windows') !== -1;
+  const isWindows = os.type().includes('Windows');
   // Let console know what's going on
   console.log(`Running ${tool}:${environment}`);
 

diff --git a/package.json b/package.json
@@ -77,6 +77,7 @@
     "test:memory": "node --expose-gc scripts/fakedom/uibench-reactlike/start.js",
     "test:memory:js-framework": "node --expose-gc scripts/fakedom/js-framework-bench/start.js",
     "test:memory:lifecycle": "node --expose-gc scripts/fakedom/uibench-lifecycle/start.js",
+    "test:memory:lifecycle:debug": "node --inspect-brk --expose-gc scripts/fakedom/uibench-lifecycle/start.js",
     "test:memory:js-framework:debug": "node --inspect-brk --expose-gc scripts/fakedom/js-framework-bench/start.js"
   },
   "devDependencies": {
@@ -90,14 +91,14 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.4",
+    "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
-    "@swc/core": "^1.3.94",
+    "@swc/core": "^1.3.95",
     "@swc/jest": "^0.2.29",
     "@types/jest": "^29.5.6",
     "@types/jsdom": "^21.1.4",
-    "@types/node": "^20.8.7",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@types/node": "^20.8.9",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
     "babel-plugin-inferno": "6.7.0",
     "cli-table": "^0.3.11",
     "concat-stream-es6": "0.0.1",
@@ -107,7 +108,7 @@
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard-with-typescript": "^39.1.1",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-promise": "^6.1.1",
@@ -129,7 +130,7 @@
     "pre-commit": "^1.2.2",
     "prettier": "^3.0.3",
     "rimraf": "^5",
-    "rollup": "^4.1.4",
+    "rollup": "^4.1.5",
     "swc": "^1.0.11",
     "swc-loader": "^0.2.3",
     "swc-plugin-inferno": "^0.0.10",

diff --git a/packages/inferno-router/src/StaticRouter.ts b/packages/inferno-router/src/StaticRouter.ts
@@ -144,14 +144,14 @@ function stripBasename(
 
   const base = addLeadingSlash(basename);
 
-  if (location.pathname.indexOf(base) !== 0) {
+  if (location.pathname.startsWith(base)) {
+    return {
+      ...location,
+      pathname: location.pathname.substring(base.length),
+    };
+  } else {
     return location;
   }
-
-  return {
-    ...location,
-    pathname: location.pathname.substring(base.length),
-  };
 }
 
 function createLocation(location): Path {

diff --git a/packages/inferno/README.md b/packages/inferno/README.md
@@ -49,6 +49,7 @@ Inferno v9 requires following features to be present in the executing runtime:
 
 - `Promise`
 - `String.prototype.includes()`
+- `String.prototype.startsWith()`
 - `Array.prototype.includes()`
 - `Object.spread()`
 

diff --git a/packages/inferno/__tests__/componentlifecycle.spec.tsx b/packages/inferno/__tests__/componentlifecycle.spec.tsx
@@ -259,9 +259,9 @@ describe('legacy life cycle', () => {
     expect(consoleErrorStub).toHaveBeenCalledTimes(1);
 
     const message = consoleErrorStub.calls.argsFor(0)[0];
-    expect(message.indexOf('componentWillMount')).toBeGreaterThan(-1);
-    expect(message.indexOf('componentWillReceiveProps')).toBeGreaterThan(-1);
-    expect(message.indexOf('componentWillUpdate')).toBeGreaterThan(-1);
+    expect(message.includes('componentWillMount')).toBeTruthy();
+    expect(message.includes('componentWillReceiveProps')).toBeTruthy();
+    expect(message.includes('componentWillUpdate')).toBeTruthy();
   });
 
   it('should allow suppress legacy life cycles when mixed with new APIs', () => {