ovsx 0.5.0 → 0.5.2

package/lib/main.js

@@ -1,94 +1,106 @@
-"use strict";
-/********************************************************************************
- * Copyright (c) 2019 TypeFox and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander = require("commander");
-const leven = require("leven");
-const create_namespace_1 = require("./create-namespace");
-const publish_1 = require("./publish");
-const util_1 = require("./util");
-const get_1 = require("./get");
-const pkg = require('../package.json');
-module.exports = function (argv) {
-    const program = new commander.Command();
-    program.usage('<command> [options]')
-        .option('-r, --registryUrl <url>', 'Use the registry API at this base URL.')
-        .option('-p, --pat <token>', 'Personal access token.')
-        .option('--debug', 'Include debug information on error')
-        .version(pkg.version, '-V, --version', 'Print the Eclipse Open VSX CLI version');
-    const createNamespaceCmd = program.command('create-namespace <name>');
-    createNamespaceCmd.description('Create a new namespace')
-        .action((name) => {
-        const { registryUrl, pat } = program.opts();
-        create_namespace_1.createNamespace({ name, registryUrl, pat })
-            .catch(util_1.handleError(program.debug));
-    });
-    const publishCmd = program.command('publish [extension.vsix]');
-    publishCmd.description('Publish an extension, packaging it first if necessary.')
-        .option('-t, --target <targets...>', 'Target architectures')
-        .option('-i, --packagePath <paths...>', 'Publish the provided VSIX packages.')
-        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with this URL.')
-        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with this URL.')
-        .option('--yarn', 'Use yarn instead of npm while packing extension files.')
-        .option('--pre-release', 'Mark this package as a pre-release')
-        .action((extensionFile, { target, packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease }) => {
-        if (extensionFile !== undefined && packagePath !== undefined) {
-            console.error('\u274c  Please specify either a package file or a package path, but not both.\n');
-            publishCmd.help();
-        }
-        if (extensionFile !== undefined && target !== undefined) {
-            console.warn("Ignoring option '--target' for prepackaged extension.");
-            target = undefined;
-        }
-        if (extensionFile !== undefined && baseContentUrl !== undefined)
-            console.warn("Ignoring option '--baseContentUrl' for prepackaged extension.");
-        if (extensionFile !== undefined && baseImagesUrl !== undefined)
-            console.warn("Ignoring option '--baseImagesUrl' for prepackaged extension.");
-        if (extensionFile !== undefined && yarn !== undefined)
-            console.warn("Ignoring option '--yarn' for prepackaged extension.");
-        const { registryUrl, pat } = program.opts();
-        publish_1.publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease })
-            .catch(util_1.handleError(program.debug, 'See the documentation for more information:\n'
-            + 'https://github.com/eclipse/openvsx/wiki/Publishing-Extensions'));
-    });
-    const getCmd = program.command('get <namespace.extension>');
-    getCmd.description('Download an extension or its metadata.')
-        .option('-t, --target <target>', 'Target architecture')
-        .option('-v, --versionRange <version>', 'Specify an exact version or a version range.')
-        .option('-o, --output <path>', 'Save the output in the specified file or directory.')
-        .option('--metadata', 'Print the extension\'s metadata instead of downloading it.')
-        .action((extensionId, { target, versionRange, output, metadata }) => {
-        const { registryUrl } = program.opts();
-        get_1.getExtension({ extensionId, target: target, version: versionRange, registryUrl, output, metadata })
-            .catch(util_1.handleError(program.debug));
-    });
-    program
-        .command('*', '', { noHelp: true })
-        .action((cmd) => {
-        const availableCommands = program.commands.map((c) => c._name);
-        const actualCommand = cmd.args[0];
-        if (actualCommand) {
-            const suggestion = availableCommands.find(c => leven(c, actualCommand) < c.length * 0.4);
-            if (suggestion)
-                console.error(`Unknown command '${actualCommand}', did you mean '${suggestion}'?\n`);
-            else
-                console.error(`Unknown command '${actualCommand}'.\n`);
-        }
-        else {
-            console.error('Unknown command.');
-        }
-        program.help();
-    });
-    program.parse(argv);
-    if (process.argv.length <= 2) {
-        program.help();
-    }
-};
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2019 TypeFox and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander = require("commander");
+const leven = require("leven");
+const create_namespace_1 = require("./create-namespace");
+const publish_1 = require("./publish");
+const util_1 = require("./util");
+const get_1 = require("./get");
+const pkg = require('../package.json');
+module.exports = function (argv) {
+    const program = new commander.Command();
+    program.usage('<command> [options]')
+        .option('-r, --registryUrl <url>', 'Use the registry API at this base URL.')
+        .option('-p, --pat <token>', 'Personal access token.')
+        .option('--debug', 'Include debug information on error')
+        .version(pkg.version, '-V, --version', 'Print the Eclipse Open VSX CLI version');
+    const createNamespaceCmd = program.command('create-namespace <name>');
+    createNamespaceCmd.description('Create a new namespace')
+        .action((name) => {
+        const { registryUrl, pat } = program.opts();
+        create_namespace_1.createNamespace({ name, registryUrl, pat })
+            .catch(util_1.handleError(program.debug));
+    });
+    const publishCmd = program.command('publish [extension.vsix]');
+    publishCmd.description('Publish an extension, packaging it first if necessary.')
+        .option('-t, --target <targets...>', 'Target architectures')
+        .option('-i, --packagePath <paths...>', 'Publish the provided VSIX packages.')
+        .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with this URL.')
+        .option('--baseImagesUrl <url>', 'Prepend all relative image links in README.md with this URL.')
+        .option('--yarn', 'Use yarn instead of npm while packing extension files.')
+        .option('--pre-release', 'Mark this package as a pre-release')
+        .action((extensionFile, { target, packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease }) => {
+        if (extensionFile !== undefined && packagePath !== undefined) {
+            console.error('\u274c  Please specify either a package file or a package path, but not both.\n');
+            publishCmd.help();
+        }
+        if (extensionFile !== undefined && target !== undefined) {
+            console.warn("Ignoring option '--target' for prepackaged extension.");
+            target = undefined;
+        }
+        if (extensionFile !== undefined && baseContentUrl !== undefined)
+            console.warn("Ignoring option '--baseContentUrl' for prepackaged extension.");
+        if (extensionFile !== undefined && baseImagesUrl !== undefined)
+            console.warn("Ignoring option '--baseImagesUrl' for prepackaged extension.");
+        if (extensionFile !== undefined && yarn !== undefined)
+            console.warn("Ignoring option '--yarn' for prepackaged extension.");
+        const { registryUrl, pat } = program.opts();
+        publish_1.publish({ extensionFile, registryUrl, pat, targets: typeof target === 'string' ? [target] : target, packagePath: typeof packagePath === 'string' ? [packagePath] : packagePath, baseContentUrl, baseImagesUrl, yarn, preRelease })
+            .then(results => {
+            const reasons = results.filter(result => result.status === 'rejected')
+                .map(result => result)
+                .map(rejectedResult => rejectedResult.reason);
+            if (reasons.length > 0) {
+                const message = 'See the documentation for more information:\n'
+                    + 'https://github.com/eclipse/openvsx/wiki/Publishing-Extensions';
+                const errorHandler = util_1.handleError(program.debug, message, false);
+                for (const reason of reasons) {
+                    errorHandler(reason);
+                }
+                process.exit(1);
+            }
+        });
+    });
+    const getCmd = program.command('get <namespace.extension>');
+    getCmd.description('Download an extension or its metadata.')
+        .option('-t, --target <target>', 'Target architecture')
+        .option('-v, --versionRange <version>', 'Specify an exact version or a version range.')
+        .option('-o, --output <path>', 'Save the output in the specified file or directory.')
+        .option('--metadata', 'Print the extension\'s metadata instead of downloading it.')
+        .action((extensionId, { target, versionRange, output, metadata }) => {
+        const { registryUrl } = program.opts();
+        get_1.getExtension({ extensionId, target: target, version: versionRange, registryUrl, output, metadata })
+            .catch(util_1.handleError(program.debug));
+    });
+    program
+        .command('*', '', { noHelp: true })
+        .action((cmd) => {
+        const availableCommands = program.commands.map((c) => c._name);
+        const actualCommand = cmd.args[0];
+        if (actualCommand) {
+            const suggestion = availableCommands.find(c => leven(c, actualCommand) < c.length * 0.4);
+            if (suggestion)
+                console.error(`Unknown command '${actualCommand}', did you mean '${suggestion}'?\n`);
+            else
+                console.error(`Unknown command '${actualCommand}'.\n`);
+        }
+        else {
+            console.error('Unknown command.');
+        }
+        program.help();
+    });
+    program.parse(argv);
+    if (process.argv.length <= 2) {
+        program.help();
+    }
+};
 //# sourceMappingURL=main.js.map

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";AAAA;;;;;;;;kFAQkF;;AAElF,uCAAuC;AACvC,+BAA+B;AAC/B,yDAAqD;AACrD,uCAAoC;AACpC,iCAAqC;AACrC,+BAAqC;AAErC,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvC,MAAM,CAAC,OAAO,GAAG,UAAU,IAAc;IACrC,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;IACxC,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC;SAC/B,MAAM,CAAC,yBAAyB,EAAE,wCAAwC,CAAC;SAC3E,MAAM,CAAC,mBAAmB,EAAE,wBAAwB,CAAC;SACrD,MAAM,CAAC,SAAS,EAAE,oCAAoC,CAAC;SACvD,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,EAAE,wCAAwC,CAAC,CAAC;IAErF,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACtE,kBAAkB,CAAC,WAAW,CAAC,wBAAwB,CAAC;SACnD,MAAM,CAAC,CAAC,IAAY,EAAE,EAAE;QACrB,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5C,kCAAe,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;aACtC,KAAK,CAAC,kBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAC/D,UAAU,CAAC,WAAW,CAAC,wDAAwD,CAAC;SAC3E,MAAM,CAAC,2BAA2B,EAAE,sBAAsB,CAAC;SAC3D,MAAM,CAAC,8BAA8B,EAAE,qCAAqC,CAAC;SAC7E,MAAM,CAAC,wBAAwB,EAAE,wDAAwD,CAAC;SAC1F,MAAM,CAAC,uBAAuB,EAAE,8DAA8D,CAAC;SAC/F,MAAM,CAAC,QAAQ,EAAE,wDAAwD,CAAC;SAC1E,MAAM,CAAC,eAAe,EAAE,oCAAoC,CAAC;SAC7D,MAAM,CAAC,CAAC,aAAqB,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE;QACxG,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE;YAC1D,OAAO,CAAC,KAAK,CAAC,iFAAiF,CAAC,CAAC;YACjG,UAAU,CAAC,IAAI,EAAE,CAAC;SACrB;QACD,IAAI,aAAa,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE;YACrD,OAAO,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YACtE,MAAM,GAAG,SAAS,CAAC;SACtB;QACD,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS;YAC3D,OAAO,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;QAClF,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS;YAC1D,OAAO,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QACjF,IAAI,aAAa,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;YACjD,OAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;QACxE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5C,iBAAO,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;aAC7N,KAAK,CAAC,kBAAW,CAAC,OAAO,CAAC,KAAK,EAC5B,+CAA+C;cAC7C,+DAA+D,CACpE,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC5D,MAAM,CAAC,WAAW,CAAC,wCAAwC,CAAC;SACvD,MAAM,CAAC,uBAAuB,EAAE,qBAAqB,CAAC;SACtD,MAAM,CAAC,8BAA8B,EAAE,8CAA8C,CAAC;SACtF,MAAM,CAAC,qBAAqB,EAAE,qDAAqD,CAAC;SACpF,MAAM,CAAC,YAAY,EAAE,4DAA4D,CAAC;SAClF,MAAM,CAAC,CAAC,WAAmB,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;QACxE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QACvC,kBAAY,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;aAC9F,KAAK,CAAC,kBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEP,OAAO;SACF,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAClC,MAAM,CAAC,CAAC,GAAsB,EAAE,EAAE;QAC/B,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAa,CAAC;QAChF,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,aAAa,EAAE;YACf,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;YACzF,IAAI,UAAU;gBACV,OAAO,CAAC,KAAK,CAAC,oBAAoB,aAAa,oBAAoB,UAAU,MAAM,CAAC,CAAC;;gBAErF,OAAO,CAAC,KAAK,CAAC,oBAAoB,aAAa,MAAM,CAAC,CAAC;SAC9D;aAAM;YACH,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACrC;QACD,OAAO,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;IAEP,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEpB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;QAC1B,OAAO,CAAC,IAAI,EAAE,CAAC;KAClB;AACL,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/lib/ovsx

@@ -1,10 +1,10 @@
-#!/usr/bin/env node
-
-const semver = require('semver');
-
-if (semver.lt(process.versions.node, '14.0.0')) {
-    console.error('ovsx requires at least NodeJS version 14. Check your installed version with `node --version`.');
-    process.exit(1);
-}
-
-require('./main')(process.argv);
+#!/usr/bin/env node
+
+const semver = require('semver');
+
+if (semver.lt(process.versions.node, '14.0.0')) {
+    console.error('ovsx requires at least NodeJS version 14. Check your installed version with `node --version`.');
+    process.exit(1);
+}
+
+require('./main')(process.argv);

package/lib/publish.d.ts

@@ -1,40 +1,40 @@
-import { RegistryOptions } from './registry';
-/**
- * Publishes an extension.
- */
-export declare function publish(options?: PublishOptions): Promise<void>;
-interface PublishCommonOptions extends RegistryOptions {
-    /**
-     * Path to the vsix file to be published. Cannot be used together with `packagePath`.
-     */
-    extensionFile?: string;
-    /**
-     * The base URL for links detected in Markdown files. Only valid with `packagePath`.
-     */
-    baseContentUrl?: string;
-    /**
-     * The base URL for images detected in Markdown files. Only valid with `packagePath`.
-     */
-    baseImagesUrl?: string;
-    /**
-     * Should use `yarn` instead of `npm`. Only valid with `packagePath`.
-     */
-    yarn?: boolean;
-    /**
-     * Mark this package as a pre-release. Only valid with `packagePath`.
-     */
-    preRelease?: boolean;
-}
-export interface PublishOptions extends PublishCommonOptions {
-    /**
-     * Target architectures.
-     */
-    targets?: string[];
-    /**
-     * Paths to the extension to be packaged and published. Cannot be used together
-     * with `extensionFile`.
-     */
-    packagePath?: string[];
-}
-export {};
+import { RegistryOptions } from './registry';
+/**
+ * Publishes an extension.
+ */
+export declare function publish(options?: PublishOptions): Promise<PromiseSettledResult<void>[]>;
+interface PublishCommonOptions extends RegistryOptions {
+    /**
+     * Path to the vsix file to be published. Cannot be used together with `packagePath`.
+     */
+    extensionFile?: string;
+    /**
+     * The base URL for links detected in Markdown files. Only valid with `packagePath`.
+     */
+    baseContentUrl?: string;
+    /**
+     * The base URL for images detected in Markdown files. Only valid with `packagePath`.
+     */
+    baseImagesUrl?: string;
+    /**
+     * Should use `yarn` instead of `npm`. Only valid with `packagePath`.
+     */
+    yarn?: boolean;
+    /**
+     * Mark this package as a pre-release. Only valid with `packagePath`.
+     */
+    preRelease?: boolean;
+}
+export interface PublishOptions extends PublishCommonOptions {
+    /**
+     * Target architectures.
+     */
+    targets?: string[];
+    /**
+     * Paths to the extension to be packaged and published. Cannot be used together
+     * with `extensionFile`.
+     */
+    packagePath?: string[];
+}
+export {};
 //# sourceMappingURL=publish.d.ts.map

package/lib/publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAWA,OAAO,EAAY,eAAe,EAAE,MAAM,YAAY,CAAC;AAGvD;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAWzE;AAsCD,UAAU,oBAAqB,SAAQ,eAAe;IAClD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEA;IACA,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEA;IACA,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEA;IACA,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,cAAe,SAAQ,oBAAoB;IAExD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"AAWA,OAAO,EAAY,eAAe,EAAE,MAAM,YAAY,CAAC;AAGvD;;GAEG;AACH,wBAAsB,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAYjG;AAsCD,UAAU,oBAAqB,SAAQ,eAAe;IAClD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,cAAe,SAAQ,oBAAoB;IAExD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B"}

package/lib/publish.js

@@ -1,95 +1,80 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/********************************************************************************
- * Copyright (c) 2019 TypeFox and others
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- ********************************************************************************/
-const vsce_1 = require("vsce");
-const util_1 = require("./util");
-const registry_1 = require("./registry");
-const check_license_1 = require("./check-license");
-/**
- * Publishes an extension.
- */
-function publish(options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        util_1.addEnvOptions(options);
-        const internalPublishOptions = [];
-        const packagePaths = options.packagePath || [undefined];
-        const targets = options.targets || [undefined];
-        for (const packagePath of packagePaths) {
-            for (const target of targets) {
-                internalPublishOptions.push(Object.assign(Object.assign({}, options), { packagePath: packagePath, target: target }));
-            }
-        }
-        yield Promise.all(internalPublishOptions.map(publishOptions => doPublish(publishOptions)));
-    });
-}
-exports.publish = publish;
-function doPublish(options = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!options.pat) {
-            throw new Error("A personal access token must be given with the option '--pat'.");
-        }
-        // if the packagePath is a link to a vsix, don't need to package it
-        if (options.packagePath && options.packagePath.endsWith('.vsix')) {
-            options.extensionFile = options.packagePath;
-            delete options.packagePath;
-            delete options.target;
-        }
-        const registry = new registry_1.Registry(options);
-        if (!options.extensionFile) {
-            yield packageExtension(options, registry);
-            console.log(); // new line
-        }
-        else if (options.preRelease) {
-            console.warn("Ignoring option '--pre-release' for prepackaged extension.");
-        }
-        const extension = yield registry.publish(options.extensionFile, options.pat);
-        if (extension.error) {
-            throw new Error(extension.error);
-        }
-        const name = `${extension.namespace}.${extension.name}`;
-        let description = `${name} v${extension.version}`;
-        if (options.target) {
-            description += `@${options.target}`;
-        }
-        console.log(`\ud83d\ude80  Published ${description}`);
-        if (extension.warning) {
-            console.log(`\n!!  ${extension.warning}`);
-        }
-    });
-}
-function packageExtension(options, registry) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (registry.requiresLicense) {
-            yield check_license_1.checkLicense(options.packagePath);
-        }
-        options.extensionFile = yield util_1.createTempFile({ postfix: '.vsix' });
-        const createVSIXOptions = {
-            target: options.target,
-            cwd: options.packagePath,
-            packagePath: options.extensionFile,
-            baseContentUrl: options.baseContentUrl,
-            baseImagesUrl: options.baseImagesUrl,
-            useYarn: options.yarn,
-            preRelease: options.preRelease
-        };
-        yield vsce_1.createVSIX(createVSIXOptions);
-    });
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/********************************************************************************
+ * Copyright (c) 2019 TypeFox and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
+const vsce_1 = require("vsce");
+const util_1 = require("./util");
+const registry_1 = require("./registry");
+const check_license_1 = require("./check-license");
+/**
+ * Publishes an extension.
+ */
+async function publish(options = {}) {
+    util_1.addEnvOptions(options);
+    const internalPublishOptions = [];
+    const packagePaths = options.packagePath || [undefined];
+    const targets = options.targets || [undefined];
+    for (const packagePath of packagePaths) {
+        for (const target of targets) {
+            internalPublishOptions.push({ ...options, packagePath: packagePath, target: target });
+        }
+    }
+    return Promise.allSettled(internalPublishOptions.map(publishOptions => doPublish(publishOptions)));
+}
+exports.publish = publish;
+async function doPublish(options = {}) {
+    if (!options.pat) {
+        throw new Error("A personal access token must be given with the option '--pat'.");
+    }
+    // if the packagePath is a link to a vsix, don't need to package it
+    if (options.packagePath && options.packagePath.endsWith('.vsix')) {
+        options.extensionFile = options.packagePath;
+        delete options.packagePath;
+        delete options.target;
+    }
+    const registry = new registry_1.Registry(options);
+    if (!options.extensionFile) {
+        await packageExtension(options, registry);
+        console.log(); // new line
+    }
+    else if (options.preRelease) {
+        console.warn("Ignoring option '--pre-release' for prepackaged extension.");
+    }
+    const extension = await registry.publish(options.extensionFile, options.pat);
+    if (extension.error) {
+        throw new Error(extension.error);
+    }
+    const name = `${extension.namespace}.${extension.name}`;
+    let description = `${name} v${extension.version}`;
+    if (extension.targetPlatform !== 'universal') {
+        description += `@${extension.targetPlatform}`;
+    }
+    console.log(`\ud83d\ude80  Published ${description}`);
+    if (extension.warning) {
+        console.log(`\n!!  ${extension.warning}`);
+    }
+}
+async function packageExtension(options, registry) {
+    if (registry.requiresLicense) {
+        await check_license_1.checkLicense(options.packagePath);
+    }
+    options.extensionFile = await util_1.createTempFile({ postfix: '.vsix' });
+    const createVSIXOptions = {
+        target: options.target,
+        cwd: options.packagePath,
+        packagePath: options.extensionFile,
+        baseContentUrl: options.baseContentUrl,
+        baseImagesUrl: options.baseImagesUrl,
+        useYarn: options.yarn,
+        preRelease: options.preRelease
+    };
+    await vsce_1.createVSIX(createVSIXOptions);
+}
 //# sourceMappingURL=publish.js.map

package/lib/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../src/publish.ts"],"names":[],"mappings":"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"}