From 3f7d42fb08b5897b69b1f96fa7d514886db9d8e8 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Sun, 1 Oct 2017 17:40:28 -0400 Subject: [PATCH] fix: Load preset/config if semantic-release run as global install --- lib/load/parser-config.js | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/load/parser-config.js b/lib/load/parser-config.js index 76294d0e..d0df5d80 100644 --- a/lib/load/parser-config.js +++ b/lib/load/parser-config.js @@ -1,4 +1,4 @@ -const importCwd = require('import-cwd'); +const importFrom = require('import-from'); const pify = require('pify'); const {mergeWith} = require('lodash'); const SemanticReleaseError = require('@semantic-release/error'); @@ -16,14 +16,15 @@ module.exports = async ({preset, config, parserOpts}) => { let loadedConfig = {}; if (preset) { + const presetPackage = `conventional-changelog-${preset.toLowerCase()}`; try { - loadedConfig = importCwd(`conventional-changelog-${preset.toLowerCase()}`); + loadedConfig = importFrom.silent(__dirname, presetPackage) || importFrom(process.cwd(), presetPackage); } catch (err) { throw new SemanticReleaseError(`Preset: "${preset}" does not exist: ${err.message}`, err.code); } } else if (config) { try { - loadedConfig = importCwd(config); + loadedConfig = importFrom.silent(__dirname, config) || importFrom(process.cwd(), config); } catch (err) { throw new SemanticReleaseError(`Config: "${config}" does not exist: ${err.message}`, err.code); } diff --git a/package.json b/package.json index a3f15daa..ca217544 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@semantic-release/error": "^2.0.0", "conventional-changelog-angular": "^1.4.0", "conventional-commits-parser": "^2.0.0", - "import-cwd": "^2.1.0", + "import-from": "^2.1.0", "lodash": "^4.17.4", "pify": "^3.0.0" },