From db449314f34f4f05221061d131e24d9e9284c08a Mon Sep 17 00:00:00 2001 From: James Henry Date: Thu, 1 Feb 2018 15:17:48 -0800 Subject: [PATCH] chore(build): use precise-commits for formatting --- .prettierrc | 3 ++ .travis.yml | 2 +- package.json | 9 ++-- scripts/check-format.sh | 3 -- scripts/format.sh | 3 -- yarn.lock | 92 +++++++++++++++++++++++++++++++++++++++-- 6 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 .prettierrc delete mode 100755 scripts/check-format.sh delete mode 100755 scripts/format.sh diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000000..dc2fb828f0 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,3 @@ +{ + "singleQuote": true +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3144244287..31dd2eb9b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - sh -e /etc/init.d/xvfb start - yarn install script: - - yarn checkformat + - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then yarn checkformat --head=$TRAVIS_PULL_REQUEST_SHA --base=$(git merge-base HEAD $TRAVIS_BRANCH); fi' - yarn test - yarn e2e addons: diff --git a/package.json b/package.json index ba8f7768e3..e45086801a 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "./scripts/build.sh", "e2e": "./scripts/e2e.sh", - "format": "./scripts/format.sh", + "format": "precise-commits --whitelist=\"{packages,e2e}/**/*.ts\"", "linknpm": "./scripts/link.sh", "package": "./scripts/package.sh", "release": "./scripts/release.sh", @@ -15,8 +15,9 @@ "test:schematics": "yarn build && ./scripts/test_schematics.sh", "test:nx": "yarn build && ./scripts/test_nx.sh", "test": "yarn linknpm && ./scripts/test_nx.sh && ./scripts/test_schematics.sh", - "checkformat": "./scripts/check-format.sh", - "publish_npm": "./scripts/publish.sh" + "checkformat": "yarn format --check-only", + "publish_npm": "./scripts/publish.sh", + "precommit": "yarn checkformat" }, "dependencies": { "jasmine-marbles": "0.2.0" @@ -41,12 +42,14 @@ "@types/jasmine": "2.5.53", "@types/node": "8.0.7", "angular": "1.6.6", + "husky": "^0.14.3", "jasmine-core": "~2.8.0", "jest": "20.0.4", "karma": "~2.0.0", "karma-chrome-launcher": "~2.2.0", "karma-jasmine": "~1.1.0", "karma-webpack": "2.0.4", + "precise-commits": "1.0.0", "prettier": "1.10.2", "rxjs": "^5.5.6", "semver": "5.4.1", diff --git a/scripts/check-format.sh b/scripts/check-format.sh deleted file mode 100755 index 4b07649a27..0000000000 --- a/scripts/check-format.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -prettier --single-quote --print-width 120 --list-different '{packages,e2e}/**/*.ts' diff --git a/scripts/format.sh b/scripts/format.sh deleted file mode 100755 index 5c18e9d2a3..0000000000 --- a/scripts/format.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -prettier --single-quote --print-width 120 --write '{packages,e2e}/**/*.ts' diff --git a/yarn.lock b/yarn.lock index 65ceb8092c..aec5bfdf68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1196,7 +1196,7 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -1298,6 +1298,16 @@ clean-css@4.1.x: dependencies: source-map "0.5.x" +cli-cursor@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + dependencies: + restore-cursor "^2.0.0" + +cli-spinners@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -1970,6 +1980,10 @@ di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" +diff-match-patch@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048" + diff@^3.2.0: version "3.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c" @@ -2373,6 +2387,18 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + expand-braces@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea" @@ -3262,6 +3288,14 @@ https-proxy-agent@1: debug "2" extend "3" +husky@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3" + dependencies: + is-ci "^1.0.10" + normalize-path "^1.0.0" + strip-indent "^2.0.0" + iconv-lite@0.4.15: version "0.4.15" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" @@ -3288,7 +3322,7 @@ iferr@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -ignore@^3.3.5: +ignore@^3.3.5, ignore@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" @@ -4361,6 +4395,12 @@ lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, l version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + dependencies: + chalk "^1.0.0" + log4js@^2.3.9: version "2.5.2" resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.5.2.tgz#234e9c688bc4aab3999bd4b149c85851a4e62faa" @@ -4697,6 +4737,10 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" +mri@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.0.tgz#5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a" + ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -4942,6 +4986,10 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" + normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -5061,6 +5109,12 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: dependencies: wrappy "1" +onetime@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + dependencies: + mimic-fn "^1.0.0" + opn@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225" @@ -5091,6 +5145,15 @@ optionator@^0.8.1: type-check "~0.3.2" wordwrap "~1.0.0" +ora@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a" + dependencies: + chalk "^1.1.1" + cli-cursor "^2.1.0" + cli-spinners "^1.0.0" + log-symbols "^1.0.2" + original@>=0.0.5: version "1.0.0" resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b" @@ -5670,6 +5733,18 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.16: source-map "^0.6.1" supports-color "^5.1.0" +precise-commits@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/precise-commits/-/precise-commits-1.0.0.tgz#3d9849ee982f70790b0582589e200a18db19ddb3" + dependencies: + diff-match-patch "^1.0.0" + execa "^0.9.0" + find-up "^2.1.0" + glob "^7.1.2" + ignore "^3.3.7" + mri "^1.1.0" + ora "^1.3.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -6248,6 +6323,13 @@ resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.7, resolve@^1.3.2: dependencies: path-parse "^1.0.5" +restore-cursor@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + dependencies: + onetime "^2.0.0" + signal-exit "^3.0.2" + right-align@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" @@ -6501,7 +6583,7 @@ shellwords@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" -signal-exit@^3.0.0: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -6924,6 +7006,10 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" +strip-indent@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + strip-json-comments@2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"