Skip to content

Commit

Permalink
Merge branch 'develop' into mz/telemetry-orgshape
Browse files Browse the repository at this point in the history
  • Loading branch information
mingxuanzhangsfdx authored Nov 11, 2024
2 parents f1e0727 + 62093d3 commit 333f73e
Show file tree
Hide file tree
Showing 21 changed files with 343 additions and 131 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "62.4.0",
"version": "62.5.0",
"command": {
"version": {
"allowBranch": [
Expand Down
374 changes: 293 additions & 81 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions packages/salesforcedx-apex-debugger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@salesforce/salesforcedx-apex-debugger",
"displayName": "Apex Debugger Adapter",
"description": "Implements the VS Code Debug Protocol for the Apex Debugger",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -12,15 +12,15 @@
"Debuggers"
],
"dependencies": {
"@salesforce/salesforcedx-utils": "62.4.0",
"@salesforce/salesforcedx-utils": "62.5.0",
"@vscode/debugadapter": "1.65.0",
"@vscode/debugprotocol": "1.65.0",
"async-lock": "1.0.0",
"faye": "1.1.2",
"request-light": "^0.7.0"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@types/async-lock": "0.0.20",
"@types/chai": "4.3.3",
"@types/jest": "^29.5.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/salesforcedx-apex-replay-debugger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@salesforce/salesforcedx-apex-replay-debugger",
"displayName": "Apex Replay Debug Adapter",
"description": "Implements the VS Code Debug Protocol for the Apex Replay Debugger",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"preview": true,
"license": "BSD-3-Clause",
Expand All @@ -13,7 +13,7 @@
"Debuggers"
],
"dependencies": {
"@salesforce/salesforcedx-utils": "62.4.0",
"@salesforce/salesforcedx-utils": "62.5.0",
"@vscode/debugadapter": "1.65.0",
"@vscode/debugprotocol": "1.65.0",
"vscode-uri": "1.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/salesforcedx-sobjects-faux-generator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@salesforce/salesforcedx-sobjects-faux-generator",
"displayName": "Salesforce SObject Faux Generator",
"description": "Fetches sobjects and generates their faux apex class to be used for Apex Language Server",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"@jsforce/jsforce-node": "3.4.1",
"@salesforce/core-bundle": "8.6.1",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"shelljs": "0.8.5"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/salesforcedx-test-utils-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "@salesforce/salesforcedx-test-utils-vscode",
"displayName": "SFDX Test Utilities for VS Code",
"description": "Provides test utilities to interface the SFDX libraries with VS Code",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"categories": [
"Other"
],
"dependencies": {
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"shelljs": "0.8.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-utils-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@salesforce/salesforcedx-utils-vscode",
"displayName": "SFDX Utilities for VS Code",
"description": "Provides utilities to interface the SFDX libraries with VS Code",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"categories": [
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@salesforce/salesforcedx-utils",
"displayName": "Node Utilities for VS Code",
"version": "62.4.0",
"version": "62.5.0",
"description": "Provides node specific utilities for the Salesforce VSCode extensions",
"publisher": "salesforce",
"license": "BSD-3-Clause",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@salesforce/salesforcedx-visualforce-language-server",
"description": "Visualforce language server",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
"vscode": "^1.86.0"
},
"dependencies": {
"@salesforce/salesforcedx-visualforce-markup-language-server": "62.4.0",
"@salesforce/salesforcedx-visualforce-markup-language-server": "62.5.0",
"typescript": "^5.2.2",
"vscode-css-languageservice": "2.1.9",
"vscode-languageserver": "5.2.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@salesforce/salesforcedx-visualforce-markup-language-server",
"description": "Language service for Visualforce Markup",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand Down
8 changes: 4 additions & 4 deletions packages/salesforcedx-vscode-apex-debugger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -24,13 +24,13 @@
"Debuggers"
],
"dependencies": {
"@salesforce/salesforcedx-apex-debugger": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-apex-debugger": "62.5.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"@vscode/debugprotocol": "1.65.0",
"vscode-extension-telemetry": "0.0.17"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
"@types/node": "^18.11.9",
Expand Down
10 changes: 5 additions & 5 deletions packages/salesforcedx-vscode-apex-replay-debugger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -26,15 +26,15 @@
"dependencies": {
"@salesforce/apex-node-bundle": "8.1.12",
"@salesforce/core-bundle": "8.6.1",
"@salesforce/salesforcedx-apex-replay-debugger": "62.4.0",
"@salesforce/salesforcedx-utils": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-apex-replay-debugger": "62.5.0",
"@salesforce/salesforcedx-utils": "62.5.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"async-lock": "1.0.0",
"request-light": "^0.7.0",
"vscode-extension-telemetry": "0.0.17"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@salesforce/ts-sinon": "1.4.0",
"@types/async-lock": "0.0.20",
"@types/chai": "4.3.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/salesforcedx-vscode-apex/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -27,7 +27,7 @@
"@salesforce/apex-node-bundle": "8.1.12",
"@salesforce/apex-tmlanguage": "1.8.0",
"@salesforce/core-bundle": "8.6.1",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"@salesforce/vscode-service-provider": "1.2.1",
"expand-home-dir": "0.0.3",
"find-java-home": "0.2.0",
Expand All @@ -36,7 +36,7 @@
"vscode-languageclient": "8.1.0"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@salesforce/ts-sinon": "1.4.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
Expand Down
8 changes: 4 additions & 4 deletions packages/salesforcedx-vscode-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -26,8 +26,8 @@
"dependencies": {
"@jsforce/jsforce-node": "3.4.1",
"@salesforce/core-bundle": "8.6.1",
"@salesforce/salesforcedx-sobjects-faux-generator": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-sobjects-faux-generator": "62.5.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"@salesforce/schemas": "1.9.0",
"@salesforce/source-deploy-retrieve-bundle": "12.7.4",
"@salesforce/templates": "62.0.1",
Expand All @@ -41,7 +41,7 @@
"shelljs": "0.8.5"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@salesforce/ts-sinon": "^1.0.0",
"@types/adm-zip": "^0.5.0",
"@types/chai": "4.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-vscode-expanded/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/salesforcedx-vscode-lightning/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -27,13 +27,13 @@
"@salesforce/aura-language-server": "4.12.2",
"@salesforce/core-bundle": "8.6.1",
"@salesforce/lightning-lsp-common": "4.12.2",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"applicationinsights": "1.0.7",
"vscode-extension-telemetry": "0.0.17",
"vscode-languageclient": "^5.2.1"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
"@types/node": "^18.11.9",
Expand Down
6 changes: 3 additions & 3 deletions packages/salesforcedx-vscode-lwc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -28,7 +28,7 @@
"@salesforce/eslint-config-lwc": "3.6.0",
"@salesforce/lightning-lsp-common": "4.12.2",
"@salesforce/lwc-language-server": "4.12.2",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"ajv": "6.12.6",
"applicationinsights": "1.0.7",
"jest-editor-support": "30.3.1",
Expand All @@ -40,7 +40,7 @@
"vscode-languageclient": "^5.2.1"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
"@types/node": "^18.11.9",
Expand Down
8 changes: 4 additions & 4 deletions packages/salesforcedx-vscode-soql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"repository": {
"url": "https://github.com/forcedotcom/salesforcedx-vscode"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"icon": "images/VSCodeSoql.png",
Expand Down Expand Up @@ -40,9 +40,9 @@
"@salesforce/soql-model": "1.0.0"
},
"devDependencies": {
"@salesforce/salesforcedx-sobjects-faux-generator": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-sobjects-faux-generator": "62.5.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"@salesforce/soql-common": "0.2.1",
"@salesforce/ts-sinon": "1.4.0",
"@salesforce/ts-types": "2.0.12",
Expand Down
8 changes: 4 additions & 4 deletions packages/salesforcedx-vscode-visualforce/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand All @@ -24,15 +24,15 @@
"Programming Languages"
],
"dependencies": {
"@salesforce/salesforcedx-visualforce-language-server": "62.4.0",
"@salesforce/salesforcedx-visualforce-markup-language-server": "62.4.0",
"@salesforce/salesforcedx-visualforce-language-server": "62.5.0",
"@salesforce/salesforcedx-visualforce-markup-language-server": "62.5.0",
"vscode-extension-telemetry": "0.0.17",
"vscode-languageclient": "5.2.1",
"vscode-languageserver-protocol": "3.14.1",
"vscode-languageserver-types": "3.14.0"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
"@types/node": "^18.11.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/salesforcedx-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"color": "#ECECEC",
"theme": "light"
},
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/system-tests/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "system-tests",
"description": "System tests for Salesforce DX Extensions for VS Code",
"version": "62.4.0",
"version": "62.5.0",
"publisher": "salesforce",
"license": "BSD-3-Clause",
"main": "./out/src",
"engines": {
"vscode": "^1.86.0"
},
"devDependencies": {
"@salesforce/salesforcedx-test-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-utils-vscode": "62.4.0",
"@salesforce/salesforcedx-test-utils-vscode": "62.5.0",
"@salesforce/salesforcedx-utils-vscode": "62.5.0",
"@types/chai": "4.3.3",
"@types/mocha": "^5",
"@types/node": "^18.11.9",
Expand Down

0 comments on commit 333f73e

Please sign in to comment.