chore: Add oxlint for linting (#947)

wxt-dev · Aug 30, 2024 · 0bd94fc · 0bd94fc
1 parent 2a97c06
commit 0bd94fc
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 40 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@aklinker1/buildc": "^1.1.1",
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "@types/fs-extra": "^11.0.4",
     "@vitest/coverage-v8": "^2.0.4",
     "changelogen": "^0.5.5",

diff --git a/packages/auto-icons/package.json b/packages/auto-icons/package.json
@@ -45,7 +45,8 @@
     "wxt": ">=0.19.0"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
+    "oxlint": "^0.9.1",
     "publint": "^0.2.9",
     "typescript": "^5.5.4",
     "unbuild": "^2.0.0",

diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -38,9 +38,10 @@
     }
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "@types/chrome": "^0.0.268",
     "@types/node": "^20.14.2",
+    "oxlint": "^0.9.1",
     "publint": "^0.2.8",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",

diff --git a/packages/i18n/src/utils.ts b/packages/i18n/src/utils.ts
@@ -14,7 +14,7 @@ export function applyChromeMessagePlaceholders(message: ChromeMessage): string {
 export function getSubstitionCount(message: string): number {
   return (
     1 +
-    new Array(MAX_SUBSTITUTIONS).findLastIndex((_, i) =>
+    Array.from({ length: MAX_SUBSTITUTIONS }).findLastIndex((_, i) =>
       message.match(new RegExp(`(?<!\\$)\\$${i + 1}`)),
     )
   );

diff --git a/packages/module-react/package.json b/packages/module-react/package.json
@@ -50,7 +50,7 @@
     "@vitejs/plugin-react": "^4.3.1"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "publint": "^0.2.9",

diff --git a/packages/module-solid/package.json b/packages/module-solid/package.json
@@ -50,7 +50,7 @@
     "vite-plugin-solid": "^2.10.2"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "publint": "^0.2.9",
     "solid-js": "^1.8.19",
     "typescript": "^5.5.4",

diff --git a/packages/module-svelte/package.json b/packages/module-svelte/package.json
@@ -48,7 +48,7 @@
     "@sveltejs/vite-plugin-svelte": "^3.1.1"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "publint": "^0.2.9",
     "typescript": "^5.5.4",
     "unbuild": "^2.0.0",

diff --git a/packages/module-vue/package.json b/packages/module-vue/package.json
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue": "^5.1.1"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "publint": "^0.2.9",
     "typescript": "^5.5.4",
     "unbuild": "^2.0.0",

diff --git a/packages/wxt/.oxlintignore b/packages/wxt/.oxlintignore
@@ -0,0 +1 @@
+src/core/utils/building/__tests__/test-entrypoints
diff --git a/packages/wxt/package.json b/packages/wxt/package.json
@@ -125,7 +125,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "devDependencies": {
-    "@aklinker1/check": "^1.3.1",
+    "@aklinker1/check": "^1.4.5",
     "@faker-js/faker": "^8.4.1",
     "@types/chrome": "^0.0.269",
     "@types/fs-extra": "^11.0.4",
@@ -137,6 +137,7 @@
     "extract-zip": "^2.0.1",
     "happy-dom": "^14.12.3",
     "lodash.merge": "^4.6.2",
+    "oxlint": "^0.9.1",
     "p-map": "^7.0.2",
     "publint": "^0.2.9",
     "tsx": "4.15.7",

diff --git a/packages/wxt/src/core/create-server.ts b/packages/wxt/src/core/create-server.ts
@@ -211,7 +211,7 @@ function createFileReloader(server: WxtDevServer) {
             wxt.logger.success(`Reloaded: ${getFilenameList(rebuiltNames)}`);
             break;
         }
-      } catch (err) {
+      } catch {
         // Catch build errors instead of crashing. Don't log error either, builder should have already logged it
       }
     });

diff --git a/packages/wxt/src/core/utils/building/resolve-config.ts b/packages/wxt/src/core/utils/building/resolve-config.ts
@@ -86,7 +86,7 @@ export async function resolveConfig(
   if (await isDirMissing(entrypointsDir)) {
     logMissingDir(logger, 'Entrypoints', entrypointsDir);
   }
-  const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length
+  const filterEntrypoints = mergedConfig.filterEntrypoints?.length
     ? new Set(mergedConfig.filterEntrypoints)
     : undefined;
   const publicDir = path.resolve(srcDir, mergedConfig.publicDir ?? 'public');

diff --git a/packages/wxt/src/core/utils/entrypoints.ts b/packages/wxt/src/core/utils/entrypoints.ts
@@ -14,7 +14,7 @@ export function getEntrypointName(
 ): string {
   const relativePath = path.relative(entrypointsDir, inputPath);
   // Grab the string up to the first . or / or \\
-  const name = relativePath.split(/[\.\/\\]/, 2)[0];
+  const name = relativePath.split(/[./\\]/, 2)[0];
 
   return name;
 }

diff --git a/packages/wxt/src/core/utils/environments/environment.ts b/packages/wxt/src/core/utils/environments/environment.ts
@@ -42,7 +42,7 @@ export function applyGlobals(globals: EnvGlobals): void {
     try {
       // @ts-expect-error: Untyped key on globalThis
       globalThis[key] = envValue;
-    } catch (err) {
+    } catch {
       // ignore any globals that can't be set
     }
   });

diff --git a/packages/wxt/src/core/utils/eslint.ts b/packages/wxt/src/core/utils/eslint.ts
@@ -5,7 +5,8 @@ export async function getEslintVersion(): Promise<string[]> {
     );
     const { ESLint } = require('eslint');
     return ESLint.version?.split('.') ?? [];
-  } catch (error) {
+  } catch {
+    // Return an empty version when there's an error importing ESLint
     return [];
   }
 }
diff --git a/packages/wxt/src/core/utils/manifest.ts b/packages/wxt/src/core/utils/manifest.ts
@@ -272,14 +272,14 @@ function addEntrypoints(
       options.browser_style = popup.options.browserStyle;
     if (manifest.manifest_version === 3) {
       manifest.action = {
-        ...(manifest.action ?? {}),
+        ...manifest.action,
         ...options,
         default_popup,
       };
     } else {
       const key = popup.options.mv2Key ?? 'browser_action';
       manifest[key] = {
-        ...(manifest[key] ?? {}),
+        ...manifest[key],
         ...options,
         default_popup,
       };
@@ -434,8 +434,8 @@ function discoverIcons(
     /^icon@([0-9]+)w\.png$/,                // [email protected]
     /^icon@([0-9]+)h\.png$/,                // [email protected]
     /^icon@([0-9]+)\.png$/,                 // [email protected]
-    /^icons?[\/\\]([0-9]+)\.png$/,          // icon/16.png | icons/16.png
-    /^icons?[\/\\]([0-9]+)x[0-9]+\.png$/,   // icon/16x16.png | icons/16x16.png
+    /^icons?[/\\]([0-9]+)\.png$/,          // icon/16.png | icons/16.png
+    /^icons?[/\\]([0-9]+)x[0-9]+\.png$/,   // icon/16x16.png | icons/16x16.png
   ];
   // #endregion snippet
 

diff --git a/packages/wxt/src/core/utils/package.ts b/packages/wxt/src/core/utils/package.ts
@@ -16,6 +16,7 @@ export async function getPackageJson(): Promise<
   } catch (err) {
     wxt.logger.debug(
       `Failed to read package.json at: ${file}. Returning undefined.`,
+      err,
     );
     return {};
   }

diff --git a/packages/wxt/src/core/utils/transform.ts b/packages/wxt/src/core/utils/transform.ts
@@ -162,9 +162,7 @@ function getSimpleAstJson(ast: any): any {
   } else if (typeof ast === 'object') {
     return Object.fromEntries(
       Object.entries(ast)
-        .filter(
-          ([key, value]) => key !== 'loc' && key !== 'start' && key !== 'end',
-        )
+        .filter(([key]) => key !== 'loc' && key !== 'start' && key !== 'end')
         .map(([key, value]) => [key, getSimpleAstJson(value)]),
     );
   } else {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		src/core/utils/building/__tests__/test-entrypoints