diff --git a/.release-it.json b/.release-it.json index b405ae159..f1159d867 100644 --- a/.release-it.json +++ b/.release-it.json @@ -1,34 +1,5 @@ { - "plugins": { - "@release-it/conventional-changelog": { - "preset": { - "name": "conventionalcommits", - "types": [ - { - "type": "feat", - "section": "Features" - }, - { - "type": "fix", - "section": "Bug Fixes" - }, - { - "type": "cleanup", - "section": "Cleanup" - }, - { - "type": "docs", - "section": "Documentations" - } - ] - }, - "infile": "CHANGELOG.md" - }, - "@release-it/bumper": { - "in": "version.json", - "out": ["version.json", "dist/version.json", "app/package.json"] - } - }, + "plugins": {}, "git": { "commitMessage": "chore: release ${version}", "tag": true, @@ -38,13 +9,11 @@ "publish": false }, "github": { - "release": true, - "releaseName": "Release ${version}", - "assets": ["dist/*.zip"] + "release": true }, "hooks": { - "before:bump": "yarn release:build --version=${version}", + "before:bump": "yarn build", "after:bump": "git checkout -- package.json", - "after:release": "yarn " + "after:release": "git checkout release && git reset --hard main && git push origin release -f && git checkout main" } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 9426597f7..f304972ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1 @@ - - -### [0.0.1](https://github.com/jetstreamapp/jetstream/compare/1.0.1-0...0.0.1) (2022-08-07) \ No newline at end of file +# Release Changelog diff --git a/package.json b/package.json index 18f4222e9..189436e4e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "url": "https://github.com/jetstreamapp/jetstream" }, "author": "Jetstream", - "version": "0.0.0", + "version": "2.0.0", "license": "GNU Lesser General Public License v3.0", "engines": { "node": ">=16 <=18" @@ -195,7 +195,7 @@ "css-loader": "^6.4.0", "cypress": "^8.3.0", "dotenv": "^16.0.1", - "dotenv-cli": "^6.0.0", + "dotenv-cli": "^7.0.0", "electron": "^18.2.4", "electron-builder": "^23.0.9", "electron-notarize": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 14c83e66b..3cf01c411 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11873,26 +11873,26 @@ dot-prop@^6.0.1: dependencies: is-obj "^2.0.0" -dotenv-cli@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-6.0.0.tgz#8a30cbc59d0a8aaa166b2fee0a9a55e23a1223ab" - integrity sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg== +dotenv-cli@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dotenv-cli/-/dotenv-cli-7.0.0.tgz#b24e842a4c00928ec91d051ab152cd927c66ad97" + integrity sha512-XfMzVdpdDTRnlcgvFLg3lSyiLXqFxS4tH7RbK5IxkC4XIUuxPyrGoDufkfLjy/dA28EILzEu+mros6h8aQmyGg== dependencies: cross-spawn "^7.0.3" dotenv "^16.0.0" - dotenv-expand "^8.0.1" - minimist "^1.2.5" + dotenv-expand "^10.0.0" + minimist "^1.2.6" + +dotenv-expand@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-10.0.0.tgz#12605d00fb0af6d0a592e6558585784032e4ef37" + integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv-expand@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-8.0.3.tgz#29016757455bcc748469c83a19b36aaf2b83dd6e" - integrity sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg== - dotenv@^16.0.0, dotenv@^16.0.1: version "16.0.1" resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz"