From ffaa873b9b37bd4b208b3d798f534f7f81aa0411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20J=C3=BCrisoo?= Date: Sat, 28 Sep 2024 11:33:01 +0200 Subject: [PATCH] Temp revert name change of extention package --- .github/workflows/publish.yml | 22 +++------------------- .vscode/launch.json | 4 ++-- package.json | 6 +++--- packages/vscode-extension/package.json | 2 +- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d560c1c3..bbf752dd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -165,7 +165,7 @@ jobs: - name: Check VS Code extension version id: check_vscode run: | - PACKAGE_VERSION=$(node -p "require('./packages/vscode-extension/package.json').version") + PACKAGE_VERSION=$(node -p "require('./packages/ds-ext/package.json').version") echo "Version: $PACKAGE_VERSION" HTTP_STATUS=$(curl -X POST \ -H "Accept: */*;api-version=7.2-preview.1;excludeUrls=true" \ @@ -195,16 +195,6 @@ jobs: run: | yarn build - - name: Modify package.json for vsce - if: env.VERSION_EXISTS == 'false' - run: | - cd packages/vscode-extension - # Backup the original package.json - cp package.json package.json.bak - # Use jq to modify the name field - jq '.name = "ds-ext" | .private = false' package.json > package.tmp.json - mv package.tmp.json package.json - - name: Install vsce if: env.VERSION_EXISTS == 'false' run: npm install -g vsce @@ -212,17 +202,11 @@ jobs: - name: Build VS Code Extension if: env.VERSION_EXISTS == 'false' run: | - cd packages/vscode-extension + cd packages/ds-ext yarn build - name: Publish VS Code Extension if: env.VERSION_EXISTS == 'false' run: | - cd packages/vscode-extension + cd packages/ds-ext vsce publish --pat ${{ secrets.VSCE_TOKEN }} --yarn - - - name: Restore original package.json - if: env.VERSION_EXISTS == 'false' - run: | - cd packages/vscode-extension - mv package.json.bak package.json diff --git a/.vscode/launch.json b/.vscode/launch.json index 369b5a37..efca816f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,10 +7,10 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-extension" + "--extensionDevelopmentPath=${workspaceFolder}/packages/ds-ext" ], "outFiles": [ - "${workspaceFolder}/packages/vscode-extension/dist/**/*.js" + "${workspaceFolder}/packages/ds-ext/dist/**/*.js" ], "preLaunchTask": "${defaultBuildTask}" } diff --git a/package.json b/package.json index 0f10f99a..54b6b2ae 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "packages/nodejs", "packages/openai", "packages/hubspot", - "packages/vscode-extension", + "packages/ds-ext", "packages/private/*" ], "scripts": { @@ -25,10 +25,10 @@ "lint": "eslint .", "lint:fix": "eslint '**/*.{js,jsx,ts,tsx}' --fix --no-cache", "postinstall": "[ \"$CI\" = \"true\" ] || husky install", - "release-core": "yarn workspace @data-story/core run release && yarn release-ui && yarn release-nodejs && yarn release-vscode-extension", + "release-core": "yarn workspace @data-story/core run release && yarn release-ui && yarn release-nodejs && yarn release-ds-ext", "release-ui": "yarn workspace @data-story/ui run release", "release-nodejs": "yarn workspace @data-story/nodejs run release", - "release-vscode-extension": "yarn workspace @data-story/vscode-extension run release", + "release-ds-ext": "yarn workspace ds-ext run release", "ci:test": "turbo test --filter=@data-story/core --filter=@data-story/ui --filter=@data-story/docs && yarn cy:component && yarn ci:e2e", "ci:e2e": "start-server-and-test 'yarn dev -- --port 3009' 3009 'cy:e2e' ", "core:test": "turbo test --filter=@data-story/core", diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json index ac1a33e4..e918a163 100644 --- a/packages/vscode-extension/package.json +++ b/packages/vscode-extension/package.json @@ -1,5 +1,5 @@ { - "name": "@data-story/vscode-extension", + "name": "ds-ext", "displayName": "ds-ext", "description": "", "version": "0.0.97",