oclif 4.1.0 → 4.1.2

package/lib/commands/manifest.js

@@ -76,8 +76,7 @@ class Manifest extends core_1.Command {
             throw new Error('plugin not found');
         await plugin.load();
         if (!plugin.valid) {
-            const p = require.resolve('@oclif/plugin-legacy', { paths: [process.cwd()] });
-            const { PluginLegacy } = require(p);
+            const { PluginLegacy } = await Promise.resolve().then(() => require('@oclif/plugin-legacy'));
             plugin = new PluginLegacy(this.config, plugin);
             await plugin.load();
         }

package/lib/commands/readme.js

@@ -156,6 +156,7 @@ Customize the code URL prefix by setting oclif.repositoryPrefix in package.json.
         }
         const config = await core_1.Config.load({ devPlugins: false, root: cwd, userPlugins: false });
         try {
+            // eslint-disable-next-line node/no-missing-require
             const p = require.resolve('@oclif/plugin-legacy', { paths: [cwd] });
             const plugin = new core_1.Plugin({ root: p, type: 'core' });
             await plugin.load();

package/lib/tarballs/build.js

@@ -22,6 +22,39 @@ const pack = async (from, to) => {
         ? await exec(`tar czf ${to} ${path.basename(from)}`, { cwd })
         : await exec(`tar cfJ ${to} ${path.basename(from)}`, { cwd });
 };
+const isYarnProject = (yarnRootPath) => {
+    const yarnLockFileName = 'yarn.lock';
+    const rootYarnLockFilePath = path.join(yarnRootPath, yarnLockFileName);
+    return (0, node_fs_1.existsSync)(rootYarnLockFilePath);
+};
+const copyCoreYarnFiles = async (yarnRootPath, workspacePath) => {
+    // copy yarn dependencies lock file
+    const yarnLockFileName = 'yarn.lock';
+    const rootYarnLockFilePath = path.join(yarnRootPath, yarnLockFileName);
+    const workspaceYarnLockFilePath = path.join(workspacePath, yarnLockFileName);
+    if ((0, node_fs_1.existsSync)(rootYarnLockFilePath)) {
+        await (0, fs_extra_1.copy)(rootYarnLockFilePath, workspaceYarnLockFilePath);
+    }
+    // copy yarn configuration file
+    const yarnConfigFileName = '.yarnrc.yml';
+    const rootYarnConfigFilePath = path.join(yarnRootPath, yarnConfigFileName);
+    const workspaceYarnConfigFilePath = path.join(workspacePath, yarnConfigFileName);
+    if ((0, node_fs_1.existsSync)(rootYarnConfigFilePath)) {
+        await (0, fs_extra_1.copy)(rootYarnConfigFilePath, workspaceYarnConfigFilePath);
+    }
+    // copy yarn releases e.g. yarn may be installed via a local config path like "yarnPath"
+    const yarnReleasesDirectoryRelativePath = './.yarn/releases/';
+    const rootYarnReleasesDirectoryPath = path.join(yarnRootPath, yarnReleasesDirectoryRelativePath);
+    const workspaceYarnReleasesDirectoryPath = path.join(workspacePath, yarnReleasesDirectoryRelativePath);
+    if ((0, node_fs_1.existsSync)(rootYarnReleasesDirectoryPath)) {
+        // create the directory if it does not exist
+        if (!(0, node_fs_1.existsSync)(workspaceYarnReleasesDirectoryPath)) {
+            await (0, promises_1.mkdir)(workspaceYarnReleasesDirectoryPath, { recursive: true });
+        }
+        // recursively copy all files in the directory
+        await (0, fs_extra_1.copy)(rootYarnReleasesDirectoryPath, workspaceYarnReleasesDirectoryPath);
+    }
+};
 async function build(c, options = {}) {
     const { config, xz } = c;
     const packCLI = async () => {
@@ -52,8 +85,8 @@ async function build(c, options = {}) {
     };
     const addDependencies = async () => {
         const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
-        if ((0, node_fs_1.existsSync)(path.join(yarnRoot, 'yarn.lock'))) {
-            await (0, fs_extra_1.copy)(path.join(yarnRoot, 'yarn.lock'), path.join(c.workspace(), 'yarn.lock'));
+        if (isYarnProject(yarnRoot)) {
+            await copyCoreYarnFiles(yarnRoot, c.workspace());
             const { stdout } = await exec('yarn -v');
             const yarnVersion = stdout.charAt(0);
             if (yarnVersion === '1') {

package/lib/tarballs/index.js

@@ -1,7 +1,20 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./bin"), exports);
-tslib_1.__exportStar(require("./build"), exports);
-tslib_1.__exportStar(require("./config"), exports);
-tslib_1.__exportStar(require("./node"), exports);
+__exportStar(require("./bin"), exports);
+__exportStar(require("./build"), exports);
+__exportStar(require("./config"), exports);
+__exportStar(require("./node"), exports);

package/oclif.manifest.json

@@ -717,5 +717,5 @@
       ]
     }
   },
-  "version": "4.1.0"
+  "version": "4.1.2"
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
   },
   "bugs": "https://github.com/oclif/oclif/issues",
   "dependencies": {
-    "@oclif/core": "^3.0.4",
-    "@oclif/plugin-help": "^5.2.14",
-    "@oclif/plugin-not-found": "^2.3.32",
-    "@oclif/plugin-warn-if-update-available": "^3.0.0",
+    "@oclif/core": "^3.16.0",
+    "@oclif/plugin-help": "^6.0.9",
+    "@oclif/plugin-not-found": "^3.0.7",
+    "@oclif/plugin-warn-if-update-available": "^3.0.8",
     "async-retry": "^1.3.3",
     "aws-sdk": "^2.1231.0",
     "change-case": "^4",
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.7.0",
-    "@oclif/plugin-legacy": "^1.3.0",
+    "@oclif/plugin-legacy": "^2.0.4",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^3.1.2",
     "@types/async-retry": "^1.4.5",