From 16fd23417973260515f8bd13c08e639b01fd5ae5 Mon Sep 17 00:00:00 2001 From: stone Date: Mon, 30 Sep 2024 11:31:47 +0800 Subject: [PATCH 1/5] fix: add support for yarn workspaces in vsce --- packages/ds-ext/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/ds-ext/package.json b/packages/ds-ext/package.json index afdae6c6..7d47d3d1 100644 --- a/packages/ds-ext/package.json +++ b/packages/ds-ext/package.json @@ -5,7 +5,7 @@ "version": "0.0.104", "publisher": "ajthinking", "engines": { - "vscode": "^1.93.0" + "vscode": "^1.80.0" }, "categories": [ "Other" @@ -74,6 +74,9 @@ ] } }, + "vsce": { + "dependencies": false + }, "scripts": { "vscode:prepublish": "yarn run package", "build": "webpack && vite build", @@ -102,7 +105,7 @@ "@types/node": "20.x", "@types/react": "^18", "@types/react-dom": "^18", - "@types/vscode": "^1.93.0", + "@types/vscode": "^1.80.0", "@typescript-eslint/eslint-plugin": "^8.3.0", "@typescript-eslint/parser": "^8.3.0", "@vitejs/plugin-react": "^4.3.1", From c154f202be341b03a3a58c834190b0a137047611 Mon Sep 17 00:00:00 2001 From: stone Date: Mon, 30 Sep 2024 14:04:37 +0800 Subject: [PATCH 2/5] fix: resolving repository and license details in vsce package --- .github/workflows/publish.yml | 2 +- packages/ds-ext/package.json | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index daa84f3d..3822a948 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -204,5 +204,5 @@ jobs: if: env.VERSION_EXISTS == 'false' run: | cd packages/ds-ext - vsce package --no-yarn + vsce package --no-yarn --skip-license vsce publish --pat ${{ secrets.AZURE_ACCESS_TOKEN }} --no-yarn diff --git a/packages/ds-ext/package.json b/packages/ds-ext/package.json index 7d47d3d1..f4ce8231 100644 --- a/packages/ds-ext/package.json +++ b/packages/ds-ext/package.json @@ -126,5 +126,9 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "ts-loader": "^9.5.1" + }, + "repository": { + "type": "git", + "url": "https://github.com/ajthinking/data-story.git" } -} +} \ No newline at end of file From 352299e8936796ee4051e5a99dcb99dc909cab0e Mon Sep 17 00:00:00 2001 From: stone Date: Mon, 30 Sep 2024 14:28:36 +0800 Subject: [PATCH 3/5] chore: update the yarn lock --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index f5e42926..aa177a85 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2561,7 +2561,7 @@ __metadata: languageName: node linkType: hard -"@types/vscode@npm:^1.93.0": +"@types/vscode@npm:^1.80.0": version: 1.93.0 resolution: "@types/vscode@npm:1.93.0" checksum: 10/d11367aabe04ceaa4ebb07b61871434f4294a80c71916afb19fedfce86b8f94cebb95d39c1b714ea792f2daeac04367cb0c25fb9a5271dd9b5ce89eea29c0ed5 @@ -5616,7 +5616,7 @@ __metadata: "@types/node": "npm:20.x" "@types/react": "npm:^18" "@types/react-dom": "npm:^18" - "@types/vscode": "npm:^1.93.0" + "@types/vscode": "npm:^1.80.0" "@typescript-eslint/eslint-plugin": "npm:^8.3.0" "@typescript-eslint/parser": "npm:^8.3.0" "@vitejs/plugin-react": "npm:^4.3.1" From 3afd808354546b24a0447b5d2af602e9ea51b5c7 Mon Sep 17 00:00:00 2001 From: stone Date: Mon, 30 Sep 2024 14:41:40 +0800 Subject: [PATCH 4/5] feat: pin the version of vsce for consistent builds --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3822a948..753e0660 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -163,7 +163,7 @@ jobs: node-version: '18.x' - name: Install vsce - run: npm install -g vsce + run: npm install -g vsce@3.1.0 - name: Check VS Code extension version id: check_vscode From 9e824d57e8fae4ca2d05395169ef68e00e7e170d Mon Sep 17 00:00:00 2001 From: stone Date: Mon, 30 Sep 2024 14:58:01 +0800 Subject: [PATCH 5/5] fix: update references from vsce to @vscode/vsce in npm --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 753e0660..12ee341a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -163,7 +163,7 @@ jobs: node-version: '18.x' - name: Install vsce - run: npm install -g vsce@3.1.0 + run: npm install -g @vscode/vsce@3.1.0 - name: Check VS Code extension version id: check_vscode