conventional-recommended-bump 4.0.0 → 4.1.1

package/CHANGELOG.md

@@ -3,6 +3,72 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.1](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.1.0...conventional-recommended-bump@4.1.1) (2019-04-11)
+
+
+### Bug Fixes
+
+* preset load error message should handle objects ([fb4a8d1](https://github.com/conventional-changelog/conventional-changelog/commit/fb4a8d1))
+
+
+
+
+
+# [4.1.0](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.0.4...conventional-recommended-bump@4.1.0) (2019-04-10)
+
+
+### Bug Fixes
+
+* **deps:** update dependency concat-stream to v2 ([#401](https://github.com/conventional-changelog/conventional-changelog/issues/401)) ([4c09bfc](https://github.com/conventional-changelog/conventional-changelog/commit/4c09bfc))
+
+
+### Features
+
+* conventionalcommits preset, preMajor config option ([#434](https://github.com/conventional-changelog/conventional-changelog/issues/434)) ([dde12fe](https://github.com/conventional-changelog/conventional-changelog/commit/dde12fe))
+* **conventional-recommended-bump:** send options to whatBump ([#409](https://github.com/conventional-changelog/conventional-changelog/issues/409)) ([508d6d6](https://github.com/conventional-changelog/conventional-changelog/commit/508d6d6)), closes [/github.com/lerna/lerna/blob/a6733a2b864cf9d082d080bbd3bfedb04e59b0ab/core/conventional-commits/lib/recommend-version.js#L13-L21](https://github.com//github.com/lerna/lerna/blob/a6733a2b864cf9d082d080bbd3bfedb04e59b0ab/core/conventional-commits/lib/recommend-version.js/issues/L13-L21)
+
+
+
+
+
+## [4.0.4](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.0.3...conventional-recommended-bump@4.0.4) (2018-11-01)
+
+
+### Bug Fixes
+
+* fix broken release of conventional-recommended-bump ([d9267e8](https://github.com/conventional-changelog/conventional-changelog/commit/d9267e8))
+
+
+
+
+
+## [4.0.3](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.0.2...conventional-recommended-bump@4.0.3) (2018-11-01)
+
+**Note:** Version bump only for package conventional-recommended-bump
+
+
+
+
+
+## [4.0.2](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.0.1...conventional-recommended-bump@4.0.2) (2018-11-01)
+
+
+### Bug Fixes
+
+* Upgrade to Lerna 3, fix Node.js v11 error ([#385](https://github.com/conventional-changelog/conventional-changelog/issues/385)) ([cdef282](https://github.com/conventional-changelog/conventional-changelog/commit/cdef282))
+
+
+
+
+
+<a name="4.0.1"></a>
+## [4.0.1](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@4.0.0...conventional-recommended-bump@4.0.1) (2018-08-21)
+
+
+
+
+**Note:** Version bump only for package conventional-recommended-bump
+
 <a name="4.0.0"></a>
 # [4.0.0](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-recommended-bump@3.0.0...conventional-recommended-bump@4.0.0) (2018-06-06)
 

package/index.js

@@ -16,7 +16,7 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
     throw new Error(`The 'options' argument must be an object.`)
   }
 
-  const options = Object.assign({ignoreReverted: true}, optionsArgument)
+  const options = Object.assign({ ignoreReverted: true }, optionsArgument)
 
   const cb = typeof parserOptsArgument === `function` ? parserOptsArgument : cbArgument
 
@@ -29,7 +29,12 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
     try {
       presetPackage = conventionalChangelogPresetLoader(options.preset)
     } catch (err) {
-      return cb(new Error(`Unable to load the "${options.preset}" preset package. Please make sure it's installed.`))
+      if (err.message === 'does not exist') {
+        const preset = typeof options.preset === 'object' ? options.preset.name : options.preset
+        return cb(new Error(`Unable to load the "${preset}" preset package. Please make sure it's installed.`))
+      } else {
+        return cb(err)
+      }
     }
   }
 
@@ -73,7 +78,7 @@ function conventionalRecommendedBump (optionsArgument, parserOptsArgument, cbArg
             warn(`No commits since last release`)
           }
 
-          let result = whatBump(commits)
+          let result = whatBump(commits, options)
 
           if (result && result.level != null) {
             result.releaseType = VERSIONS[result.level]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "conventional-recommended-bump",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "description": "Get a recommended version bump based on conventional commits",
   "bugs": {
     "url": "https://github.com/conventional-changelog/conventional-changelog/issues"
@@ -31,25 +31,18 @@
     "bump"
   ],
   "dependencies": {
-    "concat-stream": "^1.6.0",
-    "conventional-changelog-preset-loader": "^2.0.0",
-    "conventional-commits-filter": "^2.0.0",
-    "conventional-commits-parser": "^3.0.0",
-    "git-raw-commits": "^2.0.0",
-    "git-semver-tags": "^2.0.0",
+    "concat-stream": "^2.0.0",
+    "conventional-changelog-preset-loader": "^2.1.1",
+    "conventional-commits-filter": "^2.0.2",
+    "conventional-commits-parser": "^3.0.2",
+    "git-raw-commits": "2.0.0",
+    "git-semver-tags": "^2.0.2",
     "meow": "^4.0.0",
     "q": "^1.5.1"
   },
-  "devDependencies": {
-    "better-than-before": "^1.0.0",
-    "core-assert": "^0.2.0",
-    "shelljs": "^0.8.0",
-    "temp": "^0.8.3"
-  },
   "scripts": {
-    "lint": "eslint --fix .",
-    "test": "npm run-script lint && mocha --timeout 30000 *.spec.js",
-    "test-windows": "mocha --timeout 30000 preset-resolver.spec.js"
+    "test-windows": "mocha --timeout 30000 ./test/preset-resolver.spec.js"
   },
-  "bin": "cli.js"
+  "bin": "cli.js",
+  "gitHead": "c0314ad9cd0b30d456a65385b70988cd5f4b3410"
 }

package/preset-resolver.js

@@ -2,6 +2,21 @@
 
 const Q = require(`q`)
 
-module.exports = presetPackage => (typeof presetPackage === `function` || typeof presetPackage === `object`)
-  ? (typeof presetPackage === `function` ? Q.nfcall(presetPackage) : new Q(presetPackage))
-  : Promise.reject(new Error(`preset package must be a promise, funciton, or object`))
+module.exports = presetResolver
+
+function presetResolver (presetPackage) {
+  // start the chain as a Q.Promise
+  return Q.resolve().then(() => {
+    // handle traditional node-style callbacks
+    if (typeof presetPackage === `function`) {
+      return Q.nfcall(presetPackage)
+    }
+
+    // handle object literal or Promise instance
+    if (typeof presetPackage === `object`) {
+      return Q(presetPackage)
+    }
+
+    throw new Error(`preset package must be a promise, function, or object`)
+  })
+}