From d55737239530f5eee684e9cbf959f7238d609fd4 Mon Sep 17 00:00:00 2001 From: Kristoffer K Date: Fri, 6 Dec 2019 06:17:47 +0100 Subject: [PATCH] fix: use require.resolve for the default preset (#465) --- defaults.js | 2 +- lib/preset-loader.js | 7 ++++--- package.json | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults.js b/defaults.js index 202b8f4d4..fa5cb4287 100644 --- a/defaults.js +++ b/defaults.js @@ -12,7 +12,7 @@ const defaults = { skip: {}, dryRun: false, gitTagFallback: true, - preset: 'conventionalcommits' + preset: require.resolve('conventional-changelog-conventionalcommits') } /** diff --git a/lib/preset-loader.js b/lib/preset-loader.js index 72cb4d3ad..a7c077281 100644 --- a/lib/preset-loader.js +++ b/lib/preset-loader.js @@ -3,10 +3,11 @@ const spec = require('conventional-changelog-config-spec') module.exports = (args) => { - let preset = args.preset || 'conventionalcommits' - if (preset === 'conventionalcommits') { + const defaultPreset = require.resolve('conventional-changelog-conventionalcommits') + let preset = args.preset || defaultPreset + if (preset === defaultPreset) { preset = { - name: preset + name: defaultPreset } Object.keys(spec.properties).forEach(key => { if (args[key] !== undefined) preset[key] = args[key] diff --git a/package.json b/package.json index c39b56d57..c9e522122 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "chalk": "2.4.2", "conventional-changelog": "3.1.15", "conventional-changelog-config-spec": "2.1.0", + "conventional-changelog-conventionalcommits": "4.2.1", "conventional-recommended-bump": "6.0.5", "detect-indent": "6.0.0", "detect-newline": "3.1.0",