Skip to content

Commit

Permalink
fix: reduce cycles
Browse files Browse the repository at this point in the history
  • Loading branch information
@Westbrook
Westbrook committed Mar 9, 2021
1 parent 37e5a80 commit 66a4efb
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 61 deletions.
4 changes: 3 additions & 1 deletion .husky/pre-commit
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn pretty-quick --staged && yarn lint
yarn analyze:quick
yarn lint:css
yarn pretty-quick --staged
19 changes: 7 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
},
"scripts": {
"analyze": "lit-analyzer 'packages/*/src/**/!(*.css).ts'",
"analyze:quick": "lit-analyzer \"packages/*/src/!(*.css).ts\"",
"get-ready": "yarn build:clear-cache && run-p process-icons process-spectrum && yarn build",
"postinstall": "yarn get-ready",
"spectrum-vars": "node ./scripts/spectrum-vars.js",
Expand Down Expand Up @@ -77,12 +78,6 @@
"new-package": "cd projects/templates && plop",
"prepare": "husky install"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged && yarn lint",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
"peerDependencies": {
"common-tags": "^1.8.0",
"prismjs": "^1.15.0"
Expand Down Expand Up @@ -110,8 +105,8 @@
"@types/sinon": "^9.0.0",
"@types/webpack": "^4.4.26",
"@types/webpack-env": "^1.13.9",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"@typescript-eslint/eslint-plugin": "^4.16.1",
"@typescript-eslint/parser": "^4.16.1",
"@vaadin/router": "^1.2.0",
"@web/dev-server": "^0.1.8",
"@web/test-runner": "^0.12.15",
Expand All @@ -130,13 +125,13 @@
"cssnano": "^4.1.10",
"deepmerge": "^4.0.0",
"element-closest": "^3.0.1",
"eslint": "^7.11.0",
"eslint-config-prettier": "^7.1.0",
"eslint": "^7.21.0",
"eslint-config-prettier": "^8.1.0",
"eslint-formatter-pretty": "^4.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-lit-a11y": "^1.0.0",
"eslint-plugin-lit-a11y": "^1.0.1",
"eslint-plugin-notice": "^0.9.10",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-spectrum-web-components": "file:./linters/eslint",
"express": "^4.16.4",
"extract-loader": "^5.0.1",
Expand Down
3 changes: 1 addition & 2 deletions packages/checkbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@spectrum-css/checkbox": "^3.0.0",
"@spectrum-web-components/field-group": "^0.3.1"
"@spectrum-css/checkbox": "^3.0.0"
},
"dependencies": {
"@spectrum-web-components/base": "^0.4.1",
Expand Down
4 changes: 1 addition & 3 deletions packages/field-group/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@spectrum-css/fieldgroup": "^3.0.0",
"@spectrum-web-components/checkbox": "^0.9.1",
"@spectrum-web-components/radio": "^0.7.1"
"@spectrum-css/fieldgroup": "^3.0.0"
},
"dependencies": {
"@spectrum-web-components/base": "^0.4.1",
Expand Down
116 changes: 73 additions & 43 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3971,7 +3971,7 @@
dependencies:
"@types/node" "*"

"@typescript-eslint/eslint-plugin@^4.15.2", "@typescript-eslint/eslint-plugin@^4.2.0":
"@typescript-eslint/eslint-plugin@^4.15.2":
version "4.15.2"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.15.2.tgz#981b26b4076c62a5a55873fbef3fe98f83360c61"
integrity sha512-uiQQeu9tWl3f1+oK0yoAv9lt/KXO24iafxgQTkIYO/kitruILGx3uH+QtIAHqxFV+yIsdnJH+alel9KuE3J15Q==
Expand All @@ -3985,6 +3985,20 @@
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/eslint-plugin@^4.16.1":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz#2caf6a79dd19c3853b8d39769a27fccb24e4e651"
integrity sha512-SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==
dependencies:
"@typescript-eslint/experimental-utils" "4.16.1"
"@typescript-eslint/scope-manager" "4.16.1"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
regexpp "^3.0.0"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"
Expand All @@ -4007,6 +4021,18 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"

"@typescript-eslint/[email protected]":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz#da7a396dc7d0e01922acf102b76efff17320b328"
integrity sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==
dependencies:
"@types/json-schema" "^7.0.3"
"@typescript-eslint/scope-manager" "4.16.1"
"@typescript-eslint/types" "4.16.1"
"@typescript-eslint/typescript-estree" "4.16.1"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"

"@typescript-eslint/parser@^2.20.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8"
Expand All @@ -4017,24 +4043,16 @@
"@typescript-eslint/typescript-estree" "2.34.0"
eslint-visitor-keys "^1.1.0"

"@typescript-eslint/parser@^4.2.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.13.0.tgz#c413d640ea66120cfcc37f891e8cb3fd1c9d247d"
integrity sha512-KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg==
"@typescript-eslint/parser@^4.16.1":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.16.1.tgz#3bbd3234dd3c5b882b2bcd9899bc30e1e1586d2a"
integrity sha512-/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==
dependencies:
"@typescript-eslint/scope-manager" "4.13.0"
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/typescript-estree" "4.13.0"
"@typescript-eslint/scope-manager" "4.16.1"
"@typescript-eslint/types" "4.16.1"
"@typescript-eslint/typescript-estree" "4.16.1"
debug "^4.1.1"

"@typescript-eslint/[email protected]":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141"
integrity sha512-UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ==
dependencies:
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/visitor-keys" "4.13.0"

"@typescript-eslint/[email protected]":
version "4.15.2"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.15.2.tgz#5725bda656995960ae1d004bfd1cd70320f37f4f"
Expand All @@ -4043,16 +4061,24 @@
"@typescript-eslint/types" "4.15.2"
"@typescript-eslint/visitor-keys" "4.15.2"

"@typescript-eslint/[email protected]":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8"
integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ==
"@typescript-eslint/[email protected]":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz#244e2006bc60cfe46987e9987f4ff49c9e3f00d5"
integrity sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==
dependencies:
"@typescript-eslint/types" "4.16.1"
"@typescript-eslint/visitor-keys" "4.16.1"

"@typescript-eslint/[email protected]":
version "4.15.2"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.15.2.tgz#04acf3a2dc8001a88985291744241e732ef22c60"
integrity sha512-r7lW7HFkAarfUylJ2tKndyO9njwSyoy6cpfDKWPX6/ctZA+QyaYscAHXVAfJqtnY6aaTwDYrOhp+ginlbc7HfQ==

"@typescript-eslint/[email protected]":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.16.1.tgz#5ba2d3e38b1a67420d2487519e193163054d9c15"
integrity sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==

"@typescript-eslint/[email protected]", "@typescript-eslint/typescript-estree@^2.29.0":
version "2.34.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5"
Expand All @@ -4066,20 +4092,6 @@
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e"
integrity sha512-9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg==
dependencies:
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/visitor-keys" "4.13.0"
debug "^4.1.1"
globby "^11.0.1"
is-glob "^4.0.1"
lodash "^4.17.15"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "4.15.2"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.15.2.tgz#c2f7a1e94f3428d229d5ecff3ead6581ee9b62fa"
Expand All @@ -4093,13 +4105,18 @@
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/visitor-keys@4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe"
integrity sha512-6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g==
"@typescript-eslint/typescript-estree@4.16.1":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz#c2fc46b05a48fbf8bbe8b66a63f0a9ba04b356f1"
integrity sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==
dependencies:
"@typescript-eslint/types" "4.13.0"
eslint-visitor-keys "^2.0.0"
"@typescript-eslint/types" "4.16.1"
"@typescript-eslint/visitor-keys" "4.16.1"
debug "^4.1.1"
globby "^11.0.1"
is-glob "^4.0.1"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/[email protected]":
version "4.15.2"
Expand All @@ -4109,6 +4126,14 @@
"@typescript-eslint/types" "4.15.2"
eslint-visitor-keys "^2.0.0"

"@typescript-eslint/[email protected]":
version "4.16.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz#d7571fb580749fae621520deeb134370bbfc7293"
integrity sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==
dependencies:
"@typescript-eslint/types" "4.16.1"
eslint-visitor-keys "^2.0.0"

"@ungap/from-entries@^0.2.1":
version "0.2.1"
resolved "https://registry.yarnpkg.com/@ungap/from-entries/-/from-entries-0.2.1.tgz#7e86196b8b2e99d73106a8f25c2a068326346354"
Expand Down Expand Up @@ -9397,6 +9422,11 @@ eslint-config-prettier@^7.1.0:
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==

eslint-config-prettier@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==

eslint-formatter-pretty@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.0.0.tgz#dc15f3bf4fb51b7ba5fbedb77f57ba8841140ce2"
Expand Down Expand Up @@ -9459,7 +9489,7 @@ eslint-plugin-import@^2.18.2, eslint-plugin-import@^2.22.1:
resolve "^1.17.0"
tsconfig-paths "^3.9.0"

eslint-plugin-lit-a11y@^1.0.0:
eslint-plugin-lit-a11y@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-lit-a11y/-/eslint-plugin-lit-a11y-1.0.1.tgz#0454d2b4df972d5d064d31473388e2a6968c782c"
integrity sha512-c+GgGSXb9HMgbzJGp0yl+msHk2rBXcA7KwbobbLonSXdHm6ln7zRwAEj4i7527FOaCKkhxiN6RXfOJcZT1/Bow==
Expand Down Expand Up @@ -9499,7 +9529,7 @@ eslint-plugin-notice@^0.9.10:
lodash "^4.17.15"
metric-lcs "^0.1.2"

eslint-plugin-prettier@^3.1.4:
eslint-plugin-prettier@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
Expand Down Expand Up @@ -9615,7 +9645,7 @@ eslint@^6.7.2:
text-table "^0.2.0"
v8-compile-cache "^2.0.3"

eslint@^7.11.0, eslint@^7.6.0, eslint@^7.8.0:
eslint@^7.21.0, eslint@^7.6.0, eslint@^7.8.0:
version "7.21.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"
integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==
Expand Down

0 comments on commit 66a4efb

Please sign in to comment.