diff --git a/.npmignore b/.npmignore index bad048d..9e7d950 100644 --- a/.npmignore +++ b/.npmignore @@ -150,3 +150,7 @@ fabric.properties !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json + +### Project +!dist +!lib diff --git a/package.json b/package.json index 3bc1230..3182ef2 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,14 @@ "test": "ava", "semantic-release": "semantic-release -e ./release.config.js", "travis-deploy-once": "travis-deploy-once", - "prerelease": "git diff-index --quiet HEAD -- && git checkout dev && git pull && yarn test && yarn run build", - "release": "git checkout master && git pull && git merge dev && git push", - "postrelease": "git checkout dev && git merge master && git push" + "clean-dist": "del dist && del lib", + "check-git": "git diff-index --quiet HEAD --", + "update-dev": "git checkout dev && git pull", + "merge-to-master": "git checkout master && git pull && git merge dev", + "master-to-dev": "git checkout dev && git merge master", + "prerelease": "yarn run check-git && yarn run clean-dist && yarn run update-dev && yarn test && yarn run build", + "release": "yarn run merge-to-master && git push", + "postrelease": "yarn run master-to-dev && git push" }, "ava": { "babel": "inherit", @@ -55,6 +60,7 @@ "ava": "^0.24.0", "browser-env": "^3.2.4", "conventional-changelog-eslint": "^0.3.0", + "del-cli": "^1.1.0", "npm-run-all": "^4.1.2", "require-extension-hooks": "^0.3.2", "require-extension-hooks-babel": "^0.1.1", diff --git a/yarn.lock b/yarn.lock index 02959c3..a617ea8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1872,6 +1872,25 @@ define-properties@^1.1.2: foreach "^2.0.5" object-keys "^1.0.8" +del-cli@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-1.1.0.tgz#27557d69a0b7df99dcbaa1e34a09e6ac6591d2c4" + dependencies: + del "^3.0.0" + meow "^3.6.0" + update-notifier "^2.1.0" + +del@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" + dependencies: + globby "^6.1.0" + is-path-cwd "^1.0.0" + is-path-in-cwd "^1.0.0" + p-map "^1.1.1" + pify "^3.0.0" + rimraf "^2.2.8" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -2477,7 +2496,7 @@ globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" -globby@^6.0.0: +globby@^6.0.0, globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" dependencies: @@ -2931,6 +2950,16 @@ is-observable@^1.0.0: dependencies: symbol-observable "^1.1.0" +is-path-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" + +is-path-in-cwd@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" + dependencies: + is-path-inside "^1.0.0" + is-path-inside@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz#fc06e5a1683fbda13de667aff717bbc10a48f37f" @@ -3434,7 +3463,7 @@ memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" -meow@^3.3.0, meow@^3.7.0: +meow@^3.3.0, meow@^3.6.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" dependencies: @@ -3817,6 +3846,10 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-map@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" @@ -4532,6 +4565,12 @@ rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: dependencies: glob "^7.0.5" +rimraf@^2.2.8: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + dependencies: + glob "^7.0.5" + rollup-plugin-commonjs@^8.2.6: version "8.2.6" resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677" @@ -5196,7 +5235,7 @@ unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" -update-notifier@^2.3.0: +update-notifier@^2.1.0, update-notifier@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" dependencies: