Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _scripts/check-node-version.sh
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
# Use the repo's installed semver if available; fall back to a bare major check
# so this script still works before `yarn install` has run.
if [[ -d "$REPO_ROOT/node_modules/semver" ]]; then
COMPAT=$(node -e "const s = require('$REPO_ROOT/node_modules/semver'); console.log(s.satisfies('$CURRENT_NODE_VERSION', s.validRange('$REQUIRED_NODE_VERSION') || s.coerce('$REQUIRED_NODE_VERSION')))")
COMPAT=$(node -e "const s = require('$REPO_ROOT/node_modules/semver'); console.log(s.satisfies('$CURRENT_NODE_VERSION', '^$REQUIRED_NODE_VERSION'))")
else
REQUIRED_MAJOR=$(echo "$REQUIRED_NODE_VERSION" | cut -d. -f1)
CURRENT_MAJOR=$(echo "$CURRENT_NODE_VERSION" | cut -d. -f1)
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-admin-panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"mozlog": "^3.0.2",
"on-headers": "^1.1.0",
"react-hook-form": "^7.54.0",
"react-router": "7.18.0",
"react-router": "8.3.0",
"react-scripts": "^5.0.1",
"serve-static": "^1.16.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-settings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"react-easy-crop": "^5.2.0",
"react-hook-form": "^7.54.0",
"react-refresh": "^0.16.0",
"react-router": "7.18.0",
"react-router": "8.3.0",
"react-webcam": "^7.2.0",
"resolve": "^1.22.8",
"resolve-url-loader": "^5.0.0",
Expand Down
33 changes: 16 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -27782,6 +27782,13 @@ __metadata:
languageName: node
linkType: hard

"cookie-es@npm:^3.1.1":
version: 3.1.1
resolution: "cookie-es@npm:3.1.1"
checksum: 10c0/62cf0c325cc547b52477b351e9b5d068b3ffc74f7d143cdf7af854648dd1015fca3aed1498b355365e24b0746333f0b15688ed3a535abecc5ed0a046ae956a84
languageName: node
linkType: hard

"cookie-parser@npm:1.4.6":
version: 1.4.6
resolution: "cookie-parser@npm:1.4.6"
Expand Down Expand Up @@ -33588,7 +33595,7 @@ __metadata:
postcss-import: "npm:^16.1.0"
prettier: "npm:^3.5.3"
react-hook-form: "npm:^7.54.0"
react-router: "npm:7.18.0"
react-router: "npm:8.3.0"
react-scripts: "npm:^5.0.1"
serve-static: "npm:^1.16.0"
supertest: "npm:^7.0.0"
Expand Down Expand Up @@ -34229,7 +34236,7 @@ __metadata:
react-easy-crop: "npm:^5.2.0"
react-hook-form: "npm:^7.54.0"
react-refresh: "npm:^0.16.0"
react-router: "npm:7.18.0"
react-router: "npm:8.3.0"
react-webcam: "npm:^7.2.0"
resolve: "npm:^1.22.8"
resolve-url-loader: "npm:^5.0.0"
Expand Down Expand Up @@ -49411,19 +49418,18 @@ __metadata:
languageName: node
linkType: hard

"react-router@npm:7.18.0":
version: 7.18.0
resolution: "react-router@npm:7.18.0"
"react-router@npm:8.3.0":
version: 8.3.0
resolution: "react-router@npm:8.3.0"
dependencies:
cookie: "npm:^1.0.1"
set-cookie-parser: "npm:^2.6.0"
cookie-es: "npm:^3.1.1"
peerDependencies:
react: ">=18"
react-dom: ">=18"
react: ">=19.2.7"
react-dom: ">=19.2.7"
peerDependenciesMeta:
react-dom:
optional: true
checksum: 10c0/7ab6c6dc7efdc14092486d63f55b04f9e3ef269fdec8c695a513f69e55d02a9beab8f637a13396952815d85accf16e7db2d65d9cbb68def13c349be82ceb5aee
checksum: 10c0/c1277d6a75ff1b77e759bc0142e3257b6cea1eb683595a64a19d7fb341a7b9ba30c81ef8fc426e437c7fbec043bde683462b2463a055b0f58c8e5ad19cdee2ad
languageName: node
linkType: hard

Expand Down Expand Up @@ -51584,13 +51590,6 @@ __metadata:
languageName: node
linkType: hard

"set-cookie-parser@npm:^2.6.0":
version: 2.7.2
resolution: "set-cookie-parser@npm:2.7.2"
checksum: 10c0/4381a9eb7ee951dfe393fe7aacf76b9a3b4e93a684d2162ab35594fa4053cc82a4d7d7582bf397718012c9adcf839b8cd8f57c6c42901ea9effe33c752da4a45
languageName: node
linkType: hard

"set-function-length@npm:^1.2.2":
version: 1.2.2
resolution: "set-function-length@npm:1.2.2"
Expand Down
Loading