release-it 20.0.0-0 → 20.0.0-1

package/README.md

@@ -44,7 +44,7 @@ npm install -D release-it
     "release": "release-it"
   },
   "devDependencies": {
-    "release-it": "^19.0.0"
+    "release-it": "^20.0.0"
   }
 }
 ```
@@ -99,7 +99,7 @@ Here's a quick example `.release-it.json`:
 
 ```json
 {
-  "$schema": "https://unpkg.com/release-it@19/schema/release-it.json",
+  "$schema": "https://unpkg.com/release-it@20/schema/release-it.json",
   "git": {
     "commitMessage": "chore: release v${version}"
   },
@@ -280,7 +280,7 @@ Note that arguments need to be quoted properly when used from the command line:
 release-it --'hooks.after:release="echo Successfully released ${name} v${version} to ${repo.repository}."'
 ```
 
-Using Inquirer.js inside custom hook scripts might cause issues (since release-it also uses this itself).
+Using @inquirer/prompts inside custom hook scripts might cause issues (since release-it also uses this itself).
 
 ## Dry Runs
 
@@ -353,15 +353,16 @@ release-it programmatically][58] for example code.
 
 ## Node.js version support
 
-The latest major version is v19, supporting Node.js 20 and up:
+The latest major version is v20, supporting Node.js 20 and up:
 
-| release-it | Node.js |
-| :--------: | :-----: |
-|    v19     |   v20   |
-|    v18     |   v20   |
-|    v17     |   v18   |
-|    v16     |   v16   |
-|    v15     |   v14   |
+| release-it | Node.js  |
+| :--------: | :------- |
+|    v20     | v20.19.0 |
+|    v19     | v20.12.0 |
+|    v18     | v20      |
+|    v17     | v18      |
+|    v16     | v16      |
+|    v15     | v14      |
 
 Also see [CHANGELOG.md][80] for dates and details.
 

package/lib/plugin/npm/npm.js

@@ -187,21 +187,25 @@ class npm extends Plugin {
     return this.exec(`npm show ${name}@${tag} version${registryArg}`, { options: getOptions() }).catch(() => null);
   }
 
-  getRegistryPreReleaseTags() {
+  getRegistryDistTags() {
     return this.exec(`npm view ${this.getName()} dist-tags --json`, { options: getOptions() }).then(
       output => {
         try {
-          const tags = JSON.parse(output);
-          return Object.keys(tags).filter(tag => tag !== DEFAULT_TAG);
+          return JSON.parse(output);
         } catch (err) {
           this.debug(err);
-          return [];
+          return {};
         }
       },
-      () => []
+      () => ({})
     );
   }
 
+  async getRegistryPreReleaseTags() {
+    const tags = await this.getRegistryDistTags();
+    return Object.keys(tags).filter(tag => tag !== DEFAULT_TAG);
+  }
+
   getPackageUrl() {
     const baseUrl = this.getRegistry() || NPM_BASE_URL;
     const publicPath = this.getPublicPath() || NPM_PUBLIC_PATH;
@@ -226,13 +230,18 @@ class npm extends Plugin {
   }
 
   async guessPreReleaseTag() {
-    const [tag] = await this.getRegistryPreReleaseTags();
-    if (tag) {
-      return tag;
-    } else {
-      this.log.warn(`Unable to get pre-release tag(s) from npm registry. Using "${DEFAULT_TAG_PRERELEASE}".`);
-      return DEFAULT_TAG_PRERELEASE;
-    }
+    const distTags = await this.getRegistryDistTags();
+    const latestVersion = this.getLatestVersion();
+    const match = Object.entries(distTags).find(
+      ([tag, version]) => tag !== DEFAULT_TAG && version === latestVersion
+    );
+    if (match) return match[0];
+
+    const [tag] = Object.keys(distTags).filter(tag => tag !== DEFAULT_TAG);
+    if (tag) return tag;
+
+    this.log.warn(`Unable to get pre-release tag(s) from npm registry. Using "${DEFAULT_TAG_PRERELEASE}".`);
+    return DEFAULT_TAG_PRERELEASE;
   }
 
   async resolveTag(version) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "20.0.0-0",
+  "version": "20.0.0-1",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",

package/test/npm.js

@@ -44,14 +44,22 @@ describe('npm', async () => {
 
   test('should resolve default tag for pre-release', async t => {
     const npmClient = await factory(npm);
-    t.mock.method(npmClient, 'getRegistryPreReleaseTags', () => []);
+    t.mock.method(npmClient, 'getRegistryDistTags', () => ({}));
     const tag = await npmClient.resolveTag('1.0.0-0');
     assert.equal(tag, 'next');
   });
 
-  test('should guess tag from registry for pre-release', async t => {
+  test('should guess tag from registry for pre-release matching current version', async t => {
     const npmClient = await factory(npm);
-    t.mock.method(npmClient, 'getRegistryPreReleaseTags', () => ['alpha']);
+    npmClient.setContext({ latestVersion: '1.0.0-0' });
+    t.mock.method(npmClient, 'getRegistryDistTags', () => ({ latest: '0.9.0', alpha: '1.0.0-alpha.1', next: '1.0.0-0' }));
+    const tag = await npmClient.resolveTag('1.0.0-1');
+    assert.equal(tag, 'next');
+  });
+
+  test('should guess first pre-release tag from registry when no version match', async t => {
+    const npmClient = await factory(npm);
+    t.mock.method(npmClient, 'getRegistryDistTags', () => ({ latest: '0.9.0', alpha: '1.0.0-alpha.1' }));
     const tag = await npmClient.resolveTag('1.0.0-0');
     assert.equal(tag, 'alpha');
   });
@@ -112,17 +120,15 @@ describe('npm', async () => {
     const exec = t.mock.method(npmClient.shell, 'exec', command => {
       if (command === 'npm whoami --registry registry.example.org') return Promise.resolve('john');
       const re = /npm access (list collaborators --json|ls-collaborators) release-it --registry registry.example.org/;
-      if (re.test.command) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
       return Promise.resolve();
     });
 
     await runTasks(npmClient);
-    assert.equal(exec.mock.calls[0].arguments[0], 'npm ping --registry registry.example.org');
-    assert.equal(exec.mock.calls[1].arguments[0], 'npm whoami --registry registry.example.org');
-    assert.match(
-      exec.mock.calls[2].arguments[0],
-      /npm show release-it@[a-z]+ version --registry registry\.example\.org/
-    );
+    const commands = exec.mock.calls.map(c => c.arguments[0]);
+    assert(commands.includes('npm ping --registry registry.example.org'));
+    assert(commands.includes('npm whoami --registry registry.example.org'));
+    assert(commands.some(c => /npm show release-it@[a-z]+ version --registry registry\.example\.org/.test(c)));
   });
 
   test('should not throw when executing tasks', async t => {
@@ -130,7 +136,7 @@ describe('npm', async () => {
     t.mock.method(npmClient.shell, 'exec', command => {
       if (command === 'npm whoami') return Promise.resolve('john');
       const re = /npm access (list collaborators --json|ls-collaborators) release-it/;
-      if (re.test.command) return Promise.resolve(JSON.stringify({ john: ['write'] }));
+      if (re.test(command)) return Promise.resolve(JSON.stringify({ john: ['write'] }));
       return Promise.resolve();
     });
     await assert.doesNotReject(runTasks(npmClient));

package/test/tasks.interactive.js

@@ -113,7 +113,7 @@ describe('tasks.interactive', () => {
     });
 
     const config = {
-      $schema: 'https://unpkg.com/release-it@19/schema/release-it.json',
+      $schema: 'https://unpkg.com/release-it@20/schema/release-it.json',
       extends: 'github:release-it/release-it-configuration',
       config: true
     };
@@ -137,7 +137,7 @@ describe('tasks.interactive', () => {
     renameSync('.git', 'foo');
 
     const config = {
-      $schema: 'https://unpkg.com/release-it@19/schema/release-it.json',
+      $schema: 'https://unpkg.com/release-it@20/schema/release-it.json',
       extends: false
     };