release-it 15.1.2 → 15.2.0

package/README.md

@@ -297,16 +297,16 @@ Using Inquirer.js inside custom hook scripts might cause issues (since release-i
 
 Since v11, release-it can be extended in many, many ways. Here are some plugins:
 
-| Plugin                                                                                     | Description                                                                   |
-| ------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------- |
-| [@release-it/bumper](https://github.com/release-it/bumper)                                 | Read & write the version from/to any file                                     |
-| [@release-it/conventional-changelog](https://github.com/release-it/conventional-changelog) | Provides recommended bump, conventional-changelog, and updates `CHANGELOG.md` |
-| [@release-it/keep-a-changelog](https://github.com/release-it/keep-a-changelog)             | Maintain CHANGELOG.md using the Keep a Changelog standards                    |
-| [release-it-lerna-changelog](https://github.com/rwjblue/release-it-lerna-changelog)        | Integrates lerna-changelog into the release-it pipeline                       |
-| [release-it-yarn-workspaces](https://github.com/rwjblue/release-it-yarn-workspaces)        | Releases each of your projects configured workspaces                          |
-| [release-it-calver-plugin](https://github.com/casmith/release-it-calver-plugin)            | Enables Calendar Versioning (calver) with release-it                          |
-| [@grupoboticario/news-fragments](https://github.com/grupoboticario/news-fragments)         | An easy way to generate your changelog file                                   |
-| [@j-ulrich/release-it-regex-bumper](https://github.com/j-ulrich/release-it-regex-bumper)   | Regular expression based version read/write plugin for release-it             |
+| Plugin                                                                                       | Description                                                                   |
+| -------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
+| [@release-it/bumper](https://github.com/release-it/bumper)                                   | Read & write the version from/to any file                                     |
+| [@release-it/conventional-changelog](https://github.com/release-it/conventional-changelog)   | Provides recommended bump, conventional-changelog, and updates `CHANGELOG.md` |
+| [@release-it/keep-a-changelog](https://github.com/release-it/keep-a-changelog)               | Maintain CHANGELOG.md using the Keep a Changelog standards                    |
+| [@release-it-plugins/lerna-changelog](https://github.com/release-it-plugins/lerna-changelog) | Integrates lerna-changelog into the release-it pipeline                       |
+| [@release-it-plugins/workspaces](https://github.com/release-it-plugins/workspaces)           | Releases each of your projects configured workspaces                          |
+| [release-it-calver-plugin](https://github.com/casmith/release-it-calver-plugin)              | Enables Calendar Versioning (calver) with release-it                          |
+| [@grupoboticario/news-fragments](https://github.com/grupoboticario/news-fragments)           | An easy way to generate your changelog file                                   |
+| [@j-ulrich/release-it-regex-bumper](https://github.com/j-ulrich/release-it-regex-bumper)     | Regular expression based version read/write plugin for release-it             |
 
 Internally, release-it uses its own plugin architecture (for Git, GitHub, GitLab, npm).
 

package/lib/plugin/factory.js

@@ -37,7 +37,15 @@ const load = async pluginName => {
       plugin = module.default;
     }
   }
-  return [path.parse(pluginName).name, plugin];
+  return [getPluginName(pluginName), plugin];
+};
+
+export const getPluginName = pluginName => {
+  if (pluginName.startsWith('.')) {
+    return path.parse(pluginName).name;
+  }
+
+  return pluginName;
 };
 
 export let getPlugins = async (config, container) => {

package/lib/util.js

@@ -48,10 +48,10 @@ const rejectAfter = (ms, error) =>
 
 const parseGitUrl = remoteUrl => {
   if (!remoteUrl) return { host: null, owner: null, project: null, protocol: null, remote: null, repository: null };
-  const normalizedUrl = (remoteUrl || '').replace(/\\/g, '/');
+  const normalizedUrl = (remoteUrl || '').replace(/^[A-Z]:/, '').replace(/\\/g, '/'); // Hacky workaround for file protocol in Windows
   const parsedUrl = gitUrlParse(normalizedUrl);
   const { resource: host, name: project, protocol, href: remote } = parsedUrl;
-  const owner = protocol === 'file' ? _.last(parsedUrl.owner.split('/')) : parsedUrl.owner;
+  const owner = protocol === 'file' ? _.last(parsedUrl.owner.split('/')) : parsedUrl.owner; // Fix owner for file protocol
   const repository = `${owner}/${project}`;
   return { host, owner, project, protocol, remote, repository };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "15.1.2",
+  "version": "15.2.0",
   "description": "Generic CLI tool to automate versioning and package publishing related tasks.",
   "keywords": [
     "build",
@@ -38,7 +38,8 @@
   "type": "module",
   "exports": {
     ".": "./lib/index.js",
-    "./test/util.js": "./test/util/index.js"
+    "./package.json": "./package.json",
+    "./test/util/index.js": "./test/util/index.js"
   },
   "files": [
     "bin",
@@ -65,15 +66,15 @@
     "cosmiconfig": "7.0.1",
     "execa": "6.1.0",
     "form-data": "4.0.0",
-    "git-url-parse": "11.6.0",
+    "git-url-parse": "12.0.0",
     "globby": "13.1.2",
-    "got": "12.1.0",
-    "inquirer": "9.0.1",
+    "got": "12.2.0",
+    "inquirer": "9.0.2",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "new-github-release-url": "2.0.0",
-    "node-fetch": "3.2.8",
+    "node-fetch": "3.2.9",
     "open": "8.4.0",
     "ora": "6.1.2",
     "os-name": "5.0.1",
@@ -89,14 +90,14 @@
   "devDependencies": {
     "@octokit/request-error": "3.0.0",
     "ava": "4.3.1",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-ava": "13.2.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.2.1",
     "mock-fs": "5.1.2",
     "mock-stdio": "1.0.3",
-    "nock": "13.2.8",
+    "nock": "13.2.9",
     "nyc": "15.1.0",
     "prettier": "2.7.1",
     "sinon": "14.0.0",

package/test/github.js

@@ -13,7 +13,7 @@ import {
 } from './stub/github.js';
 
 const tokenRef = 'GITHUB_TOKEN';
-const pushRepo = 'git://github.com:user/repo';
+const pushRepo = 'git://github.com/user/repo';
 const host = 'github.com';
 const git = { changelog: '' };
 const requestErrorOptions = { request: { url: '', headers: {} }, response: { headers: {} } };
@@ -198,7 +198,7 @@ test('should create new release for unreleased tag', async t => {
 });
 
 test('should release to enterprise host', async t => {
-  const options = { git, github: { tokenRef, pushRepo: 'git://github.example.org:user/repo' } };
+  const options = { git, github: { tokenRef, pushRepo: 'git://github.example.org/user/repo' } };
   const github = factory(GitHub, { options });
   const exec = sinon.stub(github.shell, 'exec').callThrough();
   exec.withArgs('git remote get-url origin').resolves(`https://github.example.org/user/repo`);
@@ -227,7 +227,7 @@ test('should release to alternative host and proxy', async t => {
     git,
     github: {
       tokenRef,
-      pushRepo: `git://custom.example.org:user/repo`,
+      pushRepo: `git://custom.example.org/user/repo`,
       host: 'custom.example.org',
       proxy: 'http://proxy:8080'
     }
@@ -402,7 +402,7 @@ test('should generate GitHub web release url for enterprise host', async t => {
   const options = {
     git,
     github: {
-      pushRepo: 'git://custom.example.org:user/repo',
+      pushRepo: 'git@custom.example.org:user/repo',
       release: true,
       web: true,
       host: 'custom.example.org',

package/test/plugin-name.js

@@ -0,0 +1,9 @@
+import test from 'ava';
+import { getPluginName } from '../lib/plugin/factory.js';
+
+test('pluginName can return correct name for variants', t => {
+  t.is(getPluginName('plain-plugin'), 'plain-plugin');
+  t.is(getPluginName('@some/scoped-plugin'), '@some/scoped-plugin');
+  t.is(getPluginName('@some/nested/scoped-plugin'), '@some/nested/scoped-plugin');
+  t.is(getPluginName('./relative-plugin.cjs'), 'relative-plugin');
+});

package/test/plugins.js

@@ -121,6 +121,57 @@ test.serial('should instantiate plugins and execute all release-cycle methods',
   });
 });
 
+test.serial('should instantiate plugins and execute all release-cycle methods for scoped plugins', async t => {
+  const { dir } = t.context;
+
+  const pluginDir = mkTmpDir();
+  sh.pushd('-q', pluginDir);
+  sh.ShellString(JSON.stringify({ name: '@scoped/my-plugin', version: '1.0.0', type: 'module' })).toEnd(
+    join(pluginDir, 'package.json')
+  );
+  sh.exec(`npm link release-it`);
+  const content = "import { Plugin } from 'release-it'; " + MyPlugin.toString() + '; export default MyPlugin;';
+  sh.ShellString(content).toEnd(join(pluginDir, 'index.js'));
+
+  sh.pushd('-q', dir);
+  sh.ShellString(JSON.stringify({ name: 'project', version: '1.0.0', type: 'module' })).toEnd(
+    join(dir, 'package.json')
+  );
+  sh.exec(`npm install ${pluginDir}`);
+  sh.exec(`npm link release-it`);
+
+  const config = {
+    plugins: {
+      '@scoped/my-plugin': {
+        name: 'foo'
+      }
+    }
+  };
+  const container = getContainer(config);
+
+  const result = await runTasks({}, container);
+
+  t.deepEqual(container.log.info.args, [
+    ['@scoped/my-plugin:foo:init'],
+    ['@scoped/my-plugin:foo:getName'],
+    ['@scoped/my-plugin:foo:getLatestVersion'],
+    ['@scoped/my-plugin:foo:getIncrement'],
+    ['@scoped/my-plugin:foo:getIncrementedVersionCI'],
+    ['@scoped/my-plugin:foo:beforeBump'],
+    ['@scoped/my-plugin:foo:bump:1.3.0'],
+    ['@scoped/my-plugin:foo:beforeRelease'],
+    ['@scoped/my-plugin:foo:release'],
+    ['@scoped/my-plugin:foo:afterRelease']
+  ]);
+
+  t.deepEqual(result, {
+    changelog: undefined,
+    name: 'new-project-name',
+    latestVersion: '1.2.3',
+    version: '1.3.0'
+  });
+});
+
 test.serial('should disable core plugins', async t => {
   const { dir } = t.context;
   sh.ShellString(JSON.stringify({ name: 'project', version: '1.0.0' })).toEnd(join(dir, 'package.json'));

package/test/tasks.interactive.js

@@ -60,7 +60,7 @@ const getHooks = plugins => {
 };
 
 test.before(t => {
-  t.timeout(60 * 1000);
+  t.timeout(90 * 1000);
 });
 
 test.serial.beforeEach(t => {