Merge remote-tracking branch 'upstream/master' into input-tweaks

Author: isc-bsaviano

.github/workflows/main.yml

@@ -19,10 +19,7 @@ on:
 jobs:
   build:
     timeout-minutes: 10
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+    runs-on: ubuntu-latest
     outputs:
       name: ${{ steps.set-version.outputs.name }}
       version: ${{ steps.set-version.outputs.version }}
@@ -32,7 +29,7 @@ jobs:
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Find which branch the release tag points at
         id: find-branch
-        if: github.event_name == 'release' && runner.os == 'Windows'
+        if: github.event_name == 'release'
         shell: bash
         run: |
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
@@ -41,7 +38,6 @@ jobs:
           echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
       - name: Set an output
         id: set-version
-        if: runner.os == 'Windows'
         shell: bash
         run: |
           set -x
@@ -72,17 +68,16 @@ jobs:
         with:
           run: npm run test
       - name: Build package
-        if: runner.os == 'Windows'
         run: |
           npx vsce package -o ${{ steps.set-version.outputs.name }}.vsix
       - uses: actions/[email protected]
-        if: (runner.os == 'Windows') && (github.event_name != 'release')
+        if: github.event_name != 'release'
         with:
           name: ${{ steps.set-version.outputs.name }}.vsix
           path: ${{ steps.set-version.outputs.name }}.vsix
   beta:
     if: (github.event_name == 'push')
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     needs: build
     steps:
       - uses: actions/[email protected]
@@ -100,7 +95,7 @@ jobs:
   publish:
     needs: build
     if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'master'
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:

.github/workflows/prerelease.yml

@@ -19,10 +19,7 @@ on:
 jobs:
   build:
     timeout-minutes: 10
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+    runs-on: ubuntu-latest
     outputs:
       name: ${{ steps.set-version.outputs.name }}
       version: ${{ steps.set-version.outputs.version }}
@@ -32,7 +29,7 @@ jobs:
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Find which branch the release tag points at
         id: find-branch
-        if: github.event_name == 'release' && runner.os == 'Windows'
+        if: github.event_name == 'release'
         shell: bash
         run: |
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
@@ -41,7 +38,6 @@ jobs:
           echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
       - name: Set an output
         id: set-version
-        if: runner.os == 'Windows'
         shell: bash
         run: |
           set -x
@@ -72,17 +68,16 @@ jobs:
         with:
           run: npm run test
       - name: Build pre-release package
-        if: runner.os == 'Windows'
         run: |
           npx vsce package --pre-release -o ${{ steps.set-version.outputs.name }}.vsix --githubBranch prerelease
       - uses: actions/[email protected]
-        if: (runner.os == 'Windows') && (github.event_name != 'release')
+        if: github.event_name != 'release'
         with:
           name: ${{ steps.set-version.outputs.name }}.vsix
           path: ${{ steps.set-version.outputs.name }}.vsix
   beta:
     if: (github.event_name == 'push')
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     needs: build
     steps:
       - uses: actions/[email protected]
@@ -102,7 +97,7 @@ jobs:
   publish:
     needs: build
     if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'prerelease'
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:

.gitignore

@@ -3,4 +3,5 @@ node_modules/
 out/
 dist/
 .vscode-test
+.vscode-test-web
 *.vsix

.vscode/launch.json

@@ -44,6 +44,18 @@
         "${workspaceFolder}/out/test/**/*.js"
       ],
       "preLaunchTask": "npm: test-compile"
+    },
+    {
+      "name": "Launch Web Extension",
+      "type": "extensionHost",
+      "debugWebWorkerHost": true,
+      "request": "launch",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceFolder}",
+        "--extensionDevelopmentKind=web"
+      ],
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+      "preLaunchTask": "npm: webpack"
     }
   ]
 }