oclif 3.13.0 → 3.13.1-beta.0

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.13.0",
+  "version": "3.13.1-beta.0",
   "commands": {
     "generate": {
       "id": "generate",

package/lib/aws.js

@@ -20,11 +20,7 @@ const aws = {
     },
     get s3() {
         try {
-            cache.s3 = cache.s3 || new (require('aws-sdk/clients/s3'))({
-                ...this.creds,
-                endpoint: process.env.AWS_S3_ENDPOINT,
-                s3ForcePathStyle: Boolean(process.env.AWS_S3_FORCE_PATH_STYLE),
-            });
+            cache.s3 = cache.s3 || new (require('aws-sdk/clients/s3'))(Object.assign(Object.assign({}, this.creds), { endpoint: process.env.AWS_S3_ENDPOINT, s3ForcePathStyle: Boolean(process.env.AWS_S3_FORCE_PATH_STYLE) }));
             return cache.s3;
         }
         catch (error) {

package/lib/commands/manifest.js

@@ -11,7 +11,7 @@ async function fileExists(filePath) {
         await fs.access(filePath);
         return true;
     }
-    catch {
+    catch (_a) {
         return false;
     }
 }
@@ -22,7 +22,7 @@ class Manifest extends core_1.Command {
         try {
             fs.unlinkSync('oclif.manifest.json');
         }
-        catch { }
+        catch (_b) { }
         const { args } = await this.parse(Manifest);
         const root = path.resolve(args.path);
         const packageJson = fs.readJSONSync('package.json');
@@ -73,7 +73,7 @@ class Manifest extends core_1.Command {
         const dotfile = plugin.pjson.files.find((f) => f.endsWith('.oclif.manifest.json'));
         const file = path.join(plugin.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
         for (const manifest of jitPluginManifests) {
-            plugin.manifest.commands = { ...plugin.manifest.commands, ...manifest.commands };
+            plugin.manifest.commands = Object.assign(Object.assign({}, plugin.manifest.commands), manifest.commands);
         }
         fs.writeFileSync(file, JSON.stringify(plugin.manifest, null, 2));
         this.log(`wrote manifest to ${file}`);
@@ -82,11 +82,11 @@ class Manifest extends core_1.Command {
         try {
             this.executeCommand(`git clone --branch ${tag} ${repoUrl} ${fullPath} --depth 1`);
         }
-        catch {
+        catch (_a) {
             try {
                 this.executeCommand(`git clone --branch v${tag} ${repoUrl} ${fullPath} --depth 1`);
             }
-            catch {
+            catch (_b) {
                 throw new Error(`Unable to clone repo ${repoUrl} with tag ${tag}`);
             }
         }
@@ -94,7 +94,7 @@ class Manifest extends core_1.Command {
     executeCommand(command, options) {
         const debugString = (options === null || options === void 0 ? void 0 : options.cwd) ? `executing command: ${command} in ${options.cwd}` : `executing command: ${command}`;
         this.debug(debugString);
-        const result = (0, shelljs_1.exec)(command, { ...options, silent: true, async: false });
+        const result = (0, shelljs_1.exec)(command, Object.assign(Object.assign({}, options), { silent: true, async: false }));
         if (result.code !== 0) {
             this.error(result.stderr);
         }

package/lib/commands/promote.js

@@ -42,11 +42,7 @@ class Promote extends core_1.Command {
             });
             // strip version & sha so update/scripts can point to a static channel manifest
             const unversionedManifest = manifest.replace(`-v${flags.version}-${flags.sha}`, '');
-            await aws_1.default.s3.copyObject({
-                ...awsDefaults,
-                CopySource: cloudBucketCommitKey(manifest),
-                Key: cloudChannelKey(unversionedManifest),
-            });
+            await aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: cloudBucketCommitKey(manifest), Key: cloudChannelKey(unversionedManifest) }));
         };
         const promoteGzTarballs = async (target) => {
             const versionedTarGzName = (0, upload_util_1.templateShortKey)('versioned', '.tar.gz', {
@@ -60,11 +56,7 @@ class Promote extends core_1.Command {
             // strip version & sha so update/scripts can point to a static channel tarball
             const unversionedTarGzName = versionedTarGzName.replace(`-v${flags.version}-${flags.sha}`, '');
             const unversionedTarGzKey = cloudChannelKey(unversionedTarGzName);
-            await Promise.all([aws_1.default.s3.copyObject({
-                    ...awsDefaults,
-                    CopySource: versionedTarGzKey,
-                    Key: unversionedTarGzKey,
-                })].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)({ ...indexDefaults, originalUrl: versionedTarGzKey, filename: unversionedTarGzName })] : []));
+            await Promise.all([aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: versionedTarGzKey, Key: unversionedTarGzKey }))].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarGzKey, filename: unversionedTarGzName }))] : []));
         };
         const promoteXzTarballs = async (target) => {
             const versionedTarXzName = (0, upload_util_1.templateShortKey)('versioned', '.tar.xz', {
@@ -78,11 +70,7 @@ class Promote extends core_1.Command {
             // strip version & sha so update/scripts can point to a static channel tarball
             const unversionedTarXzName = versionedTarXzName.replace(`-v${flags.version}-${flags.sha}`, '');
             const unversionedTarXzKey = cloudChannelKey(unversionedTarXzName);
-            await Promise.all([aws_1.default.s3.copyObject({
-                    ...awsDefaults,
-                    CopySource: versionedTarXzKey,
-                    Key: unversionedTarXzKey,
-                })].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)({ ...indexDefaults, originalUrl: versionedTarXzKey, filename: unversionedTarXzName })] : []));
+            await Promise.all([aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: versionedTarXzKey, Key: unversionedTarXzKey }))].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarXzKey, filename: unversionedTarXzName }))] : []));
         };
         const promoteMacInstallers = async () => {
             this.log(`Promoting macos pkgs to ${flags.channel}`);
@@ -92,11 +80,7 @@ class Promote extends core_1.Command {
                 const darwinCopySource = cloudBucketCommitKey(darwinPkg);
                 // strip version & sha so scripts can point to a static channel pkg
                 const unversionedPkg = darwinPkg.replace(`-v${flags.version}-${flags.sha}`, '');
-                await Promise.all([aws_1.default.s3.copyObject({
-                        ...awsDefaults,
-                        CopySource: darwinCopySource,
-                        Key: cloudChannelKey(unversionedPkg),
-                    })].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)({ ...indexDefaults, originalUrl: darwinCopySource, filename: unversionedPkg })] : []));
+                await Promise.all([aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: darwinCopySource, Key: cloudChannelKey(unversionedPkg) }))].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }))] : []));
             }));
         };
         const promoteWindowsInstallers = async () => {
@@ -108,11 +92,7 @@ class Promote extends core_1.Command {
                 const winCopySource = cloudBucketCommitKey(winPkg);
                 // strip version & sha so scripts can point to a static channel exe
                 const unversionedExe = winPkg.replace(`-v${flags.version}-${flags.sha}`, '');
-                await Promise.all([aws_1.default.s3.copyObject({
-                        ...awsDefaults,
-                        CopySource: winCopySource,
-                        Key: cloudChannelKey(unversionedExe),
-                    })].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)({ ...indexDefaults, originalUrl: winCopySource, filename: unversionedExe })] : []));
+                await Promise.all([aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: winCopySource, Key: cloudChannelKey(unversionedExe) }))].concat(flags.indexes ? [(0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: winCopySource, filename: unversionedExe }))] : []));
                 core_1.ux.action.stop('successfully');
             }));
         };
@@ -148,16 +128,8 @@ class Promote extends core_1.Command {
                 // with this, the docs are correct. The copies are all done in parallel so it shouldn't be too costly.
                 const workaroundKey = cloudChannelKey(`apt/./${artifact}`);
                 return [
-                    aws_1.default.s3.copyObject({
-                        ...awsDefaults,
-                        CopySource: debCopySource,
-                        Key: debKey,
-                    }),
-                    aws_1.default.s3.copyObject({
-                        ...awsDefaults,
-                        CopySource: debCopySource,
-                        Key: workaroundKey,
-                    }),
+                    aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: debCopySource, Key: debKey })),
+                    aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: debCopySource, Key: workaroundKey })),
                 ];
             }));
         };

package/lib/commands/readme.js

@@ -23,14 +23,14 @@ class Readme extends core_1.Command {
             await plugin.load();
             config.plugins.set(plugin.name, plugin);
         }
-        catch { }
+        catch (_a) { }
         await config.runHook('init', { id: 'readme', argv: this.argv });
         this.HelpClass = await (0, core_1.loadHelpClass)(config);
         let readme = await fs.readFile(readmePath, 'utf8');
         let commands = config.commands
             .filter(c => !c.hidden && c.pluginType === 'core')
             .filter(c => flags.aliases ? true : !c.aliases.includes(c.id))
-            .map(c => c.id === '.' ? { ...c, id: '' } : c);
+            .map(c => c.id === '.' ? Object.assign(Object.assign({}, c), { id: '' }) : c);
         this.debug('commands:', commands.map(c => c.id).length);
         commands = (0, util_1.uniqBy)(commands, c => c.id);
         commands = (0, util_1.sortBy)(commands, c => c.id);
@@ -127,7 +127,7 @@ USAGE
         try {
             // copy c to keep the command ID with colons, see:
             // https://github.com/oclif/oclif/pull/1165#discussion_r1282305242
-            const command = { ...c };
+            const command = Object.assign({}, c);
             return (0, util_1.compact)([
                 header(),
                 title,
@@ -162,7 +162,7 @@ USAGE
         return `_See code: [${label}](${_.template(template)({ repo, version, commandPath, config, c })})_`;
     }
     repo(plugin) {
-        const pjson = { ...plugin.pjson };
+        const pjson = Object.assign({}, plugin.pjson);
         normalize(pjson);
         const repo = pjson.repository && pjson.repository.url;
         if (!repo)

package/lib/commands/upload/deb.js

@@ -24,7 +24,7 @@ class UploadDeb extends core_1.Command {
         const cloudKeyBase = (0, upload_util_1.commitAWSDir)(config.pjson.version, buildConfig.gitSha, s3Config);
         const upload = (file) => {
             const cloudKey = `${cloudKeyBase}/apt/${file}`;
-            return aws_1.default.s3.uploadFile(dist(file), { ...S3Options, CacheControl: 'max-age=86400', Key: cloudKey });
+            return aws_1.default.s3.uploadFile(dist(file), Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
         };
         // apt expects ../apt/dists/versionName/[artifacts] but oclif wants versions/sha/apt/[artifacts]
         // see https://github.com/oclif/oclif/issues/347 for the AWS-redirect that solves this
@@ -32,7 +32,7 @@ class UploadDeb extends core_1.Command {
         // with this, the docs are correct. The copies are all done in parallel so it shouldn't be too costly.
         const uploadWorkaround = (file) => {
             const cloudKey = `${cloudKeyBase}/apt/./${file}`;
-            return aws_1.default.s3.uploadFile(dist(file), { ...S3Options, CacheControl: 'max-age=86400', Key: cloudKey });
+            return aws_1.default.s3.uploadFile(dist(file), Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
         };
         const uploadDeb = async (arch) => {
             const deb = (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: arch });

package/lib/commands/upload/macos.js

@@ -23,7 +23,7 @@ class UploadMacos extends core_1.Command {
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
             const localPkg = dist(`macos/${templateKey}`);
             if (fs.existsSync(localPkg))
-                await aws_1.default.s3.uploadFile(localPkg, { ...S3Options, CacheControl: 'max-age=86400', Key: cloudKey });
+                await aws_1.default.s3.uploadFile(localPkg, Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
             else
                 this.error('Cannot find macOS pkg', {
                     suggestions: ['Run "oclif pack macos" before uploading'],

package/lib/commands/upload/tarballs.js

@@ -16,7 +16,7 @@ class UploadTarballs extends core_1.Command {
         const { s3Config, dist, config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
-            const tarball = dist((0, upload_util_1.templateShortKey)('versioned', { ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha, ...target }));
+            const tarball = dist((0, upload_util_1.templateShortKey)('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
             if (!fs.existsSync(tarball))
                 this.error(`Cannot find a tarball ${tarball} for ${target.platform}-${target.arch}`, {
                     suggestions: [`Run "oclif pack --target ${target.platform}-${target.arch}" before uploading`],
@@ -39,11 +39,11 @@ class UploadTarballs extends core_1.Command {
             const releaseTarballs = async (ext) => {
                 const localKey = (0, upload_util_1.templateShortKey)('versioned', ext, shortKeyInputs);
                 const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${localKey}`;
-                await aws_1.default.s3.uploadFile(dist(localKey), { ...S3Options, CacheControl: 'max-age=604800', ContentType: 'application/gzip', Key: cloudKey });
+                await aws_1.default.s3.uploadFile(dist(localKey), Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=604800', ContentType: 'application/gzip', Key: cloudKey }));
             };
             const manifest = (0, upload_util_1.templateShortKey)('manifest', shortKeyInputs);
             const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${manifest}`;
-            await Promise.all([releaseTarballs('.tar.gz'), aws_1.default.s3.uploadFile(dist(manifest), { ...S3Options, CacheControl: 'max-age=86400', ContentType: 'application/json', Key: cloudKey })].concat(xz ? [releaseTarballs('.tar.xz')] : []));
+            await Promise.all([releaseTarballs('.tar.gz'), aws_1.default.s3.uploadFile(dist(manifest), Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', ContentType: 'application/json', Key: cloudKey }))].concat(xz ? [releaseTarballs('.tar.xz')] : []));
         };
         if (buildConfig.targets.length > 0)
             (0, log_1.log)('uploading targets');

package/lib/commands/upload/win.js

@@ -30,7 +30,7 @@ class UploadWin extends core_1.Command {
             const localExe = dist(`win32/${templateKey}`);
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
             if (fs.existsSync(localExe))
-                await aws_1.default.s3.uploadFile(localExe, { ...S3Options, CacheControl: 'max-age=86400', Key: cloudKey });
+                await aws_1.default.s3.uploadFile(localExe, Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
         };
         await Promise.all([uploadWin('x64'), uploadWin('x86')]);
         (0, log_1.log)(`done uploading windows executables for v${config.version}-${buildConfig.gitSha}`);

package/lib/generators/cli.js

@@ -12,7 +12,7 @@ try {
     (0, child_process_1.execSync)('yarn -v', { stdio: 'ignore' });
     hasYarn = true;
 }
-catch { }
+catch (_a) { }
 class CLI extends Generator {
     constructor(args, opts) {
         super(args, opts);
@@ -45,41 +45,11 @@ class CLI extends Generator {
         this.env.cwd = this.destinationPath();
         this.githubUser = await this.user.github.username().catch(debug);
         // establish order of properties in the resulting package.json
-        this.pjson = {
-            name: '',
-            version: '',
-            description: '',
-            author: '',
-            bin: {},
-            homepage: '',
-            license: '',
-            main: '',
-            repository: '',
-            files: [],
-            dependencies: {},
-            devDependencies: {},
-            oclif: {},
-            scripts: {},
-            engines: {},
-            ...this.fs.readJSON(path.join(this.env.cwd, 'package.json'), {}),
-        };
+        this.pjson = Object.assign({ name: '', version: '', description: '', author: '', bin: {}, homepage: '', license: '', main: '', repository: '', files: [], dependencies: {}, devDependencies: {}, oclif: {}, scripts: {}, engines: {} }, this.fs.readJSON(path.join(this.env.cwd, 'package.json'), {}));
         let repository = this.destinationRoot().split(path.sep).slice(-2).join('/');
         if (this.githubUser)
             repository = `${this.githubUser}/${repository.split('/')[1]}`;
-        const defaults = {
-            ...this.pjson,
-            name: this.name ? this.name.replace(/ /g, '-') : this.determineAppname().replace(/ /g, '-'),
-            version: '0.0.0',
-            license: 'MIT',
-            author: this.githubUser ? `${this.user.git.name()} @${this.githubUser}` : this.user.git.name(),
-            dependencies: {},
-            repository,
-            engines: {
-                node: '>=12.0.0',
-                ...this.pjson.engines,
-            },
-            options: this.options,
-        };
+        const defaults = Object.assign(Object.assign({}, this.pjson), { name: this.name ? this.name.replace(/ /g, '-') : this.determineAppname().replace(/ /g, '-'), version: '0.0.0', license: 'MIT', author: this.githubUser ? `${this.user.git.name()} @${this.githubUser}` : this.user.git.name(), dependencies: {}, repository, engines: Object.assign({ node: '>=12.0.0' }, this.pjson.engines), options: this.options });
         this.repository = defaults.repository;
         if (this.repository && this.repository.url) {
             this.repository = this.repository.url;
@@ -152,11 +122,7 @@ class CLI extends Generator {
         }
         debug(this.answers);
         if (!this.options.defaults) {
-            this.options = {
-                ...this.answers.ci,
-                yarn: this.answers.pkg === 'yarn',
-                force: true,
-            };
+            this.options = Object.assign(Object.assign({}, this.answers.ci), { yarn: this.answers.pkg === 'yarn', force: true });
         }
         this.yarn = this.options.yarn;
         this.env.options.nodePackageManager = this.yarn ? 'yarn' : 'npm';
@@ -199,7 +165,7 @@ class CLI extends Generator {
             // this in a spawned process. Setting the NODE_ENV to production will silence these warnings. This
             // doesn't affect the behavior of the command in production since the NODE_ENV is already set to production
             // in that scenario.
-            env: { ...process.env, NODE_ENV: 'production' },
+            env: Object.assign(Object.assign({}, process.env), { NODE_ENV: 'production' }),
         });
         console.log(`\nCreated ${this.pjson.name} in ${this.destinationRoot()}`);
     }

package/lib/generators/command.js

@@ -32,7 +32,7 @@ class Command extends Generator {
             bin = bin.split('/').pop();
         const cmd = `${bin} ${this.options.name}`;
         const commandPath = this.destinationPath(`src/commands/${cmdPath}.ts`);
-        const opts = { ...this.options, bin, cmd, _, type: 'command', path: commandPath };
+        const opts = Object.assign(Object.assign({}, this.options), { bin, cmd, _, type: 'command', path: commandPath });
         this.fs.copyTpl(this.templatePath('src/command.ts.ejs'), commandPath, opts);
         if (this.hasMocha()) {
             this.fs.copyTpl(this.templatePath('test/command.test.ts.ejs'), this.destinationPath(`test/commands/${cmdPath}.test.ts`), opts);

package/lib/upload-util.js

@@ -37,7 +37,7 @@ options = { root: '.' }) {
         win32: '<%- bin %>-v<%- version %>-<%- sha %>-<%- arch %>.exe',
         deb: '<%- bin %>_<%- versionShaRevision %>_<%- arch %>.deb',
     };
-    return _.template(templates[type])({ ...options });
+    return _.template(templates[type])(Object.assign({}, options));
 }
 exports.templateShortKey = templateShortKey;
 function debArch(arch) {

package/lib/version-indexes.js

@@ -59,10 +59,7 @@ const appendToIndex = async (input) => {
         debug(`error on ${key}`, error);
     }
     // appends new version from this promotion if not already present (idempotent)
-    await fs.writeJSON(jsonFileName, sortVersionsObjectByKeysDesc({
-        ...existing,
-        [version]: originalUrl.replace(s3Config.bucket, s3Config.host),
-    }, s3Config.indexVersionLimit), { spaces: 2 });
+    await fs.writeJSON(jsonFileName, sortVersionsObjectByKeysDesc(Object.assign(Object.assign({}, existing), { [version]: originalUrl.replace(s3Config.bucket, s3Config.host) }), s3Config.indexVersionLimit), { spaces: 2 });
     // put the file back in the same place
     await aws_1.default.s3.uploadFile(jsonFileName, {
         Bucket: s3Config.bucket,

package/package.json

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