@oclif/core 3.0.0-beta.11 → 3.0.0-beta.13

package/lib/config/config.js

@@ -1,25 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCached = exports.Config = void 0;
-const errors_1 = require("../errors");
+const node_url_1 = require("node:url");
+const node_util_1 = require("node:util");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
 const ejs = require("ejs");
-const os = require("os");
-const path = require("path");
-const url_1 = require("url");
-const util_1 = require("util");
-const util_2 = require("./util");
-const util_3 = require("../util");
+const errors_1 = require("../errors");
+const util_1 = require("./util");
+const util_2 = require("../util");
 const module_loader_1 = require("../module-loader");
 const help_1 = require("../help");
 const stream_1 = require("../cli-ux/stream");
 const performance_1 = require("../performance");
 const settings_1 = require("../settings");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
 const plugin_loader_1 = require("./plugin-loader");
 // eslint-disable-next-line new-cap
-const debug = (0, util_2.Debug)();
-const _pjson = (0, util_3.requireJson)(__dirname, '..', '..', 'package.json');
+const debug = (0, util_1.Debug)();
+const _pjson = (0, util_2.requireJson)(__dirname, '..', '..', 'package.json');
 const BASE = `${_pjson.name}@${_pjson.version}`;
 function channelFromVersion(version) {
     const m = version.match(/[^-]+(?:-([^.]+))?/);
@@ -36,7 +34,7 @@ class Permutations extends Map {
     }
     add(permutation, commandId) {
         this.validPermutations.set(permutation, commandId);
-        for (const id of (0, util_2.collectUsableIds)([permutation])) {
+        for (const id of (0, util_1.collectUsableIds)([permutation])) {
             if (this.has(id)) {
                 this.set(id, this.get(id).add(commandId));
             }
@@ -74,7 +72,7 @@ class Config {
     static async load(opts = module.filename || __dirname) {
         // Handle the case when a file URL string is passed in such as 'import.meta.url'; covert to file path.
         if (typeof opts === 'string' && opts.startsWith('file://')) {
-            opts = (0, url_1.fileURLToPath)(opts);
+            opts = (0, node_url_1.fileURLToPath)(opts);
         }
         if (typeof opts === 'string')
             opts = { root: opts };
@@ -118,8 +116,8 @@ class Config {
         this.version = this.options.version || this.pjson.version || '0.0.0';
         this.channel = this.options.channel || channelFromVersion(this.version);
         this.valid = Config._rootPlugin.valid;
-        this.arch = (os.arch() === 'ia32' ? 'x86' : os.arch());
-        this.platform = WSL ? 'wsl' : os.platform();
+        this.arch = ((0, node_os_1.arch)() === 'ia32' ? 'x86' : (0, node_os_1.arch)());
+        this.platform = WSL ? 'wsl' : (0, node_os_1.platform)();
         this.windows = this.platform === 'win32';
         this.bin = this.pjson.oclif.bin || this.name;
         this.binAliases = this.pjson.oclif.binAliases;
@@ -134,11 +132,11 @@ class Config {
         this.userAgent = `${this.name}/${this.version} ${this.platform}-${this.arch} node-${process.version}`;
         this.shell = this._shell();
         this.debug = this._debug();
-        this.home = process.env.HOME || (this.windows && this.windowsHome()) || os.homedir() || os.tmpdir();
+        this.home = process.env.HOME || (this.windows && this.windowsHome()) || (0, node_os_1.homedir)() || (0, node_os_1.tmpdir)();
         this.cacheDir = this.scopedEnvVar('CACHE_DIR') || this.macosCacheDir() || this.dir('cache');
         this.configDir = this.scopedEnvVar('CONFIG_DIR') || this.dir('config');
         this.dataDir = this.scopedEnvVar('DATA_DIR') || this.dir('data');
-        this.errlog = path.join(this.cacheDir, 'error.log');
+        this.errlog = (0, node_path_1.join)(this.cacheDir, 'error.log');
         this.binPath = this.scopedEnvVar('BINPATH');
         this.npmRegistry = this.scopedEnvVar('NPM_REGISTRY') || this.pjson.oclif.npmRegistry;
         this.pjson.oclif.update = this.pjson.oclif.update || {};
@@ -230,7 +228,7 @@ class Config {
                     (0, errors_1.exit)(code);
                 },
                 log(message, ...args) {
-                    stream_1.stdout.write((0, util_1.format)(message, ...args) + '\n');
+                    stream_1.stdout.write((0, node_util_1.format)(message, ...args) + '\n');
                 },
                 error(message, options = {}) {
                     (0, errors_1.error)(message, options);
@@ -430,7 +428,7 @@ class Config {
             architecture,
             nodeVersion,
             pluginVersions: Object.fromEntries([...this.plugins.values()].map(p => [p.name, { version: p.version, type: p.type, root: p.root }])),
-            osVersion: `${os.type()} ${os.release()}`,
+            osVersion: `${(0, node_os_1.type)()} ${(0, node_os_1.release)()}`,
             shell: this.shell,
             rootPath: this.root,
         };
@@ -447,8 +445,8 @@ class Config {
         const host = this.pjson.oclif.update.s3.host;
         if (!host)
             throw new Error('no s3 host is set');
-        const url = new url_1.URL(host);
-        url.pathname = path.join(url.pathname, key);
+        const url = new node_url_1.URL(host);
+        url.pathname = (0, node_path_1.join)(url.pathname, key);
         return url.toString();
     }
     getPluginsList() {
@@ -457,20 +455,20 @@ class Config {
     dir(category) {
         const base = process.env[`XDG_${category.toUpperCase()}_HOME`] ||
             (this.windows && process.env.LOCALAPPDATA) ||
-            path.join(this.home, category === 'data' ? '.local/share' : '.' + category);
-        return path.join(base, this.dirname);
+            (0, node_path_1.join)(this.home, category === 'data' ? '.local/share' : '.' + category);
+        return (0, node_path_1.join)(base, this.dirname);
     }
     windowsHome() {
         return this.windowsHomedriveHome() || this.windowsUserprofileHome();
     }
     windowsHomedriveHome() {
-        return (process.env.HOMEDRIVE && process.env.HOMEPATH && path.join(process.env.HOMEDRIVE, process.env.HOMEPATH));
+        return (process.env.HOMEDRIVE && process.env.HOMEPATH && (0, node_path_1.join)(process.env.HOMEDRIVE, process.env.HOMEPATH));
     }
     windowsUserprofileHome() {
         return process.env.USERPROFILE;
     }
     macosCacheDir() {
-        return (this.platform === 'darwin' && path.join(this.home, 'Library', 'Caches', this.dirname)) || undefined;
+        return (this.platform === 'darwin' && (0, node_path_1.join)(this.home, 'Library', 'Caches', this.dirname)) || undefined;
     }
     _shell() {
         let shellPath;
@@ -508,7 +506,7 @@ class Config {
         if (err instanceof Error) {
             const modifiedErr = err;
             modifiedErr.name = `${err.name} Plugin: ${this.name}`;
-            modifiedErr.detail = (0, util_2.compact)([
+            modifiedErr.detail = (0, util_1.compact)([
                 err.detail,
                 `module: ${this._base}`,
                 scope && `task: ${scope}`,
@@ -522,7 +520,7 @@ class Config {
         // err is an object
         process.emitWarning('Config.warn expected either a string or Error, but instead received an object');
         err.name = `${err.name} Plugin: ${this.name}`;
-        err.detail = (0, util_2.compact)([
+        err.detail = (0, util_1.compact)([
             err.detail,
             `module: ${this._base}`,
             scope && `task: ${scope}`,
@@ -533,7 +531,7 @@ class Config {
         process.emitWarning(JSON.stringify(err));
     }
     get isProd() {
-        return (0, util_3.isProd)();
+        return (0, util_2.isProd)();
     }
     isJitPluginCommand(c) {
         // Return true if the command's plugin is listed under oclif.jitPlugins AND if the plugin hasn't been loaded to this.plugins
@@ -588,7 +586,7 @@ class Config {
     }
     loadTopics(plugin) {
         const marker = performance_1.default.mark(`config.loadTopics#${plugin.name}`, { plugin: plugin.name });
-        for (const topic of (0, util_2.compact)(plugin.topics)) {
+        for (const topic of (0, util_1.compact)(plugin.topics)) {
             const existing = this._topics.get(topic.name);
             if (existing) {
                 existing.description = topic.description || existing.description;
@@ -597,7 +595,7 @@ class Config {
             else {
                 this._topics.set(topic.name, topic);
             }
-            const permutations = this.flexibleTaxonomy ? (0, util_2.getCommandIdPermutations)(topic.name) : [topic.name];
+            const permutations = this.flexibleTaxonomy ? (0, util_1.getCommandIdPermutations)(topic.name) : [topic.name];
             for (const permutation of permutations) {
                 this.topicPermutations.add(permutation, topic.name);
             }
@@ -787,7 +785,7 @@ async function toCached(c, plugin, respectNoCacheDefault = false) {
         }
     }
     const args = {};
-    for (const [name, arg] of Object.entries((0, util_3.ensureArgObject)(c.args))) {
+    for (const [name, arg] of Object.entries((0, util_2.ensureArgObject)(c.args))) {
         args[name] = {
             name,
             description: arg.description,

package/lib/config/ts-node.js

@@ -6,7 +6,6 @@ const path = require("path");
 const settings_1 = require("../settings");
 const util_1 = require("../util");
 const util_2 = require("./util");
-const config_1 = require("./config");
 const errors_1 = require("../errors");
 // eslint-disable-next-line new-cap
 const debug = (0, util_2.Debug)('ts-node');
@@ -92,7 +91,6 @@ function registerTSNode(root) {
     REGISTERED.add(root);
     return tsconfig;
 }
-// eslint-disable-next-line complexity
 function tsPath(root, orig, plugin) {
     if (!orig)
         return orig;
@@ -102,28 +100,19 @@ function tsPath(root, orig, plugin) {
         debug(`Skipping ts-node registration for ${root} because tsNodeEnabled is explicitly set to false`);
         return orig;
     }
-    // Skip ts-node registration if plugin is an ESM plugin executing from a CJS plugin
-    if (plugin?.moduleType === 'module' && config_1.Config.rootPlugin?.moduleType === 'commonjs') {
-        debug(`Skipping ts-node registration for ${root} because it's an ESM module but the root plugin is CommonJS`);
+    // Skip ts-node registration for ESM plugins.
+    // The node ecosystem is not mature enough to support auto-transpiling ESM modules at this time.
+    // See the following:
+    // - https://github.com/TypeStrong/ts-node/issues/1791#issuecomment-1149754228
+    // - https://github.com/nodejs/node/issues/49432
+    // - https://github.com/nodejs/node/pull/49407
+    // - https://github.com/nodejs/node/issues/34049
+    if (plugin?.moduleType === 'module') {
+        debug(`Skipping ts-node registration for ${root} because it's an ESM module`);
         if (plugin.type === 'link')
-            (0, errors_1.memoizedWarn)(`${plugin.name} is a linked ESM module and cannot be auto-compiled from a CommonJS root plugin. Existing compiled source will be used instead.`);
+            (0, errors_1.memoizedWarn)(`${plugin.name} is a linked ESM module and cannot be auto-transpiled. Existing compiled source will be used instead.`);
         return orig;
     }
-    // If plugin is an ESM plugin being executed from an ESM root plugin, check to see if ts-node/esm loader has been set
-    // either in the NODE_OPTIONS env var or from the exec args. If the ts-node/esm loader has NOT been loaded then we want
-    // to skip ts-node registration so that it falls back on the compiled source.
-    if (plugin?.moduleType === 'module') {
-        const tsNodeEsmLoaderInExecArgv = process.execArgv.includes('--loader') && process.execArgv.includes('ts-node/esm');
-        const tsNodeEsmLoaderInNodeOptions = process.env.NODE_OPTIONS?.includes('--loader=ts-node/esm') ?? false;
-        if (!tsNodeEsmLoaderInExecArgv && !tsNodeEsmLoaderInNodeOptions) {
-            debug(`Skipping ts-node registration for ${root} because it's an ESM module but the ts-node/esm loader hasn't been run`);
-            debug('try setting NODE_OPTIONS="--loader ts-node/esm" in your environment.');
-            if (plugin.type === 'link') {
-                (0, errors_1.memoizedWarn)(`${plugin.name} is a linked ESM module and cannot be auto-compiled without setting NODE_OPTIONS="--loader=ts-node/esm" in the environment. Existing compiled source will be used instead.`);
-            }
-            return orig;
-        }
-    }
     if (settings_1.settings.tsnodeEnabled === undefined && (0, util_1.isProd)() && plugin?.type !== 'link') {
         debug(`Skipping ts-node registration for ${root} because NODE_ENV is NOT "test" or "development"`);
         return orig;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.0.0-beta.11",
+  "version": "3.0.0-beta.13",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {