@oclif/core 4.8.2 → 4.8.4

package/lib/config/config.js

@@ -156,23 +156,11 @@ class Config {
         if (typeof opts === 'string')
             opts = { root: opts };
         if (isConfig(opts)) {
-            /**
-             * Reload the Config based on the version required by the command.
-             * This is needed because the command is given the Config instantiated
-             * by the root plugin, which may be a different version than the one
-             * required by the command.
-             *
-             * Doing this ensures that the command can freely use any method on Config that
-             * exists in the version of Config required by the command but may not exist on the
-             * root's instance of Config.
-             */
-            if (BASE !== opts._base) {
-                debug(`reloading config from ${opts._base} to ${BASE}`);
-                const config = new Config({ ...opts.options, plugins: opts.plugins });
-                await config.load();
-                return config;
-            }
-            return opts;
+            debug(`reloading config from ${opts._base} to ${BASE}`);
+            const pluginMap = new Map(opts.getPluginsList().map((p) => [p.name, p]));
+            const config = new Config({ ...opts.options, plugins: pluginMap });
+            await config.load();
+            return config;
         }
         const config = new Config(opts);
         await config.load();
@@ -215,10 +203,12 @@ class Config {
         if (SHELL) {
             shellPath = SHELL.split('/');
         }
-        else if (this.windows && process.title.toLowerCase().includes('powershell')) {
+        else if (this.windows &&
+            (process.title.toLowerCase().includes('powershell') || process.title.toLowerCase().includes('pwsh'))) {
             shellPath = ['powershell'];
         }
-        else if (this.windows && process.title.toLowerCase().includes('command prompt')) {
+        else if (this.windows &&
+            (process.title.toLowerCase().includes('command prompt') || process.title.toLowerCase().includes('cmd'))) {
             shellPath = ['cmd.exe'];
         }
         else if (this.windows && COMSPEC) {

package/package.json

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