From dea705956e54d0360eeeb84dc4141d7b445ea25e Mon Sep 17 00:00:00 2001 From: lcampos Date: Wed, 31 Oct 2018 16:44:57 -0700 Subject: [PATCH 1/5] Update changelog for release v44.5.0 (#713) --- packages/salesforcedx-vscode/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/salesforcedx-vscode/CHANGELOG.md b/packages/salesforcedx-vscode/CHANGELOG.md index fdf9dba0ff..1251797812 100644 --- a/packages/salesforcedx-vscode/CHANGELOG.md +++ b/packages/salesforcedx-vscode/CHANGELOG.md @@ -1,3 +1,11 @@ +## 44.4.0 - November 1, 2018 + +### Fixed + +#### salesforcedx-vscode-apex-replay-debugger + +- We fixed some minor under-the-hood bugs. + ## 44.4.0 - October 25, 2018 ### Fixed From 362ec0707cd5e14717bd840bfe78b2ac71850fac Mon Sep 17 00:00:00 2001 From: lcampos Date: Wed, 31 Oct 2018 17:41:04 -0700 Subject: [PATCH 2/5] Check if Apex LSP is ready before getting breakpoint info (#712) @W-5402619@ --- .../src/adapter/debugConfigurationProvider.ts | 36 +++++++++++++++---- .../debugConfigurationProvider.test.ts | 16 ++------- packages/salesforcedx-vscode/package.json | 3 +- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts b/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts index 6907d969e6..220d6151a8 100644 --- a/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts +++ b/packages/salesforcedx-vscode-apex-replay-debugger/src/adapter/debugConfigurationProvider.ts @@ -14,6 +14,9 @@ import { nls } from '../messages'; export class DebugConfigurationProvider implements vscode.DebugConfigurationProvider { + private sfdxApex = vscode.extensions.getExtension( + 'salesforce.salesforcedx-vscode-apex' + ); public static getConfig(logFile?: string) { return { name: nls.localize('config_name_text'), @@ -38,7 +41,9 @@ export class DebugConfigurationProvider token?: vscode.CancellationToken ): vscode.ProviderResult { return this.asyncDebugConfig(config).catch(async err => { - return vscode.window.showErrorMessage(err.message).then(x => undefined); + return vscode.window + .showErrorMessage(err.message, { modal: true }) + .then(x => undefined); }); } @@ -64,13 +69,30 @@ export class DebugConfigurationProvider config.projectPath = vscode.workspace.workspaceFolders[0].uri.fsPath; } - const sfdxApex = vscode.extensions.getExtension( - 'salesforce.salesforcedx-vscode-apex' - ); - if (sfdxApex && sfdxApex.exports) { - config.lineBreakpointInfo = await sfdxApex.exports.getLineBreakpointInfo(); + if (this.sfdxApex && this.sfdxApex.exports) { + await this.isLanguageClientReady(); + config.lineBreakpointInfo = await this.sfdxApex.exports.getLineBreakpointInfo(); } - return config; } + + private async isLanguageClientReady() { + let expired = false; + let i = 0; + while ( + this.sfdxApex && + this.sfdxApex.exports && + !this.sfdxApex.exports.isLanguageClientReady() && + !expired + ) { + await new Promise(r => setTimeout(r, 100)); + if (i >= 30) { + expired = true; + } + i++; + } + if (expired) { + throw Error(nls.localize('language_client_not_ready')); + } + } } diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts b/packages/salesforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts index e552523de7..d2def05317 100644 --- a/packages/salesforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts +++ b/packages/salesforcedx-vscode-apex-replay-debugger/test/unit/adapter/debugConfigurationProvider.test.ts @@ -96,13 +96,7 @@ describe('Configuration provider', () => { expect(config.stopOnEntry).to.equals(true); expect(config.trace).to.equals(true); expect(config.projectPath).to.not.equals(undefined); - expect(config.lineBreakpointInfo).to.deep.equals([ - { - uri: '/force-app/main/default/classes/A.cls', - typeref: 'A', - lines: [2, 5, 6, 7] - } - ]); + expect(config.lineBreakpointInfo).to.not.equals(undefined); } else { expect.fail( 'Did not get configuration information from resolveDebugConfiguration' @@ -128,13 +122,7 @@ describe('Configuration provider', () => { expect(config.stopOnEntry).to.equals(false); expect(config.trace).to.equals(false); expect(config.projectPath).to.not.equals(undefined); - expect(config.lineBreakpointInfo).to.deep.equals([ - { - uri: '/force-app/main/default/classes/A.cls', - typeref: 'A', - lines: [2, 5, 6, 7] - } - ]); + expect(config.lineBreakpointInfo).to.not.equals(undefined); } else { expect.fail( 'Did not get configuration information from resolveDebugConfiguration' diff --git a/packages/salesforcedx-vscode/package.json b/packages/salesforcedx-vscode/package.json index 0574d33f7b..88c2775551 100644 --- a/packages/salesforcedx-vscode/package.json +++ b/packages/salesforcedx-vscode/package.json @@ -1,8 +1,7 @@ { "name": "salesforcedx-vscode", "displayName": "Salesforce", - "description": - "Extensions for developing on the Salesforce Platform", + "description": "Extensions for developing on the Salesforce Platform", "qna": "https://github.com/forcedotcom/salesforcedx-vscode/issues", "bugs": { "url": "https://github.com/forcedotcom/salesforcedx-vscode/issues" From 882a9d7e4a8ea1cdb143981cba8ee24a9769780d Mon Sep 17 00:00:00 2001 From: jgrantham-sf Date: Thu, 1 Nov 2018 09:40:14 -0600 Subject: [PATCH 3/5] v44.5.0 --- lerna.json | 2 +- .../salesforcedx-apex-debugger/package.json | 25 ++--- .../package.json | 28 +++--- .../salesforcedx-slds-linter/package.json | 13 ++- .../package.json | 21 ++--- .../salesforcedx-utils-vscode/package.json | 23 ++--- .../package.json | 18 ++-- .../package.json | 20 ++-- .../package.json | 32 ++++--- .../package.json | 39 +++++--- .../salesforcedx-vscode-apex/package.json | 41 +++++--- .../salesforcedx-vscode-core/package.json | 94 ++++++++----------- .../package.json | 21 +++-- .../salesforcedx-vscode-lwc-next/package.json | 24 ++--- packages/salesforcedx-vscode-lwc/package.json | 24 ++--- .../package.json | 66 +++++++++---- packages/salesforcedx-vscode/package.json | 6 +- packages/system-tests/package.json | 4 +- 18 files changed, 283 insertions(+), 218 deletions(-) diff --git a/lerna.json b/lerna.json index 9a0242806c..8b63efdfee 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "44.4.0" + "version": "44.5.0" } diff --git a/packages/salesforcedx-apex-debugger/package.json b/packages/salesforcedx-apex-debugger/package.json index 89f19e47c1..fcf24b936c 100644 --- a/packages/salesforcedx-apex-debugger/package.json +++ b/packages/salesforcedx-apex-debugger/package.json @@ -2,15 +2,17 @@ "name": "@salesforce/salesforcedx-apex-debugger", "displayName": "Apex Debugger Adapter", "description": "Implements the VS Code Debug Protocol for the Apex Debugger", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Debuggers"], + "categories": [ + "Debuggers" + ], "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "async-lock": "1.0.0", "faye": "1.1.2", "request-light": "0.2.1", @@ -40,16 +42,15 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-apex-replay-debugger/package.json b/packages/salesforcedx-apex-replay-debugger/package.json index ed25a04199..8798ebf681 100644 --- a/packages/salesforcedx-apex-replay-debugger/package.json +++ b/packages/salesforcedx-apex-replay-debugger/package.json @@ -1,18 +1,19 @@ { "name": "@salesforce/salesforcedx-apex-replay-debugger", "displayName": "Apex Replay Debug Adapter", - "description": - "Implements the VS Code Debug Protocol for the Apex Replay Debugger", - "version": "44.4.0", + "description": "Implements the VS Code Debug Protocol for the Apex Replay Debugger", + "version": "44.5.0", "publisher": "salesforce", "preview": true, "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Debuggers"], + "categories": [ + "Debuggers" + ], "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "vscode-debugadapter": "1.28.0", "vscode-debugprotocol": "1.28.0", "vscode-uri": "1.0.1" @@ -38,16 +39,15 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-slds-linter/package.json b/packages/salesforcedx-slds-linter/package.json index e5bd8463ca..b8cca8da97 100644 --- a/packages/salesforcedx-slds-linter/package.json +++ b/packages/salesforcedx-slds-linter/package.json @@ -2,10 +2,12 @@ "name": "@salesforce/salesforcedx-slds-linter", "displayName": "SFDX SLDS Linting for VS Code", "description": "Provides linting for deprecated SLDS class names", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", - "categories": ["Other"], + "categories": [ + "Other" + ], "engines": { "vscode": "^1.26.0" }, @@ -39,10 +41,13 @@ "test:unit": "node ./node_modules/vscode/bin/test" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] }, "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "vscode-languageclient": "3.5.1", "vscode-languageserver": "3.5.1" } diff --git a/packages/salesforcedx-sobjects-faux-generator/package.json b/packages/salesforcedx-sobjects-faux-generator/package.json index 1a10f6c783..44f3f678c0 100644 --- a/packages/salesforcedx-sobjects-faux-generator/package.json +++ b/packages/salesforcedx-sobjects-faux-generator/package.json @@ -1,16 +1,15 @@ { "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": "44.4.0", + "description": "Fetches sobjects and generates their faux apex class to be used for Apex Language Server", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "cross-spawn": "6.0.5", "request-light": "0.2.1", "rxjs": "^5.4.1", @@ -39,14 +38,14 @@ "lint": "tslint --project .", "watch": "tsc -watch -p .", "clean": "shx rm -rf node_modules && shx rm -rf out", - "test": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": - "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-utils-vscode/package.json b/packages/salesforcedx-utils-vscode/package.json index a632fbaf8a..9d6e4653c3 100644 --- a/packages/salesforcedx-utils-vscode/package.json +++ b/packages/salesforcedx-utils-vscode/package.json @@ -1,12 +1,13 @@ { "name": "@salesforce/salesforcedx-utils-vscode", "displayName": "SFDX Utilities for VS Code", - "description": - "Provides utilies to interface the SFDX libraries with VS Code", - "version": "44.4.0", + "description": "Provides utilies to interface the SFDX libraries with VS Code", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", - "categories": ["Other"], + "categories": [ + "Other" + ], "dependencies": { "cross-spawn": "6.0.5", "rxjs": "^5.4.1", @@ -43,15 +44,15 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", "coverage": "./node_modules/.bin/nyc npm test" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-visualforce-language-server/package.json b/packages/salesforcedx-visualforce-language-server/package.json index e0a86c2dcb..4d92193d55 100644 --- a/packages/salesforcedx-visualforce-language-server/package.json +++ b/packages/salesforcedx-visualforce-language-server/package.json @@ -1,14 +1,14 @@ { "name": "@salesforce/salesforcedx-visualforce-language-server", "description": "Visualforce language server", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, "dependencies": { - "@salesforce/salesforcedx-visualforce-markup-language-server": "44.4.0", + "@salesforce/salesforcedx-visualforce-markup-language-server": "44.5.0", "vscode-css-languageservice": "2.1.9", "vscode-languageserver": "3.4.2", "vscode-languageserver-protocol": "3.4.2", @@ -33,14 +33,14 @@ "compile": "tsc -p ./ && shx cp -R test/fixtures out/test", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-visualforce-markup-language-server/package.json b/packages/salesforcedx-visualforce-markup-language-server/package.json index 949e9cfd33..dad36c60e5 100644 --- a/packages/salesforcedx-visualforce-markup-language-server/package.json +++ b/packages/salesforcedx-visualforce-markup-language-server/package.json @@ -1,13 +1,15 @@ { "name": "@salesforce/salesforcedx-visualforce-markup-language-server", "description": "Language service for Visualforce Markup", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "activationEvents": ["onView:never"], + "activationEvents": [ + "onView:never" + ], "main": "./out/src/htmlLanguageService.js", "typings": "./out/src/htmlLanguageService", "devDependencies": { @@ -34,14 +36,14 @@ "compile": "tsc -p ./ && shx cp src/beautify/beautify-* out/src/beautify", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": - "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": ["text-summary", "lcov"] + "reporter": [ + "text-summary", + "lcov" + ] } } diff --git a/packages/salesforcedx-vscode-apex-debugger/package.json b/packages/salesforcedx-vscode-apex-debugger/package.json index ad1cf6fb4a..5b01782250 100644 --- a/packages/salesforcedx-vscode-apex-debugger/package.json +++ b/packages/salesforcedx-vscode-apex-debugger/package.json @@ -14,15 +14,17 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Debuggers"], + "categories": [ + "Debuggers" + ], "dependencies": { - "@salesforce/salesforcedx-apex-debugger": "44.4.0", + "@salesforce/salesforcedx-apex-debugger": "44.5.0", "vscode-debugprotocol": "1.28.0", "vscode-extension-telemetry": "0.0.17" }, @@ -49,8 +51,7 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" @@ -83,10 +84,11 @@ { "type": "apex", "label": "Apex Debugger", - "program": - "./node_modules/@salesforce/salesforcedx-apex-debugger/out/src/adapter/apexDebug.js", + "program": "./node_modules/@salesforce/salesforcedx-apex-debugger/out/src/adapter/apexDebug.js", "runtime": "node", - "languages": ["apex"], + "languages": [ + "apex" + ], "configurationSnippets": [ { "label": "%launch_snippet_label_text%", @@ -105,7 +107,9 @@ "configurationAttributes": { "launch": { "properties": { - "required": ["sfdxProject"], + "required": [ + "sfdxProject" + ], "userIdFilter": { "type": "array", "description": "%user_id_filter_text%", @@ -152,14 +156,20 @@ "default": "${workspaceRoot}" }, "trace": { - "type": ["boolean", "string"], + "type": [ + "boolean", + "string" + ], "description": "%trace_text%", "default": false }, "connectType": { "type": "string", "description": "%connect_type_text%", - "enum": ["DEFAULT", "ISV_DEBUGGER"] + "enum": [ + "DEFAULT", + "ISV_DEBUGGER" + ] } } } diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/package.json b/packages/salesforcedx-vscode-apex-replay-debugger/package.json index 70b08e86cc..9a0fd5e82d 100644 --- a/packages/salesforcedx-vscode-apex-replay-debugger/package.json +++ b/packages/salesforcedx-vscode-apex-replay-debugger/package.json @@ -14,15 +14,17 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Debuggers"], + "categories": [ + "Debuggers" + ], "dependencies": { - "@salesforce/salesforcedx-apex-replay-debugger": "44.4.0", + "@salesforce/salesforcedx-apex-replay-debugger": "44.5.0", "async-lock": "1.0.0", "path-exists": "3.0.0", "request-light": "0.2.1", @@ -53,8 +55,7 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" @@ -74,8 +75,13 @@ "languages": [ { "id": "apexlog", - "aliases": ["ApexLog", "DebugLog"], - "extensions": [".log"], + "aliases": [ + "ApexLog", + "DebugLog" + ], + "extensions": [ + ".log" + ], "firstLine": "^\\d{2}.*APEX_CODE,FINEST;.*VISUALFORCE,(FINER|FINEST);.*" } ], @@ -121,8 +127,7 @@ "explorer/context": [ { "command": "sfdx.launch.replay.debugger.logfile", - "when": - "sfdx:project_opened && resourceIsFile && resourceLangId == 'apexlog'" + "when": "sfdx:project_opened && resourceIsFile && resourceLangId == 'apexlog'" } ] }, @@ -162,10 +167,11 @@ { "type": "apex-replay", "label": "Apex Replay Debugger", - "program": - "./node_modules/@salesforce/salesforcedx-apex-replay-debugger/out/src/adapter/apexReplayDebug.js", + "program": "./node_modules/@salesforce/salesforcedx-apex-replay-debugger/out/src/adapter/apexReplayDebug.js", "runtime": "node", - "languages": ["apex"], + "languages": [ + "apex" + ], "variables": { "AskForLogFileName": "extension.replay-debugger.getLogFileName" }, @@ -186,7 +192,9 @@ "configurationAttributes": { "launch": { "properties": { - "required": ["logFile"], + "required": [ + "logFile" + ], "logFile": { "type": "string", "description": "%logfile_text%", @@ -198,7 +206,10 @@ "default": true }, "trace": { - "type": ["boolean", "string"], + "type": [ + "boolean", + "string" + ], "description": "%trace_text%", "default": false } diff --git a/packages/salesforcedx-vscode-apex/package.json b/packages/salesforcedx-vscode-apex/package.json index 939061b028..53f480dd2a 100644 --- a/packages/salesforcedx-vscode-apex/package.json +++ b/packages/salesforcedx-vscode-apex/package.json @@ -1,8 +1,7 @@ { "name": "salesforcedx-vscode-apex", "displayName": "Apex", - "description": - "Provides code-editing features for the Apex programming language", + "description": "Provides code-editing features for the Apex programming language", "qna": "https://github.com/forcedotcom/salesforcedx-vscode/issues", "bugs": { "url": "https://github.com/forcedotcom/salesforcedx-vscode/issues" @@ -15,13 +14,15 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Languages"], + "categories": [ + "Languages" + ], "devDependencies": { "@types/chai": "^4.0.0", "@types/mocha": "2.2.38", @@ -38,7 +39,9 @@ "vscode": "1.1.17", "vscode-extension-telemetry": "0.0.17" }, - "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], + "extensionDependencies": [ + "salesforce.salesforcedx-vscode-core" + ], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -47,13 +50,14 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && cd out && node ../../../scripts/clean-all-but-jar.js && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && cd out && node ../../../scripts/clean-all-but-jar.js && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": ["workspaceContains:sfdx-project.json"], + "activationEvents": [ + "workspaceContains:sfdx-project.json" + ], "main": "./out/src", "contributes": { "viewsContainers": { @@ -138,7 +142,10 @@ "title": "%configuration_title%", "properties": { "salesforcedx-vscode-apex.java.home": { - "type": ["string", "null"], + "type": [ + "string", + "null" + ], "default": null, "description": "%java_home_description%" } @@ -147,8 +154,15 @@ "languages": [ { "id": "apex", - "aliases": ["Apex", "apex"], - "extensions": [".cls", ".trigger", ".apex"], + "aliases": [ + "Apex", + "apex" + ], + "extensions": [ + ".cls", + ".trigger", + ".apex" + ], "configuration": "./syntaxes/apex.configuration.json" } ], @@ -156,8 +170,7 @@ { "language": "apex", "scopeName": "source.apex", - "path": - "./node_modules/@salesforce/apex-tmlanguage/grammars/apex.tmLanguage" + "path": "./node_modules/@salesforce/apex-tmlanguage/grammars/apex.tmLanguage" } ], "snippets": [ @@ -169,7 +182,7 @@ }, "dependencies": { "@salesforce/apex-tmlanguage": "1.1.0", - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "expand-home-dir": "0.0.3", "find-java-home": "0.2.0", "path-exists": "3.0.0", diff --git a/packages/salesforcedx-vscode-core/package.json b/packages/salesforcedx-vscode-core/package.json index 61a82f8d30..67c71a477d 100644 --- a/packages/salesforcedx-vscode-core/package.json +++ b/packages/salesforcedx-vscode-core/package.json @@ -15,17 +15,19 @@ "theme": "light" }, "aiKey": "ec3632a4-df47-47a4-98dc-8134cacbaf7e", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Other"], + "categories": [ + "Other" + ], "dependencies": { "@salesforce/core": "0.18.2", - "@salesforce/salesforcedx-sobjects-faux-generator": "44.4.0", - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-sobjects-faux-generator": "44.5.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "adm-zip": "0.4.7", "glob": "^7.1.2", "moment": "2.20.1", @@ -61,13 +63,10 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", - "test": - "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test", - "test:unit": - "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test" + "test": "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test", + "test:unit": "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test" }, "activationEvents": [ "workspaceContains:sfdx-project.json", @@ -95,75 +94,61 @@ "editor/context": [ { "command": "sfdx.force.source.retrieve.current.file", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.deploy.current.file", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.delete.current.file", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" } ], "explorer/context": [ { "command": "sfdx.force.apex.class.create", - "when": - "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.visualforce.component.create", - "when": - "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.visualforce.page.create", - "when": - "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.lightning.app.create", - "when": - "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.component.create", - "when": - "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.event.create", - "when": - "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.interface.create", - "when": - "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.apex.trigger.create", - "when": - "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.source.retrieve", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.deploy", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.delete", - "when": - "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" } ], "commandPalette": [ @@ -189,38 +174,31 @@ }, { "command": "sfdx.force.source.pull", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.pull.force", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.push", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.push.force", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status.local", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status.remote", - "when": - "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.apex.test.run", @@ -564,17 +542,23 @@ "title": "%feature_previews_title%", "properties": { "salesforcedx-vscode-core.show-cli-success-msg": { - "type": ["boolean"], + "type": [ + "boolean" + ], "default": true, "description": "%show_cli_success_msg_description%" }, "salesforcedx-vscode-core.retrieve-test-code-coverage": { - "type": ["boolean"], + "type": [ + "boolean" + ], "default": false, "description": "%retrieve_test_code_coverage_text%" }, "salesforcedx-vscode-core.telemetry.enabled": { - "type": ["boolean"], + "type": [ + "boolean" + ], "default": true, "description": "%telemetry_enabled_description%" } diff --git a/packages/salesforcedx-vscode-lightning/package.json b/packages/salesforcedx-vscode-lightning/package.json index 96e02840d2..9e08c31e19 100644 --- a/packages/salesforcedx-vscode-lightning/package.json +++ b/packages/salesforcedx-vscode-lightning/package.json @@ -14,19 +14,21 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Programming Languages"], + "categories": [ + "Programming Languages" + ], "dependencies": { - "@salesforce/salesforcedx-slds-linter": "44.4.0", + "@salesforce/salesforcedx-slds-linter": "44.5.0", "vscode-extension-telemetry": "0.0.17" }, "devDependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "@types/chai": "^4.0.0", "@types/mocha": "2.2.38", "@types/node": "8.9.3", @@ -38,7 +40,9 @@ "typescript": "2.6.2", "vscode": "1.1.17" }, - "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], + "extensionDependencies": [ + "salesforce.salesforcedx-vscode-core" + ], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -47,13 +51,14 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": ["workspaceContains:sfdx-project.json"], + "activationEvents": [ + "workspaceContains:sfdx-project.json" + ], "main": "./out/src", "contributes": { "languages": [ diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index 944df254a5..5f054a0737 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -14,16 +14,18 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "preview": true, "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Programming Languages"], + "categories": [ + "Programming Languages" + ], "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "ajv": "^6.1.1", "lwc-language-server": "1.6.7", "rxjs": "^5.4.1", @@ -52,24 +54,22 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "pretest": "node ../../scripts/download-vscode-for-system-tests", - "test": - "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", - "test:unit": - "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" + "test": "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", + "test:unit": "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": ["workspaceContains:sfdx-project.json"], + "activationEvents": [ + "workspaceContains:sfdx-project.json" + ], "main": "./out/src", "contributes": { "menus": { "explorer/context": [ { "command": "sfdx.force.lightning.lwc.create", - "when": - "explorerResourceIsFolder && resourceFilename == lwc && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == lwc && sfdx:project_opened" } ], "commandPalette": [ diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json index b5620f15e2..7a813d3d35 100644 --- a/packages/salesforcedx-vscode-lwc/package.json +++ b/packages/salesforcedx-vscode-lwc/package.json @@ -14,16 +14,18 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "preview": true, "license": "BSD-3-Clause", "engines": { "vscode": "^1.26.0" }, - "categories": ["Programming Languages"], + "categories": [ + "Programming Languages" + ], "dependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "ajv": "^6.1.1", "eslint": "4.16.0", "lwc-language-server": "1.6.7", @@ -55,24 +57,22 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "pretest": "node ../../scripts/download-vscode-for-system-tests", - "test": - "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", - "test:unit": - "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" + "test": "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", + "test:unit": "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": ["workspaceContains:sfdx-project.json"], + "activationEvents": [ + "workspaceContains:sfdx-project.json" + ], "main": "./out/src", "contributes": { "menus": { "explorer/context": [ { "command": "sfdx.force.lightning.lwc.create", - "when": - "explorerResourceIsFolder && resourceFilename == lightningcomponents && sfdx:project_opened" + "when": "explorerResourceIsFolder && resourceFilename == lightningcomponents && sfdx:project_opened" } ], "commandPalette": [ diff --git a/packages/salesforcedx-vscode-visualforce/package.json b/packages/salesforcedx-vscode-visualforce/package.json index db4166ef42..60525305fb 100644 --- a/packages/salesforcedx-vscode-visualforce/package.json +++ b/packages/salesforcedx-vscode-visualforce/package.json @@ -14,16 +14,18 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { "vscode": "^1.17.0" }, - "categories": ["Languages"], + "categories": [ + "Languages" + ], "dependencies": { - "@salesforce/salesforcedx-visualforce-language-server": "44.4.0", - "@salesforce/salesforcedx-visualforce-markup-language-server": "44.4.0", + "@salesforce/salesforcedx-visualforce-language-server": "44.5.0", + "@salesforce/salesforcedx-visualforce-markup-language-server": "44.5.0", "typescript": "2.6.2", "vscode-extension-telemetry": "0.0.17", "vscode-languageclient": "3.4.2", @@ -31,7 +33,7 @@ "vscode-languageserver-types": "3.4.0" }, "devDependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "@types/chai": "^4.0.0", "@types/mocha": "2.2.38", "@types/node": "8.9.3", @@ -42,7 +44,9 @@ "sinon": "^2.3.6", "vscode": "1.1.17" }, - "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], + "extensionDependencies": [ + "salesforce.salesforcedx-vscode-core" + ], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -51,20 +55,27 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": - "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensionst", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": ["workspaceContains:sfdx-project.json"], + "activationEvents": [ + "workspaceContains:sfdx-project.json" + ], "main": "./out/src/extension", "contributes": { "languages": [ { "id": "visualforce", - "aliases": ["Visualforce", "visualforce"], - "extensions": [".page", ".component"], + "aliases": [ + "Visualforce", + "visualforce" + ], + "extensions": [ + ".page", + ".component" + ], "configuration": "./syntaxes/visualforce.configuration.json" } ], @@ -96,13 +107,19 @@ "description": "%visualforce.format.wrapLineLength.desc%" }, "visualforce.format.unformatted": { - "type": ["string", "null"], + "type": [ + "string", + "null" + ], "scope": "resource", "default": "", "description": "%visualforce.format.unformatted.desc%" }, "visualforce.format.contentUnformatted": { - "type": ["string", "null"], + "type": [ + "string", + "null" + ], "scope": "resource", "default": "pre,code,textarea", "description": "%visualforce.format.contentUnformatted.desc%" @@ -120,7 +137,10 @@ "description": "%visualforce.format.preserveNewLines.desc%" }, "visualforce.format.maxPreserveNewLines": { - "type": ["number", "null"], + "type": [ + "number", + "null" + ], "scope": "resource", "default": null, "description": "%visualforce.format.maxPreserveNewLines.desc%" @@ -132,7 +152,10 @@ "description": "%visualforce.format.endWithNewline.desc%" }, "visualforce.format.extraLiners": { - "type": ["string", "null"], + "type": [ + "string", + "null" + ], "scope": "resource", "default": "head, body, /html", "description": "%visualforce.format.extraLiners.desc%" @@ -141,7 +164,12 @@ "type": "string", "scope": "resource", "default": "auto", - "enum": ["auto", "force", "force-aligned", "force-expand-multiline"], + "enum": [ + "auto", + "force", + "force-aligned", + "force-expand-multiline" + ], "enumDescriptions": [ "%visualforce.format.wrapAttributes.auto%", "%visualforce.format.wrapAttributes.force%", @@ -177,7 +205,11 @@ "visualforce.trace.server": { "type": "string", "scope": "window", - "enum": ["off", "messages", "verbose"], + "enum": [ + "off", + "messages", + "verbose" + ], "default": "off", "description": "%visualforce.trace.server.desc%" } diff --git a/packages/salesforcedx-vscode/package.json b/packages/salesforcedx-vscode/package.json index 88c2775551..fdd013a2b0 100644 --- a/packages/salesforcedx-vscode/package.json +++ b/packages/salesforcedx-vscode/package.json @@ -14,7 +14,7 @@ "color": "#ECECEC", "theme": "light" }, - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "engines": { @@ -26,7 +26,9 @@ "vscode:sha256": "node ../../scripts/generate-sha256.js >> ../../SHA256", "vscode:publish": "node ../../scripts/publish-vsix.js" }, - "categories": ["Extension Packs"], + "categories": [ + "Extension Packs" + ], "extensionPack": [ "salesforce.salesforcedx-vscode-apex", "salesforce.salesforcedx-vscode-apex-debugger", diff --git a/packages/system-tests/package.json b/packages/system-tests/package.json index 1ce64c7de4..2432748a00 100644 --- a/packages/system-tests/package.json +++ b/packages/system-tests/package.json @@ -1,7 +1,7 @@ { "name": "system-tests", "description": "System tests for Salesforce DX Extensions for VS Code", - "version": "44.4.0", + "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", "main": "./out/src", @@ -9,7 +9,7 @@ "vscode": "^1.17.0" }, "devDependencies": { - "@salesforce/salesforcedx-utils-vscode": "44.4.0", + "@salesforce/salesforcedx-utils-vscode": "44.5.0", "@types/chai": "^4.0.0", "@types/mkdirp": "0.5.2", "@types/mocha": "2.2.38", From a99059cf2f5ecd3f8ed17ca7148c52e05906dfa9 Mon Sep 17 00:00:00 2001 From: jgrantham-sf Date: Thu, 1 Nov 2018 09:42:55 -0600 Subject: [PATCH 4/5] Updated SHA256 --- SHA256.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SHA256.md b/SHA256.md index dda494725c..09900b4e0a 100644 --- a/SHA256.md +++ b/SHA256.md @@ -8,7 +8,7 @@ make sure that their SHA values match the values in the list below. following the instructions at https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions. For example, download, - https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/44.4.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage. + https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/44.5.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage. 2. From a terminal, run: @@ -16,14 +16,14 @@ shasum -a 256 3. Confirm that the SHA in your output matches the value in this list of SHAs. -3aec7672fd6ce816b44ea71b524694063ab1d83c788a31ad6f01350a5b71cbe3 salesforcedx-vscode-apex-debugger-44.4.0.vsix -f2568c541d79deffa40a1235180414232f522d7a9201317bb82a9d0d639d5705 salesforcedx-vscode-apex-replay-debugger-44.4.0.vsix -6a3b18d98220ae27901390a2ef2e1f1a5a99977f113704e25c97370a953b0581 salesforcedx-vscode-apex-44.4.0.vsix -5bc29e1c79963ff7ebb17549ce5fb275e7ad61d654d6c83bf9af8f9368108162 salesforcedx-vscode-core-44.4.0.vsix -3166d99891b110a06ff107818a9a05e758ee359cdc9d770d5ba8a9fb8cfb0f64 salesforcedx-vscode-lightning-44.4.0.vsix -49838f67fb89b8bf8b8906bc5205a6a966df2264cecebc2c9b82a5da8f93ef47 salesforcedx-vscode-lwc-44.4.0.vsix -6522991d7687c211d5fb2488ffb33c72ced2dd0a8828c794f5cfe0f386e4610a salesforcedx-vscode-visualforce-44.4.0.vsix -6dfa5611b270598fbf1e46e3232d16a038de7c0dbf7e6e7bccc1ce4e947e5c32 salesforcedx-vscode-44.4.0.vsix +99ca3017c5d3187060d009edc0e62ae8f649263249bdf11092853dff6d99bda5 salesforcedx-vscode-apex-debugger-44.5.0.vsix +ceb8d8c49a218d75266664b19fb4437705f32e6ee863d8c237d09796d9bfca85 salesforcedx-vscode-apex-replay-debugger-44.5.0.vsix +bd47b5a49e467e830029160e3eff8b1800c7b61043b958c73c582fafbf80a476 salesforcedx-vscode-apex-44.5.0.vsix +6d1bd9dd3b30a8d60f9a7d346d547e455cb6488f6b101dbcfb94573281f40b6b salesforcedx-vscode-core-44.5.0.vsix +5caf9a9640405ef6df8236edd32b164bac1c7d175d036e45870052f398b6827b salesforcedx-vscode-lightning-44.5.0.vsix +e583d2b0fafab8c1cd1bbd6d8f81002ac79351af1c8c3b58d5d7cb4c0182005c salesforcedx-vscode-lwc-44.5.0.vsix +8ddd719c60af1d78fbb6b0f918c52c10766d8db3587d3acbb2f39ba3eb5c9dd0 salesforcedx-vscode-visualforce-44.5.0.vsix +7b782db6f39d52d298bedd46fbecc39f58ab2d3d087cfef8a47b3bcd359ac739 salesforcedx-vscode-44.5.0.vsix 4. Change the filename extension for the file that you downloaded from .zip to From 2116e205a5c07160743a412159cddd8a8c23aebc Mon Sep 17 00:00:00 2001 From: jgrantham-sf Date: Thu, 1 Nov 2018 09:42:55 -0600 Subject: [PATCH 5/5] Reformat for lerna --- .../salesforcedx-apex-debugger/package.json | 21 +++-- .../package.json | 24 ++--- .../salesforcedx-slds-linter/package.json | 9 +- .../package.json | 17 ++-- .../salesforcedx-utils-vscode/package.json | 21 +++-- .../package.json | 14 +-- .../package.json | 18 ++-- .../package.json | 28 ++---- .../package.json | 35 +++----- .../salesforcedx-vscode-apex/package.json | 37 +++----- .../salesforcedx-vscode-core/package.json | 88 +++++++++++-------- .../package.json | 15 ++-- .../salesforcedx-vscode-lwc-next/package.json | 20 ++--- packages/salesforcedx-vscode-lwc/package.json | 20 ++--- .../package.json | 58 +++--------- packages/salesforcedx-vscode/package.json | 4 +- 16 files changed, 182 insertions(+), 247 deletions(-) diff --git a/packages/salesforcedx-apex-debugger/package.json b/packages/salesforcedx-apex-debugger/package.json index fcf24b936c..3374d83eb8 100644 --- a/packages/salesforcedx-apex-debugger/package.json +++ b/packages/salesforcedx-apex-debugger/package.json @@ -8,9 +8,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Debuggers" - ], + "categories": ["Debuggers"], "dependencies": { "@salesforce/salesforcedx-utils-vscode": "44.5.0", "async-lock": "1.0.0", @@ -42,15 +40,16 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-apex-replay-debugger/package.json b/packages/salesforcedx-apex-replay-debugger/package.json index 8798ebf681..c1a1f261f6 100644 --- a/packages/salesforcedx-apex-replay-debugger/package.json +++ b/packages/salesforcedx-apex-replay-debugger/package.json @@ -1,7 +1,8 @@ { "name": "@salesforce/salesforcedx-apex-replay-debugger", "displayName": "Apex Replay Debug Adapter", - "description": "Implements the VS Code Debug Protocol for the Apex Replay Debugger", + "description": + "Implements the VS Code Debug Protocol for the Apex Replay Debugger", "version": "44.5.0", "publisher": "salesforce", "preview": true, @@ -9,9 +10,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Debuggers" - ], + "categories": ["Debuggers"], "dependencies": { "@salesforce/salesforcedx-utils-vscode": "44.5.0", "vscode-debugadapter": "1.28.0", @@ -39,15 +38,16 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-slds-linter/package.json b/packages/salesforcedx-slds-linter/package.json index b8cca8da97..52b457d427 100644 --- a/packages/salesforcedx-slds-linter/package.json +++ b/packages/salesforcedx-slds-linter/package.json @@ -5,9 +5,7 @@ "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", - "categories": [ - "Other" - ], + "categories": ["Other"], "engines": { "vscode": "^1.26.0" }, @@ -41,10 +39,7 @@ "test:unit": "node ./node_modules/vscode/bin/test" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] }, "dependencies": { "@salesforce/salesforcedx-utils-vscode": "44.5.0", diff --git a/packages/salesforcedx-sobjects-faux-generator/package.json b/packages/salesforcedx-sobjects-faux-generator/package.json index 44f3f678c0..af275c3e9f 100644 --- a/packages/salesforcedx-sobjects-faux-generator/package.json +++ b/packages/salesforcedx-sobjects-faux-generator/package.json @@ -1,7 +1,8 @@ { "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", + "description": + "Fetches sobjects and generates their faux apex class to be used for Apex Language Server", "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", @@ -38,14 +39,14 @@ "lint": "tslint --project .", "watch": "tsc -watch -p .", "clean": "shx rm -rf node_modules && shx rm -rf out", - "test": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:integration": "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "test": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/unit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:integration": + "./node_modules/.bin/cross-env VSCODE_NLS_CONFIG={} ./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-utils-vscode/package.json b/packages/salesforcedx-utils-vscode/package.json index 9d6e4653c3..7d295bd25e 100644 --- a/packages/salesforcedx-utils-vscode/package.json +++ b/packages/salesforcedx-utils-vscode/package.json @@ -1,13 +1,12 @@ { "name": "@salesforce/salesforcedx-utils-vscode", "displayName": "SFDX Utilities for VS Code", - "description": "Provides utilies to interface the SFDX libraries with VS Code", + "description": + "Provides utilies to interface the SFDX libraries with VS Code", "version": "44.5.0", "publisher": "salesforce", "license": "BSD-3-Clause", - "categories": [ - "Other" - ], + "categories": ["Other"], "dependencies": { "cross-spawn": "6.0.5", "rxjs": "^5.4.1", @@ -44,15 +43,15 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --timeout 20000 --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", "coverage": "./node_modules/.bin/nyc npm test" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-visualforce-language-server/package.json b/packages/salesforcedx-visualforce-language-server/package.json index 4d92193d55..df26d071b4 100644 --- a/packages/salesforcedx-visualforce-language-server/package.json +++ b/packages/salesforcedx-visualforce-language-server/package.json @@ -33,14 +33,14 @@ "compile": "tsc -p ./ && shx cp -R test/fixtures out/test", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-visualforce-markup-language-server/package.json b/packages/salesforcedx-visualforce-markup-language-server/package.json index dad36c60e5..6de1caec49 100644 --- a/packages/salesforcedx-visualforce-markup-language-server/package.json +++ b/packages/salesforcedx-visualforce-markup-language-server/package.json @@ -7,9 +7,7 @@ "engines": { "vscode": "^1.26.0" }, - "activationEvents": [ - "onView:never" - ], + "activationEvents": ["onView:never"], "main": "./out/src/htmlLanguageService.js", "typings": "./out/src/htmlLanguageService", "devDependencies": { @@ -36,14 +34,14 @@ "compile": "tsc -p ./ && shx cp src/beautify/beautify-* out/src/beautify", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", - "test": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", - "test:unit": "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "test": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json", + "test:unit": + "./node_modules/.bin/nyc ./node_modules/.bin/_mocha --recursive out/test --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaConfig.json" }, "nyc": { - "reporter": [ - "text-summary", - "lcov" - ] + "reporter": ["text-summary", "lcov"] } } diff --git a/packages/salesforcedx-vscode-apex-debugger/package.json b/packages/salesforcedx-vscode-apex-debugger/package.json index 5b01782250..7e6d91ac20 100644 --- a/packages/salesforcedx-vscode-apex-debugger/package.json +++ b/packages/salesforcedx-vscode-apex-debugger/package.json @@ -20,9 +20,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Debuggers" - ], + "categories": ["Debuggers"], "dependencies": { "@salesforce/salesforcedx-apex-debugger": "44.5.0", "vscode-debugprotocol": "1.28.0", @@ -51,7 +49,8 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" @@ -84,11 +83,10 @@ { "type": "apex", "label": "Apex Debugger", - "program": "./node_modules/@salesforce/salesforcedx-apex-debugger/out/src/adapter/apexDebug.js", + "program": + "./node_modules/@salesforce/salesforcedx-apex-debugger/out/src/adapter/apexDebug.js", "runtime": "node", - "languages": [ - "apex" - ], + "languages": ["apex"], "configurationSnippets": [ { "label": "%launch_snippet_label_text%", @@ -107,9 +105,7 @@ "configurationAttributes": { "launch": { "properties": { - "required": [ - "sfdxProject" - ], + "required": ["sfdxProject"], "userIdFilter": { "type": "array", "description": "%user_id_filter_text%", @@ -156,20 +152,14 @@ "default": "${workspaceRoot}" }, "trace": { - "type": [ - "boolean", - "string" - ], + "type": ["boolean", "string"], "description": "%trace_text%", "default": false }, "connectType": { "type": "string", "description": "%connect_type_text%", - "enum": [ - "DEFAULT", - "ISV_DEBUGGER" - ] + "enum": ["DEFAULT", "ISV_DEBUGGER"] } } } diff --git a/packages/salesforcedx-vscode-apex-replay-debugger/package.json b/packages/salesforcedx-vscode-apex-replay-debugger/package.json index 9a0fd5e82d..fd773e0425 100644 --- a/packages/salesforcedx-vscode-apex-replay-debugger/package.json +++ b/packages/salesforcedx-vscode-apex-replay-debugger/package.json @@ -20,9 +20,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Debuggers" - ], + "categories": ["Debuggers"], "dependencies": { "@salesforce/salesforcedx-apex-replay-debugger": "44.5.0", "async-lock": "1.0.0", @@ -55,7 +53,8 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" @@ -75,13 +74,8 @@ "languages": [ { "id": "apexlog", - "aliases": [ - "ApexLog", - "DebugLog" - ], - "extensions": [ - ".log" - ], + "aliases": ["ApexLog", "DebugLog"], + "extensions": [".log"], "firstLine": "^\\d{2}.*APEX_CODE,FINEST;.*VISUALFORCE,(FINER|FINEST);.*" } ], @@ -127,7 +121,8 @@ "explorer/context": [ { "command": "sfdx.launch.replay.debugger.logfile", - "when": "sfdx:project_opened && resourceIsFile && resourceLangId == 'apexlog'" + "when": + "sfdx:project_opened && resourceIsFile && resourceLangId == 'apexlog'" } ] }, @@ -167,11 +162,10 @@ { "type": "apex-replay", "label": "Apex Replay Debugger", - "program": "./node_modules/@salesforce/salesforcedx-apex-replay-debugger/out/src/adapter/apexReplayDebug.js", + "program": + "./node_modules/@salesforce/salesforcedx-apex-replay-debugger/out/src/adapter/apexReplayDebug.js", "runtime": "node", - "languages": [ - "apex" - ], + "languages": ["apex"], "variables": { "AskForLogFileName": "extension.replay-debugger.getLogFileName" }, @@ -192,9 +186,7 @@ "configurationAttributes": { "launch": { "properties": { - "required": [ - "logFile" - ], + "required": ["logFile"], "logFile": { "type": "string", "description": "%logfile_text%", @@ -206,10 +198,7 @@ "default": true }, "trace": { - "type": [ - "boolean", - "string" - ], + "type": ["boolean", "string"], "description": "%trace_text%", "default": false } diff --git a/packages/salesforcedx-vscode-apex/package.json b/packages/salesforcedx-vscode-apex/package.json index 53f480dd2a..4cbd3146ba 100644 --- a/packages/salesforcedx-vscode-apex/package.json +++ b/packages/salesforcedx-vscode-apex/package.json @@ -1,7 +1,8 @@ { "name": "salesforcedx-vscode-apex", "displayName": "Apex", - "description": "Provides code-editing features for the Apex programming language", + "description": + "Provides code-editing features for the Apex programming language", "qna": "https://github.com/forcedotcom/salesforcedx-vscode/issues", "bugs": { "url": "https://github.com/forcedotcom/salesforcedx-vscode/issues" @@ -20,9 +21,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Languages" - ], + "categories": ["Languages"], "devDependencies": { "@types/chai": "^4.0.0", "@types/mocha": "2.2.38", @@ -39,9 +38,7 @@ "vscode": "1.1.17", "vscode-extension-telemetry": "0.0.17" }, - "extensionDependencies": [ - "salesforce.salesforcedx-vscode-core" - ], + "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -50,14 +47,13 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && cd out && node ../../../scripts/clean-all-but-jar.js && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && cd out && node ../../../scripts/clean-all-but-jar.js && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": [ - "workspaceContains:sfdx-project.json" - ], + "activationEvents": ["workspaceContains:sfdx-project.json"], "main": "./out/src", "contributes": { "viewsContainers": { @@ -142,10 +138,7 @@ "title": "%configuration_title%", "properties": { "salesforcedx-vscode-apex.java.home": { - "type": [ - "string", - "null" - ], + "type": ["string", "null"], "default": null, "description": "%java_home_description%" } @@ -154,15 +147,8 @@ "languages": [ { "id": "apex", - "aliases": [ - "Apex", - "apex" - ], - "extensions": [ - ".cls", - ".trigger", - ".apex" - ], + "aliases": ["Apex", "apex"], + "extensions": [".cls", ".trigger", ".apex"], "configuration": "./syntaxes/apex.configuration.json" } ], @@ -170,7 +156,8 @@ { "language": "apex", "scopeName": "source.apex", - "path": "./node_modules/@salesforce/apex-tmlanguage/grammars/apex.tmLanguage" + "path": + "./node_modules/@salesforce/apex-tmlanguage/grammars/apex.tmLanguage" } ], "snippets": [ diff --git a/packages/salesforcedx-vscode-core/package.json b/packages/salesforcedx-vscode-core/package.json index 67c71a477d..5c861c66c5 100644 --- a/packages/salesforcedx-vscode-core/package.json +++ b/packages/salesforcedx-vscode-core/package.json @@ -21,9 +21,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Other" - ], + "categories": ["Other"], "dependencies": { "@salesforce/core": "0.18.2", "@salesforce/salesforcedx-sobjects-faux-generator": "44.5.0", @@ -63,10 +61,13 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", - "test": "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test", - "test:unit": "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test" + "test": + "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test", + "test:unit": + "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ./node_modules/vscode/bin/test" }, "activationEvents": [ "workspaceContains:sfdx-project.json", @@ -94,61 +95,75 @@ "editor/context": [ { "command": "sfdx.force.source.retrieve.current.file", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.deploy.current.file", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.delete.current.file", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" } ], "explorer/context": [ { "command": "sfdx.force.apex.class.create", - "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.visualforce.component.create", - "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.visualforce.page.create", - "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.lightning.app.create", - "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.component.create", - "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.event.create", - "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.lightning.interface.create", - "when": "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == aura && sfdx:project_opened" }, { "command": "sfdx.force.apex.trigger.create", - "when": "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename != aura && resourceFilename != lightningcomponents && sfdx:project_opened" }, { "command": "sfdx.force.source.retrieve", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.deploy", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" }, { "command": "sfdx.force.source.delete", - "when": "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" + "when": + "sfdx:project_opened && sfdx:default_username_has_no_change_tracking" } ], "commandPalette": [ @@ -174,31 +189,38 @@ }, { "command": "sfdx.force.source.pull", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.pull.force", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.push", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.push.force", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status.local", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.source.status.remote", - "when": "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" + "when": + "sfdx:project_opened && !sfdx:isv_debug_project && sfdx:default_username_has_change_tracking" }, { "command": "sfdx.force.apex.test.run", @@ -542,23 +564,17 @@ "title": "%feature_previews_title%", "properties": { "salesforcedx-vscode-core.show-cli-success-msg": { - "type": [ - "boolean" - ], + "type": ["boolean"], "default": true, "description": "%show_cli_success_msg_description%" }, "salesforcedx-vscode-core.retrieve-test-code-coverage": { - "type": [ - "boolean" - ], + "type": ["boolean"], "default": false, "description": "%retrieve_test_code_coverage_text%" }, "salesforcedx-vscode-core.telemetry.enabled": { - "type": [ - "boolean" - ], + "type": ["boolean"], "default": true, "description": "%telemetry_enabled_description%" } diff --git a/packages/salesforcedx-vscode-lightning/package.json b/packages/salesforcedx-vscode-lightning/package.json index 9e08c31e19..83a1097c07 100644 --- a/packages/salesforcedx-vscode-lightning/package.json +++ b/packages/salesforcedx-vscode-lightning/package.json @@ -20,9 +20,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Programming Languages" - ], + "categories": ["Programming Languages"], "dependencies": { "@salesforce/salesforcedx-slds-linter": "44.5.0", "vscode-extension-telemetry": "0.0.17" @@ -40,9 +38,7 @@ "typescript": "2.6.2", "vscode": "1.1.17" }, - "extensionDependencies": [ - "salesforce.salesforcedx-vscode-core" - ], + "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -51,14 +47,13 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensions", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": [ - "workspaceContains:sfdx-project.json" - ], + "activationEvents": ["workspaceContains:sfdx-project.json"], "main": "./out/src", "contributes": { "languages": [ diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index 5f054a0737..f2a348bf4b 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -21,9 +21,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Programming Languages" - ], + "categories": ["Programming Languages"], "dependencies": { "@salesforce/salesforcedx-utils-vscode": "44.5.0", "ajv": "^6.1.1", @@ -54,22 +52,24 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "pretest": "node ../../scripts/download-vscode-for-system-tests", - "test": "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", - "test:unit": "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" + "test": + "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", + "test:unit": + "node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": [ - "workspaceContains:sfdx-project.json" - ], + "activationEvents": ["workspaceContains:sfdx-project.json"], "main": "./out/src", "contributes": { "menus": { "explorer/context": [ { "command": "sfdx.force.lightning.lwc.create", - "when": "explorerResourceIsFolder && resourceFilename == lwc && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == lwc && sfdx:project_opened" } ], "commandPalette": [ diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json index 7a813d3d35..595219ee3b 100644 --- a/packages/salesforcedx-vscode-lwc/package.json +++ b/packages/salesforcedx-vscode-lwc/package.json @@ -21,9 +21,7 @@ "engines": { "vscode": "^1.26.0" }, - "categories": [ - "Programming Languages" - ], + "categories": ["Programming Languages"], "dependencies": { "@salesforce/salesforcedx-utils-vscode": "44.5.0", "ajv": "^6.1.1", @@ -57,22 +55,24 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "pretest": "node ../../scripts/download-vscode-for-system-tests", - "test": "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", - "test:unit": "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" + "test": + "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions", + "test:unit": + "cross-env FORCE_LOAD_CURRENT_LWC=true node ../../scripts/install-vsix-dependencies dbaeumer.vscode-eslint && node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": [ - "workspaceContains:sfdx-project.json" - ], + "activationEvents": ["workspaceContains:sfdx-project.json"], "main": "./out/src", "contributes": { "menus": { "explorer/context": [ { "command": "sfdx.force.lightning.lwc.create", - "when": "explorerResourceIsFolder && resourceFilename == lightningcomponents && sfdx:project_opened" + "when": + "explorerResourceIsFolder && resourceFilename == lightningcomponents && sfdx:project_opened" } ], "commandPalette": [ diff --git a/packages/salesforcedx-vscode-visualforce/package.json b/packages/salesforcedx-vscode-visualforce/package.json index 60525305fb..93b47bf02d 100644 --- a/packages/salesforcedx-vscode-visualforce/package.json +++ b/packages/salesforcedx-vscode-visualforce/package.json @@ -20,9 +20,7 @@ "engines": { "vscode": "^1.17.0" }, - "categories": [ - "Languages" - ], + "categories": ["Languages"], "dependencies": { "@salesforce/salesforcedx-visualforce-language-server": "44.5.0", "@salesforce/salesforcedx-visualforce-markup-language-server": "44.5.0", @@ -44,9 +42,7 @@ "sinon": "^2.3.6", "vscode": "1.1.17" }, - "extensionDependencies": [ - "salesforce.salesforcedx-vscode-core" - ], + "extensionDependencies": ["salesforce.salesforcedx-vscode-core"], "scripts": { "vscode:prepublish": "npm prune --production", "vscode:package": "vsce package", @@ -55,27 +51,20 @@ "compile": "tsc -p ./", "lint": "tslint --project .", "watch": "tsc -watch -p .", - "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", + "clean": + "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output", "postinstall": "node ./node_modules/vscode/bin/install", "test": "node ../../scripts/run-test-with-top-level-extensionst", "test:unit": "node ../../scripts/run-test-with-top-level-extensions" }, - "activationEvents": [ - "workspaceContains:sfdx-project.json" - ], + "activationEvents": ["workspaceContains:sfdx-project.json"], "main": "./out/src/extension", "contributes": { "languages": [ { "id": "visualforce", - "aliases": [ - "Visualforce", - "visualforce" - ], - "extensions": [ - ".page", - ".component" - ], + "aliases": ["Visualforce", "visualforce"], + "extensions": [".page", ".component"], "configuration": "./syntaxes/visualforce.configuration.json" } ], @@ -107,19 +96,13 @@ "description": "%visualforce.format.wrapLineLength.desc%" }, "visualforce.format.unformatted": { - "type": [ - "string", - "null" - ], + "type": ["string", "null"], "scope": "resource", "default": "", "description": "%visualforce.format.unformatted.desc%" }, "visualforce.format.contentUnformatted": { - "type": [ - "string", - "null" - ], + "type": ["string", "null"], "scope": "resource", "default": "pre,code,textarea", "description": "%visualforce.format.contentUnformatted.desc%" @@ -137,10 +120,7 @@ "description": "%visualforce.format.preserveNewLines.desc%" }, "visualforce.format.maxPreserveNewLines": { - "type": [ - "number", - "null" - ], + "type": ["number", "null"], "scope": "resource", "default": null, "description": "%visualforce.format.maxPreserveNewLines.desc%" @@ -152,10 +132,7 @@ "description": "%visualforce.format.endWithNewline.desc%" }, "visualforce.format.extraLiners": { - "type": [ - "string", - "null" - ], + "type": ["string", "null"], "scope": "resource", "default": "head, body, /html", "description": "%visualforce.format.extraLiners.desc%" @@ -164,12 +141,7 @@ "type": "string", "scope": "resource", "default": "auto", - "enum": [ - "auto", - "force", - "force-aligned", - "force-expand-multiline" - ], + "enum": ["auto", "force", "force-aligned", "force-expand-multiline"], "enumDescriptions": [ "%visualforce.format.wrapAttributes.auto%", "%visualforce.format.wrapAttributes.force%", @@ -205,11 +177,7 @@ "visualforce.trace.server": { "type": "string", "scope": "window", - "enum": [ - "off", - "messages", - "verbose" - ], + "enum": ["off", "messages", "verbose"], "default": "off", "description": "%visualforce.trace.server.desc%" } diff --git a/packages/salesforcedx-vscode/package.json b/packages/salesforcedx-vscode/package.json index fdd013a2b0..79bbdeac91 100644 --- a/packages/salesforcedx-vscode/package.json +++ b/packages/salesforcedx-vscode/package.json @@ -26,9 +26,7 @@ "vscode:sha256": "node ../../scripts/generate-sha256.js >> ../../SHA256", "vscode:publish": "node ../../scripts/publish-vsix.js" }, - "categories": [ - "Extension Packs" - ], + "categories": ["Extension Packs"], "extensionPack": [ "salesforce.salesforcedx-vscode-apex", "salesforce.salesforcedx-vscode-apex-debugger",