Skip to content

Commit 442adcb

Browse files
authored
Merge branch 'main' into chore/automerging-tooling-update-workflows
2 parents 955c125 + c7eef80 commit 442adcb

File tree

5 files changed

+984
-970
lines changed

5 files changed

+984
-970
lines changed

.yarn/releases/yarn-4.6.0.cjs

Lines changed: 0 additions & 934 deletions
This file was deleted.

.yarn/releases/yarn-4.9.1.cjs

Lines changed: 948 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ enableGlobalCache: false
44

55
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-4.6.0.cjs
7+
yarnPath: .yarn/releases/yarn-4.9.1.cjs

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"react-dom": "^18.2.0",
9696
"react-i18next": "^12.1.5",
9797
"swc-loader": "^0.2.3",
98-
"turbo": "^2.4.2",
98+
"turbo": "^2.5.2",
9999
"typescript": "^4.9.5",
100100
"webpack": "^5.75.0",
101101
"webpack-cli": "^5.0.1"
@@ -104,5 +104,5 @@
104104
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
105105
"*.{css,scss,ts,tsx}": "prettier --write --list-different"
106106
},
107-
"packageManager": "yarn@4.6.0"
107+
"packageManager": "yarn@4.9.1"
108108
}

yarn.lock

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3546,7 +3546,7 @@ __metadata:
35463546
react-dom: "npm:^18.2.0"
35473547
react-i18next: "npm:^12.1.5"
35483548
swc-loader: "npm:^0.2.3"
3549-
turbo: "npm:^2.4.2"
3549+
turbo: "npm:^2.5.2"
35503550
typescript: "npm:^4.9.5"
35513551
webpack: "npm:^5.75.0"
35523552
webpack-cli: "npm:^5.0.1"
@@ -13435,8 +13435,8 @@ __metadata:
1343513435
linkType: hard
1343613436

1343713437
"http-proxy-middleware@npm:^2.0.3":
13438-
version: 2.0.7
13439-
resolution: "http-proxy-middleware@npm:2.0.7"
13438+
version: 2.0.9
13439+
resolution: "http-proxy-middleware@npm:2.0.9"
1344013440
dependencies:
1344113441
"@types/http-proxy": "npm:^1.17.8"
1344213442
http-proxy: "npm:^1.18.1"
@@ -13448,7 +13448,7 @@ __metadata:
1344813448
peerDependenciesMeta:
1344913449
"@types/express":
1345013450
optional: true
13451-
checksum: 10/4a51bf612b752ad945701995c1c029e9501c97e7224c0cf3f8bf6d48d172d6a8f2b57c20fec469534fdcac3aa8a6f332224a33c6b0d7f387aa2cfff9b67216fd
13451+
checksum: 10/4ece416a91d52e96f8136c5f4abfbf7ac2f39becbad21fa8b158a12d7e7d8f808287ff1ae342b903fd1f15f2249dee87fabc09e1f0e73106b83331c496d67660
1345213452
languageName: node
1345313453
linkType: hard
1345413454

@@ -19920,58 +19920,58 @@ __metadata:
1992019920
languageName: node
1992119921
linkType: hard
1992219922

19923-
"turbo-darwin-64@npm:2.4.2":
19924-
version: 2.4.2
19925-
resolution: "turbo-darwin-64@npm:2.4.2"
19923+
"turbo-darwin-64@npm:2.5.2":
19924+
version: 2.5.2
19925+
resolution: "turbo-darwin-64@npm:2.5.2"
1992619926
conditions: os=darwin & cpu=x64
1992719927
languageName: node
1992819928
linkType: hard
1992919929

19930-
"turbo-darwin-arm64@npm:2.4.2":
19931-
version: 2.4.2
19932-
resolution: "turbo-darwin-arm64@npm:2.4.2"
19930+
"turbo-darwin-arm64@npm:2.5.2":
19931+
version: 2.5.2
19932+
resolution: "turbo-darwin-arm64@npm:2.5.2"
1993319933
conditions: os=darwin & cpu=arm64
1993419934
languageName: node
1993519935
linkType: hard
1993619936

19937-
"turbo-linux-64@npm:2.4.2":
19938-
version: 2.4.2
19939-
resolution: "turbo-linux-64@npm:2.4.2"
19937+
"turbo-linux-64@npm:2.5.2":
19938+
version: 2.5.2
19939+
resolution: "turbo-linux-64@npm:2.5.2"
1994019940
conditions: os=linux & cpu=x64
1994119941
languageName: node
1994219942
linkType: hard
1994319943

19944-
"turbo-linux-arm64@npm:2.4.2":
19945-
version: 2.4.2
19946-
resolution: "turbo-linux-arm64@npm:2.4.2"
19944+
"turbo-linux-arm64@npm:2.5.2":
19945+
version: 2.5.2
19946+
resolution: "turbo-linux-arm64@npm:2.5.2"
1994719947
conditions: os=linux & cpu=arm64
1994819948
languageName: node
1994919949
linkType: hard
1995019950

19951-
"turbo-windows-64@npm:2.4.2":
19952-
version: 2.4.2
19953-
resolution: "turbo-windows-64@npm:2.4.2"
19951+
"turbo-windows-64@npm:2.5.2":
19952+
version: 2.5.2
19953+
resolution: "turbo-windows-64@npm:2.5.2"
1995419954
conditions: os=win32 & cpu=x64
1995519955
languageName: node
1995619956
linkType: hard
1995719957

19958-
"turbo-windows-arm64@npm:2.4.2":
19959-
version: 2.4.2
19960-
resolution: "turbo-windows-arm64@npm:2.4.2"
19958+
"turbo-windows-arm64@npm:2.5.2":
19959+
version: 2.5.2
19960+
resolution: "turbo-windows-arm64@npm:2.5.2"
1996119961
conditions: os=win32 & cpu=arm64
1996219962
languageName: node
1996319963
linkType: hard
1996419964

19965-
"turbo@npm:^2.4.2":
19966-
version: 2.4.2
19967-
resolution: "turbo@npm:2.4.2"
19968-
dependencies:
19969-
turbo-darwin-64: "npm:2.4.2"
19970-
turbo-darwin-arm64: "npm:2.4.2"
19971-
turbo-linux-64: "npm:2.4.2"
19972-
turbo-linux-arm64: "npm:2.4.2"
19973-
turbo-windows-64: "npm:2.4.2"
19974-
turbo-windows-arm64: "npm:2.4.2"
19965+
"turbo@npm:^2.5.2":
19966+
version: 2.5.2
19967+
resolution: "turbo@npm:2.5.2"
19968+
dependencies:
19969+
turbo-darwin-64: "npm:2.5.2"
19970+
turbo-darwin-arm64: "npm:2.5.2"
19971+
turbo-linux-64: "npm:2.5.2"
19972+
turbo-linux-arm64: "npm:2.5.2"
19973+
turbo-windows-64: "npm:2.5.2"
19974+
turbo-windows-arm64: "npm:2.5.2"
1997519975
dependenciesMeta:
1997619976
turbo-darwin-64:
1997719977
optional: true
@@ -19987,7 +19987,7 @@ __metadata:
1998719987
optional: true
1998819988
bin:
1998919989
turbo: bin/turbo
19990-
checksum: 10/31f0d3a6f1453afebbd1b38ac8080b9b846662452c8312ab98e382249b3e4b978535cba9437e3966802ce55992064f44d4632a62eb85ceec1fa46a1a2bf9d1e0
19990+
checksum: 10/dee9047dbeeddd5584744e604620267749e278e71f9658fd58ca72f6f71d38c47132ea958aee7b7049e51c85bcfce35ca6efb1e8d180b03d7504d7427f05b026
1999119991
languageName: node
1999219992
linkType: hard
1999319993

0 commit comments

Comments
 (0)