@salesforce/cli 2.0.1 → 2.0.2

package/npm-shrinkwrap.json

@@ -1,12 +1,13 @@
 {
   "name": "@salesforce/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@salesforce/cli",
-      "version": "2.0.1",
+      "version": "2.0.2",
+      "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@oclif/core": "2.8.11",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.0.2",
   "commands": {
     "cmdt:generate:field": {
       "id": "cmdt:generate:field",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.0.1",
+  "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",
@@ -28,6 +30,10 @@
   "main": "dist/index.js",
   "oclif": {
     "bin": "sf",
+    "binAliases": [
+      "sfdx"
+    ],
+    "nsisCustomization": "scripts/nsis.nsi",
     "scope": "salesforce",
     "dirname": "sf",
     "topicSeparator": " ",
@@ -79,7 +85,8 @@
     ],
     "hooks": {
       "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": {
@@ -93,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"
       }
     },
@@ -199,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",

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');
+  }
+})();