oclif 4.3.4 → 4.3.6-dev.0

package/lib/tarballs/build.js

@@ -27,6 +27,18 @@ const isYarnProject = (yarnRootPath) => {
     const rootYarnLockFilePath = path.join(yarnRootPath, yarnLockFileName);
     return (0, node_fs_1.existsSync)(rootYarnLockFilePath);
 };
+const copyYarnDirectory = async (relativePath, yarnRootPath, workspacePath) => {
+    const rootYarnDirectoryPath = path.join(yarnRootPath, relativePath);
+    const workspaceYarnDirectoryPath = path.join(workspacePath, relativePath);
+    if ((0, node_fs_1.existsSync)(rootYarnDirectoryPath)) {
+        // create the directory if it does not exist
+        if (!(0, node_fs_1.existsSync)(workspaceYarnDirectoryPath)) {
+            await (0, promises_1.mkdir)(workspaceYarnDirectoryPath, { recursive: true });
+        }
+        // recursively copy all files in the directory
+        await (0, fs_extra_1.copy)(rootYarnDirectoryPath, workspaceYarnDirectoryPath);
+    }
+};
 const copyCoreYarnFiles = async (yarnRootPath, workspacePath) => {
     // copy yarn dependencies lock file
     const yarnLockFileName = 'yarn.lock';
@@ -43,17 +55,9 @@ const copyCoreYarnFiles = async (yarnRootPath, workspacePath) => {
         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);
-    }
+    await copyYarnDirectory('./.yarn/releases/', yarnRootPath, workspacePath);
+    // copy yarn plugins if they exists
+    await copyYarnDirectory('./.yarn/plugins/', yarnRootPath, workspacePath);
 };
 async function build(c, options = {}) {
     const { config, xz } = c;

package/lib/version-indexes.js

@@ -53,7 +53,11 @@ const appendToIndex = async (input) => {
             Bucket: s3Config.bucket,
             Key: key,
         });
-        existing = JSON.parse(Body?.toString());
+        // @ts-expect-error because StreamingBlobTypes doesn't have transformToString
+        // but it's expected to be there according to the docs
+        // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-smithy-types/TypeAlias/StreamingBlobPayloadOutputTypes/
+        // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-smithy-types/Interface/SdkStreamMixin/
+        existing = JSON.parse(await Body?.transformToString());
         debug('appending to existing index file');
     }
     catch (error) {

package/oclif.manifest.json

@@ -732,5 +732,5 @@
       ]
     }
   },
-  "version": "4.3.4"
+  "version": "4.3.6-dev.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.3.4",
+  "version": "4.3.6-dev.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"