make release-it work with conventional-changelog

kremalicious · Dec 5, 2018 · 2dcd5a7 · 2dcd5a7
1 parent 771f0a7
commit 2dcd5a7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.release-it.json b/.release-it.json
@@ -0,0 +1,5 @@
+{
+  "beforeChangelogCommand": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s",
+  "changelogCommand": "./node_modules/.bin/conventional-changelog | tail -n +3",
+  "safeBump": false
+}
diff --git a/package.json b/package.json
@@ -7,11 +7,11 @@
     "build": "babel src --out-dir . --ignore __tests__",
     "start": "babel -w src --out-dir . --ignore __tests__",
     "test": "eslint ./src/**/*.js",
-    "release": "npm run changelog && ./node_modules/release-it/bin/release-it.js --src.tagName='v%s' --github.release --npm.publish --non-interactive",
-    "release-minor": "npm run changelog && ./node_modules/release-it/bin/release-it.js minor --src.tagName='v%s' --github.release --npm.publish --non-interactive",
-    "release-major": "npm run changelog && ./node_modules/release-it/bin/release-it.js major --src.tagName='v%s' --github.release --npm.publish --non-interactive",
+    "release": "./node_modules/release-it/bin/release-it.js --src.tagName='v%s' --github.release --npm.publish --non-interactive",
+    "release-minor": "./node_modules/release-it/bin/release-it.js minor --src.tagName='v%s' --github.release --npm.publish --non-interactive",
+    "release-major": "./node_modules/release-it/bin/release-it.js major --src.tagName='v%s' --github.release --npm.publish --non-interactive",
     "prepublishOnly": "cross-env NODE_ENV=production npm run build",
-    "changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'update changelog'"
+    "changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -r 0"
   },
   "dependencies": {
     "babel-runtime": "^6.26.0",