intersystems-community · isc-bsaviano · Jan 5, 2024 · Nov 3, 2023 · Nov 3, 2023 · Nov 3, 2023
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
       version: ${{ steps.set-version.outputs.version }}
       taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Find which branch the release tag points at
         id: find-branch
@@ -38,7 +38,7 @@ jobs:
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
           set -x
           TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
-          echo ::set-output name=taggedbranch::$TAGGEDBRANCH
+          echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
       - name: Set an output
         id: set-version
         if: runner.os == 'Windows'
@@ -49,33 +49,33 @@ jobs:
           [ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
           CHANGELOG=$(cat CHANGELOG.md | sed -n "/## \[${VERSION}\]/,/## /p" | sed '/^$/d;1d;$d')
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          echo ::set-output name=changelog::$CHANGELOG
+          echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
           git tag -l | cat
           [ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
           [ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev.${{ github.event.pull_request.number }}
-          echo ::set-output name=version::$VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
           NAME=$(jq -r '.name' package.json)-$VERSION
-          echo ::set-output name=name::$NAME
+          echo "name=$NAME" >> $GITHUB_OUTPUT
           tmp=$(mktemp)
           jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
           mkdir dist
           echo $VERSION > .version
           echo $NAME > .name
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18
       - run: npm install
       - run: npm run compile
       - name: npm test
-        uses: GabrielBB/xvfb-action@v1.0
+        uses: coactions/setup-xvfb@v1
         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/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: (runner.os == 'Windows') && (github.event_name != 'release')
         with:
           name: ${{ steps.set-version.outputs.name }}.vsix
@@ -85,44 +85,31 @@ jobs:
     runs-on: windows-latest
     needs: build
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: ${{ needs.build.outputs.name }}.vsix
       - name: Create Release
         id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
           tag_name: v${{ needs.build.outputs.version }}
           release_name: v${{ needs.build.outputs.version }}
           prerelease: ${{ github.event_name != 'release' }}
-          body: |
-            Changes in this release
-            ${{ needs.build.outputs.changelog }}
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.build.outputs.name }}.vsix
-          asset_name: ${{ needs.build.outputs.name }}.vsix
-          asset_content_type: application/zip
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: ${{ needs.build.outputs.name }}.vsix
   publish:
     needs: build
     if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'master'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: master
           token: ${{ secrets.TOKEN }}
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18
       - name: Prepare build
         id: set-version
         shell: bash
@@ -136,22 +123,19 @@ jobs:
           git add package.json
           git commit -m 'auto bump version with release'
           jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
-          jq '.enableProposedApi = false' package.json > "$tmp" && mv "$tmp" package.json
+          jq 'del(.enableProposedApi,.enabledApiProposals)' package.json > "$tmp" && mv "$tmp" package.json
           npm install
           git push
       - name: Build package
         run: |
           npx vsce package -o ${{ needs.build.outputs.name }}.vsix
       - name: Upload Release Asset
         id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ needs.build.outputs.name }}.vsix
-          asset_name: ${{ needs.build.outputs.name }}.vsix
-          asset_content_type: application/zip
+          tag_name: ${{ github.event.release.tag_name }}
+          files: ${{ needs.build.outputs.name }}.vsix
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to VSCode Marketplace
         shell: bash
         run: |

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -28,7 +28,7 @@ jobs:
       version: ${{ steps.set-version.outputs.version }}
       taggedbranch: ${{ steps.find-branch.outputs.taggedbranch }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Find which branch the release tag points at
         id: find-branch
@@ -38,7 +38,7 @@ jobs:
           git fetch --depth=1 origin +refs/heads/*:refs/heads/*
           set -x
           TAGGEDBRANCH=$(git for-each-ref --points-at=${{github.sha}} --format='%(refname:lstrip=2)' refs/heads/)
-          echo ::set-output name=taggedbranch::$TAGGEDBRANCH
+          echo "taggedbranch=$TAGGEDBRANCH" >> $GITHUB_OUTPUT
       - name: Set an output
         id: set-version
         if: runner.os == 'Windows'
@@ -49,33 +49,33 @@ jobs:
           [ $GITHUB_EVENT_NAME == 'release' ] && VERSION=${{ github.event.release.tag_name }} && VERSION=${VERSION/v/}
           CHANGELOG=$(cat CHANGELOG.md | sed -n "/## \[${VERSION}\]/,/## /p" | sed '/^$/d;1d;$d')
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          echo ::set-output name=changelog::$CHANGELOG
+          echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
           git tag -l | cat
           [ $GITHUB_EVENT_NAME == 'push' ] && VERSION+=-beta && VERSION+=.$(($(git tag -l "v$VERSION.*" | sort -nt. -k4 2>/dev/null | tail -1 | cut -d. -f4)+1))
           [ $GITHUB_EVENT_NAME == 'pull_request' ] && VERSION+=-dev.${{ github.event.pull_request.number }}
-          echo ::set-output name=version::$VERSION
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
           NAME=$(jq -r '.name' package.json)-$VERSION
-          echo ::set-output name=name::$NAME
+          echo "name=$NAME" >> $GITHUB_OUTPUT
           tmp=$(mktemp)
           jq --arg version "$VERSION" '.version = $version' package.json > "$tmp" && mv "$tmp" package.json
           mkdir dist
           echo $VERSION > .version
           echo $NAME > .name
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18
       - run: npm install
       - run: npm run compile
       - name: npm test
-        uses: GabrielBB/xvfb-action@v1.0
+        uses: coactions/setup-xvfb@v1
         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/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: (runner.os == 'Windows') && (github.event_name != 'release')
         with:
           name: ${{ steps.set-version.outputs.name }}.vsix
@@ -85,46 +85,33 @@ jobs:
     runs-on: windows-latest
     needs: build
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: ${{ needs.build.outputs.name }}.vsix
       - name: Create Pre-Release
         id: create_release
-        uses: actions/create-release@v1
-        if: runner.os == 'Windows'
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ needs.build.outputs.version }}
           release_name: v${{ needs.build.outputs.version }}
           prerelease: ${{ github.event_name != 'release' }}
-          body: |
-            Changes in this pre-release
-            ${{ needs.build.outputs.changelog }}
-      - name: Upload Pre-Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        if: runner.os == 'Windows'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ needs.build.outputs.name }}.vsix
-          asset_name: ${{ needs.build.outputs.name }}.vsix
-          asset_content_type: application/zip
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: ${{ needs.build.outputs.name }}.vsix
   publish:
     needs: build
     if: github.event_name == 'release' && needs.build.outputs.taggedbranch == 'prerelease'
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: prerelease
           token: ${{ secrets.TOKEN }}
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18
       - name: Prepare pre-release build
         id: set-version
         shell: bash
@@ -146,15 +133,11 @@ jobs:
           npx vsce package --pre-release -o ${{ needs.build.outputs.name }}.vsix --githubBranch prerelease
       - name: Upload Release Asset
         id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        if: runner.os == 'Windows'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{ needs.build.outputs.name }}.vsix
-          asset_name: ${{ needs.build.outputs.name }}.vsix
-          asset_content_type: application/zip
+          tag_name: ${{ github.event.release.tag_name }}
+          files: ${{ needs.build.outputs.name }}.vsix
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to VSCode Marketplace
         shell: bash
         run: |

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 node_modules/
 out/
+dist/
 .vscode-test
 *.vsix
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,12 +11,11 @@
         "--disable-extensions",
         "--extensionDevelopmentPath=${workspaceRoot}"
       ],
-      "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceRoot}/out/**/*.js"
+        "${workspaceRoot}/dist/**/*.js"
       ],
-      "preLaunchTask": "npm: watch"
+      "preLaunchTask": "npm: webpack"
     },
     {
       "name": "Launch Extension",
@@ -26,12 +25,11 @@
       "args": [
         "--extensionDevelopmentPath=${workspaceRoot}"
       ],
-      "stopOnEntry": false,
       "sourceMaps": true,
       "outFiles": [
-        "${workspaceRoot}/out/**/*.js"
+        "${workspaceRoot}/dist/**/*.js"
       ],
-      "preLaunchTask": "npm: watch"
+      "preLaunchTask": "npm: webpack"
     },
     {
       "name": "Extension Tests",
@@ -45,7 +43,7 @@
       "outFiles": [
         "${workspaceFolder}/out/test/**/*.js"
       ],
-      "preLaunchTask": "npm: compile"
+      "preLaunchTask": "npm: test-compile"
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,9 +12,9 @@
   "tasks": [
     {
       "type": "npm",
-      "script": "watch",
+      "script": "webpack-dev",
       "presentation": {
-        "reveal": "always"
+        "reveal": "never"
       },
       "group": {
         "isDefault": true,

diff --git a/.vscodeignore b/.vscodeignore
@@ -1,10 +1,9 @@
-.github/**
-.vscode/**
-.vscode-test/**
-out/test/**
-**/*.ts
-**/*.map
-.gitignore
-**/tsconfig.json
-**/tslint.json
-**/.eslintrc.json
+**
+!dist/*.js
+!dist/*.txt
+!images/*.svg
+!images/*.png
+!CHANGELOG.md
+!LICENSE
+!README.md
+!package.json
diff --git a/images/InterSystems.svg b/images/InterSystems.svg
diff --git a/images/toolbox.svg b/images/toolbox.svg
diff --git a/images/toolsContainer.svg b/images/toolsContainer.svg