Merge pull request #966 from alcarney/fix-deps

Fix VSCode extension packaging

Author: alcarney

.github/dependabot.yml

@@ -17,12 +17,6 @@ updates:
     schedule:
       interval: "monthly"
 
-  - package-ecosystem: "pip"
-    directory: "/code"
-    target-branch: "develop"
-    schedule:
-      interval: "monthly"
-
   - package-ecosystem: "pip"
     directory: "/lib/esbonio/tests/workspaces/demo"
     target-branch: "develop"

.github/workflows/vscode-pr.yml

@@ -28,7 +28,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-vscode-pip-deps-${{ hashFiles('code/requirements.txt') }}
+        key: ${{ runner.os }}-vscode-pip-deps-${{ hashFiles('code/requirements-*.txt') }}
         restore-keys: |
           ${{ runner.os }}-vscode-pip-deps
 
@@ -68,3 +68,40 @@ jobs:
         path: code/*.vsix
         if-no-files-found: error
         retention-days: 7
+
+  test:
+    name: "Python v${{ matrix.python-version }}"
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: 'actions/setup-node@v4'
+      with:
+        node-version: 20.x
+        cache: 'npm'
+        cache-dependency-path: 'code/package-lock.json'
+
+    - name: Setup Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
+
+    - run: |
+        cd code/
+        make dev-deps
+        npx tsc -p .
+
+        # Force the extension to use this version of Python
+        python --version
+        export ESBONIO_SERVER_PYCMD=$(command -v python)
+        echo $ESBONIO_SERVER_PYCMD
+
+        xvfb-run -a npm run test
+      name: Run Tests

.vscode/launch.json

@@ -17,6 +17,17 @@
             ],
             "preLaunchTask": "${defaultBuildTask}",
         },
+        {
+            "name": "VSCode Extension Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "testConfiguration": "${workspaceFolder}/code/.vscode-test.js",
+            "args": [
+              "--extensionDevelopmentPath=${workspaceFolder}/code",
+            ],
+            "outFiles": ["${workspaceFolder}/code/dist/test/**/*.js"]
+        },
         {
             "name": "pytest: esbonio",
             "type": "debugpy",

code/.vscode-test.js

@@ -0,0 +1,13 @@
+const { defineConfig } = require('@vscode/test-cli');
+
+module.exports = defineConfig([
+  {
+    label: 'E2E Tests',
+    files: 'dist/test/**/*.test.js',
+    workspaceFolder: '../lib/esbonio/tests/workspaces/demo',
+    mocha: {
+      ui: 'tdd',
+      timeout: 20000
+    }
+  }
+]);

code/Makefile

@@ -6,6 +6,12 @@ ESBONIO ?= --pre esbonio
 clean:
 	rm -r bundled node_modules dist
 
+.PHONY: test
+test: dev-deps $(NPM)
+	-test -d dist && rm -r dist
+	$(NPX) tsc -p .
+	$(NPM) run test
+
 .PHONY: watch
 watch: dev-deps $(NPM)
 	-test -d dist && rm -r dist

code/changes/965.fix.md

@@ -0,0 +1 @@
+Add missing `exceptiongroup` package