Merge branch 'origin/main' into 'next-release/main'

This commit is contained in:
oauth
2026-05-28 08:47:24 +00:00
2 changed files with 33 additions and 26 deletions

View File

@@ -76,7 +76,7 @@
"resolve-url-loader": "^5.0.0",
"sass-loader": "^16.0.8",
"source-map-explorer": "^2.5.3",
"typescript": "^5.9.3",
"typescript": "^6.0.3",
"url-loader": "4.1.1",
"webpack": "5.105.2",
"webpack-manifest-plugin": "5.0.0",

View File

@@ -38,7 +38,7 @@ importers:
version: 1.16.0
i18next:
specifier: ^26.1.0
version: 26.1.0(typescript@5.9.3)
version: 26.1.0(typescript@6.0.3)
i18next-browser-languagedetector:
specifier: ^8.2.1
version: 8.2.1
@@ -56,7 +56,7 @@ importers:
version: 17.0.2(react@17.0.2)
react-i18next:
specifier: ^15.7.4
version: 15.7.4(i18next@26.1.0(typescript@5.9.3))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(typescript@5.9.3)
version: 15.7.4(i18next@26.1.0(typescript@6.0.3))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(typescript@6.0.3)
react-redux:
specifier: ^8.1.3
version: 8.1.3(@types/react-dom@17.0.26(@types/react@17.0.91))(@types/react@17.0.91)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(redux@4.2.1)
@@ -123,13 +123,13 @@ importers:
version: 2.9.2(webpack@5.105.2)
pnp-webpack-plugin:
specifier: 1.7.0
version: 1.7.0(typescript@5.9.3)
version: 1.7.0(typescript@6.0.3)
postcss-flexbugs-fixes:
specifier: 5.0.2
version: 5.0.2(postcss@8.5.15)
postcss-loader:
specifier: 8.2.1
version: 8.2.1(postcss@8.5.15)(typescript@5.9.3)(webpack@5.105.2)
version: 8.2.1(postcss@8.5.15)(typescript@6.0.3)(webpack@5.105.2)
postcss-normalize:
specifier: 13.0.1
version: 13.0.1(browserslist@4.28.2)(postcss@8.5.15)
@@ -138,7 +138,7 @@ importers:
version: 11.2.0(postcss@8.5.15)
react-dev-utils:
specifier: ^12.0.1
version: 12.0.1(typescript@5.9.3)(webpack@5.105.2)
version: 12.0.1(typescript@6.0.3)(webpack@5.105.2)
resolve:
specifier: ^1.22.12
version: 1.22.12
@@ -152,8 +152,8 @@ importers:
specifier: ^2.5.3
version: 2.5.3
typescript:
specifier: ^5.9.3
version: 5.9.3
specifier: ^6.0.3
version: 6.0.3
url-loader:
specifier: 4.1.1
version: 4.1.1(webpack@5.105.2)
@@ -4618,6 +4618,11 @@ packages:
engines: {node: '>=14.17'}
hasBin: true
typescript@6.0.3:
resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
engines: {node: '>=14.17'}
hasBin: true
unbox-primitive@1.1.0:
resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
engines: {node: '>= 0.4'}
@@ -7022,14 +7027,14 @@ snapshots:
path-type: 4.0.0
yaml: 1.10.3
cosmiconfig@9.0.1(typescript@5.9.3):
cosmiconfig@9.0.1(typescript@6.0.3):
dependencies:
env-paths: 2.2.1
import-fresh: 3.3.1
js-yaml: 4.1.1
parse-json: 5.2.0
optionalDependencies:
typescript: 5.9.3
typescript: 6.0.3
cross-spawn@7.0.6:
dependencies:
@@ -7544,7 +7549,7 @@ snapshots:
cross-spawn: 7.0.6
signal-exit: 4.1.0
fork-ts-checker-webpack-plugin@6.5.3(typescript@5.9.3)(webpack@5.105.2):
fork-ts-checker-webpack-plugin@6.5.3(typescript@6.0.3)(webpack@5.105.2):
dependencies:
'@babel/code-frame': 7.29.0
'@types/json-schema': 7.0.15
@@ -7559,7 +7564,7 @@ snapshots:
schema-utils: 2.7.0
semver: 7.8.1
tapable: 1.1.3
typescript: 5.9.3
typescript: 6.0.3
webpack: 5.105.2
form-data@4.0.5:
@@ -7914,9 +7919,9 @@ snapshots:
optionalDependencies:
typescript: 5.9.3
i18next@26.1.0(typescript@5.9.3):
i18next@26.1.0(typescript@6.0.3):
optionalDependencies:
typescript: 5.9.3
typescript: 6.0.3
iconv-lite@0.6.3:
dependencies:
@@ -8552,9 +8557,9 @@ snapshots:
dependencies:
find-up: 3.0.0
pnp-webpack-plugin@1.7.0(typescript@5.9.3):
pnp-webpack-plugin@1.7.0(typescript@6.0.3):
dependencies:
ts-pnp: 1.2.0(typescript@5.9.3)
ts-pnp: 1.2.0(typescript@6.0.3)
transitivePeerDependencies:
- typescript
@@ -8709,9 +8714,9 @@ snapshots:
'@csstools/utilities': 3.0.0(postcss@8.5.15)
postcss: 8.5.15
postcss-loader@8.2.1(postcss@8.5.15)(typescript@5.9.3)(webpack@5.105.2):
postcss-loader@8.2.1(postcss@8.5.15)(typescript@6.0.3)(webpack@5.105.2):
dependencies:
cosmiconfig: 9.0.1(typescript@5.9.3)
cosmiconfig: 9.0.1(typescript@6.0.3)
jiti: 2.7.0
postcss: 8.5.15
semver: 7.8.1
@@ -9037,7 +9042,7 @@ snapshots:
rimraf: 5.0.10
underscore.string: 3.3.6
react-dev-utils@12.0.1(typescript@5.9.3)(webpack@5.105.2):
react-dev-utils@12.0.1(typescript@6.0.3)(webpack@5.105.2):
dependencies:
'@babel/code-frame': 7.29.0
address: 1.2.2
@@ -9048,7 +9053,7 @@ snapshots:
escape-string-regexp: 4.0.0
filesize: 8.0.7
find-up: 5.0.0
fork-ts-checker-webpack-plugin: 6.5.3(typescript@5.9.3)(webpack@5.105.2)
fork-ts-checker-webpack-plugin: 6.5.3(typescript@6.0.3)(webpack@5.105.2)
global-modules: 2.0.0
globby: 11.1.0
gzip-size: 6.0.0
@@ -9065,7 +9070,7 @@ snapshots:
text-table: 0.2.0
webpack: 5.105.2
optionalDependencies:
typescript: 5.9.3
typescript: 6.0.3
transitivePeerDependencies:
- eslint
- supports-color
@@ -9080,15 +9085,15 @@ snapshots:
react-error-overlay@6.1.0: {}
react-i18next@15.7.4(i18next@26.1.0(typescript@5.9.3))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(typescript@5.9.3):
react-i18next@15.7.4(i18next@26.1.0(typescript@6.0.3))(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(typescript@6.0.3):
dependencies:
'@babel/runtime': 7.29.2
html-parse-stringify: 3.0.1
i18next: 26.1.0(typescript@5.9.3)
i18next: 26.1.0(typescript@6.0.3)
react: 17.0.2
optionalDependencies:
react-dom: 17.0.2(react@17.0.2)
typescript: 5.9.3
typescript: 6.0.3
react-is@16.13.1: {}
@@ -9777,9 +9782,9 @@ snapshots:
treeify@1.1.0: {}
ts-pnp@1.2.0(typescript@5.9.3):
ts-pnp@1.2.0(typescript@6.0.3):
optionalDependencies:
typescript: 5.9.3
typescript: 6.0.3
tslib@2.8.1: {}
@@ -9831,6 +9836,8 @@ snapshots:
typescript@5.9.3: {}
typescript@6.0.3: {}
unbox-primitive@1.1.0:
dependencies:
call-bound: 1.0.4