@semantic-release/release-notes-generator 6.0.10 → 6.1.1

package/README.md

@@ -11,7 +11,7 @@ Customizable release-notes-generator plugin for [semantic-release](https://githu
 
 ## Options
 
-By default `release-notes-generator` uses the `angular` format described in [Angular convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/convention.md).
+By default `release-notes-generator` uses the `angular` format described in [Angular convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
 
 Additional options can be set within the plugin definition in `package.json` to use a different commit format and to customize it:
 
@@ -38,7 +38,9 @@ Additional options can be set within the plugin definition in `package.json` to
 | `parserOpts` | Additional [conventional-commits-parser](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-commits-parser#conventionalcommitsparseroptions) options that will extends ones loaded by `preset` or `config`. See [Parser options](#parser-options). | -         |
 | `writerOpts` | Additional [conventional-commits-writer](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-writer#options) options that will extends ones loaded by `preset` or `config`. See [Writer options](#writer-options).                        | -         |
 
-**NOTE:** `options.config` will be overwritten by the values of preset. You should use either `preset` or `config`, but not both. Individual properties of `parserOpts` and `writerOpts` will overwrite ones loaded with `preset` or `config`.
+**Note**: `config` will be overwritten by the values of `preset`. You should use either `preset` or `config`, but not both.
+
+**Note**: Individual properties of `parserOpts` and `writerOpts` will override ones loaded with an explicitly set `preset` or `config`. If `preset` or `config` are not set, only the properties set in `parserOpts` and `writerOpts` will be used.
 
 ### Parser Options
 

package/index.js

@@ -3,25 +3,28 @@ const {find} = require('lodash');
 const getStream = require('get-stream');
 const intoStream = require('into-stream');
 const gitUrlParse = require('git-url-parse');
-const conventionalCommitsParser = require('conventional-commits-parser').sync;
-const conventionalChangelogWriter = require('conventional-changelog-writer');
+const parser = require('conventional-commits-parser').sync;
+const writer = require('conventional-changelog-writer');
+const filter = require('conventional-commits-filter');
 const debug = require('debug')('semantic-release:release-notes-generator');
 const loadChangelogConfig = require('./lib/load-changelog-config');
 const HOSTS_CONFIG = require('./lib/hosts-config');
 
 /**
- * Generate the changelog for all the commits since the last release.
+ * Generate the changelog for all the commits in `options.commits`.
  *
- * @param {Object} [pluginConfig={}] semantic-release configuration
- * @param {string} pluginConfig.preset conventional-changelog preset ('angular', 'atom', 'codemirror', 'ember', 'eslint', 'express', 'jquery', 'jscs', 'jshint')
- * @param {string} pluginConfig.config requierable npm package with a custom conventional-changelog preset
+ * @param {Object} [pluginConfig={}] semantic-release configuration.
+ * @param {String} pluginConfig.preset conventional-changelog preset ('angular', 'atom', 'codemirror', 'ember', 'eslint', 'express', 'jquery', 'jscs', 'jshint').
+ * @param {String} pluginConfig.config requierable npm package with a custom conventional-changelog preset
  * @param {Object} pluginConfig.parserOpts additional `conventional-changelog-parser` options that will overwrite ones loaded by `preset` or `config`.
  * @param {Object} pluginConfig.writerOpts additional `conventional-changelog-writer` options that will overwrite ones loaded by `preset` or `config`.
- * @param {Object} options semantic-release options
- * @param {Array<Object>} options.commits array of commits, each containing `hash` and `message`
- * @param {Object>} options.lastRelease last release with `gitHead` corresponding to the commit hash used to make the last release and `gitTag` corresponding to the git tag associated with `gitHead`
- * @param {Object>} options.nextRelease next release with `gitHead` corresponding to the commit hash used to make the  release, the release `version` and `gitTag` corresponding to the git tag associated with `gitHead`
- * @param {Object} options.options.repositoryUrl git repository URL
+ * @param {Object} options semantic-release options.
+ * @param {Array<Object>} options.commits array of commits, each containing `hash` and `message`.
+ * @param {Object} options.lastRelease last release with `gitHead` corresponding to the commit hash used to make the last release and `gitTag` corresponding to the git tag associated with `gitHead`.
+ * @param {Object} options.nextRelease next release with `gitHead` corresponding to the commit hash used to make the  release, the release `version` and `gitTag` corresponding to the git tag associated with `gitHead`.
+ * @param {Object} options.options.repositoryUrl git repository URL.
+ *
+ * @returns {String} the changelog for all the commits in `options.commits`.
  */
 async function releaseNotesGenerator(pluginConfig, {commits, lastRelease, nextRelease, options: {repositoryUrl}}) {
   const {parserOpts, writerOpts} = await loadChangelogConfig(pluginConfig);
@@ -31,10 +34,12 @@ async function releaseNotesGenerator(pluginConfig, {commits, lastRelease, nextRe
 
   const {issue, commit, referenceActions, issuePrefixes} =
     find(HOSTS_CONFIG, conf => conf.hostname === hostname) || HOSTS_CONFIG.default;
-  const parsedCommits = commits.map(rawCommit => ({
-    ...rawCommit,
-    ...conventionalCommitsParser(rawCommit.message, {referenceActions, issuePrefixes, ...parserOpts}),
-  }));
+  const parsedCommits = filter(
+    commits.map(rawCommit => ({
+      ...rawCommit,
+      ...parser(rawCommit.message, {referenceActions, issuePrefixes, ...parserOpts}),
+    }))
+  );
   const previousTag = lastRelease.gitTag || lastRelease.gitHead;
   const currentTag = nextRelease.gitTag || nextRelease.gitHead;
   const context = {
@@ -56,7 +61,7 @@ async function releaseNotesGenerator(pluginConfig, {commits, lastRelease, nextRe
   debug('previousTag: %o', previousTag);
   debug('currentTag: %o', currentTag);
 
-  return getStream(intoStream.obj(parsedCommits).pipe(conventionalChangelogWriter(context, writerOpts)));
+  return getStream(intoStream.obj(parsedCommits).pipe(writer(context, writerOpts)));
 }
 
 module.exports = releaseNotesGenerator;

package/lib/load-changelog-config.js

@@ -1,6 +1,5 @@
 const {promisify} = require('util');
 const importFrom = require('import-from');
-const {mergeWith} = require('lodash');
 const conventionalChangelogAngular = require('conventional-changelog-angular');
 
 /**
@@ -13,14 +12,14 @@ const conventionalChangelogAngular = require('conventional-changelog-angular');
  * @return {Promise<Object>} a `Promise` that resolve to the `conventional-changelog-core` config.
  */
 module.exports = async ({preset, config, parserOpts, writerOpts}) => {
-  let loadedConfig = {};
+  let loadedConfig;
 
   if (preset) {
     const presetPackage = `conventional-changelog-${preset.toLowerCase()}`;
     loadedConfig = importFrom.silent(__dirname, presetPackage) || importFrom(process.cwd(), presetPackage);
   } else if (config) {
     loadedConfig = importFrom.silent(__dirname, config) || importFrom(process.cwd(), config);
-  } else if (!parserOpts || !writerOpts) {
+  } else {
     loadedConfig = conventionalChangelogAngular;
   }
 
@@ -30,12 +29,8 @@ module.exports = async ({preset, config, parserOpts, writerOpts}) => {
     loadedConfig = await loadedConfig;
   }
 
-  return mergeWith(
-    {},
-    !preset && !config && parserOpts ? {parserOpts} : {parserOpts: loadedConfig.parserOpts},
-    {parserOpts},
-    !preset && !config && writerOpts ? {writerOpts} : {writerOpts: loadedConfig.writerOpts},
-    {writerOpts},
-    (value, source) => (Array.isArray(value) ? source : undefined)
-  );
+  return {
+    parserOpts: !preset && !config && parserOpts ? parserOpts : {...loadedConfig.parserOpts, ...parserOpts},
+    writerOpts: !preset && !config && writerOpts ? writerOpts : {...loadedConfig.writerOpts, ...writerOpts},
+  };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@semantic-release/release-notes-generator",
   "description": "Customizable release-notes-generator plugin for semantic-release",
-  "version": "6.0.10",
+  "version": "6.1.1",
   "author": "Pierre Vanduynslager (https://twitter.com/@pvdlg_)",
   "bugs": {
     "url": "https://github.com/semantic-release/release-notes-generator/issues"
@@ -16,12 +16,13 @@
     "Gregor Martynus (https://twitter.com/gr2m)"
   ],
   "dependencies": {
-    "conventional-changelog-angular": "^3.0.6",
-    "conventional-changelog-writer": "^3.0.9",
-    "conventional-commits-parser": "^2.1.7",
+    "conventional-changelog-angular": "^5.0.0",
+    "conventional-changelog-writer": "^4.0.0",
+    "conventional-commits-filter": "^2.0.0",
+    "conventional-commits-parser": "^3.0.0",
     "debug": "^3.1.0",
     "get-stream": "^3.0.0",
-    "git-url-parse": "^9.0.0",
+    "git-url-parse": "^10.0.1",
     "import-from": "^2.1.0",
     "into-stream": "^3.1.0",
     "lodash": "^4.17.4"
@@ -30,16 +31,16 @@
     "ava": "^0.25.0",
     "codecov": "^3.0.0",
     "commitizen": "^2.9.6",
-    "conventional-changelog-atom": "^0.2.8",
-    "conventional-changelog-ember": "^0.3.11",
-    "conventional-changelog-eslint": "^1.0.9",
-    "conventional-changelog-express": "^0.3.6",
-    "conventional-changelog-jshint": "^0.3.8",
+    "conventional-changelog-atom": "^2.0.0",
+    "conventional-changelog-ember": "^2.0.0",
+    "conventional-changelog-eslint": "^3.0.0",
+    "conventional-changelog-express": "^2.0.0",
+    "conventional-changelog-jshint": "^2.0.0",
     "cz-conventional-changelog": "^2.0.0",
     "escape-string-regexp": "^1.0.5",
-    "nyc": "^11.1.0",
+    "nyc": "^12.0.1",
     "semantic-release": "^15.0.0",
-    "xo": "^0.20.0"
+    "xo": "^0.21.0"
   },
   "engines": {
     "node": ">=8.3"
@@ -74,7 +75,8 @@
     "all": true
   },
   "prettier": {
-    "printWidth": 120
+    "printWidth": 120,
+    "trailingComma": "es5"
   },
   "publishConfig": {
     "access": "public",