Merge branch 'master' of github.com:commitizen/cz-cli

jimthedev · jimthedev · commit 0ac499c09f01 · 2017-01-03T23:46:45.000-06:00
* 'master' of github.com:commitizen/cz-cli: Allow using ES6 modules with default export (#328) chore(package): update babel-core to version 6.18.2 (#379)
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   "devDependencies": {
     "axios": "0.15.2",
     "babel-cli": "6.18.0",
-    "babel-core": "6.17.0",
+    "babel-core": "6.18.2",
     "babel-preset-es2015": "6.18.0",
     "babel-preset-stage-2": "6.18.0",
     "chai": "3.5.0",
diff --git a/src/commitizen/adapter.js b/src/commitizen/adapter.js
@@ -116,6 +116,8 @@ function getPrompter(adapterPath) {
 
   if(adapter && adapter.prompter && isFunction(adapter.prompter)) {
      return adapter.prompter;
+  } else if (adapter && adapter.default && adapter.default.prompter && isFunction(adapter.default.prompter)) {
+     return adapter.default.prompter;
   } else {
     throw "Could not find prompter method in the provided adapter module: " + adapterPath;
   }

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ function getPrompter(adapterPath) {`
`116`	`116`
`117`	`117`	`if(adapter && adapter.prompter && isFunction(adapter.prompter)) {`
`118`	`118`	`return adapter.prompter;`
	`119`	`+ } else if (adapter && adapter.default && adapter.default.prompter && isFunction(adapter.default.prompter)) {`
	`120`	`+ return adapter.default.prompter;`
`119`	`121`	`} else {`
`120`	`122`	`throw "Could not find prompter method in the provided adapter module: " + adapterPath;`
`121`	`123`	`}`