@salesforce/cli 2.13.1-esm.0 → 2.13.1

package/oclif.manifest.json

@@ -1,4 +1,5 @@
 {
+  "version": "2.13.1",
   "commands": {
     "cmdt:generate:field": {
       "id": "cmdt:generate:field",
@@ -6593,6 +6594,5 @@
         }
       ]
     }
-  },
-  "version": "2.13.1-esm.0"
+  }
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.13.1-esm.0",
+  "version": "2.13.1",
   "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": [
@@ -122,7 +121,7 @@
     ]
   },
   "dependencies": {
-    "@oclif/core": "3.0.3",
+    "@oclif/core": "2.15.0",
     "@oclif/plugin-autocomplete": "2.3.9",
     "@oclif/plugin-commands": "2.2.28",
     "@oclif/plugin-help": "5.2.20",
@@ -151,8 +150,9 @@
     "@salesforce/plugin-templates": "55.5.14",
     "@salesforce/plugin-trust": "2.6.18",
     "@salesforce/plugin-user": "2.3.35",
-    "@salesforce/sf-plugins-core": "4.0.0",
-    "debug": "^4.3.4"
+    "@salesforce/sf-plugins-core": "3.1.28",
+    "debug": "^4.3.4",
+    "tslib": "^2.4.1"
   },
   "pinnedDependencies": [
     "@oclif/plugin-autocomplete",
@@ -191,14 +191,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",
@@ -213,13 +213,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",
     "upload:deb": "oclif upload:deb",
     "upload:macos": "oclif upload:macos",
@@ -229,10 +229,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.10.0",
-    "@salesforce/plugin-release-management": "^4.4.7",
+    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/plugin-release-management": "^4.4.0",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.17",
     "@types/debug": "^4.1.9",
@@ -241,8 +241,8 @@
     "aws-sdk": "^2.1468.0",
     "chai": "^4.3.10",
     "eslint": "^8.50.0",
-    "eslint-config-oclif": "^5",
-    "eslint-config-oclif-typescript": "^2.0.1",
+    "eslint-config-oclif": "^3.1",
+    "eslint-config-oclif-typescript": "^0.2.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-config-salesforce": "^2.0.2",
     "eslint-config-salesforce-license": "^0.2.0",
@@ -250,88 +250,15 @@
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-jsdoc": "^46.8.2",
+    "globby": "^11.1.0",
     "husky": "^7.0.4",
-    "mocha": "^10",
+    "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "oclif": "^4.0.0-beta.5",
+    "oclif": "^3.17.2",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.1.3",
-    "sinon": "^15.2.0",
+    "sinon": "^11.1.2",
     "ts-node": "^10.9.1",
-    "typescript": "^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,44 +1,39 @@
 #!/usr/bin/env node
 
-const { spawn } = await import('node:child_process');
-const { join } = await import('node:path');
-const { fileURLToPath } = await import('node:url');
-
-async function main() {
-  if (process.env.SF_HIDE_RELEASE_NOTES === 'true') 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
-   */
-  await new Promise((resolve) => {
-    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());
-
-      resolve();
-    };
-
-    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 is finished
-    cmd.on('exit', (code) => {
-      resolve();
-    });
-  });
-}
-
-await main();
+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 @@
-async function main() {
-  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,10 +11,6 @@ async function main() {
   };
   // test sfdx is installed
   if (testCliNotVersion('sfdx', 'sfdx-cli/7.')) {
-    throw new 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');
   }
-}
-
-await main();
+})();

package/bin/dev.js

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

package/bin/run.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-// 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');
-
-async function main() {
-  // 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 = () => {};
-
-  cli
-    .create({ version: pjson.version, bin: pjson.oclif.bin, channel: 'stable' })
-    .run()
-    .then(async () => {
-      await oclif.flush();
-    })
-    .catch(async (err) => {
-      await oclif.handle(err);
-    });
-}
-
-await main();