fix: add .exe for windows

Amour1688 · Amour1688 · commit 596bcb0aeb12 · 2025-08-09T15:25:34.000+08:00
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/darwin-arm64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint"
+  },
   "description": "binary for rslint",
   "homepage": "https://rslint.rs",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/darwin-x64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint"
+  },
   "description": "binary for rslint",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
   "repository": {
diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/linux-arm64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint"
+  },
   "description": "binary for rslint",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
   "repository": {
diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/linux-x64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint"
+  },
   "description": "binary for rslint",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
   "repository": {
diff --git a/npm/win32-arm64/package.json b/npm/win32-arm64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/win32-arm64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint.exe"
+  },
   "description": "binary for rslint",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
   "repository": {
diff --git a/npm/win32-x64/package.json b/npm/win32-x64/package.json
@@ -2,6 +2,9 @@
   "name": "@rslint/win32-x64",
   "version": "0.1.7",
   "license": "MIT",
+  "exports": {
+    "./bin": "./rslint.exe"
+  },
   "description": "binary for rslint",
   "bugs": "https://github.com/web-infra-dev/rslint/issues",
   "repository": {
diff --git a/package.json b/package.json
@@ -14,8 +14,9 @@
   "license": "MIT",
   "scripts": {
     "build": "pnpm -r build",
-    "build:npm": "zx scripts/build-npm.mjs",
     "check-spell": "pnpx cspell",
+    "build:npm:all": "zx scripts/build-npm.mjs all",
+    "build:npm:current": "zx scripts/build-npm.mjs current",
     "version": "zx scripts/version.mjs",
     "release": "pnpm publish -r --no-git-checks",
     "publish:vsce": "zx scripts/publish-marketplace.mjs",
diff --git a/packages/rslint/.gitignore b/packages/rslint/.gitignore
diff --git a/packages/rslint/bin/rslint.cjs b/packages/rslint/bin/rslint.cjs
@@ -1,22 +1,9 @@
 #!/usr/bin/env node
-const path = require('node:path');
 const os = require('node:os');
-const fs = require('node:fs');
-function getBinPath() {
-  if (fs.existsSync(path.resolve(__dirname, './rslint'))) {
-    return path.resolve(__dirname, './rslint');
-  }
-  if (fs.existsSync(path.resolve(__dirname, './rslint.exe'))) {
-    return path.resolve(__dirname, './rslint.exe');
-  }
-  let platformKey = `${process.platform}-${os.arch()}`;
 
-  return require.resolve(
-    `@rslint/${platformKey}/rslint${process.platform === 'win32' ? '.exe' : ''}`,
-  );
-}
 function main() {
-  const binPath = getBinPath();
+  const binPath = require.resolve(`@rslint/${os.platform()}-${os.arch()}/bin`);
+
   try {
     require('child_process').execFileSync(binPath, process.argv.slice(2), {
       stdio: 'inherit',
@@ -31,4 +18,5 @@ function main() {
     }
   }
 }
+
 main();
diff --git a/packages/rslint/package.json b/packages/rslint/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/web-infra-dev/rslint"
   },
   "scripts": {
-    "build:bin": "go build -v -o bin/rslint ../../cmd/rslint",
+    "build:bin": "zx ../../scripts/build-npm.mjs current",
     "build:debug": "GOEXPERIMENT=noregabi go build -v -gcflags='all=-N -l' -o  bin/rslint ../../cmd/rslint ",
     "build:js": "tsc -b tsconfig.build.json --force",
     "dev": "tsc -b tsconfig.build.json --force --watch",
diff --git a/packages/rslint/src/service.ts b/packages/rslint/src/service.ts
@@ -1,5 +1,5 @@
 import { spawn, ChildProcess } from 'child_process';
-import path from 'path';
+import { platform, arch } from 'os';
 
 /**
  * Types for rslint IPC protocol
@@ -66,7 +66,8 @@ export class RSLintService {
     this.nextMessageId = 1;
     this.pendingMessages = new Map();
     this.rslintPath =
-      options.rslintPath || path.join(import.meta.dirname, '../bin/rslint');
+      options.rslintPath ||
+      require.resolve(`@rslint/${platform()}-${arch()}/bin`);
 
     this.process = spawn(this.rslintPath, ['--api'], {
       stdio: ['pipe', 'pipe', 'inherit'],
diff --git a/packages/rslint/tests/api.test.mjs b/packages/rslint/tests/api.test.mjs
@@ -3,13 +3,14 @@ import { describe, test, expect } from '@rstest/core';
 import path from 'node:path';
 
 describe('lint api', async t => {
-  let cwd = path.resolve(import.meta.dirname, '../fixtures');
+  const cwd = path.resolve(import.meta.dirname, '../fixtures');
+
   test('virtual file support', async t => {
-    let config = path.resolve(
+    const config = path.resolve(
       import.meta.dirname,
       '../fixtures/rslint.virtual.json',
     );
-    let virtual_entry = path.resolve(cwd, 'src/virtual.ts');
+    const virtual_entry = path.resolve(cwd, 'src/virtual.ts');
     // Use virtual file contents instead of reading from disk
     const diags = await lint({
       config,
@@ -28,7 +29,7 @@ describe('lint api', async t => {
     expect(diags).toMatchSnapshot();
   });
   test('diag snapshot', async t => {
-    let config = path.resolve(import.meta.dirname, '../fixtures/rslint.json');
+    const config = path.resolve(import.meta.dirname, '../fixtures/rslint.json');
     const diags = await lint({
       config,
       workingDirectory: cwd,
diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
@@ -83,6 +83,12 @@
   },
   "devDependencies": {
     "@rslint/core": "workspace:*",
+    "@rslint/darwin-arm64": "workspace:*",
+    "@rslint/darwin-x64": "workspace:*",
+    "@rslint/linux-arm64": "workspace:*",
+    "@rslint/linux-x64": "workspace:*",
+    "@rslint/win32-arm64": "workspace:*",
+    "@rslint/win32-x64": "workspace:*",
     "@types/mocha": "10.0.9",
     "@types/node": "24.0.14",
     "@types/vscode": "^1.74.0",
diff --git a/packages/vscode-extension/scripts/build.js b/packages/vscode-extension/scripts/build.js
@@ -1,6 +1,7 @@
 const esbuild = require('esbuild');
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const os = require('node:os');
+const fs = require('node:fs');
 const isWatchMode = process.argv.includes('--watch');
 
 const config = {
@@ -20,17 +21,17 @@ const config = {
       name: 'copy-files',
       setup(build) {
         build.onStart(() => {
-          console.info('start rebuild');
+          console.log('📁 Copy file start');
         });
         build.onEnd(() => {
-          const binDir = path.resolve(
-            require.resolve('@rslint/core/package.json'),
-            '../bin',
+          const binPath = require.resolve(
+            `@rslint/${os.platform()}-${os.arch()}/bin`,
           );
-          fs.cpSync(binDir, path.join(__dirname, '../dist'), {
+          const binaryName = path.basename(binPath);
+          fs.cpSync(binPath, path.join(__dirname, `../dist/${binaryName}`), {
             recursive: true,
           });
-          console.log('rebuild done');
+          console.log('✅ Copy file done');
         });
       },
     },
diff --git a/packages/vscode-extension/src/Extension.ts b/packages/vscode-extension/src/Extension.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/build-npm.mjs b/scripts/build-npm.mjs
