index.js

@@ -4,6 +4,7 @@ const vscePrepare = require('./lib/prepare');
 
 let verified = false;
 let prepared = false;
+let packagePath;
 
 async function verifyConditions (pluginConfig, { logger }) {
   await verifyVsce(logger);
@@ -15,7 +16,7 @@ async function prepare (pluginConfig, { nextRelease: { version }, logger }) {
     await verifyVsce(logger);
     verified = true;
   }
-  await vscePrepare(version, pluginConfig.packageVsix, pluginConfig.yarn, logger);
+  packagePath = await vscePrepare(version, pluginConfig.packageVsix, pluginConfig.yarn, logger);
   prepared = true;
 }
 
@@ -27,9 +28,9 @@ async function publish (pluginConfig, { nextRelease: { version }, logger }) {
 
   if (!prepared) {
     // BC: prior to semantic-release v15 prepare was part of publish
-    await vscePrepare(version, pluginConfig.packageVsix, pluginConfig.yarn, logger);
+    packagePath = await vscePrepare(version, pluginConfig.packageVsix, pluginConfig.yarn, logger);
   }
-  return vscePublish(version, pluginConfig.yarn, logger);
+  return vscePublish(version, packagePath, pluginConfig.yarn, logger);
 }
 
 module.exports = {

lib/prepare.js

@@ -1,22 +1,27 @@
 const execa = require('execa');
-const updatePackageVersion = require('./update-package-version');
+const { readJson } = require('fs-extra');
 
 module.exports = async (version, packageVsix, yarn, logger) => {
-  await updatePackageVersion(version, logger);
-
   if (packageVsix) {
-    logger.log('Packaging version %s as .vsix', version);
-
-    const options = ['package'];
+    let packagePath;
 
     if (typeof packageVsix === 'string') {
-      options.push(...['--out', packageVsix]);
+      packagePath = packageVsix;
+    } else {
+      const { name } = await readJson('./package.json');
+      packagePath = `${name}-${version}.vsix`;
     }
 
+    logger.log(`Packaging version ${version} to ${packagePath}`);
+
+    const options = ['package', version, '--no-git-tag-version', '--out', packagePath];
+
     if (yarn) {
       options.push('--yarn');
     }
 
     await execa('vsce', options, { stdio: 'inherit' });
+
+    return packagePath;
   }
 };

lib/publish.js

@@ -1,21 +1,27 @@
 const execa = require('execa');
 const { readJson } = require('fs-extra');
 
-module.exports = async (version, yarn, logger) => {
+module.exports = async (version, packagePath, yarn, logger) => {
   const { publisher, name } = await readJson('./package.json');
 
-  logger.log('Publishing version %s to vs code marketplace', version);
-
   const options = ['publish'];
 
+  if (packagePath) {
+    logger.log(`Publishing version ${version} from ${packagePath} to Visual Studio Marketplace`);
+    options.push(...['--packagePath', packagePath]);
+  } else {
+    logger.log(`Publishing version ${version} to Visual Studio Marketplace`);
+    options.push(...[version, '--no-git-tag-version']);
+  }
+
   if (yarn) {
     options.push('--yarn');
   }
 
   await execa('vsce', options, { stdio: 'inherit' });
 
   const url = `https://marketplace.visualstudio.com/items?itemName=${publisher}.${name}`;
-  logger.log(`New version is available at ${url}`);
+  logger.log(`The new version is available at ${url}`);
   return {
     name: 'Visual Studio Marketplace',
     url

lib/verify-auth.js

@@ -2,20 +2,19 @@ const execa = require('execa');
 const SemanticReleaseError = require('@semantic-release/error');
 
 module.exports = async (logger) => {
-  logger.log('Verify authentication for vsce');
+  logger.log('Verifying authentication for vsce');
 
   if (!('VSCE_PAT' in process.env) && ('VSCE_TOKEN' in process.env)) {
     logger.log('VSCE_TOKEN is deprecated and may be removed in the next major release, please use VSCE_PAT instead.');
     process.env.VSCE_PAT = process.env.VSCE_TOKEN;
   }
 
   if (!process.env.VSCE_PAT) {
-    throw new SemanticReleaseError('No vsce personal access token specified (set the "VSCE_PAT" environment variable).', 'ENOVSCEPAT');
+    throw new SemanticReleaseError('No vsce personal access token specified (set the `VSCE_PAT` environment variable).', 'ENOVSCEPAT');
   }
 
   try {
-    const options = ['verify-pat'];
-    execa.sync('vsce', options);
+    await execa('vsce', ['verify-pat']);
   } catch (e) {
     throw new SemanticReleaseError(`Invalid vsce token. Additional information:\n\n${e}`, 'EINVALIDVSCETOKEN');
   }

lib/verify-pkg.js

@@ -1,10 +1,29 @@
 const SemanticReleaseError = require('@semantic-release/error');
+const { readJson } = require('fs-extra');
+const fs = require('fs');
+
+module.exports = async () => {
+  if (!fs.existsSync('./package.json')) {
+    throw new SemanticReleaseError(
+      'The `package.json` was not found. A `package.json` is required to release with vsce.',
+      'ENOPKG'
+    );
+  }
+
+  let packageJson;
+
+  try {
+    packageJson = await readJson('./package.json');
+  } catch (error) {
+    throw new SemanticReleaseError('The `package.json` seems to be invalid.', 'EINVALIDPKG');
+  }
+
+  const { name, publisher } = packageJson;
 
-module.exports = ({ name, publisher }) => {
   if (!name) {
-    throw new SemanticReleaseError('No "name" found in package.json.', 'ENOPKGNAME');
+    throw new SemanticReleaseError('No `name` found in `package.json`.', 'ENOPKGNAME');
   }
   if (!publisher) {
-    throw new SemanticReleaseError('No "publisher" found in package.json.', 'ENOPUBLISHER');
+    throw new SemanticReleaseError('No `publisher` found in `package.json`.', 'ENOPUBLISHER');
   }
 };

lib/verify.js

@@ -1,17 +1,8 @@
 const verifyPkg = require('./verify-pkg');
 const verifyAuth = require('./verify-auth');
-const getPkg = require('read-pkg-up');
-const SemanticReleaseError = require('@semantic-release/error');
 
 module.exports = async logger => {
-  const { packageJson } = await getPkg();
-  if (!packageJson) {
-    throw new SemanticReleaseError(
-      'package.json not found. A package.json is required to release with vsce.',
-      'ENOPKG'
-    );
-  }
-  verifyPkg(packageJson);
+  await verifyPkg();
 
-  verifyAuth(logger);
+  await verifyAuth(logger);
 };