From 905d11230ba681584fa1bffe9a58e817e22d1bb0 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:25:28 -0600 Subject: [PATCH 01/10] Add step to publish to Open VSX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Should this be in a different job? 🤔 --- .../workflows/manual-vscode-boxel-tools.yml | 18 +++-- packages/vscode-boxel-tools/package.json | 3 + pnpm-lock.yaml | 68 ++++++++++++++++++- 3 files changed, 83 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 61df8cb269..e6d20d41d1 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -94,13 +94,23 @@ jobs: - name: Package run: pnpm vscode:package working-directory: packages/vscode-boxel-tools - - name: Publish + # - name: Publish to Visual Studio Marketplace + # run: | + # if [ "${{ inputs.environment }}" = "production" ]; then + # pnpm vscode:publish + # else + # pnpm vscode:publish:prerelease + # fi + # working-directory: packages/vscode-boxel-tools + # env: + # VSCE_PAT: ${{ secrets.VSCE_PAT }} + - name: Publish to Open VSX run: | if [ "${{ inputs.environment }}" = "production" ]; then - pnpm vscode:publish + pnpm vscode:publish-open-vsx else - pnpm vscode:publish:prerelease + pnpm vscode:publish-open-vsx:prerelease fi working-directory: packages/vscode-boxel-tools env: - VSCE_PAT: ${{ secrets.VSCE_PAT }} + OVSX_TOKEN: ${{ secrets.OVSX_TOKEN }} diff --git a/packages/vscode-boxel-tools/package.json b/packages/vscode-boxel-tools/package.json index 8f25f3cc10..5486f81861 100644 --- a/packages/vscode-boxel-tools/package.json +++ b/packages/vscode-boxel-tools/package.json @@ -102,6 +102,8 @@ "vscode:package": "pnpm vsce package --no-dependencies", "vscode:publish": "pnpm vsce publish --no-dependencies", "vscode:publish:prerelease": "pnpm vsce publish --no-dependencies --pre-release", + "vscode:publish-open-vsx": "pnpm ovsx publish --no-dependencies --pat $OVSX_TOKEN", + "vscode:publish-open-vsx:prerelease": "pnpm ovsx publish --no-dependencies --pre-release --pat $OVSX_TOKEN", "compile": "node esbuild.mjs --production", "compile:development": "node esbuild.mjs", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", @@ -129,6 +131,7 @@ "concurrently": "^8.0.1", "esbuild": "^0.24.0", "eslint": "^8.26.0", + "ovsx": "^0.10.1", "typescript": "~5.1.6" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb06d379ff..68302e7f60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2199,6 +2199,9 @@ importers: eslint: specifier: ^8.26.0 version: 8.57.0 + ovsx: + specifier: ^0.10.1 + version: 0.10.1 typescript: specifier: ~5.1.6 version: 5.1.6 @@ -8184,6 +8187,41 @@ packages: - supports-color dev: true + /@vscode/vsce@3.2.1: + resolution: {integrity: sha512-AY9vBjwExakK1c0cI/3NN2Ey0EgiKLBye/fxl/ue+o4q6RZ7N+xzd1jAD6eI6eBeMVANi617+V2rxIAkDPco2Q==} + engines: {node: '>= 20'} + hasBin: true + dependencies: + '@azure/identity': 4.4.1 + '@vscode/vsce-sign': 2.0.4 + azure-devops-node-api: 12.5.0 + chalk: 2.4.2 + cheerio: 1.0.0 + cockatiel: 3.2.1 + commander: 6.2.1 + form-data: 4.0.0 + glob: 11.0.0 + hosted-git-info: 4.1.0 + jsonc-parser: 3.3.1 + leven: 3.1.0 + markdown-it: 14.1.0 + mime: 1.6.0 + minimatch: 3.1.2 + parse-semver: 1.1.1 + read: 1.0.7 + semver: 7.6.2 + tmp: 0.2.3 + typed-rest-client: 1.8.11 + url-join: 4.0.1 + xml2js: 0.5.0 + yauzl: 2.10.0 + yazl: 2.5.1 + optionalDependencies: + keytar: 7.9.0 + transitivePeerDependencies: + - supports-color + dev: true + /@webassemblyjs/ast@1.11.6: resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} dependencies: @@ -14691,7 +14729,7 @@ packages: globby: 11.1.0 ora: 5.4.1 slash: 3.0.0 - tmp: 0.2.1 + tmp: 0.2.3 workerpool: 6.5.1 transitivePeerDependencies: - supports-color @@ -14711,7 +14749,7 @@ packages: globby: 11.1.0 ora: 5.4.1 slash: 3.0.0 - tmp: 0.2.1 + tmp: 0.2.3 workerpool: 6.5.1 transitivePeerDependencies: - supports-color @@ -20888,6 +20926,24 @@ packages: /outdent@0.8.0: resolution: {integrity: sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==} + /ovsx@0.10.1: + resolution: {integrity: sha512-8i7+MJMMeq73m1zPEIClSFe17SNuuzU5br7G77ZIfOC24elB4pGQs0N1qRd+gnnbyhL5Qu96G21nFOVOBa2OBg==} + engines: {node: '>= 20'} + hasBin: true + dependencies: + '@vscode/vsce': 3.2.1 + commander: 6.2.1 + follow-redirects: 1.15.3(debug@4.3.2) + is-ci: 2.0.0 + leven: 3.1.0 + semver: 7.6.2 + tmp: 0.2.3 + yauzl: 3.2.0 + transitivePeerDependencies: + - debug + - supports-color + dev: true + /p-cancelable@0.4.1: resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==} engines: {node: '>=4'} @@ -25840,6 +25896,14 @@ packages: fd-slicer: 1.1.0 dev: true + /yauzl@3.2.0: + resolution: {integrity: sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==} + engines: {node: '>=12'} + dependencies: + buffer-crc32: 0.2.13 + pend: 1.2.0 + dev: true + /yazl@2.5.1: resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==} dependencies: From e5512cdac053913383d7d5fcd584e7a5063fd53d Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:29:17 -0600 Subject: [PATCH 02/10] Add hacks to cause publishing --- .github/workflows/manual-vscode-boxel-tools.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index e6d20d41d1..2abcb12b1f 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -12,6 +12,10 @@ on: environment: required: true type: string + # FIXME remove + pull_request: + paths: + - "packages/vscode-boxel-tools/**" jobs: check-version: @@ -105,8 +109,9 @@ jobs: # env: # VSCE_PAT: ${{ secrets.VSCE_PAT }} - name: Publish to Open VSX + # FIXME: remove environment hack run: | - if [ "${{ inputs.environment }}" = "production" ]; then + if [ "never" = "production" ]; then pnpm vscode:publish-open-vsx else pnpm vscode:publish-open-vsx:prerelease From a6cc4b0643cf75caf81d2ae2dbf4535e6f1ddc28 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:29:24 -0600 Subject: [PATCH 03/10] Update version --- packages/vscode-boxel-tools/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vscode-boxel-tools/package.json b/packages/vscode-boxel-tools/package.json index 5486f81861..081e343adb 100644 --- a/packages/vscode-boxel-tools/package.json +++ b/packages/vscode-boxel-tools/package.json @@ -2,7 +2,7 @@ "name": "boxel-tools", "displayName": "Boxel Tools", "description": "Access boxel realm data and code from your vscode workspace.", - "version": "0.0.23", + "version": "0.0.24", "publisher": "cardstack", "private": true, "license": "MIT", From 1681977825f28379cb234c63a9dd0486756ece93 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:46:45 -0600 Subject: [PATCH 04/10] Add Volta setup --- .github/workflows/manual-vscode-boxel-tools.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 2abcb12b1f..9e2ea1c137 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -92,6 +92,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/init + - uses: volta-cli/action@v4 - name: Build boxel-ui run: pnpm build working-directory: packages/boxel-ui/addon From 89fd525f8b6a67ad510963400923d05f2230d20b Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:46:59 -0600 Subject: [PATCH 05/10] Add Node version logging --- .github/workflows/manual-vscode-boxel-tools.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 9e2ea1c137..1437225c6e 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -99,6 +99,9 @@ jobs: - name: Package run: pnpm vscode:package working-directory: packages/vscode-boxel-tools + - name: Node version FIXME + run: node --version + working-directory: packages/vscode-boxel-tools # - name: Publish to Visual Studio Marketplace # run: | # if [ "${{ inputs.environment }}" = "production" ]; then From 0ef9aafab9ddf847c3c416d2bf02b3d0346292ec Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:54:53 -0600 Subject: [PATCH 06/10] Change installation order --- .github/workflows/manual-vscode-boxel-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 1437225c6e..a0d5325b52 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -91,8 +91,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/init - uses: volta-cli/action@v4 + - uses: ./.github/actions/init - name: Build boxel-ui run: pnpm build working-directory: packages/boxel-ui/addon From ee4fc7fada647f95c7a7497a502cc289affc4bd5 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 10:58:53 -0600 Subject: [PATCH 07/10] Add more logging --- .github/workflows/manual-vscode-boxel-tools.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index a0d5325b52..8efbbbca84 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -102,6 +102,9 @@ jobs: - name: Node version FIXME run: node --version working-directory: packages/vscode-boxel-tools + - name: Node version via pnpm FIXME + run: pnpm exec node --version + working-directory: packages/vscode-boxel-tools # - name: Publish to Visual Studio Marketplace # run: | # if [ "${{ inputs.environment }}" = "production" ]; then From 0225311ee4a2e1bbdb477a49fb85375c13c64744 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 15:56:02 -0600 Subject: [PATCH 08/10] Change how publish command is run --- .github/workflows/manual-vscode-boxel-tools.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 8efbbbca84..8f872a359c 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -119,9 +119,9 @@ jobs: # FIXME: remove environment hack run: | if [ "never" = "production" ]; then - pnpm vscode:publish-open-vsx + npx ovsx publish --no-dependencies --pat $OVSX_TOKEN else - pnpm vscode:publish-open-vsx:prerelease + npx ovsx publish --no-dependencies --pre-release --pat $OVSX_TOKEN fi working-directory: packages/vscode-boxel-tools env: From b9d88d7245caa482d1ffe879e7568d01a95d6a9e Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 16:21:06 -0600 Subject: [PATCH 09/10] Remove hacks and restore version --- .../workflows/manual-vscode-boxel-tools.yml | 32 +++------- packages/vscode-boxel-tools/package.json | 5 +- pnpm-lock.yaml | 64 ------------------- 3 files changed, 11 insertions(+), 90 deletions(-) diff --git a/.github/workflows/manual-vscode-boxel-tools.yml b/.github/workflows/manual-vscode-boxel-tools.yml index 8f872a359c..cdfb00fb54 100644 --- a/.github/workflows/manual-vscode-boxel-tools.yml +++ b/.github/workflows/manual-vscode-boxel-tools.yml @@ -12,10 +12,6 @@ on: environment: required: true type: string - # FIXME remove - pull_request: - paths: - - "packages/vscode-boxel-tools/**" jobs: check-version: @@ -91,7 +87,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: volta-cli/action@v4 - uses: ./.github/actions/init - name: Build boxel-ui run: pnpm build @@ -99,26 +94,19 @@ jobs: - name: Package run: pnpm vscode:package working-directory: packages/vscode-boxel-tools - - name: Node version FIXME - run: node --version - working-directory: packages/vscode-boxel-tools - - name: Node version via pnpm FIXME - run: pnpm exec node --version + - name: Publish to Visual Studio Marketplace + run: | + if [ "${{ inputs.environment }}" = "production" ]; then + pnpm vscode:publish + else + pnpm vscode:publish:prerelease + fi working-directory: packages/vscode-boxel-tools - # - name: Publish to Visual Studio Marketplace - # run: | - # if [ "${{ inputs.environment }}" = "production" ]; then - # pnpm vscode:publish - # else - # pnpm vscode:publish:prerelease - # fi - # working-directory: packages/vscode-boxel-tools - # env: - # VSCE_PAT: ${{ secrets.VSCE_PAT }} + env: + VSCE_PAT: ${{ secrets.VSCE_PAT }} - name: Publish to Open VSX - # FIXME: remove environment hack run: | - if [ "never" = "production" ]; then + if [ "${{ inputs.environment }}" = "production" ]; then npx ovsx publish --no-dependencies --pat $OVSX_TOKEN else npx ovsx publish --no-dependencies --pre-release --pat $OVSX_TOKEN diff --git a/packages/vscode-boxel-tools/package.json b/packages/vscode-boxel-tools/package.json index 081e343adb..8f25f3cc10 100644 --- a/packages/vscode-boxel-tools/package.json +++ b/packages/vscode-boxel-tools/package.json @@ -2,7 +2,7 @@ "name": "boxel-tools", "displayName": "Boxel Tools", "description": "Access boxel realm data and code from your vscode workspace.", - "version": "0.0.24", + "version": "0.0.23", "publisher": "cardstack", "private": true, "license": "MIT", @@ -102,8 +102,6 @@ "vscode:package": "pnpm vsce package --no-dependencies", "vscode:publish": "pnpm vsce publish --no-dependencies", "vscode:publish:prerelease": "pnpm vsce publish --no-dependencies --pre-release", - "vscode:publish-open-vsx": "pnpm ovsx publish --no-dependencies --pat $OVSX_TOKEN", - "vscode:publish-open-vsx:prerelease": "pnpm ovsx publish --no-dependencies --pre-release --pat $OVSX_TOKEN", "compile": "node esbuild.mjs --production", "compile:development": "node esbuild.mjs", "lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"", @@ -131,7 +129,6 @@ "concurrently": "^8.0.1", "esbuild": "^0.24.0", "eslint": "^8.26.0", - "ovsx": "^0.10.1", "typescript": "~5.1.6" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68302e7f60..eb6115eb03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2199,9 +2199,6 @@ importers: eslint: specifier: ^8.26.0 version: 8.57.0 - ovsx: - specifier: ^0.10.1 - version: 0.10.1 typescript: specifier: ~5.1.6 version: 5.1.6 @@ -8187,41 +8184,6 @@ packages: - supports-color dev: true - /@vscode/vsce@3.2.1: - resolution: {integrity: sha512-AY9vBjwExakK1c0cI/3NN2Ey0EgiKLBye/fxl/ue+o4q6RZ7N+xzd1jAD6eI6eBeMVANi617+V2rxIAkDPco2Q==} - engines: {node: '>= 20'} - hasBin: true - dependencies: - '@azure/identity': 4.4.1 - '@vscode/vsce-sign': 2.0.4 - azure-devops-node-api: 12.5.0 - chalk: 2.4.2 - cheerio: 1.0.0 - cockatiel: 3.2.1 - commander: 6.2.1 - form-data: 4.0.0 - glob: 11.0.0 - hosted-git-info: 4.1.0 - jsonc-parser: 3.3.1 - leven: 3.1.0 - markdown-it: 14.1.0 - mime: 1.6.0 - minimatch: 3.1.2 - parse-semver: 1.1.1 - read: 1.0.7 - semver: 7.6.2 - tmp: 0.2.3 - typed-rest-client: 1.8.11 - url-join: 4.0.1 - xml2js: 0.5.0 - yauzl: 2.10.0 - yazl: 2.5.1 - optionalDependencies: - keytar: 7.9.0 - transitivePeerDependencies: - - supports-color - dev: true - /@webassemblyjs/ast@1.11.6: resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} dependencies: @@ -20926,24 +20888,6 @@ packages: /outdent@0.8.0: resolution: {integrity: sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==} - /ovsx@0.10.1: - resolution: {integrity: sha512-8i7+MJMMeq73m1zPEIClSFe17SNuuzU5br7G77ZIfOC24elB4pGQs0N1qRd+gnnbyhL5Qu96G21nFOVOBa2OBg==} - engines: {node: '>= 20'} - hasBin: true - dependencies: - '@vscode/vsce': 3.2.1 - commander: 6.2.1 - follow-redirects: 1.15.3(debug@4.3.2) - is-ci: 2.0.0 - leven: 3.1.0 - semver: 7.6.2 - tmp: 0.2.3 - yauzl: 3.2.0 - transitivePeerDependencies: - - debug - - supports-color - dev: true - /p-cancelable@0.4.1: resolution: {integrity: sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==} engines: {node: '>=4'} @@ -25896,14 +25840,6 @@ packages: fd-slicer: 1.1.0 dev: true - /yauzl@3.2.0: - resolution: {integrity: sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==} - engines: {node: '>=12'} - dependencies: - buffer-crc32: 0.2.13 - pend: 1.2.0 - dev: true - /yazl@2.5.1: resolution: {integrity: sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==} dependencies: From 8881b54878045484ed7fd51492b2c48764a2aff9 Mon Sep 17 00:00:00 2001 From: Buck Doyle Date: Mon, 9 Dec 2024 16:25:37 -0600 Subject: [PATCH 10/10] Revert lockfile changes --- pnpm-lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb6115eb03..eb06d379ff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14691,7 +14691,7 @@ packages: globby: 11.1.0 ora: 5.4.1 slash: 3.0.0 - tmp: 0.2.3 + tmp: 0.2.1 workerpool: 6.5.1 transitivePeerDependencies: - supports-color @@ -14711,7 +14711,7 @@ packages: globby: 11.1.0 ora: 5.4.1 slash: 3.0.0 - tmp: 0.2.3 + tmp: 0.2.1 workerpool: 6.5.1 transitivePeerDependencies: - supports-color