Merge "ballerina-integrator-1.6.0" into "release-ballerina"

.github/workflows/publish-vsix.yml

@@ -90,7 +90,7 @@ jobs:
           elif [ "${{ github.event.inputs.extension }}" == "choreo" ]; then
             echo "repo=wso2/choreo-vscode" >> $GITHUB_OUTPUT
           elif [ "${{ github.event.inputs.extension }}" == "wso2-platform" ]; then
-            echo "repo=wso2/wso2-platform-vscode" >> $GITHUB_OUTPUT
+            echo "repo=wso2/vscode-extensions" >> $GITHUB_OUTPUT
           elif [ "${{ github.event.inputs.extension }}" == "apk" ]; then
             echo "repo=wso2/apk-vscode" >> $GITHUB_OUTPUT
           elif [ "${{ github.event.inputs.extension }}" == "micro-integrator" ]; then
@@ -102,7 +102,7 @@ jobs:
         run: vsce publish -p ${{ secrets.VSCE_TOKEN }} --packagePath ${{ steps.vsix.outputs.vsixName }} ${{ steps.vsix.outputs.releaseMode }}
 
       - name: Publish to OpenVSX marketplace
-        if: ${{ github.event.inputs.openVSX == 'true' && github.event.inputs.isPreRelease == 'false' }}
+        if: ${{ github.event.inputs.openVSX == 'true' }}
         run: ovsx publish -p ${{ secrets.OPENVSX_TOKEN }} --packagePath ${{ steps.vsix.outputs.vsixName }} ${{ steps.vsix.outputs.releaseMode }}
 
       - name: Create a release in ${{ steps.repo.outputs.repo }} repo

.github/workflows/release-vsix.yml

@@ -143,11 +143,11 @@ jobs:
           token: ${{ secrets.CHOREO_BOT_TOKEN }}
           chatAPI: ${{ steps.chat.outputs.chatAPI }}
 
-      - name: Create a release in wso2/platform-vscode repo
+      - name: Create a release in wso2/vscode-extensions repo
         if: ${{ github.event.inputs.wso2-platform == 'true' }}
         uses: ./.github/actions/release
         with:
-          repo: wso2/platform-vscode
+          repo: wso2/vscode-extensions
           name: wso2-platform
           token: ${{ secrets.CHOREO_BOT_TOKEN }}
           chatAPI: ${{ steps.chat.outputs.chatAPI }}

.vscode/launch.json

@@ -115,7 +115,8 @@
                 "CELL_VIEW_DEV_HOST": "http://localhost:3001/cellDiagram.js"
             },
             "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}/workspaces/wso2-platform/wso2-platform-extension"
+                "--extensionDevelopmentPath=${workspaceFolder}/workspaces/wso2-platform/wso2-platform-extension",
+                "--enable-proposed-api=wso2.wso2-platform"
             ],
             "outFiles": [
                 "${workspaceFolder}/workspaces/wso2-platform/wso2-platform-extension/dist/**/*.js"
@@ -128,8 +129,8 @@
             "type": "extensionHost",
             "request": "launch",
             "env": {
-                "WEB_VIEW_DEV_MODE": "true",
-                "WEB_VIEW_DEV_HOST": "http://localhost:3000/main.js",
+                "WEB_VIEW_DEV_MODE_CHOREO": "true",
+                "WEB_VIEW_DEV_HOST_CHOREO": "http://localhost:3001/main.js",
                 "CELL_VIEW_DEV_MODE": "true",
                 "CELL_VIEW_DEV_HOST": "http://localhost:3001/cellDiagram.js"
             },
@@ -178,8 +179,8 @@
             ],
             "envFile": "${workspaceFolder}/workspaces/choreo/choreo-extension/.env",
             "env": {
-                "WEB_VIEW_DEV_MODE": "true",
-                "WEB_VIEW_DEV_HOST": "http://localhost:3000/main.js",
+                "WEB_VIEW_DEV_MODE_CHOREO": "true",
+                "WEB_VIEW_DEV_HOST_CHOREO": "http://localhost:3001/main.js",
             },
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen",
@@ -257,7 +258,7 @@
             "outFiles": [
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/out/test/**/*.js"
             ],
-            "preLaunchTask": "compile:ballerina-tests",
+            "preLaunchTask": "clean-and-compile:ballerina-tests",
             "envFile": "${workspaceFolder}/workspaces/ballerina/ballerina-extension/.env"
         },
         {
@@ -279,7 +280,7 @@
             "outFiles": [
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/out/test/**/*.js"
             ],
-            "preLaunchTask": "compile:ballerina-tests",
+            "preLaunchTask": "clean-and-compile:ballerina-tests",
             "envFile": "${workspaceFolder}/workspaces/ballerina/ballerina-extension/.env"
         },
         {
@@ -295,4 +296,4 @@
             "preLaunchTask": "npm: watch-apk"
         },
     ]
-}
+}

.vscode/tasks.json

@@ -195,12 +195,36 @@
 				"isDefault": true
 			}
 		},
+        {
+            "label": "clean:ballerina-test-output",
+            "type": "shell",
+            "command": "rm",
+            "args": ["-rf", "out"],
+            "options": {
+                "cwd": "${workspaceFolder}/workspaces/ballerina/ballerina-extension"
+            }
+        },
         {
             "label": "compile:ballerina-tests",
             "type": "npm",
             "path": "workspaces/ballerina/ballerina-extension",
             "script": "test-compile",
         },
+        {
+            "label": "build:ballerina-extension",
+            "type": "npm",
+            "path": "workspaces/ballerina/ballerina-extension",
+            "script": "compile"
+        },
+        {
+            "label": "clean-and-compile:ballerina-tests",
+            "dependsOn": [
+                "clean:ballerina-test-output",
+                "build:ballerina-extension",
+                "compile:ballerina-tests"
+            ],
+            "dependsOrder": "sequence"
+        },
         {
             "label": "compile:wso2-platform-tests",
             "type": "npm",

ballerina-extension.code-workspace

@@ -13,7 +13,7 @@
 			"path": "workspaces/common-libs/ui-toolkit"
 		},
 		{
-			"path": "workspaces/ballerina/data-mapper-view"
+			"path": "workspaces/ballerina/data-mapper"
 		},
 		{
 			"path": "workspaces/ballerina/statement-editor"

common/autoinstallers/rush-plugins/package.json

@@ -2,6 +2,11 @@
   "name": "rush-plugins",
   "version": "1.0.0",
   "private": true,
+  "pnpm": {
+    "overrides": {
+      "undici": "^7.18.2"
+    }
+  },
   "dependencies": {
     "@gigara/rush-github-action-build-cache-plugin": "^1.1.1"
   }