@salesforce/cli 2.0.0-beta.11 → 2.0.0-beta.13

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "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.0-beta.11",
+  "version": "2.0.0-beta.13",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -17,7 +17,8 @@
     "/bin",
     "/dist/**/*.js",
     "/oclif.manifest.json",
-    "/npm-shrinkwrap.json"
+    "/npm-shrinkwrap.json",
+    "/scripts/preinstall.js"
   ],
   "keywords": [
     "oclif",
@@ -31,6 +32,7 @@
     "binAliases": [
       "sfdx"
     ],
+    "nsisCustomization": "scripts/nsis.nsi",
     "scope": "salesforce",
     "dirname": "sf",
     "topicSeparator": " ",
@@ -116,12 +118,12 @@
     ]
   },
   "dependencies": {
-    "@oclif/core": "2.8.3",
+    "@oclif/core": "2.8.4",
     "@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.7",
+    "@oclif/plugin-plugins": "3.0.1",
     "@oclif/plugin-search": "0.0.17",
     "@oclif/plugin-update": "3.1.13",
     "@oclif/plugin-version": "1.3.3",
@@ -142,7 +144,7 @@
     "@salesforce/plugin-source": "2.10.7",
     "@salesforce/plugin-telemetry": "2.2.0",
     "@salesforce/plugin-templates": "55.4.13",
-    "@salesforce/plugin-trust": "2.4.12",
+    "@salesforce/plugin-trust": "2.4.14",
     "@salesforce/plugin-user": "2.3.10",
     "@salesforce/sf-plugins-core": "2.4.0",
     "debug": "^4.3.4",
@@ -182,7 +184,8 @@
   ],
   "resolutions": {
     "@salesforce/schemas": "1.5.1",
-    "@salesforce/templates": "57.1.1"
+    "@salesforce/templates": "57.1.1",
+    "@oclif/core": "2.8.4"
   },
   "repository": "salesforcecli/cli",
   "scripts": {
@@ -202,6 +205,7 @@
     "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",
     "prepack": "sf-prepack",
     "prepare": "sf-install && yarn compile && yarn lint",
     "prepublishOnly": "npm shrinkwrap",
@@ -225,7 +229,7 @@
     "@oclif/plugin-command-snapshot": "^3.3.0",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^3.1.1",
-    "@salesforce/plugin-release-management": "^3.15.2",
+    "@salesforce/plugin-release-management": "^3.17.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.6",
     "@types/debug": "^4.1.7",
@@ -247,7 +251,7 @@
     "husky": "^7.0.4",
     "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "oclif": "^3.8.1",
+    "oclif": "^3.9.0",
     "prettier": "^2.8.5",
     "pretty-quick": "^3.1.3",
     "sinon": "^11.1.2",

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  or sfdx is installed
+  if (testCliNotVersion('sfdx', 'sfdx-cli/7.')) {
+    throw Error('Please uninstall sfdx');
+  }
+})();