@salesforce/cli 2.0.0-qa.8 → 2.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.0.0-qa.8",
+  "version": "2.0.2",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -17,7 +17,9 @@
     "/bin",
     "/dist/**/*.js",
     "/oclif.manifest.json",
-    "/npm-shrinkwrap.json"
+    "/npm-shrinkwrap.json",
+    "/scripts/preinstall.js",
+    "/scripts/post-install-release-notes.js"
   ],
   "keywords": [
     "oclif",
@@ -31,6 +33,7 @@
     "binAliases": [
       "sfdx"
     ],
+    "nsisCustomization": "scripts/nsis.nsi",
     "scope": "salesforce",
     "dirname": "sf",
     "topicSeparator": " ",
@@ -66,29 +69,29 @@
       "@salesforce/plugin-user"
     ],
     "jitPlugins": {
-      "@salesforce/plugin-custom-metadata": "2.1.15",
-      "@salesforce/plugin-community": "2.2.10",
-      "@salesforce/plugin-dev": "0.7.0",
-      "@salesforce/plugin-env": "2.1.7",
-      "@salesforce/plugin-functions": "1.21.7",
-      "@salesforce/plugin-packaging": "1.16.6",
-      "@salesforce/plugin-signups": "1.4.12",
+      "@salesforce/plugin-custom-metadata": "2.1.30",
+      "@salesforce/plugin-community": "2.3.5",
+      "@salesforce/plugin-dev": "0.7.13",
+      "@salesforce/plugin-env": "2.1.15",
+      "@salesforce/plugin-functions": "1.21.10",
+      "@salesforce/plugin-packaging": "1.20.1",
+      "@salesforce/plugin-signups": "1.4.22",
       "@salesforce/sfdx-plugin-lwc-test": "1.0.2",
-      "@salesforce/sfdx-scanner": "3.11.0"
+      "@salesforce/sfdx-scanner": "3.13.0"
     },
     "devPlugins": [
       "@oclif/plugin-command-snapshot",
       "@salesforce/plugin-release-management"
     ],
     "hooks": {
-      "preupdate": "./dist/hooks/preupdate",
       "command_incomplete": "./dist/hooks/incomplete",
-      "plugins:preinstall": "./dist/hooks/pluginsPreinstall.js"
+      "plugins:preinstall": "./dist/hooks/pluginsPreinstall.js",
+      "update": "./dist/hooks/display-release-notes.js"
     },
     "update": {
       "s3": {
         "bucket": "dfc-data-production",
-        "indexVersionLimit": 20,
+        "indexVersionLimit": 140,
         "folder": "media/salesforce-cli/sf",
         "acl": " ",
         "host": "https://developer.salesforce.com"
@@ -97,7 +100,7 @@
     "info": {
       "releasenotes": {
         "distTagUrl": "https://registry.npmjs.org/-/package/@salesforce/cli/dist-tags",
-        "releaseNotesPath": "https://github.com/forcedotcom/cli/tree/main/releasenotes/sf",
+        "releaseNotesPath": "https://github.com/forcedotcom/cli/tree/main/releasenotes",
         "releaseNotesFilename": "README.md"
       }
     },
@@ -116,35 +119,35 @@
     ]
   },
   "dependencies": {
-    "@oclif/core": "2.8.2",
-    "@oclif/plugin-autocomplete": "2.1.9",
-    "@oclif/plugin-commands": "2.2.14",
-    "@oclif/plugin-help": "5.2.9",
-    "@oclif/plugin-not-found": "2.3.23",
-    "@oclif/plugin-plugins": "2.4.6",
-    "@oclif/plugin-search": "0.0.16",
-    "@oclif/plugin-update": "3.1.12",
-    "@oclif/plugin-version": "1.3.3",
-    "@oclif/plugin-warn-if-update-available": "2.0.35",
-    "@oclif/plugin-which": "2.2.19",
-    "@salesforce/core": "3.35.0-qa.3",
-    "@salesforce/plugin-apex": "2.2.13",
-    "@salesforce/plugin-auth": "2.7.12",
-    "@salesforce/plugin-data": "2.3.10",
-    "@salesforce/plugin-deploy-retrieve": "1.9.0-qa.1",
-    "@salesforce/plugin-info": "2.6.7",
-    "@salesforce/plugin-limits": "2.3.13",
-    "@salesforce/plugin-login": "1.2.5",
-    "@salesforce/plugin-org": "2.7.0",
-    "@salesforce/plugin-schema": "2.3.8",
-    "@salesforce/plugin-settings": "1.5.0-qa.5",
-    "@salesforce/plugin-sobject": "0.1.17",
-    "@salesforce/plugin-source": "2.10.3",
-    "@salesforce/plugin-telemetry": "2.1.4",
-    "@salesforce/plugin-templates": "55.4.9",
-    "@salesforce/plugin-trust": "2.5.0-qa.1",
-    "@salesforce/plugin-user": "2.3.8",
-    "@salesforce/sf-plugins-core": "^2.3.0-qa.3",
+    "@oclif/core": "2.8.11",
+    "@oclif/plugin-autocomplete": "2.3.1",
+    "@oclif/plugin-commands": "2.2.17",
+    "@oclif/plugin-help": "5.2.11",
+    "@oclif/plugin-not-found": "2.3.26",
+    "@oclif/plugin-plugins": "3.1.6",
+    "@oclif/plugin-search": "0.0.18",
+    "@oclif/plugin-update": "3.1.22",
+    "@oclif/plugin-version": "1.3.6",
+    "@oclif/plugin-warn-if-update-available": "2.0.41",
+    "@oclif/plugin-which": "2.2.22",
+    "@salesforce/core": "^4.3.5",
+    "@salesforce/plugin-apex": "2.3.4",
+    "@salesforce/plugin-auth": "2.8.4",
+    "@salesforce/plugin-data": "2.4.5",
+    "@salesforce/plugin-deploy-retrieve": "1.13.5",
+    "@salesforce/plugin-info": "2.6.25",
+    "@salesforce/plugin-limits": "2.3.23",
+    "@salesforce/plugin-login": "1.2.15",
+    "@salesforce/plugin-org": "2.9.19",
+    "@salesforce/plugin-schema": "2.3.17",
+    "@salesforce/plugin-settings": "1.4.17",
+    "@salesforce/plugin-sobject": "0.1.32",
+    "@salesforce/plugin-source": "2.10.22",
+    "@salesforce/plugin-telemetry": "2.2.1",
+    "@salesforce/plugin-templates": "55.5.2",
+    "@salesforce/plugin-trust": "2.4.27",
+    "@salesforce/plugin-user": "2.3.20",
+    "@salesforce/sf-plugins-core": "3.1.4",
     "debug": "^4.3.4",
     "semver": "^7.3.8",
     "tslib": "^2.4.1"
@@ -161,7 +164,6 @@
     "@oclif/plugin-version",
     "@oclif/plugin-warn-if-update-available",
     "@oclif/plugin-which",
-    "@salesforce/core",
     "@salesforce/plugin-apex",
     "@salesforce/plugin-auth",
     "@salesforce/plugin-data",
@@ -181,10 +183,10 @@
     "@salesforce/plugin-user"
   ],
   "resolutions": {
-    "@salesforce/core": "3.35.0-qa.3",
-    "@salesforce/schemas": "1.5.1",
-    "@salesforce/templates": "57.1.1",
-    "@salesforce/telemetry": "3.2.25"
+    "@salesforce/schemas": "1.6.0",
+    "@salesforce/templates": "58.0.1",
+    "@salesforce/source-deploy-retrieve": "9.3.0",
+    "@salesforce/source-tracking": "4.2.4"
   },
   "repository": "salesforcecli/cli",
   "scripts": {
@@ -204,6 +206,8 @@
     "pack:verify": "sf-release cli:tarballs:verify --cli sf --windows-username-buffer 34",
     "pack:win": "oclif pack:win",
     "postpack": "rm -f oclif.manifest.json npm-shrinkwrap.json",
+    "preinstall": "node ./scripts/preinstall.js",
+    "postinstall": "node ./scripts/post-install-release-notes.js",
     "prepack": "sf-prepack",
     "prepare": "sf-install && yarn compile && yarn lint",
     "prepublishOnly": "npm shrinkwrap",
@@ -225,32 +229,32 @@
   "types": "dist/index.d.ts",
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.0",
-    "@salesforce/dev-config": "^3.1.0",
+    "@salesforce/dev-config": "^4.0.1",
     "@salesforce/dev-scripts": "^3.1.1",
-    "@salesforce/plugin-release-management": "^3.15.2",
-    "@salesforce/prettier-config": "^0.0.2",
-    "@salesforce/ts-sinon": "^1.4.6",
-    "@types/debug": "^4.1.7",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
-    "@typescript-eslint/parser": "^5.58.0",
-    "aws-sdk": "^2.1359.0",
+    "@salesforce/plugin-release-management": "^3.16.11",
+    "@salesforce/prettier-config": "^0.0.3",
+    "@salesforce/ts-sinon": "^1.4.9",
+    "@types/debug": "^4.1.8",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
+    "aws-sdk": "^2.1410.0",
     "chai": "^4.3.7",
-    "eslint": "^8.38.0",
+    "eslint": "^8.43.0",
     "eslint-config-oclif": "^3.1",
     "eslint-config-oclif-typescript": "^0.2.0",
     "eslint-config-prettier": "^8.7.0",
-    "eslint-config-salesforce": "^1.2.0",
+    "eslint-config-salesforce": "^2.0.1",
     "eslint-config-salesforce-license": "^0.2.0",
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^39.8.0",
+    "eslint-plugin-jsdoc": "^46.4.3",
     "globby": "^11.1.0",
     "husky": "^7.0.4",
     "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "oclif": "^3.8.1",
-    "prettier": "^2.8.5",
+    "oclif": "^3.9.1",
+    "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
     "sinon": "^11.1.2",
     "ts-node": "^10.9.1",

package/scripts/post-install-release-notes.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+
+const { spawn } = require('child_process');
+const { join } = require('path');
+
+if (process.env.SF_HIDE_RELEASE_NOTES === 'true') process.exit(0);
+
+const logAndExit = (msg) => {
+  console.log('NOTE: This error can be ignored in CI and may be silenced in the future');
+  console.log('- Set the SF_HIDE_RELEASE_NOTES env var to "true" to skip this script\n');
+  console.log(msg.toString());
+
+  process.exit(0);
+};
+
+/*
+ * NOTE: Please read "Notes about the hook scripts" in this PR before making changes:
+ * https://github.com/salesforcecli/sfdx-cli/pull/407
+ */
+
+var executable = process.platform === 'win32' ? 'run.cmd' : 'run';
+
+var cmd = spawn(join(__dirname, '..', 'bin', executable), ['whatsnew', '--hook'], {
+  stdio: ['ignore', 'inherit', 'pipe'],
+  timeout: 10000,
+});
+
+cmd.stderr.on('data', (error) => {
+  logAndExit(error);
+});
+
+cmd.on('error', (error) => {
+  logAndExit(error);
+});
+
+// 'exit' fires whether or not the stream are finished
+cmd.on('exit', (code) => {
+  process.exit(0);
+});

package/scripts/preinstall.js

@@ -0,0 +1,16 @@
+const { execSync } = require('child_process');
+
+(() => {
+  const testCliNotVersion = (cli, version) => {
+    try {
+      return execSync(`${cli} --version`).toString('utf-8').includes(version);
+    } catch (e) {
+      // if cli isn't installed it'll throw, but that's ok for us
+      return false;
+    }
+  };
+  // test sfdx is installed
+  if (testCliNotVersion('sfdx', 'sfdx-cli/7.')) {
+    throw Error('"sf@2.x" has a bin alias for "sfdx", please uninstall sfdx-cli first. See https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_setup_move_to_sf_v2.htm for more information');
+  }
+})();

package/dist/hooks/preupdate.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hook = void 0;
-/*
- * Copyright (c) 2022, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-const core_1 = require("@oclif/core");
-// eslint-disable-next-line @typescript-eslint/require-await
-const hook = async function (opts) {
-    if (opts.config.root.includes('sfdx')) {
-        core_1.ux.warn('Running "sf update" has no effect because you\'re using a version of sf that was installed by sfdx. To update sf, run "sfdx update".');
-    }
-};
-exports.hook = hook;
-//# sourceMappingURL=preupdate.js.map