refactor(napi/oxlint): rename napi/oxlint2 to napi/oxlint

.github/generated/ast_changes_watch_list.yml

@@ -64,8 +64,8 @@ src:
   - 'crates/oxc_syntax/src/serialize.rs'
   - 'crates/oxc_syntax/src/symbol.rs'
   - 'crates/oxc_traverse/src/generated/scopes_collector.rs'
-  - 'napi/oxlint2/src-js/generated/constants.mjs'
-  - 'napi/oxlint2/src/generated/raw_transfer_constants.rs'
+  - 'napi/oxlint/src-js/generated/constants.mjs'
+  - 'napi/oxlint/src/generated/raw_transfer_constants.rs'
   - 'napi/parser/generated/constants.mjs'
   - 'napi/parser/generated/deserialize/js.mjs'
   - 'napi/parser/generated/deserialize/ts.mjs'

apps/oxlint/src/lib.rs

@@ -53,7 +53,7 @@ pub fn lint(mut external_linter: Option<ExternalLinter>) -> CliRunResult {
 
     #[expect(clippy::print_stderr)]
     if command.experimental_js_plugins {
-        // If no `ExternalLinter`, this function was not called by `napi/oxlint2`
+        // If no `ExternalLinter`, this function was not called by `napi/oxlint`
         if external_linter.is_none() {
             eprintln!("ERROR: JS plugins are not supported at present");
             return CliRunResult::InvalidOptionConfig;

apps/oxlint/src/raw_fs.rs

@@ -9,7 +9,7 @@ use std::{
 use oxc_allocator::Allocator;
 use oxc_linter::RuntimeFileSystem;
 
-/// File system used by `oxlint2`.
+/// File system used when JS plugins are in use.
 ///
 /// Identical to `OsFileSystem`, except that `read_to_arena_str` reads the file's contents into
 /// start of the allocator, instead of the end. This conforms to what raw transfer needs.

dprint.json

@@ -17,8 +17,8 @@
     "**/CHANGELOG.md",
     "pnpm-workspace.yaml",
     "pnpm-lock.yaml",
-    "napi/oxlint2/src-js/bindings.js",
-    "napi/oxlint2/src-js/bindings.d.ts",
+    "napi/oxlint/src-js/bindings.js",
+    "napi/oxlint/src-js/bindings.d.ts",
     "napi/{transform,minify,playground}/index.js",
     "napi/{parser,transform,minify,playground}/index.d.ts",
     "napi/{parser,transform,minify,playground}/*.wasi-browser.js",

napi/oxlint2/package.json → napi/oxlint/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "oxlint2",
+  "name": "oxlint",
   "version": "0.1.0",
   "bin": "dist/index.js",
   "type": "module",
@@ -24,7 +24,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/oxc-project/oxc.git",
-    "directory": "napi/oxlint2"
+    "directory": "napi/oxlint"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

napi/oxlint2/src-js/bindings.js → napi/oxlint/src-js/bindings.js

@@ -79,7 +79,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-android-arm64')
+        return require('oxlint-android-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -90,7 +90,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-android-arm-eabi')
+        return require('oxlint-android-arm-eabi')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -105,7 +105,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-x64-msvc')
+        return require('oxlint-win32-x64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -116,7 +116,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-ia32-msvc')
+        return require('oxlint-win32-ia32-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -127,7 +127,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-win32-arm64-msvc')
+        return require('oxlint-win32-arm64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -141,7 +141,7 @@ function requireNative() {
       loadErrors.push(e)
     }
     try {
-      return require('oxlint2-darwin-universal')
+      return require('oxlint-darwin-universal')
     } catch (e) {
       loadErrors.push(e)
     }
@@ -152,7 +152,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-darwin-x64')
+        return require('oxlint-darwin-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -163,7 +163,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-darwin-arm64')
+        return require('oxlint-darwin-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -178,7 +178,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-freebsd-x64')
+        return require('oxlint-freebsd-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -189,7 +189,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-freebsd-arm64')
+        return require('oxlint-freebsd-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -205,7 +205,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-x64-musl')
+          return require('oxlint-linux-x64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -216,7 +216,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-x64-gnu')
+          return require('oxlint-linux-x64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -229,7 +229,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm64-musl')
+          return require('oxlint-linux-arm64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -240,7 +240,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm64-gnu')
+          return require('oxlint-linux-arm64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -253,7 +253,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm-musleabihf')
+          return require('oxlint-linux-arm-musleabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -264,7 +264,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-arm-gnueabihf')
+          return require('oxlint-linux-arm-gnueabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -277,7 +277,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-riscv64-musl')
+          return require('oxlint-linux-riscv64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -288,7 +288,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('oxlint2-linux-riscv64-gnu')
+          return require('oxlint-linux-riscv64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -300,7 +300,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-ppc64-gnu')
+        return require('oxlint-linux-ppc64-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -311,7 +311,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-s390x-gnu')
+        return require('oxlint-linux-s390x-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -326,7 +326,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-arm64-ohos')
+        return require('oxlint-linux-arm64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -337,7 +337,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-x64-ohos')
+        return require('oxlint-linux-x64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -348,7 +348,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('oxlint2-linux-arm-ohos')
+        return require('oxlint-linux-arm-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -372,7 +372,7 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
   }
   if (!nativeBinding) {
     try {
-      nativeBinding = require('oxlint2-wasm32-wasi')
+      nativeBinding = require('oxlint-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
         loadErrors.push(err)

napi/oxlint2/test/__snapshots__/e2e.test.ts.snap → napi/oxlint/test/__snapshots__/e2e.test.ts.snap

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`oxlint2 CLI > should have UTF-16 spans in AST 1`] = `
+exports[`oxlint CLI > should have UTF-16 spans in AST 1`] = `
 "
   ! ]8;;https://oxc.rs/docs/guide/usage/linter/rules/eslint/no-debugger.html\\eslint(no-debugger)]8;;\\: \`debugger\` statement is not allowed
    ,-[index.js:1:1]
@@ -55,7 +55,7 @@ Found 3 warnings and 3 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should lint a directory with errors 1`] = `
+exports[`oxlint CLI > should lint a directory with errors 1`] = `
 "
   x ]8;;https://oxc.rs/docs/guide/usage/linter/rules/eslint/no-debugger.html\\eslint(no-debugger)]8;;\\: \`debugger\` statement is not allowed
    ,-[index.js:1:1]
@@ -68,12 +68,12 @@ Found 0 warnings and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should lint a directory without errors 1`] = `
+exports[`oxlint CLI > should lint a directory without errors 1`] = `
 "Found 0 warnings and 0 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin 1`] = `
+exports[`oxlint CLI > should load a custom plugin 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -92,7 +92,7 @@ Found 1 warning and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin when configured in overrides 1`] = `
+exports[`oxlint CLI > should load a custom plugin when configured in overrides 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -111,7 +111,7 @@ Found 1 warning and 1 error.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should load a custom plugin with multiple files 1`] = `
+exports[`oxlint CLI > should load a custom plugin with multiple files 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[files/01.js:1:1]
@@ -377,7 +377,7 @@ Found 20 warnings and 20 errors.
 Finished in Xms on 20 files using X threads."
 `;
 
-exports[`oxlint2 CLI > should receive data via \`context\` 1`] = `
+exports[`oxlint CLI > should receive data via \`context\` 1`] = `
 "
   x context-plugin(log-context): id: context-plugin/log-context
    ,-[files/1.js:1:1]
@@ -419,29 +419,29 @@ Found 0 warnings and 6 errors.
 Finished in Xms on 2 files using X threads."
 `;
 
-exports[`oxlint2 CLI > should report an error if a a rule is not found within a custom plugin (via overrides) 1`] = `
+exports[`oxlint CLI > should report an error if a a rule is not found within a custom plugin (via overrides) 1`] = `
 "Failed to build configuration.
 
   x Rule 'missing' not found in plugin 'basic-custom-plugin'
 "
 `;
 
-exports[`oxlint2 CLI > should report an error if a custom plugin cannot be loaded 1`] = `
+exports[`oxlint CLI > should report an error if a custom plugin cannot be loaded 1`] = `
 "Failed to parse configuration file.
 
   x Failed to load external plugin: ./test_plugin
   |   Cannot find module './test_plugin'
 "
 `;
 
-exports[`oxlint2 CLI > should report an error if a rule is not found within a custom plugin 1`] = `
+exports[`oxlint CLI > should report an error if a rule is not found within a custom plugin 1`] = `
 "Failed to parse configuration file.
 
   x Rule 'unknown-rule' not found in plugin 'basic-custom-plugin'
 "
 `;
 
-exports[`oxlint2 CLI > should report the correct severity when using a custom plugin 1`] = `
+exports[`oxlint CLI > should report the correct severity when using a custom plugin 1`] = `
 "
   ! basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]
@@ -460,7 +460,7 @@ Found 2 warnings and 0 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should respect disable directives for custom plugin rules 1`] = `
+exports[`oxlint CLI > should respect disable directives for custom plugin rules 1`] = `
 "
   x test-plugin(no-var): Use let or const instead of var
    ,-[index.js:1:1]
@@ -505,7 +505,7 @@ Found 0 warnings and 5 errors.
 Finished in Xms on 1 file using X threads."
 `;
 
-exports[`oxlint2 CLI > should work with multiple rules 1`] = `
+exports[`oxlint CLI > should work with multiple rules 1`] = `
 "
   x basic-custom-plugin(no-debugger): Unexpected Debugger Statement
    ,-[index.js:1:1]

napi/oxlint2/test/e2e.test.ts → napi/oxlint/test/e2e.test.ts

@@ -20,7 +20,7 @@ function normalizeOutput(output: string): string {
     .replace(/using \d+ threads./, 'using X threads.');
 }
 
-describe('oxlint2 CLI', () => {
+describe('oxlint CLI', () => {
   it('should lint a directory without errors', async () => {
     const { stdout, exitCode } = await runOxlint('test/fixtures/built_in_no_errors');
     expect(exitCode).toBe(0);