release-it 15.10.4 → 15.11.0

package/lib/index.js

@@ -15,7 +15,7 @@ const runTasks = async (opts, di) => {
     container.config = container.config || new Config(opts);
 
     const { config } = container;
-    const { isCI, isVerbose, verbosityLevel, isDryRun } = config;
+    const { isCI, isVerbose, verbosityLevel, isDryRun, isChangelog, isReleaseVersion } = config;
 
     container.log = container.log || new Logger({ isCI, isVerbose, verbosityLevel, isDryRun });
     container.spinner = container.spinner || new Spinner({ container, config });
@@ -62,6 +62,11 @@ const runTasks = async (opts, di) => {
     const latestVersion = (await reduceUntil(plugins, plugin => plugin.getLatestVersion())) || '0.0.0';
     const changelog = await reduceUntil(plugins, plugin => plugin.getChangelog(latestVersion));
 
+    if (isChangelog) {
+      console.log(changelog);
+      process.exit(0);
+    }
+
     const incrementBase = { latestVersion, increment, isPreRelease, preReleaseId };
 
     let version;
@@ -74,8 +79,12 @@ const runTasks = async (opts, di) => {
 
     config.setContext({ name, latestVersion, version, changelog });
 
-    const action = config.isIncrement ? 'release' : 'update';
-    const suffix = version && config.isIncrement ? `${latestVersion}...${version}` : `currently at ${latestVersion}`;
+    if (!isReleaseVersion) {
+      const action = config.isIncrement ? 'release' : 'update';
+      const suffix = version && config.isIncrement ? `${latestVersion}...${version}` : `currently at ${latestVersion}`;
+      log.obtrusive(`🚀 Let's ${action} ${name} (${suffix})`);
+      log.preview({ title: 'changelog', text: changelog });
+    }
 
     if (config.isIncrement) {
       version = version || (await reduceUntil(plugins, plugin => plugin.getIncrementedVersion(incrementBase)));
@@ -83,21 +92,13 @@ const runTasks = async (opts, di) => {
 
     if (!version) {
       log.obtrusive(`No new version to release`);
-    } else if (!config.isReleaseVersion && !config.isChangelog) {
-      log.obtrusive(`🚀 Let's ${action} ${name} (${suffix})`);
-      log.preview({ title: 'changelog', text: changelog });
     }
 
-    if (config.isReleaseVersion) {
+    if (isReleaseVersion) {
       console.log(version);
       process.exit(0);
     }
 
-    if (config.isChangelog) {
-      console.log(changelog);
-      process.exit(0);
-    }
-
     if (version) {
       config.setContext(parseVersion(version));
 

package/lib/plugin/npm/npm.js

@@ -13,6 +13,7 @@ const MANIFEST_PATH = './package.json';
 const DEFAULT_TAG = 'latest';
 const DEFAULT_TAG_PRERELEASE = 'next';
 const NPM_BASE_URL = 'https://www.npmjs.com';
+const NPM_PUBLIC_PATH = '/package';
 
 const fixArgs = args => (args ? (typeof args === 'string' ? args.split(' ') : args) : []);
 
@@ -198,7 +199,8 @@ class npm extends Plugin {
 
   getPackageUrl() {
     const baseUrl = this.getRegistry() || NPM_BASE_URL;
-    return urlJoin(baseUrl, 'package', this.getName());
+    const publicPath = this.getPublicPath() || NPM_PUBLIC_PATH;
+    return urlJoin(baseUrl, publicPath, this.getName());
   }
 
   getRegistry() {
@@ -213,6 +215,11 @@ class npm extends Plugin {
     return registries[0];
   }
 
+  getPublicPath() {
+    const { publishConfig } = this.getContext();
+    return (publishConfig && publishConfig.publicPath) ?? '';
+  }
+
   async guessPreReleaseTag() {
     const [tag] = await this.getRegistryPreReleaseTags();
     if (tag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "15.10.4",
+  "version": "15.11.0",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",
@@ -89,7 +89,7 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@octokit/request-error": "4.0.0",
+    "@octokit/request-error": "3.0.3",
     "ava": "5.3.0",
     "eslint": "8.41.0",
     "eslint-config-prettier": "8.8.0",

package/test/npm.js

@@ -18,6 +18,23 @@ test('should return npm package url (custom registry)', t => {
   t.is(npmClient.getPackageUrl(), 'https://registry.example.org/package/my-cool-package');
 });
 
+test('should return npm package url (custom publicPath)', t => {
+  const options = { npm: { name: 'my-cool-package', publishConfig: { publicPath: '/custom/public-path' } } };
+  const npmClient = factory(npm, { options });
+  t.is(npmClient.getPackageUrl(), 'https://www.npmjs.com/custom/public-path/my-cool-package');
+});
+
+test('should return npm package url (custom registry and publicPath)', t => {
+  const options = {
+    npm: {
+      name: 'my-cool-package',
+      publishConfig: { registry: 'https://registry.example.org/', publicPath: '/custom/public-path' }
+    }
+  };
+  const npmClient = factory(npm, { options });
+  t.is(npmClient.getPackageUrl(), 'https://registry.example.org/custom/public-path/my-cool-package');
+});
+
 test('should return default tag', async t => {
   const npmClient = factory(npm);
   const tag = await npmClient.resolveTag();