Skip to content

Commit

Permalink
Merge branch 'react-18-#1205' into migrate-to-vite-#1379
Browse files Browse the repository at this point in the history
  • Loading branch information
joelvdavies committed Apr 16, 2024
2 parents 4d80658 + 30d4ac1 commit 4276cfd
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 32 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-prettier": "5.1.3",
"express": "4.18.1",
"express": "4.19.2",
"husky": "9.0.6",
"i18next": "23.8.2",
"i18next-browser-languagedetector": "7.2.0",
Expand Down
69 changes: 38 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2619,23 +2619,23 @@ __metadata:
languageName: node
linkType: hard

"body-parser@npm:1.20.0":
version: 1.20.0
resolution: "body-parser@npm:1.20.0"
"body-parser@npm:1.20.2":
version: 1.20.2
resolution: "body-parser@npm:1.20.2"
dependencies:
bytes: "npm:3.1.2"
content-type: "npm:~1.0.4"
content-type: "npm:~1.0.5"
debug: "npm:2.6.9"
depd: "npm:2.0.0"
destroy: "npm:1.2.0"
http-errors: "npm:2.0.0"
iconv-lite: "npm:0.4.24"
on-finished: "npm:2.4.1"
qs: "npm:6.10.3"
raw-body: "npm:2.5.1"
qs: "npm:6.11.0"
raw-body: "npm:2.5.2"
type-is: "npm:~1.6.18"
unpipe: "npm:1.0.0"
checksum: 10/63fe82c27fdacac51d26665c3d13d4c6e48d1c3e9efe1fbc0fd18801aa9a598ab1023b09298ae4b3d0a7598d55902d793f7fa1b5551da99c16eabfed9b022a51
checksum: 10/3cf171b82190cf91495c262b073e425fc0d9e25cc2bf4540d43f7e7bbca27d6a9eae65ca367b6ef3993eea261159d9d2ab37ce444e8979323952e12eb3df319a
languageName: node
linkType: hard

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

"content-type@npm:~1.0.5":
version: 1.0.5
resolution: "content-type@npm:1.0.5"
checksum: 10/585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662
languageName: node
linkType: hard

"convert-source-map@npm:^1.5.0":
version: 1.9.0
resolution: "convert-source-map@npm:1.9.0"
Expand Down Expand Up @@ -3259,10 +3266,10 @@ __metadata:
languageName: node
linkType: hard

"cookie@npm:0.5.0":
version: 0.5.0
resolution: "cookie@npm:0.5.0"
checksum: 10/aae7911ddc5f444a9025fbd979ad1b5d60191011339bce48e555cb83343d0f98b865ff5c4d71fecdfb8555a5cafdc65632f6fce172f32aaf6936830a883a0380
"cookie@npm:0.6.0":
version: 0.6.0
resolution: "cookie@npm:0.6.0"
checksum: 10/c1f8f2ea7d443b9331680598b0ae4e6af18a618c37606d1bbdc75bec8361cce09fe93e727059a673f2ba24467131a9fb5a4eec76bb1b149c1b3e1ccb268dc583
languageName: node
linkType: hard

Expand Down Expand Up @@ -4479,16 +4486,16 @@ __metadata:
languageName: node
linkType: hard

"express@npm:4.18.1":
version: 4.18.1
resolution: "express@npm:4.18.1"
"express@npm:4.19.2":
version: 4.19.2
resolution: "express@npm:4.19.2"
dependencies:
accepts: "npm:~1.3.8"
array-flatten: "npm:1.1.1"
body-parser: "npm:1.20.0"
body-parser: "npm:1.20.2"
content-disposition: "npm:0.5.4"
content-type: "npm:~1.0.4"
cookie: "npm:0.5.0"
cookie: "npm:0.6.0"
cookie-signature: "npm:1.0.6"
debug: "npm:2.6.9"
depd: "npm:2.0.0"
Expand All @@ -4504,7 +4511,7 @@ __metadata:
parseurl: "npm:~1.3.3"
path-to-regexp: "npm:0.1.7"
proxy-addr: "npm:~2.0.7"
qs: "npm:6.10.3"
qs: "npm:6.11.0"
range-parser: "npm:~1.2.1"
safe-buffer: "npm:5.2.1"
send: "npm:0.18.0"
Expand All @@ -4514,7 +4521,7 @@ __metadata:
type-is: "npm:~1.6.18"
utils-merge: "npm:1.0.1"
vary: "npm:~1.1.2"
checksum: 10/7cfc95b09419c05aa565f841511853801d20c8b9a44863fbad797c325b329e4341e58fd0464489df014b8881579ae95625785c172d27e67f474a7fdb3aaf3923
checksum: 10/3fcd792536f802c059789ef48db3851b87e78fba103423e524144d79af37da7952a2b8d4e1a007f423329c7377d686d9476ac42e7d9ea413b80345d495e30a3a
languageName: node
linkType: hard

Expand Down Expand Up @@ -7574,21 +7581,21 @@ __metadata:
languageName: node
linkType: hard

"qs@npm:6.10.3":
version: 6.10.3
resolution: "qs@npm:6.10.3"
"qs@npm:6.10.4":
version: 6.10.4
resolution: "qs@npm:6.10.4"
dependencies:
side-channel: "npm:^1.0.4"
checksum: 10/73d07bfd77f07bec3750dca5e6d165cba0c87ce3e4688bb26e5e462e725ab1289ecdb69164b0b4a4d1b913e2a3ae6b22acbb8b2feb5c8f31bd76f2380f3dc23d
checksum: 10/8887a53f63180e0e0291deafef581e550bc3656f2453adc8d3ca34b49c04354d31079962f7faf90ab8f5fd6e3d70ee6645042b27814a757a3a5d5708ae3f58e0
languageName: node
linkType: hard

"qs@npm:6.10.4":
version: 6.10.4
resolution: "qs@npm:6.10.4"
"qs@npm:6.11.0":
version: 6.11.0
resolution: "qs@npm:6.11.0"
dependencies:
side-channel: "npm:^1.0.4"
checksum: 10/8887a53f63180e0e0291deafef581e550bc3656f2453adc8d3ca34b49c04354d31079962f7faf90ab8f5fd6e3d70ee6645042b27814a757a3a5d5708ae3f58e0
checksum: 10/5a3bfea3e2f359ede1bfa5d2f0dbe54001aa55e40e27dc3e60fab814362d83a9b30758db057c2011b6f53a2d4e4e5150194b5bac45372652aecb3e3c0d4b256e
languageName: node
linkType: hard

Expand Down Expand Up @@ -7632,15 +7639,15 @@ __metadata:
languageName: node
linkType: hard

"raw-body@npm:2.5.1":
version: 2.5.1
resolution: "raw-body@npm:2.5.1"
"raw-body@npm:2.5.2":
version: 2.5.2
resolution: "raw-body@npm:2.5.2"
dependencies:
bytes: "npm:3.1.2"
http-errors: "npm:2.0.0"
iconv-lite: "npm:0.4.24"
unpipe: "npm:1.0.0"
checksum: 10/280bedc12db3490ecd06f740bdcf66093a07535374b51331242382c0e130bb273ebb611b7bc4cba1b4b4e016cc7b1f4b05a6df885a6af39c2bc3b94c02291c84
checksum: 10/863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95
languageName: node
linkType: hard

Expand Down Expand Up @@ -8349,7 +8356,7 @@ __metadata:
eslint-plugin-react: "npm:^7.34.0"
eslint-plugin-react-hooks: "npm:^4.6.0"
eslint-plugin-testing-library: "npm:^6.2.0"
express: "npm:4.18.1"
express: "npm:4.19.2"
husky: "npm:9.0.6"
i18next: "npm:23.8.2"
i18next-browser-languagedetector: "npm:7.2.0"
Expand Down

0 comments on commit 4276cfd

Please sign in to comment.