fix: try fix windows extension (#189)

Co-authored-by: Copilot <[email protected]>

Author: hardfist

.github/actions/move-artifacts/action.yml

@@ -7,14 +7,4 @@ runs:
     - name: Move artifacts
       shell: bash
       run: |
-        find ./binaries
-        for file in binaries/*/*-rslint; do
-          echo "Processing $file"
-          filename=$(basename "$file")
-          dirname="${filename%-rslint}"
-          target_dir="npm/$dirname"
-          mkdir -p "$target_dir"
-          echo "Copy $file to $target_dir/rslint"
-          cp "$file" "npm/$dirname/rslint"
-        done
-        find ./npm
+        node .github/actions/move-artifacts/move-artifacts.js

.github/actions/move-artifacts/move-artifacts.js

@@ -0,0 +1,67 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+function findRslintBinaries(dir = 'binaries') {
+  const files = [];
+
+  if (!fs.existsSync(dir)) {
+    return files;
+  }
+
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const fullPath = path.join(dir, entry.name);
+
+    if (entry.isDirectory()) {
+      // Look for files ending with -rslint in subdirectories
+      const subEntries = fs.readdirSync(fullPath, { withFileTypes: true });
+      for (const subEntry of subEntries) {
+        if (subEntry.isFile() && subEntry.name.endsWith('-rslint')) {
+          files.push(path.join(fullPath, subEntry.name));
+        }
+      }
+    }
+  }
+
+  return files;
+}
+
+async function moveArtifacts() {
+  console.log('Starting artifact move process...');
+
+  try {
+    // Find all rslint binary files
+    const files = findRslintBinaries();
+    console.log(`Found ${files.length} rslint binary files`);
+
+    for (const file of files) {
+      console.log(`Processing ${file}`);
+      const isWindows = file.includes('win32');
+      const filename = path.basename(file);
+      const dirname = filename.replace(/-rslint$/, '');
+      const targetDir = path.join('npm', dirname);
+
+      const targetFile = path.join(
+        targetDir,
+        isWindows ? 'rslint.exe' : 'rslint',
+      );
+
+      // Create target directory and copy file
+      fs.mkdirSync(targetDir, { recursive: true });
+      fs.copyFileSync(file, targetFile);
+      fs.chmodSync(targetFile, 0o755); // Make executable
+
+      console.log(`Copied ${file} to ${targetFile}`);
+    }
+
+    console.log('Artifact move process completed successfully!');
+  } catch (error) {
+    console.error('Error:', error.message);
+    process.exit(1);
+  }
+}
+
+moveArtifacts();

packages/rslint/bin/rslint.cjs

@@ -6,6 +6,9 @@ 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`);

packages/vscode-extension/src/Rslint.ts

@@ -32,7 +32,6 @@ export class Rslint implements Disposable {
 
     const binPath = await this.getBinaryPath();
     this.logger.info('Rslint binary path:', binPath);
-    chmodSync(binPath, 0o755);
 
     const run: Executable = {
       command: binPath,

scripts/publish-marketplace.mjs

@@ -32,8 +32,11 @@ async function publish_all() {
 
     await $`rm -rf ./packages/vscode-extension/dist/rslint`;
     await $`rm -rf ./packages/vscode-extension/dist/rslint.exe`;
-    await $`cp binaries/${os}-${arch}-rslint/${os}-${arch}-rslint ./packages/vscode-extension/dist/rslint`;
-    await $`chmod +x ./packages/vscode-extension/dist/rslint`;
+    const targetFilename = os == 'win32' ? 'rslint.exe' : 'rslint';
+    await $`cp binaries/${os}-${arch}-rslint/${os}-${arch}-rslint ./packages/vscode-extension/dist/${targetFilename}`;
+
+    await $`chmod +x ./packages/vscode-extension/dist/${targetFilename}`;
+
     await $`ls -lR ./packages/vscode-extension/dist`;
     const prereleaseFlag = prerelease ? ['--pre-release'] : [];