From df12fb12653690825e8bdf40d68a8dfbcfc5cc4a Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Mon, 8 Feb 2021 15:28:30 -0500 Subject: [PATCH 1/7] Prevent dependabot verison updates: - React should not auto update on major version updates - Bump storybook to current dep version - Prevent USWDS auto updates --- .github/dependabot.yml | 26 +++++++++++++++----------- yarn.lock | 6 +++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d52f575b2c..6a9acfd95f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,25 +15,29 @@ updates: ignore: - dependency-name: react versions: - - '^16.11.0' + - '>=18.0.0' - dependency-name: react-dom versions: - - '^16.11.0' + - '>=18.0.0' + - dependency-name: react-test-renderer + versions: + - '>=18.0.0' - dependency-name: '@types/react' versions: - - '^16.10.0' + - '>=18.0.0' - dependency-name: '@types/react-dom' versions: - - '^16.10.0' + - '>=18.0.0' - dependency-name: '@storybook/react' versions: - - '^6.0.21' + - '^6.1.5' - dependency-name: '@storybook/addon-docs' versions: - - '^6.0.21' + - '^6.1.5' - dependency-name: '@storybook/addon-viewport' versions: - - '^6.0.21' + - '^6.1.5' + - dependency-name: 'uswds' - package-ecosystem: npm directory: '/example/' @@ -51,13 +55,13 @@ updates: ignore: - dependency-name: react versions: - - '^16.13.1' + - '>=18.0.0' - dependency-name: react-dom versions: - - '^16.13.1' + - '>=18.0.0' - dependency-name: '@types/react' versions: - - '^16.9.0' + - '>=18.0.0' - dependency-name: '@types/react-dom' versions: - - '^16.9.0' + - '>=18.0.0' diff --git a/yarn.lock b/yarn.lock index a00b48acb1..723ee55c84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -407,7 +407,7 @@ "@babel/traverse" "^7.12.5" "@babel/types" "^7.12.5" -"@babel/highlight@^7.12.13": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== @@ -1154,7 +1154,7 @@ "@babel/parser" "^7.12.7" "@babel/types" "^7.12.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.13", "@babel/traverse@^7.7.0": +"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.13", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0" integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA== @@ -1184,7 +1184,7 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611" integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ== From 43222c24b47fc407ccaf9aa1970a536ef7a174cc Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Tue, 16 Feb 2021 13:21:07 -0500 Subject: [PATCH 2/7] Allow `direct` dependency type - https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#allow --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bcd4cb32b9..ba64131a8a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: - 'type: dependencies' - 'type: automerge' allow: - - dependency-type: development + - dependency-type: direct ignore: - dependency-name: react versions: From ac1025265e46397b5ddcc3185d2a88ee6678a231 Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Wed, 17 Feb 2021 12:13:05 -0500 Subject: [PATCH 3/7] Add uswds to dependabot ignore list --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ba64131a8a..5606622a0b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,6 +34,7 @@ updates: - dependency-name: '@storybook/addon-essentials' versions: - '^6.1.5' + - dependency-name: 'uswds' - package-ecosystem: npm directory: '/example/' From 1d091e847a28b36c2da38f13d5ea92e6542be880 Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Wed, 17 Feb 2021 13:30:12 -0500 Subject: [PATCH 4/7] Yarn husky install https://github.com/typicode/husky/issues/854#issuecomment-776126582 --- .husky/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .husky/.gitignore diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 0000000000..c9cdc63b07 --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ \ No newline at end of file From 2646e3a97d3311d890e9a8ca4c1a5aa2df650196 Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Thu, 18 Feb 2021 10:40:37 -0500 Subject: [PATCH 5/7] Use >= syntax for storybook dependencies as well --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5606622a0b..30811e0877 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,10 +30,10 @@ updates: - '>=18.0.0' - dependency-name: '@storybook/react' versions: - - '^6.0.21' + - '>=7.0.0' - dependency-name: '@storybook/addon-essentials' versions: - - '^6.1.5' + - '>=7.0.0' - dependency-name: 'uswds' - package-ecosystem: npm From 58b6d228460c983baf6ba7a0cc87781d23ae415d Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Thu, 18 Feb 2021 11:50:13 -0500 Subject: [PATCH 6/7] Update husky hooks to v5 --- .husky/pre-commit | 4 ++++ .husky/pre-push | 4 ++++ package.json | 11 ++++------- yarn.lock | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 7 deletions(-) create mode 100755 .husky/pre-commit create mode 100755 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000000..a2f94be0e0 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn tsc --noEmit && yarn lint-staged \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push new file mode 100755 index 0000000000..080038b26f --- /dev/null +++ b/.husky/pre-push @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn danger local -b main --failOnErrors \ No newline at end of file diff --git a/package.json b/package.json index 33e6a38df9..fcf493805f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,9 @@ "happo": "happo", "happo-ci": "happo-ci-circleci", "example:install": "yarn build && cd example/ && yarn", - "example:start": "cd example/ && yarn start" + "example:start": "cd example/ && yarn start", + "postinstall": "husky install", + "postpublish": "pinst --enable" }, "repository": { "type": "git", @@ -103,6 +105,7 @@ "jest": "^26.1.0", "lint-staged": "^10.0.9", "mini-css-extract-plugin": "^1.0.0", + "pinst": "^2.1.4", "prettier": "^2.0.2", "react": "^17.0.1", "react-dom": "^17.0.1", @@ -133,12 +136,6 @@ "acorn-globals/acorn": "^6.4.1", "webpack/acorn": "^6.4.1" }, - "husky": { - "hooks": { - "pre-commit": "tsc --noEmit && lint-staged", - "pre-push": "yarn danger local -b main --failOnErrors" - } - }, "lint-staged": { "src/**/*.{js,jsx,ts,tsx,json,md}": [ "prettier --write", diff --git a/yarn.lock b/yarn.lock index 31bee626c5..8f4d79e68f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7127,6 +7127,11 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fromentries@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.3.2.tgz#e4bca6808816bf8f93b52750f1127f5a6fd86e3a" + integrity sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg== + fs-access@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a" @@ -11223,6 +11228,14 @@ pinpoint@^1.1.0: resolved "https://registry.yarnpkg.com/pinpoint/-/pinpoint-1.1.0.tgz#0cf7757a6977f1bf7f6a32207b709e377388e874" integrity sha1-DPd1eml38b9/ajIge3CeN3OI6HQ= +pinst@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/pinst/-/pinst-2.1.4.tgz#f951567ac350b5a6d920bca0d53f558df15a27e4" + integrity sha512-T44k87is/GiSjONFxSl/uL6yGqwVpojdnUfbYzNeatDTM8uRCoCEQjuQ0g1oW6XENfbdO2XKtMfdGlDSQ19MJA== + dependencies: + fromentries "^1.3.2" + write-json-file "^4.3.0" + pirates@^4.0.0, pirates@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" @@ -12955,6 +12968,13 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +sort-keys@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-4.2.0.tgz#6b7638cee42c506fff8c1cecde7376d21315be18" + integrity sha512-aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg== + dependencies: + is-plain-obj "^2.0.0" + source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" @@ -14768,6 +14788,18 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +write-json-file@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-4.3.0.tgz#908493d6fd23225344af324016e4ca8f702dd12d" + integrity sha512-PxiShnxf0IlnQuMYOPPhPkhExoCQuTUNPOa/2JWCYTmBquU9njyyDuwRKN26IZBlp4yn1nt+Agh2HOOBl+55HQ== + dependencies: + detect-indent "^6.0.0" + graceful-fs "^4.1.15" + is-plain-obj "^2.0.0" + make-dir "^3.0.0" + sort-keys "^4.0.0" + write-file-atomic "^3.0.0" + write@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" From 90176f07dc5f579225f6d9b4e8894f34060be34e Mon Sep 17 00:00:00 2001 From: Brandon Lenz Date: Thu, 18 Feb 2021 11:58:52 -0500 Subject: [PATCH 7/7] Add newlines to end of files --- .husky/.gitignore | 2 +- .husky/pre-commit | 2 +- .husky/pre-push | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.husky/.gitignore b/.husky/.gitignore index c9cdc63b07..31354ec138 100644 --- a/.husky/.gitignore +++ b/.husky/.gitignore @@ -1 +1 @@ -_ \ No newline at end of file +_ diff --git a/.husky/pre-commit b/.husky/pre-commit index a2f94be0e0..39e312b5f0 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn tsc --noEmit && yarn lint-staged \ No newline at end of file +yarn tsc --noEmit && yarn lint-staged diff --git a/.husky/pre-push b/.husky/pre-push index 080038b26f..b3c88e0c78 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -yarn danger local -b main --failOnErrors \ No newline at end of file +yarn danger local -b main --failOnErrors