chore: update to eslint v9

unjs · May 1, 2024 · 3c64544 · 3c64544
1 parent d880b1e
commit 3c64544
Show file tree

Hide file tree

Showing 14 changed files with 394 additions and 1,133 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc b/.eslintrc
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,15 @@
+import unjs from "eslint-config-unjs";
+
+export default unjs({
+  ignores: [
+    // ignore paths
+  ],
+  rules: {
+    // rule overrides
+  },
+  markdown: {
+    rules: {
+      // markdown rule overrides
+    },
+  },
+});
diff --git a/package.json b/package.json
@@ -20,8 +20,8 @@
   "scripts": {
     "build": "unbuild",
     "dev": "vitest",
-    "lint": "eslint --ext .ts,.js src test && prettier -c src test",
-    "lint:fix": "eslint --ext .ts,.js src test --fix && prettier -w src test",
+    "lint": "eslint src test && prettier -c src test",
+    "lint:fix": "eslint src test --fix && prettier -w src test",
     "release": "pnpm test && pnpm build && changelogen --release && npm publish && git push --follow-tags",
     "test": "pnpm lint && pnpm test:types && vitest run",
     "test:types": "tsc --noEmit"
@@ -36,8 +36,8 @@
     "@types/node": "^20.12.7",
     "@vitest/coverage-v8": "^1.5.3",
     "changelogen": "^0.5.5",
-    "eslint": "^8.57.0",
-    "eslint-config-unjs": "^0.2.1",
+    "eslint": "^9.1.1",
+    "eslint-config-unjs": "0.3.0-rc.7",
     "import-meta-resolve": "^4.1.0",
     "jiti": "^1.21.0",
     "prettier": "^3.2.5",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -1,6 +1,6 @@
 import { tokenizer } from "acorn";
 import { matchAll, clearImports, getImportNames } from "./_utils";
-import { resolvePath, ResolveOptions } from "./resolve";
+import { resolvePath, type ResolveOptions } from "./resolve";
 import { loadURL } from "./utils";
 
 /**
@@ -453,7 +453,7 @@ export function findExports(code: string): ESMExport[] {
   });
 
   // Merge and normalize exports
-  // eslint-disable-next-line unicorn/no-array-push-push
+
   const exports: ESMExport[] = normalizeExports([
     ...declaredExports,
     ...namedExports,
@@ -652,7 +652,9 @@ function _filterStatement<T extends TokenLocation>(
 function _tryGetLocations(code: string, label: string) {
   try {
     return _getLocations(code, label);
-  } catch {}
+  } catch {
+    // Ignore error
+  }
 }
 
 function _getLocations(code: string, label: string) {

diff --git a/src/cjs.ts b/src/cjs.ts
@@ -17,7 +17,7 @@ export interface CommonjsContext {
    */
   __dirname: string;
   // TODO!
-  // eslint-disable-next-line no-undef
+
   /**
    * A function to require modules as in CommonJS.
    */
@@ -81,7 +81,9 @@ export function interopDefault(
           },
         });
       }
-    } catch {}
+    } catch {
+      // Ignore error
+    }
   }
   return defaultValue;
 }
diff --git a/test/exports.test.ts b/test/exports.test.ts
@@ -70,7 +70,7 @@ describe("findExports", () => {
       specifier: "./other",
       name: "foo",
     },
-    // eslint-disable-next-line no-template-curly-in-string
+
     "const a = `<div${JSON.stringify({ class: 42 })}>`;\nexport default true;":
       { type: "default", name: "default", names: ["default"] },
     "export const enum foo { a = 'xx' }": {

diff --git a/test/fixture/eval-err.mjs b/test/fixture/eval-err.mjs
@@ -1,5 +1,5 @@
 // @ts-nocheck
-// eslint-disable-next-line require-await
+
 async function test() {
   throw new Error("Something went wrong in eval-err module!");
 }

diff --git a/test/fixture/eval.mjs b/test/fixture/eval.mjs
@@ -20,6 +20,6 @@ console.log(
   ),
 );
 
-await loadModule("./eval-err.mjs", { url: import.meta.url }).catch((e) =>
-  console.error(e),
+await loadModule("./eval-err.mjs", { url: import.meta.url }).catch((error) =>
+  console.error(error),
 );
diff --git a/test/fixture/imports/js-cjs/index.js b/test/fixture/imports/js-cjs/index.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line unicorn/prefer-module
 module.exports = "js-cjs";
 
 console.log(import("node:fs"));
diff --git a/test/fixture/imports/mixed/index.js b/test/fixture/imports/mixed/index.js
@@ -1,4 +1,3 @@
-/* eslint-disable unicorn/prefer-module */
 export const isCrtAvailable = () => {
   try {
     if (
@@ -8,5 +7,7 @@ export const isCrtAvailable = () => {
     ) {
       return ["md/crt-avail"];
     }
-  } catch {}
+  } catch {
+    // Ignore error
+  }
 };
diff --git a/test/fixture/utils.mjs b/test/fixture/utils.mjs
@@ -1,3 +1,3 @@
 export function reverse(str) {
-  return str.split("").reverse().join("");
+  return [...str].reverse().join("");
 }
diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -106,7 +106,6 @@ describe("parseNodeModulePath", () => {
 });
 
 describe("lookupNodeModuleSubpath", () => {
-  // eslint-disable-next-line unicorn/consistent-function-scoping
   const r = (p: string) => new URL(p, import.meta.url).toString();
 
   const tests = [