11

Author: fi3ework

.nvmrc

@@ -1 +1 @@
-v22
+v22

.vscode/launch.json

@@ -12,7 +12,7 @@
       "runtimeExecutable": "${execPath}",
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/packages/vscode",
-        "${workspaceFolder}/packages/vscode/sample"
+        "/Users/fi3ework/OSS/rslib/"
       ],
       "outFiles": ["${workspaceFolder}/packages/vscode/dist/**/*.js"],
       "preLaunchTask": "npm: build:local"

packages/vscode/.github/workflows/release.yml

@@ -2,14 +2,25 @@ name: Release VS Code Extension
 
 on:
   workflow_dispatch: {}
-  push:
-    tags:
-      - 'v*'
-      - 'vscode-v*'
 
 jobs:
-  release:
+  publish:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          [
+            win32-x64,
+            win32-arm64,
+            darwin-x64,
+            darwin-arm64,
+            linux-x64,
+            linux-arm64,
+            linux-armhf,
+            alpine-x64,
+            alpine-arm64,
+          ]
     defaults:
       run:
         working-directory: packages/vscode
@@ -34,23 +45,7 @@ jobs:
       - name: Build
         run: npm run build
 
-      - name: Package VSIX
-        run: npx vsce package
-
-      - name: Upload VSIX artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: rstest-vsix
-          path: packages/vscode/*.vsix
-
-      - name: Publish to VS Code Marketplace
-        if: ${{ secrets.VSCE_PAT != '' }}
+      - name: Publish to VS Code Marketplace (target)
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
-        run: npx vsce publish
-
-      - name: Create GitHub Release (tag push only)
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
-        with:
-          files: packages/vscode/*.vsix
+        run: npx vsce publish --target ${{ matrix.target }}

packages/vscode/README.md

@@ -34,3 +34,12 @@ Common commands (run from this package):
 - `npm run typecheck` — TypeScript noEmit check
 - `npm run test:unit` — Unit tests via Rstest
 - `npm run test:e2e` — VS Code Extension Host E2E tests
+
+### Packaging & Publishing
+
+- Local package (current platform): `npm run package:vsix`
+- Publish (current platform): `npm run publish:vsce` (requires `VSCE_PAT`)
+
+CI
+- On tag push or manual dispatch, GitHub Actions runs on Linux and publishes for all platforms using `vsce publish --target` (win32/darwin/linux; x64 and arm64).
+- Configure the `VSCE_PAT` repository secret for Marketplace publishing.

packages/vscode/package.json

@@ -46,7 +46,7 @@
     "test": "npm run test:unit && npm run test:e2e",
     "typecheck": "tsc --noEmit",
     "watch": "rslib build --watch",
-    "package:vsix": "npm run build && vsce package",
+    "package:vsce": "npm run build && vsce package",
     "publish:vsce": "vsce publish"
   },
   "devDependencies": {

packages/vscode/src/extension.ts

@@ -46,8 +46,6 @@ class Rstest {
     this.api = new RstestApi();
     this.api.createChildProcess();
 
-    // Populate the test tree eagerly on construction
-    // (does not rely on the Testing view resolving the root)
     scanAllTestFiles(this.ctrl);
   }
 
@@ -336,7 +334,14 @@ async function findInitialFiles(
   pattern: vscode.GlobPattern,
 ) {
   for (const file of await vscode.workspace.findFiles(pattern)) {
-    getOrCreateFile(controller, file);
+    const path = file.fsPath.toString();
+    const shouldIgnore =
+      path.includes('/node_modules/') ||
+      path.includes('/.git/') ||
+      path.endsWith('.git');
+    if (!shouldIgnore) {
+      getOrCreateFile(controller, file);
+    }
   }
 }
 

packages/vscode/src/master.ts

@@ -108,7 +108,7 @@ export class RstestApi {
 
   public async createChildProcess() {
     const execArgv: string[] = [];
-    const workerPath = path.resolve(__dirname, 'worker/index.js');
+    const workerPath = path.resolve(__dirname, 'worker.js');
     const port = await getPort();
     const wsAddress = `ws://localhost:${port}`;
     const rstestProcess = spawn('node', [...execArgv, workerPath], {

packages/vscode/src/testTree.ts

@@ -51,7 +51,15 @@ export async function scanAllTestFiles(
     for (const g of globs) {
       const pattern = new vscode.RelativePattern(folder, g);
       const found = await vscode.workspace.findFiles(pattern);
-      for (const f of found) uris.add(f.toString());
+      for (const f of found) {
+        const shouldIgnore =
+          f.fsPath.includes('/node_modules/') ||
+          f.fsPath.includes('/.git/') ||
+          f.fsPath.endsWith('.git');
+        if (!shouldIgnore) {
+          uris.add(f.toString());
+        }
+      }
     }
   }
 

packages/vscode/src/worker/index.ts

@@ -11,6 +11,7 @@ class Worker {
   public cwd!: string;
 
   constructor() {
+    console.log('🤚');
     this.ws = new WebSocket(process.env.RSTEST_WS_ADDRESS!);
     // this.initPromise = this.waitInitPromise();
     this.ws.on('message', (bufferData) => {
@@ -26,10 +27,16 @@ class Worker {
   }
 
   public async runTest(data: WorkerRunTestData) {
-    const rstest = await this.createRstest(data);
-    rstest.context.fileFilters = data.fileFilters;
-    rstest.context.normalizedConfig.testNamePattern = data.testNamePattern;
-    await rstest.runTests();
+    console.log('🙋', data);
+    try {
+      const rstest = await this.createRstest(data);
+      rstest.context.fileFilters = data.fileFilters;
+      rstest.context.normalizedConfig.testNamePattern = data.testNamePattern;
+      let res = await rstest.runTests();
+      console.log('🏁', res);
+    } catch (error) {
+      console.log('🤒', error);
+    }
   }
 
   // private waitInitPromise = () => {
@@ -47,6 +54,7 @@ class Worker {
     const rstestModule = (await import(
       this.rstestPath
     )) as typeof import('@rstest/core');
+    console.log('🤶', rstestModule);
     const { createRstest, loadConfig } = rstestModule;
     const { filePath } = await loadConfig({
       cwd: this.cwd,

packages/vscode/src/worker/reporter.ts

@@ -19,6 +19,7 @@ export class VscodeReporter implements Reporter {
 
   onTestRunEnd: Reporter['onTestRunEnd'] = ({ results, testResults }) => {
     if (this.onTestRunEndCallback) {
+      console.log('💃', results, testResults);
       this.onTestRunEndCallback({
         testFileResults: results,
         testResults: testResults,