diff --git a/apps/plone/package.json b/apps/plone/package.json index b5e2e0ccb9..b7bcd8c73d 100644 --- a/apps/plone/package.json +++ b/apps/plone/package.json @@ -66,7 +66,7 @@ }, "setupFiles": [ "@plone/volto/test-setup-globals.js", - "@plone/volto/test-setup-config.js" + "@plone/volto/test-setup-config.jsx" ], "globals": { "__DEV__": true diff --git a/packages/generator-volto/generators/app/templates/package.json.tpl b/packages/generator-volto/generators/app/templates/package.json.tpl index 653b39a1e0..ca5c3edcec 100644 --- a/packages/generator-volto/generators/app/templates/package.json.tpl +++ b/packages/generator-volto/generators/app/templates/package.json.tpl @@ -66,7 +66,7 @@ }, "setupFiles": [ "@plone/volto/test-setup-globals.js", - "@plone/volto/test-setup-config.js" + "@plone/volto/test-setup-config.jsx" ], "globals": { "__DEV__": true diff --git a/packages/generator-volto/news/6133.bugfix b/packages/generator-volto/news/6133.bugfix new file mode 100644 index 0000000000..76af974497 --- /dev/null +++ b/packages/generator-volto/news/6133.bugfix @@ -0,0 +1 @@ +Rename test-setup-config.js to test-setup-config.jsx, otherwise jest tests will eventually fail @tomschall \ No newline at end of file diff --git a/packages/volto/news/6133.bugfix b/packages/volto/news/6133.bugfix new file mode 100644 index 0000000000..1732eebd9f --- /dev/null +++ b/packages/volto/news/6133.bugfix @@ -0,0 +1 @@ +Whitelist some dynamic imports to suppress vite warnings in storybook @tomschall \ No newline at end of file diff --git a/packages/volto/src/components/manage/Add/Add.jsx b/packages/volto/src/components/manage/Add/Add.jsx index 0510b43f5a..1c4fb668e6 100644 --- a/packages/volto/src/components/manage/Add/Add.jsx +++ b/packages/volto/src/components/manage/Add/Add.jsx @@ -239,7 +239,9 @@ class Add extends Component { if (this.props.location?.state?.translationOf) { const language = this.props.location.state.languageFrom; const langFileName = toGettextLang(language); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { this.props.changeLanguage(language, locale.default); }); this.props.history.push(this.props.location?.state?.translationOf); diff --git a/packages/volto/src/components/manage/Multilingual/CreateTranslation.jsx b/packages/volto/src/components/manage/Multilingual/CreateTranslation.jsx index adc364f507..24371546c7 100644 --- a/packages/volto/src/components/manage/Multilingual/CreateTranslation.jsx +++ b/packages/volto/src/components/manage/Multilingual/CreateTranslation.jsx @@ -34,7 +34,9 @@ const CreateTranslation = (props) => { // We change the interface language if (config.settings.supportedLanguages.includes(language)) { const langFileName = toGettextLang(language); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { dispatch(changeLanguage(language, locale.default)); }); } diff --git a/packages/volto/src/components/manage/Multilingual/TranslationObject.jsx b/packages/volto/src/components/manage/Multilingual/TranslationObject.jsx index 706507b878..6b00724adf 100644 --- a/packages/volto/src/components/manage/Multilingual/TranslationObject.jsx +++ b/packages/volto/src/components/manage/Multilingual/TranslationObject.jsx @@ -48,7 +48,9 @@ const TranslationObject = ({ let lang = config.settings.supportedLanguages[Object.keys(locales).length]; const langFileName = toGettextLang(lang); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { setLocales({ ...locales, [toReactIntlLang(lang)]: locale.default }); setLoadingLocale(false); }); diff --git a/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx b/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx index 22681be9e3..ed494c2792 100644 --- a/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx +++ b/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx @@ -88,7 +88,9 @@ class PersonalPreferences extends Component { let language = data.language || 'en'; if (config.settings.supportedLanguages.includes(language)) { const langFileName = toGettextLang(language); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { this.props.changeLanguage(language, locale.default); }); } diff --git a/packages/volto/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx b/packages/volto/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx index dfd5fc99b2..6e71beb381 100644 --- a/packages/volto/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx +++ b/packages/volto/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx @@ -24,7 +24,9 @@ const MultilingualRedirector = (props) => { let mounted = true; if (settings.isMultilingual && pathname === '/') { const langFileName = toGettextLang(redirectToLanguage); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { if (mounted) { dispatch(changeLanguage(redirectToLanguage, locale.default)); } diff --git a/packages/volto/src/middleware/api.js b/packages/volto/src/middleware/api.js index f46dc30470..fa23d37dbb 100644 --- a/packages/volto/src/middleware/api.js +++ b/packages/volto/src/middleware/api.js @@ -237,11 +237,11 @@ const apiMiddlewareFactory = config.settings.supportedLanguages.includes(lang) ) { const langFileName = toGettextLang(lang); - import('@root/../locales/' + langFileName + '.json').then( - (locale) => { - dispatch(changeLanguage(lang, locale.default)); - }, - ); + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { + dispatch(changeLanguage(lang, locale.default)); + }); } } if (type === LOGIN && settings.websockets) { diff --git a/packages/volto/src/server.jsx b/packages/volto/src/server.jsx index 38948f2c86..e8555349fc 100644 --- a/packages/volto/src/server.jsx +++ b/packages/volto/src/server.jsx @@ -46,7 +46,9 @@ let locales = {}; if (config.settings) { config.settings.supportedLanguages.forEach((lang) => { const langFileName = toGettextLang(lang); - import('@root/../locales/' + langFileName + '.json').then((locale) => { + import( + /* @vite-ignore */ '@root/../locales/' + langFileName + '.json' + ).then((locale) => { locales = { ...locales, [toReactIntlLang(lang)]: locale.default }; }); });