feedback

microsoft · Jun 3, 2024 · 0690689 · 0690689
1 parent a1ededd
commit 0690689
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -117,7 +117,7 @@ module.exports = function (argv: string[]): void {
 		.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')
-		.option('--sign', 'Script to sign the VSIX package. VSIX manifest will be passed as an argument. Generates <package-name>.signature.zip alongside the VSIX package.')
+		.option('--signtool', '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,

diff --git a/src/package.ts b/src/package.ts
@@ -1843,24 +1843,18 @@ export async function pack(options: IPackageOptions = {}): Promise<IPackageResul
 	return { manifest, packagePath, files };
 }
 
-export async function signPackage(packagePath: string, signScript: string): Promise<string> {
-	const manifestPath = await generateManifest(packagePath);
-	await new Promise<void>((c, e) => {
-		const proc = cp.execFile(signScript, [manifestPath], {}, (error, _stdout, stderr) => {
-			if (error) {
-				return e(error);
-			}
-			if (stderr) {
-				return e();
-			}
-			return c();
-		});
-		proc.stdout?.on('data', (data) => {
-			console.log(data.toString('utf8'));
-		});
-	});
-	const signatureFile = path.join(path.dirname(packagePath), '.signature.p7s');
-	return zip(manifestPath, signatureFile, path.basename(packagePath, '.vsix') + '.signature.zip');
+export async function signPackage(packageFile: string, signScript: string): Promise<string> {
+	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`);
+
+	await generateManifest(packageFile, manifestFile);
+	const { stdout } = await promisify(cp.execFile)(signScript, [manifestFile,  signatureFile]);
+	console.log(stdout);
+
+	return zip(manifestFile, signatureFile, signatureZip);
 }
 
 export async function packageCommand(options: IPackageOptions = {}): Promise<any> {