oclif 3.3.0 → 3.4.0

package/lib/commands/promote.js

@@ -9,24 +9,29 @@ const upload_util_1 = require("../upload-util");
 const version_indexes_1 = require("../version-indexes");
 class Promote extends core_1.Command {
     async run() {
-        var _a;
+        var _a, _b;
         const { flags } = await this.parse(Promote);
-        const maxAge = `max-age=${flags['max-age']}`;
         const buildConfig = await Tarballs.buildConfig(flags.root, { targets: (_a = flags === null || flags === void 0 ? void 0 : flags.targets) === null || _a === void 0 ? void 0 : _a.split(',') });
         const { s3Config, config } = buildConfig;
         const indexDefaults = {
             version: flags.version,
             s3Config,
-            maxAge,
+            maxAge: `max-age=${flags['max-age']}`,
         };
         if (!s3Config.bucket)
             this.error('Cannot determine S3 bucket for promotion');
+        const awsDefaults = {
+            Bucket: s3Config.bucket,
+            ACL: (_b = s3Config.acl) !== null && _b !== void 0 ? _b : 'public-read',
+            MetadataDirective: 'REPLACE',
+            CacheControl: indexDefaults.maxAge,
+        };
         const cloudBucketCommitKey = (shortKey) => path.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
         const cloudChannelKey = (shortKey) => path.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
         // copy tarballs manifests
         if (buildConfig.targets.length > 0)
             this.log(`Promoting buildmanifests & unversioned tarballs to ${flags.channel}`);
-        for (const target of buildConfig.targets) {
+        const promoteManifest = async (target) => {
             const manifest = (0, upload_util_1.templateShortKey)('manifest', {
                 arch: target.arch,
                 bin: config.bin,
@@ -34,19 +39,11 @@ class Promote extends core_1.Command {
                 sha: flags.sha,
                 version: flags.version,
             });
-            const copySource = cloudBucketCommitKey(manifest);
             // strip version & sha so update/scripts can point to a static channel manifest
             const unversionedManifest = manifest.replace(`-v${flags.version}-${flags.sha}`, '');
-            const key = cloudChannelKey(unversionedManifest);
-            // eslint-disable-next-line no-await-in-loop
-            await aws_1.default.s3.copyObject({
-                Bucket: s3Config.bucket,
-                ACL: s3Config.acl || 'public-read',
-                CopySource: copySource,
-                Key: key,
-                CacheControl: maxAge,
-                MetadataDirective: 'REPLACE',
-            });
+            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', {
                 arch: target.arch,
                 bin: config.bin,
@@ -58,119 +55,83 @@ 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);
-            // eslint-disable-next-line no-await-in-loop
-            await aws_1.default.s3.copyObject({
-                Bucket: s3Config.bucket,
-                ACL: s3Config.acl || 'public-read',
-                CopySource: versionedTarGzKey,
-                Key: unversionedTarGzKey,
-                CacheControl: maxAge,
-                MetadataDirective: 'REPLACE',
+            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', {
+                arch: target.arch,
+                bin: config.bin,
+                platform: target.platform,
+                sha: flags.sha,
+                version: flags.version,
             });
-            // eslint-disable-next-line no-await-in-loop
-            if (flags.indexes)
-                await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarGzKey, filename: unversionedTarGzName }));
-            if (flags.xz) {
-                const versionedTarXzName = (0, upload_util_1.templateShortKey)('versioned', '.tar.xz', {
-                    arch: target.arch,
-                    bin: config.bin,
-                    platform: target.platform,
-                    sha: flags.sha,
-                    version: flags.version,
-                });
-                const versionedTarXzKey = cloudBucketCommitKey(versionedTarXzName);
-                // 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);
-                // eslint-disable-next-line no-await-in-loop
-                await aws_1.default.s3.copyObject({
-                    Bucket: s3Config.bucket,
-                    ACL: s3Config.acl || 'public-read',
-                    CopySource: versionedTarXzKey,
-                    Key: unversionedTarXzKey,
-                    CacheControl: maxAge,
-                    MetadataDirective: 'REPLACE',
-                });
-                // eslint-disable-next-line no-await-in-loop
-                if (flags.indexes)
-                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarXzKey, filename: unversionedTarXzName }));
-            }
-        }
-        // copy darwin pkg
-        if (flags.macos) {
+            const versionedTarXzKey = cloudBucketCommitKey(versionedTarXzName);
+            // 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(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}`);
             const arches = _.uniq(buildConfig.targets.filter(t => t.platform === 'darwin').map(t => t.arch));
-            for (const arch of arches) {
+            await Promise.all(arches.map(async (arch) => {
                 const darwinPkg = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: flags.version, sha: flags.sha, arch });
                 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}`, '');
-                const darwinKey = cloudChannelKey(unversionedPkg);
-                // eslint-disable-next-line no-await-in-loop
-                await aws_1.default.s3.copyObject({
-                    Bucket: s3Config.bucket,
-                    ACL: s3Config.acl || 'public-read',
-                    CopySource: darwinCopySource,
-                    Key: darwinKey,
-                    CacheControl: maxAge,
-                    MetadataDirective: 'REPLACE',
-                });
-                // eslint-disable-next-line no-await-in-loop
-                if (flags.indexes)
-                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
-            }
-        }
-        // copy win exe
-        if (flags.win) {
+                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 () => {
+            // copy win exe
             this.log(`Promoting windows exe to ${flags.channel}`);
-            const archs = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
-            for (const arch of archs) {
+            const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
+            await Promise.all(arches.map(async (arch) => {
                 const winPkg = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: flags.version, sha: flags.sha, arch });
                 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}`, '');
-                const winKey = cloudChannelKey(unversionedExe);
-                // eslint-disable-next-line no-await-in-loop
-                await aws_1.default.s3.copyObject({
-                    Bucket: s3Config.bucket,
-                    ACL: s3Config.acl || 'public-read',
-                    CopySource: winCopySource,
-                    Key: winKey,
-                    CacheControl: maxAge,
-                });
-                // eslint-disable-next-line no-await-in-loop
-                if (flags.indexes)
-                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, 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.CliUx.ux.action.stop('successfully');
-            }
-        }
-        // copy debian artifacts
-        const debArtifacts = [
-            (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'amd64' }),
-            (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'i386' }),
-            'Packages.gz',
-            'Packages.xz',
-            'Packages.bz2',
-            'Release',
-            'InRelease',
-            'Release.gpg',
-        ];
-        if (flags.deb) {
+            }));
+        };
+        const promoteDebianAptPackages = async () => {
+            // copy debian artifacts
+            const debArtifacts = [
+                (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'amd64' }),
+                (0, upload_util_1.templateShortKey)('deb', { bin: config.bin, versionShaRevision: (0, upload_util_1.debVersion)(buildConfig), arch: 'i386' }),
+                'Packages.gz',
+                'Packages.xz',
+                'Packages.bz2',
+                'Release',
+                'InRelease',
+                'Release.gpg',
+            ];
             this.log(`Promoting debian artifacts to ${flags.channel}`);
-            for (const artifact of debArtifacts) {
+            await Promise.all(debArtifacts.flatMap(artifact => {
                 const debCopySource = cloudBucketCommitKey(`apt/${artifact}`);
                 const debKey = cloudChannelKey(`apt/${artifact}`);
-                // eslint-disable-next-line no-await-in-loop
-                await aws_1.default.s3.copyObject({
-                    Bucket: s3Config.bucket,
-                    ACL: s3Config.acl || 'public-read',
-                    CopySource: debCopySource,
-                    Key: debKey,
-                    CacheControl: maxAge,
-                    MetadataDirective: 'REPLACE',
-                });
-            }
-        }
+                // apt expects ../apt/dists/versionName/[artifacts] but oclif wants varsions/sha/apt/[artifacts]
+                // see https://github.com/oclif/oclif/issues/347 for the AWS-redirect that solves this
+                // this workaround puts the code in both places that the redirect was doing
+                // 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(Object.assign(Object.assign({}, awsDefaults), { CopySource: debCopySource, Key: debKey })),
+                    aws_1.default.s3.copyObject(Object.assign(Object.assign({}, awsDefaults), { CopySource: debCopySource, Key: workaroundKey })),
+                ];
+            }));
+        };
+        await Promise.all(buildConfig.targets.flatMap(target => [
+            // always promote the manifest and gz
+            promoteManifest(target),
+            promoteGzTarballs(target),
+        ])
+            // optionally promote other artifacts depending on the specified flags
+            .concat(flags.xz ? buildConfig.targets.map(target => promoteXzTarballs(target)) : [])
+            .concat(flags.macos ? [promoteMacInstallers()] : [])
+            .concat(flags.win ? [promoteWindowsInstallers()] : [])
+            .concat(flags.deb ? [promoteDebianAptPackages()] : []));
     }
 }
 exports.default = Promote;

package/lib/commands/upload/deb.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
+const fs = require("fs");
+const path = require("path");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
@@ -11,12 +12,12 @@ class UploadDeb extends core_1.Command {
         const { flags } = await this.parse(UploadDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { s3Config, config } = buildConfig;
-        const dist = (f) => buildConfig.dist(qq.join('deb', f));
+        const dist = (f) => buildConfig.dist(path.join('deb', f));
         const S3Options = {
             Bucket: s3Config.bucket,
             ACL: s3Config.acl || 'public-read',
         };
-        if (!await qq.exists(dist('Release')))
+        if (!fs.existsSync(dist('Release')))
             this.error('Cannot find debian artifacts', {
                 suggestions: ['Run "oclif pack deb" before uploading'],
             });
@@ -25,21 +26,32 @@ class UploadDeb extends core_1.Command {
             const cloudKey = `${cloudKeyBase}/apt/${file}`;
             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
+        // this workaround puts the code in both places that the redirect was doing
+        // 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), 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 });
-            if (await qq.exists(dist(deb)))
-                await upload(deb);
+            if (fs.existsSync(dist(deb)))
+                await Promise.all([upload(deb), uploadWorkaround(deb)]);
         };
-        await uploadDeb('amd64');
-        await uploadDeb('i386');
-        await upload('Packages.gz');
-        await upload('Packages.xz');
-        await upload('Packages.bz2');
-        await upload('Release');
-        if (await qq.exists(dist('InRelease')))
-            await upload('InRelease');
-        if (await qq.exists(dist('Release.gpg')))
-            await upload('Release.gpg');
+        (0, log_1.log)(`starting upload of deb artifacts for v${config.version}-${buildConfig.gitSha}`);
+        await Promise.all([
+            uploadDeb('amd64'),
+            uploadDeb('i386'),
+            upload('Packages.gz'),
+            upload('Packages.xz'),
+            upload('Packages.bz2'),
+            upload('Release'),
+            uploadWorkaround('Packages.gz'),
+            uploadWorkaround('Packages.xz'),
+            uploadWorkaround('Packages.bz2'),
+            uploadWorkaround('Release'),
+        ].concat(fs.existsSync(dist('InRelease')) ? [upload('InRelease'), uploadWorkaround('InRelease')] : [], fs.existsSync(dist('Release.gpg')) ? [upload('Release.gpg'), uploadWorkaround('Release.gpg')] : []));
         (0, log_1.log)(`done uploading deb artifacts for v${config.version}-${buildConfig.gitSha}`);
     }
 }

package/lib/commands/upload/macos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const qq = require("qqjs");
+const fs = require("fs");
 const core_1 = require("@oclif/core");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
@@ -22,7 +22,7 @@ class UploadMacos extends core_1.Command {
             const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
             const localPkg = dist(`macos/${templateKey}`);
-            if (await qq.exists(localPkg))
+            if (fs.existsSync(localPkg))
                 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', {
@@ -32,9 +32,7 @@ class UploadMacos extends core_1.Command {
         const arches = _.uniq(buildConfig.targets
             .filter(t => t.platform === 'darwin')
             .map(t => t.arch));
-        // eslint-disable-next-line no-await-in-loop
-        for (const a of arches)
-            await upload(a);
+        await Promise.all(arches.map(a => upload(a)));
         (0, log_1.log)(`done uploading macos pkgs for v${config.version}-${buildConfig.gitSha}`);
     }
 }

package/lib/commands/upload/tarballs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
+const fs = require("fs");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
@@ -17,8 +17,7 @@ class UploadTarballs extends core_1.Command {
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
             const tarball = dist((0, upload_util_1.templateShortKey)('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
-            // eslint-disable-next-line no-await-in-loop
-            if (!await qq.exists(tarball))
+            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`],
                 });
@@ -28,25 +27,7 @@ class UploadTarballs extends core_1.Command {
             ACL: s3Config.acl || 'public-read',
         };
         const uploadTarball = async (options) => {
-            const TarballS3Options = Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=604800' });
-            const releaseTarballs = async (ext) => {
-                const localKey = (0, upload_util_1.templateShortKey)('versioned', ext, {
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                    arch: options === null || options === void 0 ? void 0 : options.arch,
-                    bin: config.bin,
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                    platform: options === null || options === void 0 ? void 0 : options.platform,
-                    sha: buildConfig.gitSha,
-                    version: config.version,
-                });
-                const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${localKey}`;
-                await aws_1.default.s3.uploadFile(dist(localKey), Object.assign(Object.assign({}, TarballS3Options), { ContentType: 'application/gzip', Key: cloudKey }));
-            };
-            await releaseTarballs('.tar.gz');
-            if (xz)
-                await releaseTarballs('.tar.xz');
-            const ManifestS3Options = Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', ContentType: 'application/json' });
-            const manifest = (0, upload_util_1.templateShortKey)('manifest', {
+            const shortKeyInputs = {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
                 arch: options === null || options === void 0 ? void 0 : options.arch,
                 bin: config.bin,
@@ -54,15 +35,19 @@ class UploadTarballs extends core_1.Command {
                 platform: options === null || options === void 0 ? void 0 : options.platform,
                 sha: buildConfig.gitSha,
                 version: config.version,
-            });
+            };
+            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), 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 aws_1.default.s3.uploadFile(dist(manifest), Object.assign(Object.assign({}, ManifestS3Options), { Key: cloudKey }));
+            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');
-        // eslint-disable-next-line no-await-in-loop
-        for (const target of buildConfig.targets)
-            await uploadTarball(target);
+        await Promise.all(buildConfig.targets.map(t => uploadTarball(t)));
         (0, log_1.log)(`done uploading tarballs & manifests for v${config.version}-${buildConfig.gitSha}`);
     }
 }

package/lib/commands/upload/win.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
+const fs = require("fs");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
@@ -19,8 +19,7 @@ class UploadWin extends core_1.Command {
         for (const arch of archs) {
             const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const localKey = dist(`win32/${templateKey}`);
-            // eslint-disable-next-line no-await-in-loop
-            if (!await qq.exists(localKey))
+            if (!fs.existsSync(localKey))
                 this.error(`Cannot find Windows exe for ${arch}`, {
                     suggestions: ['Run "oclif pack win" before uploading'],
                 });
@@ -30,11 +29,10 @@ class UploadWin extends core_1.Command {
             const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const localExe = dist(`win32/${templateKey}`);
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
-            if (await qq.exists(localExe))
+            if (fs.existsSync(localExe))
                 await aws_1.default.s3.uploadFile(localExe, Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
         };
-        await uploadWin('x64');
-        await uploadWin('x86');
+        await Promise.all([uploadWin('x64'), uploadWin('x86')]);
         (0, log_1.log)(`done uploading windows executables for v${config.version}-${buildConfig.gitSha}`);
     }
 }

package/lib/log.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = exports.debug = void 0;
 const core_1 = require("@oclif/core");
-const qq = require("qqjs");
 const util = require("util");
+const util_1 = require("./util");
 exports.debug = require('debug')('oclif');
 exports.debug.new = (name) => require('debug')(`oclif:${name}`);
 function log(format, ...args) {
-    args = args.map((arg) => qq.prettifyPaths(arg));
+    args = args.map((arg) => (0, util_1.prettifyPaths)(arg));
     exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.CliUx.ux.log(`oclif: ${util.format(format, ...args)}`);
 }
 exports.log = log;

package/lib/tarballs/bin.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBinScripts = void 0;
-const qq = require("qqjs");
+const fs = require("fs");
+const path = require("path");
 async function writeBinScripts({ config, baseWorkspace, nodeVersion }) {
     const binPathEnvVar = config.scopedEnvVarKey('BINPATH');
     const redirectedEnvVar = config.scopedEnvVarKey('REDIRECTED');
     const clientHomeEnvVar = config.scopedEnvVarKey('OCLIF_CLIENT_HOME');
     const writeWin32 = async () => {
         const { bin } = config;
-        await qq.write([baseWorkspace, 'bin', `${config.bin}.cmd`], `@echo off
+        await fs.promises.writeFile(path.join(baseWorkspace, 'bin', `${config.bin}.cmd`), `@echo off
 setlocal enableextensions
 
 if not "%${redirectedEnvVar}%"=="1" if exist "%LOCALAPPDATA%\\${bin}\\client\\bin\\${bin}.cmd" (
@@ -34,8 +35,8 @@ if exist "%~dp0..\\bin\\node.exe" (
         // `)
     };
     const writeUnix = async () => {
-        const bin = qq.join([baseWorkspace, 'bin', config.bin]);
-        await qq.write(bin, `#!/usr/bin/env bash
+        const bin = path.join(baseWorkspace, 'bin', config.bin);
+        await fs.promises.writeFile(bin, `#!/usr/bin/env bash
 set -e
 echoerr() { echo "$@" 1>&2; }
 
@@ -80,10 +81,8 @@ else
   fi
   "\$NODE" "\$DIR/run" "\$@"
 fi
-`);
-        await qq.chmod(bin, 0o755);
+`, { mode: 0o755 });
     };
-    await writeWin32();
-    await writeUnix();
+    await Promise.all([writeWin32(), writeUnix()]);
 }
 exports.writeBinScripts = writeBinScripts;