@vscode/vsce 2.24.0 → 2.24.1-0

package/dist/vsce.d.ts

@@ -172,6 +172,7 @@ export declare interface IPublishOptions {
     readonly allowMissingRepository?: boolean;
     readonly skipDuplicate?: boolean;
     readonly skipLicense?: boolean;
+    readonly sigzipPath?: string[];
 }
 
 /**

package/out/main.js

@@ -151,6 +151,7 @@ module.exports = function (argv) {
         .option('--no-git-tag-version', 'Do not create a version commit and tag when calling `npm version`. Valid only when [version] is provided.')
         .option('--no-update-package-json', 'Do not update `package.json`. Valid only when [version] is provided.')
         .option('-i, --packagePath <paths...>', 'Publish the provided VSIX packages.')
+        .option('--sigzipPath <paths...>', 'Signature archives to publish alongside the VSIX packages.')
         .option('--githubBranch <branch>', 'The GitHub branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
         .option('--gitlabBranch <branch>', 'The GitLab branch used to infer relative links in README.md. Can be overridden by --baseContentUrl and --baseImagesUrl.')
         .option('--baseContentUrl <url>', 'Prepend all relative links in README.md with the specified URL.')
@@ -169,7 +170,7 @@ module.exports = function (argv) {
         .option('--allow-missing-repository', 'Allow missing a repository URL in package.json')
         .option('--skip-duplicate', 'Fail silently if version already exists on the marketplace')
         .option('--skip-license', 'Allow publishing without license file')
-        .action((version, { pat, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipDuplicate, skipLicense, }) => main((0, publish_1.publish)({
+        .action((version, { pat, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, sigzipPath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipDuplicate, skipLicense, }) => main((0, publish_1.publish)({
         pat,
         version,
         targets: target,
@@ -180,6 +181,7 @@ module.exports = function (argv) {
         gitTagVersion,
         updatePackageJson,
         packagePath,
+        sigzipPath,
         githubBranch,
         gitlabBranch,
         baseContentUrl,

package/out/publish.js

@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unpublish = exports.publish = void 0;
 const fs = __importStar(require("fs"));
@@ -34,6 +37,8 @@ const store_1 = require("./store");
 const util_2 = require("./util");
 const zip_1 = require("./zip");
 const validation_1 = require("./validation");
+const form_data_1 = __importDefault(require("form-data"));
+const path_1 = require("path");
 const tmpName = (0, util_1.promisify)(tmp.tmpName);
 async function publish(options = {}) {
     if (options.packagePath) {
@@ -43,7 +48,8 @@ async function publish(options = {}) {
         else if (options.targets) {
             throw new Error(`Both options not supported simultaneously: 'packagePath' and 'target'. Use 'vsce package --target <target>' to first create a platform specific package, then use 'vsce publish --packagePath <path>' to publish it.`);
         }
-        for (const packagePath of options.packagePath) {
+        for (let index = 0; index < options.packagePath.length; index++) {
+            const packagePath = options.packagePath[index];
             const vsix = await (0, zip_1.readVSIXPackage)(packagePath);
             let target;
             try {
@@ -64,7 +70,7 @@ async function publish(options = {}) {
                     throw new Error(`Cannot use '--pre-release' flag with a package that was not packaged as pre-release. Please package it using the '--pre-release' flag and publish again.`);
                 }
             }
-            await _publish(packagePath, vsix.manifest, { ...options, target });
+            await _publish(packagePath, options.sigzipPath?.[index], vsix.manifest, { ...options, target });
         }
     }
     else {
@@ -77,18 +83,18 @@ async function publish(options = {}) {
             for (const target of options.targets) {
                 const packagePath = await tmpName();
                 const packageResult = await (0, package_1.pack)({ ...options, target, packagePath });
-                await _publish(packagePath, packageResult.manifest, { ...options, target });
+                await _publish(packagePath, undefined, packageResult.manifest, { ...options, target });
             }
         }
         else {
             const packagePath = await tmpName();
             const packageResult = await (0, package_1.pack)({ ...options, packagePath });
-            await _publish(packagePath, packageResult.manifest, options);
+            await _publish(packagePath, undefined, packageResult.manifest, options);
         }
     }
 }
 exports.publish = publish;
-async function _publish(packagePath, manifest, options) {
+async function _publish(packagePath, sigzipPath, manifest, options) {
     (0, validation_1.validatePublisher)(manifest.publisher);
     if (manifest.enableProposedApi && !options.allowAllProposedApis && !options.noVerify) {
         throw new Error("Extensions using proposed API (enableProposedApi: true) can't be published to the Marketplace. Use --allow-all-proposed-apis to bypass.");
@@ -129,26 +135,36 @@ async function _publish(packagePath, manifest, options) {
                     throw new Error(`${description} already exists.`);
                 }
             }
-            try {
-                await api.updateExtension(undefined, packageStream, manifest.publisher, manifest.name);
+            if (sigzipPath) {
+                await _publishSignedPackage(api, (0, path_1.basename)(packagePath), packageStream, (0, path_1.basename)(sigzipPath), fs.createReadStream(sigzipPath), manifest);
             }
-            catch (err) {
-                if (err.statusCode === 409) {
-                    if (options.skipDuplicate) {
-                        util_2.log.done(`Version ${manifest.version} is already published. Skipping publish.`);
-                        return;
+            else {
+                try {
+                    await api.updateExtension(undefined, packageStream, manifest.publisher, manifest.name);
+                }
+                catch (err) {
+                    if (err.statusCode === 409) {
+                        if (options.skipDuplicate) {
+                            util_2.log.done(`Version ${manifest.version} is already published. Skipping publish.`);
+                            return;
+                        }
+                        else {
+                            throw new Error(`${description} already exists.`);
+                        }
                     }
                     else {
-                        throw new Error(`${description} already exists.`);
+                        throw err;
                     }
                 }
-                else {
-                    throw err;
-                }
             }
         }
         else {
-            await api.createExtension(undefined, packageStream);
+            if (sigzipPath) {
+                await _publishSignedPackage(api, (0, path_1.basename)(packagePath), packageStream, (0, path_1.basename)(sigzipPath), fs.createReadStream(sigzipPath), manifest);
+            }
+            else {
+                await api.createExtension(undefined, packageStream);
+            }
         }
     }
     catch (err) {
@@ -165,6 +181,19 @@ async function _publish(packagePath, manifest, options) {
     util_2.log.info(`Hub URL: ${(0, util_2.getHubUrl)(manifest.publisher, manifest.name)}`);
     util_2.log.done(`Published ${description}.`);
 }
+async function _publishSignedPackage(api, packageName, packageStream, sigzipName, sigzipStream, manifest) {
+    const extensionType = 'Visual Studio Code';
+    const form = new form_data_1.default();
+    const lineBreak = '\r\n';
+    form.setBoundary('0f411892-ef48-488f-89d3-4f0546e84723');
+    form.append('vsix', packageStream, {
+        header: `--${form.getBoundary()}${lineBreak}Content-Disposition: attachment; name=vsix; filename=${packageName}${lineBreak}Content-Type: application/octet-stream${lineBreak}${lineBreak}`
+    });
+    form.append('sigzip', sigzipStream, {
+        header: `--${form.getBoundary()}${lineBreak}Content-Disposition: attachment; name=sigzip; filename=${sigzipName}${lineBreak}Content-Type: application/octet-stream${lineBreak}${lineBreak}`
+    });
+    return await api.publishExtensionWithPublisherSignature(undefined, form, manifest.publisher, manifest.name, extensionType);
+}
 async function unpublish(options = {}) {
     let publisher, name;
     if (options.id) {

package/out/store.js

@@ -137,7 +137,7 @@ async function verifyPat(pat, publisherName) {
 }
 exports.verifyPat = verifyPat;
 async function requestPAT(publisherName) {
-    console.log('https://marketplace.visualstudio.com/manage/publishers/');
+    console.log(`${(0, util_1.getMarketplaceUrl)()}/manage/publishers/`);
     const pat = await (0, util_1.read)(`Personal Access Token for publisher '${publisherName}':`, { silent: true, replace: '*' });
     await verifyPat(pat, publisherName);
     return pat;

package/out/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchOptionsWithManifest = exports.log = exports.sequence = exports.CancellationToken = exports.isCancelledError = exports.nonnull = exports.flatten = exports.chain = exports.normalize = exports.getPublicGalleryAPI = exports.getSecurityRolesAPI = exports.getGalleryAPI = exports.getHubUrl = exports.getPublishedUrl = exports.read = void 0;
+exports.patchOptionsWithManifest = exports.log = exports.sequence = exports.CancellationToken = exports.isCancelledError = exports.nonnull = exports.flatten = exports.chain = exports.normalize = exports.getPublicGalleryAPI = exports.getSecurityRolesAPI = exports.getGalleryAPI = exports.getHubUrl = exports.getMarketplaceUrl = exports.getPublishedUrl = exports.read = void 0;
 const util_1 = require("util");
 const read_1 = __importDefault(require("read"));
 const WebApi_1 = require("azure-devops-node-api/WebApi");
@@ -24,6 +24,10 @@ function getPublishedUrl(extension) {
     return `${marketplaceUrl}/items?itemName=${extension}`;
 }
 exports.getPublishedUrl = getPublishedUrl;
+function getMarketplaceUrl() {
+    return marketplaceUrl;
+}
+exports.getMarketplaceUrl = getMarketplaceUrl;
 function getHubUrl(publisher, name) {
     return `${marketplaceUrl}/manage/publishers/${publisher}/extensions/${name}/hub`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.24.0",
+	"version": "2.24.1-0",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -38,10 +38,11 @@
 		"node": ">= 14"
 	},
 	"dependencies": {
-		"azure-devops-node-api": "^11.0.1",
+		"azure-devops-node-api": "^12.5.0",
 		"chalk": "^2.4.2",
 		"cheerio": "^1.0.0-rc.9",
 		"commander": "^6.2.1",
+		"form-data": "^4.0.0",
 		"glob": "^7.0.6",
 		"hosted-git-info": "^4.0.2",
 		"jsonc-parser": "^3.2.0",