@vscode/vsce 2.26.1 → 2.26.2-1

package/dist/vsce.d.ts

@@ -118,6 +118,7 @@ export declare interface IPackageOptions {
     readonly allowStarActivation?: boolean;
     readonly allowMissingRepository?: boolean;
     readonly skipLicense?: boolean;
+    readonly signTool?: string;
 }
 
 /**
@@ -174,6 +175,7 @@ export declare interface IPublishOptions {
     readonly skipDuplicate?: boolean;
     readonly skipLicense?: boolean;
     readonly sigzipPath?: string[];
+    readonly signTool?: string;
 }
 
 /**

package/out/main.js

@@ -114,7 +114,8 @@ module.exports = function (argv) {
         .option('--allow-star-activation', 'Allow using * in activation events')
         .option('--allow-missing-repository', 'Allow missing a repository URL in package.json')
         .option('--skip-license', 'Allow packaging without license file')
-        .action((version, { out, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipLicense, }) => main((0, package_1.packageCommand)({
+        .option('--sign-tool', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL <path/to/extension.signature.manifest> <path/to/extension.signature.p7s>`.')
+        .action((version, { out, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, githubBranch, gitlabBranch, rewriteRelativeLinks, baseContentUrl, baseImagesUrl, yarn, ignoreFile, gitHubIssueLinking, gitLabIssueLinking, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipLicense, signTool, }) => main((0, package_1.packageCommand)({
         packagePath: out,
         version,
         target,
@@ -138,6 +139,7 @@ module.exports = function (argv) {
         allowStarActivation,
         allowMissingRepository,
         skipLicense,
+        signTool,
     })));
     commander_1.default
         .command('publish [version]')
@@ -153,6 +155,7 @@ module.exports = function (argv) {
         .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('--sign-tool', 'Path to the VSIX signing tool. Will be invoked with two arguments: `SIGNTOOL <path/to/extension.signature.manifest> <path/to/extension.signature.p7s>`. This will be ignored if --sigzipPath is provided.')
         .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.')
@@ -171,7 +174,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, azureCredential, 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)({
+        .action((version, { pat, azureCredential, target, ignoreOtherTargetFolders, readmePath, changelogPath, message, gitTagVersion, updatePackageJson, packagePath, sigzipPath, githubBranch, gitlabBranch, baseContentUrl, baseImagesUrl, yarn, noVerify, allowProposedApis, allowAllProposedApis, ignoreFile, dependencies, preRelease, allowStarActivation, allowMissingRepository, skipDuplicate, skipLicense, signTool, }) => main((0, publish_1.publish)({
         pat,
         azureCredential,
         version,
@@ -199,6 +202,7 @@ module.exports = function (argv) {
         allowMissingRepository,
         skipDuplicate,
         skipLicense,
+        signTool
     })));
     commander_1.default
         .command('unpublish [extensionid]')

package/out/package.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ls = exports.listFiles = exports.packageCommand = exports.pack = exports.prepublish = exports.collect = exports.createDefaultProcessors = exports.processFiles = exports.toContentTypes = exports.toVsixManifest = exports.readManifest = exports.validateManifest = exports.ValidationProcessor = exports.NLSProcessor = exports.isWebKind = exports.LicenseProcessor = exports.ChangelogProcessor = exports.ReadmeProcessor = exports.MarkdownProcessor = exports.TagsProcessor = exports.ManifestProcessor = exports.Targets = exports.versionBump = exports.BaseProcessor = exports.read = void 0;
+exports.ls = exports.listFiles = exports.packageCommand = exports.signPackage = exports.pack = exports.prepublish = exports.collect = exports.createDefaultProcessors = exports.processFiles = exports.toContentTypes = exports.toVsixManifest = exports.readManifest = exports.validateManifest = exports.ValidationProcessor = exports.NLSProcessor = exports.isWebKind = exports.LicenseProcessor = exports.ChangelogProcessor = exports.ReadmeProcessor = exports.MarkdownProcessor = exports.TagsProcessor = exports.ManifestProcessor = exports.Targets = exports.versionBump = exports.BaseProcessor = exports.read = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const util_1 = require("util");
@@ -47,6 +47,7 @@ const npm_1 = require("./npm");
 const GitHost = __importStar(require("hosted-git-info"));
 const parse_semver_1 = __importDefault(require("parse-semver"));
 const jsonc = __importStar(require("jsonc-parser"));
+const vsce_sign_1 = require("@vscode/vsce-sign");
 const MinimatchOptions = { dot: true };
 function isInMemoryFile(file) {
     return !!file.contents;
@@ -1008,8 +1009,11 @@ function readManifest(cwd = process.cwd(), nls = true) {
     }
     const manifestNLS = fs.promises
         .readFile(manifestNLSPath, 'utf8')
-        .catch(err => (err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve('{}')))
+        .catch(err => (err.code !== 'ENOENT' ? Promise.reject(err) : Promise.resolve(undefined)))
         .then(raw => {
+        if (!raw) {
+            return Promise.resolve(undefined);
+        }
         try {
             return Promise.resolve(jsonc.parse(raw));
         }
@@ -1019,6 +1023,9 @@ function readManifest(cwd = process.cwd(), nls = true) {
         }
     });
     return Promise.all([manifest, manifestNLS]).then(([manifest, translations]) => {
+        if (!translations) {
+            return manifest;
+        }
         return (0, nls_1.patchNLS)(manifest, translations);
     });
 }
@@ -1343,6 +1350,20 @@ async function pack(options = {}) {
     return { manifest, packagePath, files };
 }
 exports.pack = pack;
+async function signPackage(packageFile, signScript) {
+    const packageFolder = path.dirname(packageFile);
+    const packageName = path.basename(packageFile, '.vsix');
+    const manifestFile = path.join(packageFolder, `${packageName}.signature.manifest`);
+    const signatureFile = path.join(packageFolder, `${packageName}.signature.p7s`);
+    const signatureZip = path.join(packageFolder, `${packageName}.signature.zip`);
+    // Generate the signature manifest file
+    await (0, vsce_sign_1.generateManifest)(packageFile, manifestFile);
+    // Sign the manifest file to generate the signature file
+    cp.spawnSync(signScript, [manifestFile, signatureFile], { stdio: 'inherit' });
+    // Create a signature zip file containing the manifest and signature file
+    return (0, vsce_sign_1.zip)(manifestFile, signatureFile, signatureZip);
+}
+exports.signPackage = signPackage;
 async function packageCommand(options = {}) {
     const cwd = options.cwd || process.cwd();
     const manifest = await readManifest(cwd);
@@ -1350,6 +1371,9 @@ async function packageCommand(options = {}) {
     await prepublish(cwd, manifest, options.useYarn);
     await versionBump(options);
     const { packagePath, files } = await pack(options);
+    if (options.signTool) {
+        await signPackage(packagePath, options.signTool);
+    }
     const stats = await fs.promises.stat(packagePath);
     let size = 0;
     let unit = '';

package/out/publish.js

@@ -72,7 +72,11 @@ async function publish(options = {}) {
                 }
             }
             validateMarketplaceRequirements(vsix.manifest, options);
-            await _publish(packagePath, options.sigzipPath?.[index], vsix.manifest, { ...options, target });
+            let sigzipPath = options.sigzipPath?.[index];
+            if (!sigzipPath && options.signTool) {
+                sigzipPath = await (0, package_1.signPackage)(packagePath, options.signTool);
+            }
+            await _publish(packagePath, sigzipPath, vsix.manifest, { ...options, target });
         }
     }
     else {
@@ -87,13 +91,15 @@ 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, undefined, packageResult.manifest, { ...options, target });
+                const sigzipPath = options.signTool ? await (0, package_1.signPackage)(packagePath, options.signTool) : undefined;
+                await _publish(packagePath, sigzipPath, packageResult.manifest, { ...options, target });
             }
         }
         else {
             const packagePath = await tmpName();
             const packageResult = await (0, package_1.pack)({ ...options, packagePath });
-            await _publish(packagePath, undefined, packageResult.manifest, options);
+            const sigzipPath = options.signTool ? await (0, package_1.signPackage)(packagePath, options.signTool) : undefined;
+            await _publish(packagePath, sigzipPath, packageResult.manifest, options);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "2.26.1",
+	"version": "2.26.2-1",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -39,6 +39,7 @@
 	},
 	"dependencies": {
 		"@azure/identity": "^4.1.0",
+		"@vscode/vsce-sign": "^2.0.0",
 		"azure-devops-node-api": "^12.5.0",
 		"chalk": "^2.4.2",
 		"cheerio": "^1.0.0-rc.9",