Merge branch 'release/v47.17.1'

.circleci/config.yml

@@ -18,7 +18,10 @@ commands:
     steps:
       - checkout
       - restore_cache:
-          key: dependency-cache-v0-{{ checksum "package.json" }}
+          keys:
+            - dependency-cache-v1-{{ checksum "package.json" }}
+            # if cache for exact version of 'package.json' is not present, then load the most recent cache
+            - dependency-cache-v1-
       - run: npm install
       - run:
           name: 'Compile in production mode'
@@ -37,7 +40,7 @@ commands:
       - store_artifacts:
           path: ./extensions
       - save_cache:
-          key: dependency-cache-v0-{{ checksum "package.json" }}
+          key: dependency-cache-v1-{{ checksum "package.json" }}
           paths:
             - node_modules
 
@@ -47,13 +50,17 @@ commands:
       - run: git config --global core.autocrlf false
       - checkout
       - restore_cache:
-          key: dependency-cache-win1-{{ checksum "package.json" }}
+          keys:
+            - dependency-cache-win2-{{ checksum "package.json" }}
+            # if cache for exact version of 'package.json' is not present, then load the most recent cache
+            - dependency-cache-win2-
       - run:
           name: 'Install node'
           shell: bash.exe
           command: |
             nvm install $NODE_VERSION
             nvm use $NODE_VERSION
+            nvm install-latest-npm
       - run:
           name: 'Install dependent modules'
           shell: bash.exe
@@ -68,7 +75,7 @@ commands:
           shell: bash.exe
           command: npm run compile
       - save_cache:
-          key: dependency-cache-win1-{{ checksum "package.json" }}
+          key: dependency-cache-win2-{{ checksum "package.json" }}
           paths:
             - node_modules
       - run:
@@ -81,7 +88,7 @@ jobs:
   build-all:
     description: 'Build artifacts in a non-Windows environment'
     docker:
-      - image: circleci/node:10.2.0
+      - image: circleci/node:12.4.0
     environment:
       - SFDX_URL_LINUX: https://developer.salesforce.com/media/salesforce-cli/sfdx-linux-amd64.tar.xz
       - SFDX_AUTOUPDATE_DISABLE: true
@@ -96,7 +103,7 @@ jobs:
     environment:
       - SFDX_AUTOUPDATE_DISABLE: true
       - SFDX_DOMAIN_RETRY: 300
-      - NODE_VERSION: '10.2.0'
+      - NODE_VERSION: '12.4.0'
     parameters:
       run-unit-tests:
         type: boolean

.nvmrc

@@ -1 +1 @@
-v10.2.0
+v12.4.0

SHA256.md

@@ -8,22 +8,22 @@ 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/47.16.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
+   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/47.17.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
 
 2. From a terminal, run:
 
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
 
-30f049a813e29b7538faa9fe331a560754c1ae85a1fa9a7c8df3b90386d57bc4  salesforcedx-vscode-apex-debugger-47.16.0.vsix
-5d6f1d64f5cc253b4c0e1df849a1c37dcdc8052f40be8a51d520392efdc23ce4  salesforcedx-vscode-apex-replay-debugger-47.16.0.vsix
-ad23ebbc483efc05dafe770febbc244fc372fb3a78a5f0aff899152271a31dfe  salesforcedx-vscode-apex-47.16.0.vsix
-1a614b9929b4b46936b569442941c7bc12597dc7812e8274399f89e0ee42e517  salesforcedx-vscode-core-47.16.0.vsix
-06d7f5adb18f9d02aa5ef091032803bfd4662bc4374910d76d5a735ccec12a6d  salesforcedx-vscode-lightning-47.16.0.vsix
-583af8670c64cd272c3b54a3821d32ee837b17b1e97b1b66ed0e5a3499de0b49  salesforcedx-vscode-lwc-47.16.0.vsix
-687a8cea212b8fb8ece90155c090bee2f20738bfe0adbfba12af2890a62dd293  salesforcedx-vscode-visualforce-47.16.0.vsix
-b3c4b4a697e358d3891db46b95c956a55a11bf7b6a009b1a38fe8d6813bd18e3  salesforcedx-vscode-47.16.0.vsix
+e96ed560c05a2ab86c48e6074159b8b5f27e5c43597b403baf808132d71c19c3  salesforcedx-vscode-apex-debugger-47.17.1.vsix
+c923ddf3ab72535ce4f6b8cbc4daabb67028d1e59011fd65645e8f58d22bf6b6  salesforcedx-vscode-apex-replay-debugger-47.17.1.vsix
+e56313977bfbe56e39493e6254cefab88b5cbe236ce193940971f1136f136f2a  salesforcedx-vscode-apex-47.17.1.vsix
+e27653ddaae408150b82103b3efef8288a1a59b19f30ebbd635c40225abbf352  salesforcedx-vscode-core-47.17.1.vsix
+265d57fde97a9c3789ee2868e842c07a79211e0f72403d4512e454ba3b74bcbf  salesforcedx-vscode-lightning-47.17.1.vsix
+3d9fa6092fa755fa9b176e71af363d64e143633a33f6836fdf978e9c5afc5a50  salesforcedx-vscode-lwc-47.17.1.vsix
+29f49be2b97943e15f5da0fac0d6619bfce008b8ff43b10d0ce38ccdbba3b65d  salesforcedx-vscode-visualforce-47.17.1.vsix
+d712529eba0a9549a34cc1c1b3431a0dc6cbf202cdd30c0a96defd6403849feb  salesforcedx-vscode-47.17.1.vsix
 
 
 4. Change the filename extension for the file that you downloaded from .zip to

contributing/developing.md

@@ -2,7 +2,7 @@
 
 ## Pre-requisites
 
-1.  We are using Node 10. If you need to work with multiple versions of Node, you
+1.  We are using Node 12. If you need to work with multiple versions of Node, you
     might consider using [nvm](https://github.com/creationix/nvm).
 1.  This repository uses [Lerna](https://lernajs.io/) to manage it as a
     _monorepo_. Please install Lerna globally using `npm install --global lerna`.

contributing/publishing.md

@@ -37,7 +37,7 @@ It is possible to run each step manually as illustrated below.
 
 ### Prerequisite
 
-- Lerna is properly installed (`npm install -g lerna@2.4.0`).
+- Lerna is properly installed (`npm install -g lerna@3.13.1`).
 - All tests have been run prior to publishing. We don't run the tests during the
   publishing cycle since it generates artifacts that we do not want to include
   in the packaged extensions.
@@ -115,7 +115,6 @@ See this
 [guide](https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow)
 from Atlassian on the flow. These steps are manual because you might encounter merge conflicts.
 
-1. `git push --tags` to push the tags to GitHub.
 1. `git checkout master`
 1. `git pull` to get the latest changes (there shouldn't be any since you are
    the person releasing).

docs/_articles/en/apex/writing.md

@@ -75,3 +75,6 @@ When you refresh your sObject definitions, VS Code uses your default org to gene
 The first time you launch the Salesforce CLI Integration extension (which is part of the Salesforce Extension Pack), if your project doesn’t contain any faux classes we run **SFDX: Refresh SObject Definitions** for you in the background.
 
 After you add or edit standard or custom objects or their fields, be sure to rerun **SFDX: Refresh SObject Definitions**.
+
+If you've added inline help text to the fields in your custom and standard objects the extension will use it to provide on hover documentation for SObjects.
+![Field documentation, shown while hovering a field](./images/inline_help_hover_fields.png)

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "47.16.0",
+  "version": "47.17.1",
   "description": "",
   "main": "index.js",
   "scripts": {

lerna.json

@@ -3,5 +3,5 @@
     "docs",
     "packages/*"
   ],
-  "version": "47.16.0"
+  "version": "47.17.1"
 }

package.json

@@ -20,22 +20,22 @@
     "webpack-cli": "3.3.5"
   },
   "scripts": {
-    "postinstall": "lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
-    "bootstrap": "lerna bootstrap -- --no-package-lock && node scripts/reformat-with-prettier",
+    "postinstall": "lerna bootstrap --no-ci -- --no-package-lock && node scripts/reformat-with-prettier",
+    "bootstrap": "lerna bootstrap --no-ci -- --no-package-lock && node scripts/reformat-with-prettier",
     "clean": "lerna run clean",
     "compile": "lerna run --stream compile",
     "lint": "lerna run lint",
     "publish": "node scripts/publish.js",
     "build-change-log": "node scripts/change-log-generator.js",
-    "test": "lerna exec --concurrency 1 --stream --bail=false -- npm run test",
-    "test:unit": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:unit",
-    "test:unit-and-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test:unit && npm run coverage:system-tests",
-    "test:integration": "lerna run test:integration --concurrency 1 --stream",
-    "test:integration-tests-without-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test:integration && npm run test:vscode-integration",
-    "test:vscode-integration": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:vscode-integration",
-    "test:vscode-insiders-integration": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:vscode-insiders-integration",
-    "test:without-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test",
-    "test:system-tests": "lerna run test --scope system-tests --concurrency 1 --stream",
+    "test": "lerna exec --concurrency 1 --stream --bail=false -- npm run test --if-present",
+    "test:unit": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:unit --if-present",
+    "test:unit-and-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test:unit --if-present && npm run coverage:system-tests",
+    "test:integration": "lerna run test:integration --concurrency 1 --stream -- --if-present",
+    "test:integration-tests-without-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test:integration --if-present && npm run test:vscode-integration --if-present",
+    "test:vscode-integration": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:vscode-integration --if-present",
+    "test:vscode-insiders-integration": "lerna exec --concurrency 1 --stream --bail=false -- npm run test:vscode-insiders-integration --if-present",
+    "test:without-system-tests": "lerna exec --ignore system-tests --concurrency 1 --stream --bail=false -- npm run test --if-present",
+    "test:system-tests": "lerna run test --scope system-tests --concurrency 1 --stream -- --if-present",
     "test:vscode-insiders-system-tests": "lerna run test:vscode-insiders-system-tests --scope system-tests --concurrency 1 --stream",
     "coverage:system-tests": "lerna exec --scope system-tests --concurrency 1 --stream --bail=false -- npm run coverage:system-tests",
     "vscode:package": "lerna exec --scope @salesforce/salesforcedx-* -- npm prune --production && lerna run vscode:package --concurrency 1 && node scripts/reformat-with-prettier",
@@ -55,7 +55,8 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "node": "10.2.0"
+    "node": "12.4.0",
+    "npm": "^6.9.0"
   },
   "husky": {
     "hooks": {

packages/salesforcedx-apex-debugger/package.json

@@ -2,39 +2,39 @@
   "name": "@salesforce/salesforcedx-apex-debugger",
   "displayName": "Apex Debugger Adapter",
   "description": "Implements the VS Code Debug Protocol for the Apex Debugger",
-  "version": "47.16.0",
+  "version": "47.17.1",
   "publisher": "salesforce",
   "license": "BSD-3-Clause",
   "engines": {
-    "vscode": "^1.32.0"
+    "vscode": "^1.40.0"
   },
   "categories": [
     "Debuggers"
   ],
   "dependencies": {
-    "@salesforce/salesforcedx-utils-vscode": "47.16.0",
+    "@salesforce/salesforcedx-utils-vscode": "47.17.1",
     "async-lock": "1.0.0",
     "faye": "1.1.2",
     "request-light": "0.2.4",
     "vscode-debugadapter": "1.28.0",
     "vscode-debugprotocol": "1.28.0"
   },
   "devDependencies": {
-    "@salesforce/salesforcedx-test-utils-vscode": "47.16.0",
+    "@salesforce/salesforcedx-test-utils-vscode": "47.17.1",
     "@types/async-lock": "0.0.20",
     "@types/chai": "^4.0.0",
-    "@types/mocha": "2.2.38",
+    "@types/mocha": "^5",
     "@types/node": "8.9.3",
     "@types/rimraf": "^2.0.2",
     "@types/sinon": "^2.3.2",
     "chai": "^4.0.2",
     "cross-env": "5.2.0",
-    "mocha": "3.2.0",
-    "mocha-junit-reporter": "^1.13.0",
-    "mocha-multi-reporters": "^1.1.4",
+    "mocha": "^5",
+    "mocha-junit-reporter": "^1.23.3",
+    "mocha-multi-reporters": "^1.1.7",
     "mock-spawn": "0.2.6",
     "nyc": "^13",
-    "sinon": "^2.3.6",
+    "sinon": "^7.3.1",
     "typescript": "3.1.6",
     "vscode": "1.1.17",
     "vscode-debugadapter-testsupport": "1.28.0"
@@ -45,8 +45,8 @@
     "watch": "tsc -watch -p .",
     "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output",
     "test": "npm run test:unit && npm run test:integration",
-    "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/mochaUnitTestsConfig.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/mochaIntegrationTestsConfig.json"
+    "test:unit": "node ./node_modules/nyc/bin/nyc.js ./node_modules/mocha/bin/_mocha --recursive out/test/unit --exit --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaUnitTestsConfig.json",
+    "test:integration": "node ./node_modules/cross-env/dist/bin/cross-env.js VSCODE_NLS_CONFIG={} ./node_modules/nyc/bin/nyc.js ./node_modules/mocha/bin/_mocha --recursive out/test/integration --reporter mocha-multi-reporters --reporter-options configFile=../../config/mochaIntegrationTestsConfig.json"
   },
   "nyc": {
     "reporter": [