Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix yarn deps #310

Merged
merged 11 commits into from
Jan 2, 2024
15 changes: 0 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,7 @@ jobs:
with:
node-version-file: .nvmrc

# See https://github.com/actions/setup-node/issues/488
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Cache yarn dependencies
uses: actions/cache@v3
id: yarn-cache
with:
path: ${{steps.yarn-cache-dir-path.outputs.dir }}
key: yarn-cache-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
restore-keys: |
yarn-cache-

- name: Install Npm Dependencies
#if: steps.yarn-cache.outputs.cache-hit != 'true'
run: |
yarn set version 3.6.1
HUSKY=0 yarn install --immutable
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 23 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,26 @@ supportedArchitectures:
- 'glibc'

yarnPath: .yarn/releases/yarn-3.6.1.cjs

# satisfies some warnings about peer dependencies that are included in the repo
packageExtensions:
next-drupal-query@*:
dependencies:
react: "^18"
react-dom: "^18"
"@department-of-veterans-affairs/component-library@*":
dependencies:
react: "^18"
react-dom: "^18"
"@storybook/addon-controls@*":
dependencies:
react: "^18"
react-dom: "^18"
"@storybook/manager-api@*":
dependencies:
react: "^18"
react-dom: "^18"
"@types/testing-library__react@*":
dependencies:
react: "^18"
react-dom: "^18"
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
"debug": "^4.3.4",
"drupal-jsonapi-params": "^2.3.1",
"env-loader": "0.1.0",
"i18next": "^23.7.12",
"i18next-browser-languagedetector": "^7.2.0",
"jest-axe": "^8.0.0",
"jest-extended": "^4.0.2",
"jsona": "^1.12.1",
Expand All @@ -67,6 +69,7 @@
"next-drupal": "^1.6.0",
"next-drupal-query": "^0.4.0",
"next-sitemap": "^4.2.3",
"playwright-core": "^1.40.1",
"plop": "^4.0.0",
"proxy-fetcher": "0.1.0",
"react": "^18.2.0",
Expand Down Expand Up @@ -104,7 +107,7 @@
"@types/testing-library__react": "^10.2.0",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^5.62.0",
"@typescript-eslint/parser": "^6.0.0",
"axe-core": "^4.8.2",
"debug": "^4.3.4",
"eslint": "8.53.0",
Expand Down
123 changes: 100 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2049,8 +2049,8 @@ __metadata:
linkType: hard

"@department-of-veterans-affairs/formation@npm:^7.0.9":
version: 7.0.9
resolution: "@department-of-veterans-affairs/formation@npm:7.0.9"
version: 7.1.0
resolution: "@department-of-veterans-affairs/formation@npm:7.1.0"
dependencies:
"@fortawesome/fontawesome-free": ^5.6.3
domready: ^1.0.8
Expand All @@ -2060,7 +2060,7 @@ __metadata:
"@fortawesome/fontawesome-free": ^5.6.3
foundation-sites: 5
uswds: ^1.6.10
checksum: aaa8696a56e349447a63f93a2e2f7efb76e48aaf5ac6902bf22fd85bd11b6c313962df755f81292fc983c64664eb683b40629ab84e57abd42eb68d9343f8413e
checksum: 7afcf65d55359af80087d4701e4ba1167a845181362ade12776041d4eda4253b61ce33512c39fd032f3dafdbf56a5b2620dffecc52945d477d3e0aef22cd2da6
languageName: node
linkType: hard

Expand Down Expand Up @@ -5832,20 +5832,21 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^5.62.0":
version: 5.62.0
resolution: "@typescript-eslint/parser@npm:5.62.0"
"@typescript-eslint/parser@npm:^6.0.0":
version: 6.16.0
resolution: "@typescript-eslint/parser@npm:6.16.0"
dependencies:
"@typescript-eslint/scope-manager": 5.62.0
"@typescript-eslint/types": 5.62.0
"@typescript-eslint/typescript-estree": 5.62.0
"@typescript-eslint/scope-manager": 6.16.0
"@typescript-eslint/types": 6.16.0
"@typescript-eslint/typescript-estree": 6.16.0
"@typescript-eslint/visitor-keys": 6.16.0
debug: ^4.3.4
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752
checksum: 5048a4fe63a8edf3b23c4355c7399d39c266a5f92d2c271e0ff3122eff5cd81d6535c871912b9cea991d87c91d264420ad0253b7816206f34356c290b7671188
languageName: node
linkType: hard

Expand All @@ -5869,6 +5870,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:6.16.0":
version: 6.16.0
resolution: "@typescript-eslint/scope-manager@npm:6.16.0"
dependencies:
"@typescript-eslint/types": 6.16.0
"@typescript-eslint/visitor-keys": 6.16.0
checksum: a3380f2cd4dd0928dfcacc45057018cbe11f86cccb53a848d4eb4d15b363e95b11aae453b4a7822701667816fabd4b6393839447a342e55f8cfaa6740c635098
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:6.7.5":
version: 6.7.5
resolution: "@typescript-eslint/scope-manager@npm:6.7.5"
Expand Down Expand Up @@ -5910,6 +5921,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:6.16.0":
version: 6.16.0
resolution: "@typescript-eslint/types@npm:6.16.0"
checksum: 74f8e4412cd52272952bfba8db9c1f7fd991f0f3924d6f63aff4e92614a8a581ea9c0df715190567d176a72b55099f3ef03d5462d4f6a78695d2b659cf5bfe34
languageName: node
linkType: hard

"@typescript-eslint/types@npm:6.7.5":
version: 6.7.5
resolution: "@typescript-eslint/types@npm:6.7.5"
Expand Down Expand Up @@ -5953,6 +5971,25 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:6.16.0":
version: 6.16.0
resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
dependencies:
"@typescript-eslint/types": 6.16.0
"@typescript-eslint/visitor-keys": 6.16.0
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
minimatch: 9.0.3
semver: ^7.5.4
ts-api-utils: ^1.0.1
peerDependenciesMeta:
typescript:
optional: true
checksum: 20ed8b8f7bf8173d5b68e9b0b86178607a5054adeb9daba87b7c1aa245b2f42ad04b93ee669d74920229eaf430cff146d67c6366a01cc338593a81bf812e6132
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:6.7.5":
version: 6.7.5
resolution: "@typescript-eslint/typescript-estree@npm:6.7.5"
Expand Down Expand Up @@ -6026,6 +6063,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:6.16.0":
version: 6.16.0
resolution: "@typescript-eslint/visitor-keys@npm:6.16.0"
dependencies:
"@typescript-eslint/types": 6.16.0
eslint-visitor-keys: ^3.4.1
checksum: 2863e6d145a79bb12485b39417e30710996d8576894d67a484fde7cef417e3c67fd9fd99cb57736f0667e4425ddb2ab1f0954340ec5f4e08b8cb2ce7378a1977
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:6.7.5":
version: 6.7.5
resolution: "@typescript-eslint/visitor-keys@npm:6.7.5"
Expand Down Expand Up @@ -11382,6 +11429,15 @@ __metadata:
languageName: node
linkType: hard

"i18next-browser-languagedetector@npm:^7.2.0":
version: 7.2.0
resolution: "i18next-browser-languagedetector@npm:7.2.0"
dependencies:
"@babel/runtime": ^7.23.2
checksum: 757845c7ae7dfc541f5150855c3a3e4f6d29bcee113796d44dc781594abc7f16f2750a2a70d786904c16d23ba952eba2741c0bcfeaa381016669522a6236998f
languageName: node
linkType: hard

"i18next@npm:^21.6.14":
version: 21.10.0
resolution: "i18next@npm:21.10.0"
Expand All @@ -11391,6 +11447,15 @@ __metadata:
languageName: node
linkType: hard

"i18next@npm:^23.7.12":
version: 23.7.12
resolution: "i18next@npm:23.7.12"
dependencies:
"@babel/runtime": ^7.23.2
checksum: 15c54e8988c038f02a05eb520e51ae8f143f6365830e7e1adad71e3991756b150a5497bf1cd3af5712d5f8748a3f633e1373bc8f3c5654b059bd2d2ca0cc10d1
languageName: node
linkType: hard

"iconv-lite@npm:0.4.24, iconv-lite@npm:^0.4.24":
version: 0.4.24
resolution: "iconv-lite@npm:0.4.24"
Expand Down Expand Up @@ -13746,6 +13811,15 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:9.0.3, minimatch@npm:^9.0.1, minimatch@npm:^9.0.3":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
dependencies:
brace-expansion: ^2.0.1
checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
languageName: node
linkType: hard

"minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
version: 3.1.2
resolution: "minimatch@npm:3.1.2"
Expand All @@ -13764,15 +13838,6 @@ __metadata:
languageName: node
linkType: hard

"minimatch@npm:^9.0.1, minimatch@npm:^9.0.3":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
dependencies:
brace-expansion: ^2.0.1
checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
languageName: node
linkType: hard

"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8":
version: 1.2.8
resolution: "minimist@npm:1.2.8"
Expand Down Expand Up @@ -14059,7 +14124,7 @@ __metadata:
"@types/testing-library__react": ^10.2.0
"@types/uuid": ^9.0.7
"@typescript-eslint/eslint-plugin": ^6.14.0
"@typescript-eslint/parser": ^5.62.0
"@typescript-eslint/parser": ^6.0.0
axe-core: ^4.8.2
axios: ^1.6.2
clsx: ^2.0.0
Expand All @@ -14079,6 +14144,8 @@ __metadata:
fs-extra: ^11.1.1
http-server: ^14.1.1
husky: ^8.0.3
i18next: ^23.7.12
i18next-browser-languagedetector: ^7.2.0
jest: ^29.7.0
jest-axe: ^8.0.0
jest-environment-jsdom: ^29.7.0
Expand All @@ -14094,6 +14161,7 @@ __metadata:
next-drupal-query: ^0.4.0
next-sitemap: ^4.2.3
nock: ^13.4.0
playwright-core: ^1.40.1
plop: ^4.0.0
prettier: ^2.8.8
proxy-fetcher: 0.1.0
Expand Down Expand Up @@ -15322,6 +15390,15 @@ __metadata:
languageName: node
linkType: hard

"playwright-core@npm:^1.40.1":
version: 1.40.1
resolution: "playwright-core@npm:1.40.1"
bin:
playwright-core: cli.js
checksum: 84d92fb9b86e3c225b16b6886bf858eb5059b4e60fa1205ff23336e56a06dcb2eac62650992dede72f406c8e70a7b6a5303e511f9b4bc0b85022ede356a01ee0
languageName: node
linkType: hard

"playwright@npm:1.39.0":
version: 1.39.0
resolution: "playwright@npm:1.39.0"
Expand Down Expand Up @@ -15927,7 +16004,7 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^17.0.2 || ^18, react-dom@npm:^18.2.0":
"react-dom@npm:^17.0.2 || ^18, react-dom@npm:^18, react-dom@npm:^18.2.0":
version: 18.2.0
resolution: "react-dom@npm:18.2.0"
dependencies:
Expand Down Expand Up @@ -16123,7 +16200,7 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^17.0.2 || ^18, react@npm:^18.2.0":
"react@npm:^17.0.2 || ^18, react@npm:^18, react@npm:^18.2.0":
version: 18.2.0
resolution: "react@npm:18.2.0"
dependencies:
Expand Down