oclif 4.21.2 → 4.22.1

package/README.md

@@ -111,7 +111,7 @@ hello world! (./src/commands/hello/world.ts)
 
 # 🚀 Contributing
 
-See the [contributing guide](./CONRTIBUTING.md).
+See the [contributing guide](./CONTRIBUTING.md).
 
 # 🏭 Related Repositories
 

package/lib/commands/generate.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const errors_1 = require("@oclif/core/errors");
 const ansis_1 = require("ansis");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
@@ -247,8 +248,22 @@ Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
 exports.default = Generate;
 const findEjsFiles = (location) => async (dir) => (await (0, promises_1.readdir)(dir, { recursive: true, withFileTypes: true }))
     .filter((f) => f.isFile() && f.name.endsWith('.ejs'))
-    .map((f) => ({
-    destination: (0, node_path_1.join)(f.path.replace(dir, location), f.name.replace('.ejs', '')),
-    name: f.name,
-    src: (0, node_path_1.join)(f.path, f.name),
-}));
+    .map((f) => {
+    debug({
+        location,
+        name: f.name,
+        parentPath: f.parentPath,
+        path: f.path,
+    });
+    const path = f.path ?? f.parentPath;
+    if (!path) {
+        (0, errors_1.warn)(`Could not determine path for file ${f.name}. Skipping.`);
+        return null;
+    }
+    return {
+        destination: (0, node_path_1.join)(path.replace(dir, location), f.name.replace('.ejs', '')),
+        name: f.name,
+        src: (0, node_path_1.join)(path, f.name),
+    };
+})
+    .filter((f) => f !== null);

package/lib/commands/promote.js

@@ -86,8 +86,8 @@ class Promote extends core_1.Command {
             CacheControl: indexDefaults.maxAge,
             MetadataDirective: client_s3_1.MetadataDirective.REPLACE,
         };
-        const cloudBucketCommitKey = (shortKey) => node_path_1.default.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
-        const cloudChannelKey = (shortKey) => node_path_1.default.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
+        const cloudBucketCommitKey = (shortKey) => node_path_1.default.posix.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
+        const cloudChannelKey = (shortKey) => node_path_1.default.posix.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
         // copy tarballs manifests
         const promoteManifest = async (target) => {
             const manifest = (0, upload_util_1.templateShortKey)('manifest', {

package/lib/commands/upload/tarballs.js

@@ -56,8 +56,6 @@ class UploadTarballs extends core_1.Command {
     };
     async run() {
         const { flags } = await this.parse(UploadTarballs);
-        if (process.platform === 'win32')
-            throw new Error('upload does not function on windows');
         const buildConfig = await Tarballs.buildConfig(flags.root, {
             sha: flags?.sha,
             targets: flags?.targets?.split(','),

package/lib/upload-util.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commitAWSDir = commitAWSDir;
 exports.channelAWSDir = channelAWSDir;
@@ -6,18 +9,18 @@ exports.templateShortKey = templateShortKey;
 exports.debArch = debArch;
 exports.debVersion = debVersion;
 const ejs_1 = require("ejs");
-const node_path_1 = require("node:path");
+const node_path_1 = __importDefault(require("node:path"));
 function commitAWSDir(version, sha, s3Config) {
     let s3SubDir = s3Config.folder || '';
     if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
         s3SubDir = `${s3SubDir}/`;
-    return (0, node_path_1.join)(s3SubDir, 'versions', version, sha);
+    return node_path_1.default.posix.join(s3SubDir, 'versions', version, sha);
 }
 function channelAWSDir(channel, s3Config) {
     let s3SubDir = s3Config.folder || '';
     if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')
         s3SubDir = `${s3SubDir}/`;
-    return (0, node_path_1.join)(s3SubDir, 'channels', channel);
+    return node_path_1.default.posix.join(s3SubDir, 'channels', channel);
 }
 // TODO: refactor this key name lookup helper to oclif/core
 function templateShortKey(type, options) {

package/lib/version-indexes.js

@@ -81,7 +81,7 @@ const appendToIndex = async (input) => {
     // json-friendly filenames like sfdx-linux-x64-tar-gz
     const jsonFileName = `${filename.replaceAll('.', '-')}.json`;
     // folder is optional, but honored if present
-    const key = node_path_1.default.join(s3Config.folder ?? '', 'versions', jsonFileName);
+    const key = node_path_1.default.posix.join(s3Config.folder ?? '', 'versions', jsonFileName);
     // retrieve existing index file
     let existing = {};
     try {

package/oclif.manifest.json

@@ -1195,5 +1195,5 @@
       ]
     }
   },
-  "version": "4.21.2"
+  "version": "4.22.1"
 }

package/package.json

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