@salesforce/cli 2.8.3-esm.2 → 2.8.4

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.8.3-esm.2",
+  "version": "2.8.4",
   "commands": {
     "cmdt:generate:field": {
       "id": "cmdt:generate:field",

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.8.3-esm.2",
+  "version": "2.8.4",
   "author": "Salesforce",
   "bin": {
-    "sf": "./bin/run.js",
-    "sfdx": "./bin/run.js"
+    "sf": "./bin/run",
+    "sfdx": "./bin/run"
   },
   "homepage": "https://github.com/salesforcecli/cli",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=14.0.0"
   },
   "packageManager": "yarn@1.22.19",
   "files": [
@@ -27,8 +27,7 @@
     "sf"
   ],
   "license": "BSD-3-Clause",
-  "exports": "./dist/index.js",
-  "type": "module",
+  "main": "dist/index.js",
   "oclif": {
     "bin": "sf",
     "binAliases": [
@@ -120,7 +119,7 @@
     ]
   },
   "dependencies": {
-    "@oclif/core": "3.0.0-beta.11",
+    "@oclif/core": "2.15.0",
     "@oclif/plugin-autocomplete": "2.3.6",
     "@oclif/plugin-commands": "2.2.24",
     "@oclif/plugin-help": "5.2.18",
@@ -190,14 +189,14 @@
   },
   "repository": "salesforcecli/cli",
   "scripts": {
-    "build": "wireit",
+    "build": "sf-build",
     "channel:promote": "sf-release channel:promote",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "compile": "wireit",
+    "compile": "sf-compile",
     "docs": "sf-docs",
-    "format": "wireit",
-    "lint": "wireit",
+    "format": "sf-format",
+    "lint": "eslint \"src/**/*.ts\"",
     "oclif-artifacts": "oclif manifest",
     "pack:deb": "oclif pack:deb",
     "pack:macos": "oclif pack:macos",
@@ -212,13 +211,13 @@
     "prepare": "sf-install && yarn compile && yarn lint",
     "prepublishOnly": "npm shrinkwrap",
     "pretarball": "sf-release cli:tarballs:prepare --types",
+    "pretest": "echo disable # sf-compile-test",
     "promote": "oclif promote",
     "promote-dist-tags": "./scripts/promote-dist-tags",
     "promote:verify": "sf-release cli:versions:inspect --channels stable --locations archive --cli sf",
     "promote:verify-rc": "sf-release cli:versions:inspect --channels stable-rc --locations archive --cli sf",
-    "test": "wireit",
+    "test": "sf-test",
     "test:deprecation-policy": "sf-release cli:artifacts:compare",
-    "test:only": "wireit",
     "test:smoke-unix": "sf-release cli:tarballs:smoke --cli sf",
     "upload:deb": "oclif upload:deb",
     "upload:macos": "oclif upload:macos",
@@ -228,10 +227,10 @@
   },
   "types": "dist/index.d.ts",
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^4.0.2",
+    "@oclif/plugin-command-snapshot": "^3.3.0",
     "@salesforce/dev-config": "^4.0.1",
-    "@salesforce/dev-scripts": "^5.9.0",
-    "@salesforce/plugin-release-management": "^4.1.25",
+    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/plugin-release-management": "^4.1.19",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.15",
     "@types/debug": "^4.1.8",
@@ -240,7 +239,7 @@
     "aws-sdk": "^2.1446.0",
     "chai": "^4.3.8",
     "eslint": "^8.48.0",
-    "eslint-config-oclif": "^4",
+    "eslint-config-oclif": "^3.1",
     "eslint-config-oclif-typescript": "^0.2.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-salesforce": "^2.0.2",
@@ -256,82 +255,8 @@
     "oclif": "^3.11.3",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
-    "sinon": "^15.2.0",
+    "sinon": "^11.1.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
-    "wireit": "^0.9.5"
-  },
-  "wireit": {
-    "build": {
-      "dependencies": [
-        "compile",
-        "lint"
-      ]
-    },
-    "compile": {
-      "command": "tsc -p . --pretty --incremental",
-      "files": [
-        "src/**/*.ts",
-        "**/tsconfig.json",
-        "messages/**"
-      ],
-      "output": [
-        "lib/**",
-        "*.tsbuildinfo"
-      ],
-      "clean": "if-file-deleted"
-    },
-    "format": {
-      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
-      "files": [
-        "src/**/*.ts",
-        "test/**/*.ts",
-        "schemas/**/*.json",
-        "command-snapshot.json",
-        ".prettier*"
-      ],
-      "output": []
-    },
-    "lint": {
-      "command": "eslint src test --color --cache --cache-location .eslintcache",
-      "files": [
-        "src/**/*.ts",
-        "test/**/*.ts",
-        "messages/**",
-        "**/.eslint*",
-        "**/tsconfig.json"
-      ],
-      "output": []
-    },
-    "test:compile": {
-      "command": "tsc -p \"./test\" --pretty",
-      "files": [
-        "test/**/*.ts",
-        "**/tsconfig.json"
-      ],
-      "output": []
-    },
-    "test": {
-      "dependencies": [
-        "test:compile",
-        "test:only",
-        "lint"
-      ]
-    },
-    "test:only": {
-      "command": "nyc mocha \"test/**/*.test.ts\"",
-      "env": {
-        "FORCE_COLOR": "2"
-      },
-      "files": [
-        "test/**/*.ts",
-        "src/**/*.ts",
-        "**/tsconfig.json",
-        ".mocha*",
-        "!*.nut.ts",
-        ".nycrc"
-      ],
-      "output": []
-    }
+    "typescript": "^4.9.5"
   }
 }

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

@@ -1,42 +1,39 @@
 #!/usr/bin/env node
 
-void (async () => {
-  const { spawn } = await import('node:child_process');
-  const { join } = await import('node:path');
-  const { fileURLToPath } = await import('node:url');
-
-  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
-   */
-
-  const executable = process.platform === 'win32' ? 'run.cmd' : 'run.js';
-
-  const cmd = spawn(join(fileURLToPath(import.meta.url), '..', '..', '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);
-  });
-})();
+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

@@ -1,5 +1,6 @@
-void (async () => {
-  const { execSync } = await import('node:child_process');
+const { execSync } = require('child_process');
+
+(() => {
   const testCliNotVersion = (cli, version) => {
     try {
       return execSync(`${cli} --version`).toString('utf-8').includes(version);
@@ -10,8 +11,6 @@ void (async () => {
   };
   // 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'
-    );
+    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/bin/dev.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-void (async () => {
-  const oclif = await import('@oclif/core');
-  oclif.settings.performanceEnabled = true;
-  await oclif.execute({ development: true, dir: import.meta.url });
-})();

package/bin/run.js

@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-
-void (async () => {
-  // Since the CLI is a single process, we can have a larger amount of max listeners since
-  // the process gets shut down. Don't set it to 0 (no limit) since we should still be aware
-  // of rouge event listeners
-  process.setMaxListeners(parseInt(process.env.SF_MAX_EVENT_LISTENERS, 10) || 1000);
-
-  // Don't let other plugins override the CLI specified max listener count
-  process.setMaxListeners = () => {};
-
-  // Pre-process/prune flags before creating or running the actual CLI
-  (await import('../dist/flags.js')).preprocessCliFlags(process);
-
-  const oclif = await import('@oclif/core');
-  const { createRequire } = await import('module');
-  const pjson = createRequire(import.meta.url)('../package.json');
-
-  const cli = await import('../dist/cli.js');
-
-  cli
-    .create({ version: pjson.version, bin: pjson.oclif.bin, channel: 'stable' })
-    .run()
-    .then(async () => {
-      await oclif.flush();
-    })
-    .catch(async (err) => {
-      await oclif.handle(err);
-    });
-})();