Skip to content

Commit 6c5a4d6

Browse files
committed
Merge branch 'v3.35' into release/v3.35.2
2 parents 1b9fd45 + a6cdac2 commit 6c5a4d6

4 files changed

Lines changed: 1082 additions & 825 deletions

File tree

config/webpack.dll.babel.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ export default {
6060
},
6161
module: {
6262
rules: [
63+
{
64+
test: /\.m?js$/,
65+
resolve: {
66+
fullySpecified: false,
67+
},
68+
},
6369
{
6470
test: /\.(woff|woff2|ttf|eot|jpg|jpeg|png|svg)$/i,
6571
use: [

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
"repository": "https://github.com/TheThingsNetwork/lorawan-stack.git",
77
"license": "Apache-2.0",
88
"devDependencies": {
9-
"@babel/cli": "^7.28.3",
10-
"@babel/core": "^7.28.5",
11-
"@babel/eslint-parser": "^7.28.5",
9+
"@babel/cli": "^7.28.6",
10+
"@babel/core": "^7.28.6",
11+
"@babel/eslint-parser": "^7.28.6",
1212
"@babel/plugin-proposal-class-properties": "^7.18.6",
13-
"@babel/plugin-proposal-decorators": "^7.28.0",
13+
"@babel/plugin-proposal-decorators": "^7.28.6",
1414
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
1515
"@babel/plugin-transform-runtime": "^7.28.5",
16-
"@babel/plugin-transform-spread": "^7.27.1",
16+
"@babel/plugin-transform-spread": "^7.28.6",
1717
"@babel/plugin-transform-strict-mode": "^7.27.1",
18-
"@babel/preset-env": "^7.28.5",
18+
"@babel/preset-env": "^7.28.6",
1919
"@babel/preset-react": "^7.28.5",
20-
"@babel/register": "^7.28.3",
21-
"@babel/runtime-corejs2": "^7.28.4",
22-
"@inquirer/prompts": "^8.1.0",
20+
"@babel/register": "^7.28.6",
21+
"@babel/runtime-corejs2": "^7.28.6",
22+
"@inquirer/prompts": "^8.2.0",
2323
"@pmmmwh/react-refresh-webpack-plugin": "^0.6.2",
24+
"@storybook/addon-actions": "9.0.8",
2425
"@storybook/addon-designs": "8.2.1",
2526
"@storybook/addon-essentials": "8.6.14",
2627
"@storybook/addon-mdx-gfm": "8.6.14",
27-
"@storybook/addon-actions": "9.0.8",
28-
"@storybook/cli": "10.1.9",
28+
"@storybook/cli": "10.1.11",
2929
"@storybook/react": "8.6.14",
3030
"@storybook/react-webpack5": "8.6.14",
3131
"@testing-library/cypress": "^10.1.0",
@@ -38,7 +38,7 @@
3838
"clean-webpack-plugin": "^4.0.0",
3939
"copy-webpack-plugin": "^13.0.1",
4040
"css-loader": "^6.10.0",
41-
"cypress": "15.8.0",
41+
"cypress": "15.8.2",
4242
"cypress-browser-permissions": "^1.1.0",
4343
"cypress-file-upload": "^5.0.8",
4444
"cypress-log-to-output": "^1.1.2",
@@ -69,30 +69,30 @@
6969
"pg": "^8.16.3",
7070
"prettier": "3.7.4",
7171
"react-refresh": "^0.18.0",
72+
"storybook": "^8.6.15",
7273
"stylelint": "^16.26.1",
7374
"stylelint-stylus": "^1.0.0",
74-
"storybook": "^8.6.15",
7575
"stylus": "^0.64.0",
7676
"stylus-loader": "^8.1.2",
7777
"wait-on": "^9.0.3",
78-
"webpack": "^5.104.0",
78+
"webpack": "^5.104.1",
7979
"webpack-cli": "^6.0.1",
80-
"webpack-dev-server": "^5.2.2",
80+
"webpack-dev-server": "^5.2.3",
8181
"webpack-shell-plugin": "https://github.com/cdeutsch/webpack-shell-plugin.git#bee537d",
8282
"yargs": "^17.7.2"
8383
},
8484
"dependencies": {
85-
"@tabler/icons-react": "^3.36.0",
86-
"@formatjs/intl-datetimeformat": "^6.18.2",
87-
"@formatjs/intl-displaynames": "^6.8.13",
88-
"@formatjs/intl-listformat": "^7.7.13",
89-
"@formatjs/intl-locale": "^4.2.13",
90-
"@formatjs/intl-numberformat": "^8.15.6",
91-
"@formatjs/intl-pluralrules": "^5.4.6",
92-
"@formatjs/intl-relativetimeformat": "^11.4.13",
85+
"@formatjs/intl-datetimeformat": "^7.1.2",
86+
"@formatjs/intl-displaynames": "^7.1.2",
87+
"@formatjs/intl-listformat": "^8.1.2",
88+
"@formatjs/intl-locale": "^5.1.2",
89+
"@formatjs/intl-numberformat": "^9.1.2",
90+
"@formatjs/intl-pluralrules": "^6.1.2",
91+
"@formatjs/intl-relativetimeformat": "^12.1.2",
9392
"@reduxjs/toolkit": "^2.11.2",
9493
"@sentry/integrations": "^7.114.0",
95-
"@sentry/react": "^10.31.0",
94+
"@sentry/react": "^10.33.0",
95+
"@tabler/icons-react": "^3.36.1",
9696
"@tippyjs/react": "^4.2.6",
9797
"apexcharts": "^5.3.6",
9898
"autobind-decorator": "^2.4.0",
@@ -107,7 +107,7 @@
107107
"history": "^5.3.0",
108108
"jsqr": "^1.4.0",
109109
"leaflet": "^1.9.4",
110-
"lodash": "^4.17.21",
110+
"lodash": "^4.17.23",
111111
"md5": "^2.3.0",
112112
"prop-types": "^15.8.1",
113113
"query-string": "^9.3.1",
@@ -125,7 +125,7 @@
125125
"react-remove-scroll": "^2.7.2",
126126
"react-router-dom": "^6.14.1",
127127
"react-select": "^5.10.2",
128-
"react-string-replace": "^1.1.1",
128+
"react-string-replace": "^2.0.1",
129129
"react-switch": "^7.1.0",
130130
"react-text-mask": "^5.5.0",
131131
"react-toastify": "^9.1.3",

pkg/webui/lib/components/with-locale.js

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,18 @@ const WithLocale = ({ children }) => {
106106
if (!window.Intl.Locale) {
107107
log('Polyfilling Intl.Locale')
108108
await import(
109-
/* webpackChunkName: "locale-display-names" */ '@formatjs/intl-locale/polyfill'
109+
/* webpackChunkName: "locale-display-names" */
110+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
111+
'@formatjs/intl-locale/polyfill.js'
110112
)
111113
}
112114

113115
if (!window.Intl.DisplayNames) {
114116
log('Polyfilling Intl.DisplayNames')
115117
await import(
116-
/* webpackChunkName: "locale-display-names" */ '@formatjs/intl-displaynames/polyfill'
118+
/* webpackChunkName: "locale-display-names" */
119+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
120+
'@formatjs/intl-displaynames/polyfill.js'
117121
)
118122
// Instead of using dynamic imports that would cause all possible locales to be bundled
119123
// we only load the ones we want to support which as of now are English and Japanese.
@@ -129,35 +133,45 @@ const WithLocale = ({ children }) => {
129133
if (!window.Intl.ListFormat) {
130134
log('Polyfilling Intl.ListFormat')
131135
await import(
132-
/* webpackChunkName: "locale-list-format" */ '@formatjs/intl-listformat/polyfill'
136+
/* webpackChunkName: "locale-list-format" */
137+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
138+
'@formatjs/intl-listformat/polyfill.js'
133139
)
134140
}
135141

136142
if (!window.Intl.PluralRules) {
137143
log('Polyfilling Intl.PluralRules')
138144
await import(
139-
/* webpackChunkName: "locale-plural-rules" */ '@formatjs/intl-pluralrules/polyfill'
145+
/* webpackChunkName: "locale-plural-rules" */
146+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
147+
'@formatjs/intl-pluralrules/polyfill.js'
140148
)
141149
}
142150

143151
if (!window.Intl.NumberFormat) {
144152
log('Polyfilling Intl.NumberFormat')
145153
await import(
146-
/* webpackChunkName: "locale-number-format" */ '@formatjs/intl-numberformat/polyfill'
154+
/* webpackChunkName: "locale-number-format" */
155+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
156+
'@formatjs/intl-numberformat/polyfill.js'
147157
)
148158
}
149159

150160
if (!window.Intl.RelativeTimeFormat) {
151161
log('Polyfilling Intl.RelativeTimeFormat')
152162
await import(
153-
/* webpackChunkName: "locale-date-time-format" */ '@formatjs/intl-relativetimeformat/polyfill'
163+
/* webpackChunkName: "locale-date-time-format" */
164+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
165+
'@formatjs/intl-relativetimeformat/polyfill.js'
154166
)
155167
}
156168

157169
if (!window.Intl.DateTimeFormat) {
158170
log('Polyfilling Intl.DateTimeFormat')
159171
await import(
160-
/* webpackChunkName: "locale-date-time-format" */ '@formatjs/intl-datetimeformat/polyfill'
172+
/* webpackChunkName: "locale-date-time-format" */
173+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
174+
'@formatjs/intl-datetimeformat/polyfill.js'
161175
)
162176
}
163177

@@ -250,7 +264,11 @@ const LocaleLoader = ({ children }) => {
250264
if (window.Intl.DateTimeFormat.polyfilled) {
251265
log(`Polyfilling DateTimeFormat for language ${language}`)
252266
promises.push(
253-
import(/* webpackChunkName: "locale" */ '@formatjs/intl-datetimeformat/add-all-tz'),
267+
import(
268+
/* webpackChunkName: "locale" */
269+
// eslint-disable-next-line import/extensions -- package exports require explicit .js
270+
'@formatjs/intl-datetimeformat/add-all-tz.js'
271+
),
254272
)
255273
switch (language) {
256274
case 'ja':

0 commit comments

Comments
 (0)