Merge pull request #519 from semantic-release/beta

Author: travi

.github/workflows/test.yml

@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 18.0.0
-          - 19
+          - 18.17.0
+          - 20.6.1
           - 20
         os:
           - ubuntu-latest

.nvmrc

@@ -0,0 +1 @@
+v18

lib/load-parser-config.js

@@ -22,18 +22,12 @@ export default async ({ preset, config, parserOpts, presetConfig }, { cwd }) =>
 
   if (preset) {
     const presetPackage = `conventional-changelog-${preset.toLowerCase()}`;
-    loadedConfig = importFrom.silent(__dirname, presetPackage) || importFrom(cwd, presetPackage);
+    loadedConfig = await (importFrom.silent(__dirname, presetPackage) || importFrom(cwd, presetPackage))(presetConfig);
   } else if (config) {
-    loadedConfig = importFrom.silent(__dirname, config) || importFrom(cwd, config);
+    loadedConfig = await (importFrom.silent(__dirname, config) || importFrom(cwd, config))();
   } else {
-    loadedConfig = conventionalChangelogAngular;
+    loadedConfig = await conventionalChangelogAngular();
   }
 
-  loadedConfig = await (typeof loadedConfig === "function"
-    ? isPlainObject(presetConfig)
-      ? loadedConfig(presetConfig)
-      : promisify(loadedConfig)()
-    : loadedConfig);
-
   return { ...loadedConfig.parserOpts, ...parserOpts };
 };

package-lock.json

@@ -17,8 +17,8 @@
     "Gregor Martynus (https://twitter.com/gr2m)"
   ],
   "dependencies": {
-    "conventional-changelog-angular": "^6.0.0",
-    "conventional-commits-filter": "^3.0.0",
+    "conventional-changelog-angular": "^7.0.0",
+    "conventional-commits-filter": "^4.0.0",
     "conventional-commits-parser": "^5.0.0",
     "debug": "^4.0.0",
     "import-from": "^4.0.0",
@@ -28,18 +28,18 @@
   "devDependencies": {
     "ava": "5.3.1",
     "c8": "8.0.1",
-    "conventional-changelog-atom": "3.0.0",
+    "conventional-changelog-atom": "4.0.0",
     "conventional-changelog-conventionalcommits": "6.1.0",
-    "conventional-changelog-ember": "3.0.0",
-    "conventional-changelog-eslint": "4.0.0",
-    "conventional-changelog-express": "3.0.0",
-    "conventional-changelog-jshint": "3.0.0",
+    "conventional-changelog-ember": "4.0.0",
+    "conventional-changelog-eslint": "5.0.0",
+    "conventional-changelog-express": "4.0.0",
+    "conventional-changelog-jshint": "4.0.0",
     "prettier": "3.0.3",
     "semantic-release": "22.0.0",
     "sinon": "16.0.0"
   },
   "engines": {
-    "node": ">=18"
+    "node": "^18.17 || >=20.6.1"
   },
   "files": [
     "lib",

package.json

@@ -99,14 +99,14 @@ test('Accept a partial "parseOpts" object as option', async (t) => {
 
 test("Exclude commits if they have a matching revert commits", async (t) => {
   const commits = [
-    { hash: "123", message: "feat(scope): First feature" },
-    { hash: "456", message: "revert: feat(scope): First feature\n\nThis reverts commit 123.\n" },
     { message: "fix(scope): First fix" },
+    { hash: "456", message: "revert: feat(scope): First feature\n\nThis reverts commit 123.\n" },
+    { hash: "123", message: "feat(scope): First feature" },
   ];
   const releaseType = await analyzeCommits({}, { cwd, commits, logger: t.context.logger });
 
   t.is(releaseType, "patch");
-  t.true(t.context.log.calledWith("Analyzing commit: %s", commits[2].message));
+  t.true(t.context.log.calledWith("Analyzing commit: %s", commits[0].message));
   t.true(t.context.log.calledWith("The release type for the commit is %s", "patch"));
   t.true(t.context.log.calledWith("Analysis of %s commits complete: %s release", 3, "patch"));
 });

test/integration.test.js

@@ -36,7 +36,7 @@ loadConfig.title = (providedTitle, config) => `${providedTitle} Load "${config}"
 test('Load "conventional-changelog-angular" by default', async (t) => {
   t.deepEqual(
     await loadParserConfig({}, { cwd }),
-    (await (await import("conventional-changelog-angular")).default).parserOpts
+    (await (await import("conventional-changelog-angular")).default()).parserOpts
   );
 });