Merge branch 'main' into vitesupport

* main: Automatically add the PLIP to the PLIP project board (#6134) Fix link to renamed `src/constants/Languages.cjs` (#6135) Release 18.0.0-alpha.39 Release generate-volto 9.0.0-alpha.17 rename test-setup-config.js to test-setup-config.jsx (#6133) Cleanup Image widget and pass down `onSelectItem` prop if any (#6132) Release 18.0.0-alpha.38 Release @plone/slate 18.0.0-alpha.15 Rename `constants/Language` module to the right suffix, and other actions to make ESM bundlers happy. (#6130)
plone · Jun 29, 2024 · 476af45 · 476af45
2 parents e2588ae + 51bdfa0
commit 476af45
Show file tree

Hide file tree

Showing 25 changed files with 102 additions and 51 deletions.
diff --git a/.github/ISSUE_TEMPLATE/PLIP.md b/.github/ISSUE_TEMPLATE/PLIP.md
@@ -4,6 +4,7 @@ about: Plone Improvement Proposal
 title: ''
 labels: '03 type: feature (plip)'
 assignees: ''
+projects: 'plone/47'
 
 ---
 

diff --git 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/docs/source/development/i18n.md b/docs/source/development/i18n.md
@@ -25,7 +25,7 @@ The workflow for creating *new* translatable text strings is as follows:
 1. Extract all i18n strings from your code with a script and create artifacts, like `.po` and `.pot` files.
 1. Use your favorite editor to translate all i18n strings by editing the `.po` files.
 1. Re-run the script, which then moves the translations from the `.po` files into `.json` files for Volto to use.
-1. Edit [`packages/volto/src/constants/Languages.js`](https:/plone/volto/blob/main/packages/volto/src/constants/Languages.js), adding your new language's locale code, as defined in {ref}`i18n-l10n-locale-and-language-tag-conventions-label`.
+1. Edit [`packages/volto/src/constants/Languages.cjs`](https:/plone/volto/blob/main/packages/volto/src/constants/Languages.cjs), adding your new language's locale code, as defined in {ref}`i18n-l10n-locale-and-language-tag-conventions-label`.
 1. Run the unit tests as described in {ref}`run-jest-tests-on-volto-core-label`, following the prompt to update the snapshot when the test fails.
 
 This way of organizing translations relies on [gettext](https://en.wikipedia.org/wiki/Gettext), a proven and established system with great tool support.

diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,19 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.39 (2024-06-28)
+
+### Bugfix
+
+- Cleanup Image widget and pass down onSelectItem prop if any @sneridagh [#6132](https:/plone/volto/issues/6132)
+- Whitelist some dynamic imports to suppress vite warnings in storybook @tomschall [#6133](https:/plone/volto/issues/6133)
+
+## 18.0.0-alpha.38 (2024-06-28)
+
+### Internal
+
+- Renamed `constants/Languages.js` to `constants/Languages.cjs` @sneridagh [#6130](https:/plone/volto/issues/6130)
+
 ## 18.0.0-alpha.37 (2024-06-27)
 
 ### Feature

diff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-guide/index.md
@@ -354,6 +354,23 @@ The input field's placeholder text was moved above the buttons.
 Together these changes improve usability both on small screens and in small containers, such as when the widget is in grid block elements.
 
 
+### Renamed the `constants/Languages` module
+
+`src/constants/Languages.js` has been renamed to `src/constants/Languages.cjs` since, in fact, it's a CommonJS module.
+This change is needed for consistency with module suffixes in Volto core, in preparation for replacing Razzle with a modern builder.
+
+The only Volto component that makes use of it is `PersonalPreferences`.
+If you shadow it, then you should update this component.
+For the rest, it is unlikely that your code refers to this module, since it's used internally by Volto itself.
+
+### Renamed `test-setup-config` module
+
+`test-setup-config.js` has been renamed to `test-setup-config.jsx` since, in fact, it contains JSX.
+This change is needed for consistency with module suffixes in Volto core, in preparation for replacing Razzle with a modern builder.
+
+It is unlikely that your code uses it, unless you heavily customized the Jest testing pipeline.
+
+
 (volto-upgrade-guide-17.x.x)=
 
 ## Upgrading to Volto 17.x.x

diff --git a/packages/generator-volto/CHANGELOG.md b/packages/generator-volto/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 9.0.0-alpha.17 (2024-06-28)
+
+### Bugfix
+
+- Rename test-setup-config.js to test-setup-config.jsx, otherwise jest tests will eventually fail @tomschall [#6133](https:/plone/volto/issues/6133)
+
 ## 9.0.0-alpha.16 (2024-05-15)
 
 ### Bugfix

diff --git 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/package.json b/packages/generator-volto/package.json
@@ -10,7 +10,7 @@
  }
  ],
  "license": "MIT",
- "version": "9.0.0-alpha.16",
+ "version": "9.0.0-alpha.17",
  "repository": {
  "type": "git",
  "url": "git+https:/plone/generator-volto.git"

diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.15 (2024-06-28)
+
+### Internal
+
+- Add proper dependencies to `volto-slate`. @sneridagh [#6130](https:/plone/volto/issues/6130)
+
 ## 18.0.0-alpha.14 (2024-06-26)
 
 ### Feature

diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@plone/volto-slate",
- "version": "18.0.0-alpha.14",
+ "version": "18.0.0-alpha.15",
  "description": "Slate.js integration with Volto",
  "main": "src/index.js",
  "author": "European Environment Agency: IDM2 A-Team",

diff --git a/packages/volto/CHANGELOG.md b/packages/volto/CHANGELOG.md
@@ -17,6 +17,19 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.39 (2024-06-28)
+
+### Bugfix
+
+- Cleanup Image widget and pass down onSelectItem prop if any @sneridagh [#6132](https:/plone/volto/issues/6132)
+- Whitelist some dynamic imports to suppress vite warnings in storybook @tomschall [#6133](https:/plone/volto/issues/6133)
+
+## 18.0.0-alpha.38 (2024-06-28)
+
+### Internal
+
+- Renamed `constants/Languages.js` to `constants/Languages.cjs` @sneridagh [#6130](https:/plone/volto/issues/6130)
+
 ## 18.0.0-alpha.37 (2024-06-27)
 
 ### Feature

diff --git a/packages/volto/news/6134.internal b/packages/volto/news/6134.internal
@@ -0,0 +1 @@
+Automatically add a PLIP issue to the PLIP project board. @stevepiercy
diff --git a/packages/volto/news/6135.documentation b/packages/volto/news/6135.documentation
@@ -0,0 +1 @@
+Fix link to renamed `src/constants/Languages.cjs`. @stevepiercy
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -9,7 +9,7 @@
  }
  ],
  "license": "MIT",
- "version": "18.0.0-alpha.37",
+ "version": "18.0.0-alpha.39",
  "repository": {
  "type": "git",
  "url": "[email protected]:plone/volto.git"
@@ -109,7 +109,7 @@
  },
  "setupFiles": [
  "./test-setup-globals.js",
- "./test-setup-config.js"
+ "./test-setup-config.jsx"
  ],
  "globalSetup": "./global-test-setup.js",
  "setupFilesAfterEnv": [

diff --git a/packages/volto/razzle.config.js b/packages/volto/razzle.config.js
@@ -20,7 +20,7 @@ const AfterBuildPlugin = require('@fiverr/afterbuild-webpack-plugin');
 const fileLoaderFinder = makeLoaderFinder('file-loader');
 
 const projectRootPath = path.resolve('.');
-const languages = require('./src/constants/Languages');
+const languages = require('./src/constants/Languages.cjs');
 
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 

diff --git a/packages/volto/src/components/manage/Blocks/Image/Edit.jsx b/packages/volto/src/components/manage/Blocks/Image/Edit.jsx
@@ -4,13 +4,8 @@
  */
 
 import React from 'react';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-
-import { injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { ImageSidebar, SidebarPortal } from '@plone/volto/components';
-import { createContent } from '@plone/volto/actions';
 
 import {
  flattenToAppURL,
@@ -21,18 +16,6 @@ import config from '@plone/volto/registry';
 
 import { ImageInput } from '@plone/volto/components/manage/Widgets/ImageWidget';
 
-/**
- * Edit image block function.
- * @function Edit
- */
-
-// const messages = defineMessages({
-// notImage: {
-// id: 'The provided link does not lead to an image.',
-// defaultMessage: 'The provided link does not lead to an image.',
-// },
-// });
-
 function Edit(props) {
  const { data } = props;
  const Image = config.getComponent({ name: 'Image' }).component;
@@ -120,14 +103,4 @@ function Edit(props) {
  );
 }
 
-export default compose(
- injectIntl,
- withBlockExtensions,
- connect(
- (state, ownProps) => ({
- request: state.content.subrequests[ownProps.block] || {},
- content: state.content.subrequests[ownProps.block]?.data,
- }),
- { createContent },
- ),
-)(Edit);
+export default withBlockExtensions(Edit);
diff --git a/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx b/packages/volto/src/components/manage/Preferences/PersonalPreferences.jsx
@@ -14,7 +14,7 @@ import { toast } from 'react-toastify';
 
 import { Toast } from '@plone/volto/components';
 import { Form } from '@plone/volto/components/manage/Form';
-import languages from '@plone/volto/constants/Languages';
+import languages from '@plone/volto/constants/Languages.cjs';
 import { changeLanguage } from '@plone/volto/actions';
 import { toGettextLang } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';

diff --git a/packages/volto/src/components/manage/Widgets/ImageWidget.jsx b/packages/volto/src/components/manage/Widgets/ImageWidget.jsx
@@ -75,6 +75,7 @@ const UnconnectedImageInput = (props) => {
  objectBrowserPickerType = 'image',
  description,
  placeholderLinkInput = '',
+ onSelectItem,
  } = props;
 
  const intl = useIntl();
@@ -204,16 +205,15 @@ const UnconnectedImageInput = (props) => {
  e.preventDefault();
  openObjectBrowser({
  mode: objectBrowserPickerType,
- onSelectItem: (
- url,
- { title, image_field, image_scales },
- ) => {
- onChange(props.id, flattenToAppURL(url), {
- title,
- image_field,
- image_scales,
- });
- },
+ onSelectItem: onSelectItem
+ ? onSelectItem
+ : (url, { title, image_field, image_scales }) => {
+ onChange(props.id, flattenToAppURL(url), {
+ title,
+ image_field,
+ image_scales,
+ });
+ },
  currentPath: contextUrl,
  });
  }}

diff --git a/packages/volto/src/constants/Languages.js → packages/volto/src/constants/Languages.cjs b/packages/volto/src/constants/Languages.js → packages/volto/src/constants/Languages.cjs
@@ -20,3 +20,5 @@ export default {
  pt_BR: 'Português (Brasil)',
  zh_CN: '中文',
 };
+
+// export default languages;
diff --git a/packages/volto/src/helpers/AuthToken/AuthToken.js b/packages/volto/src/helpers/AuthToken/AuthToken.js
@@ -104,7 +104,7 @@ export function persistAuthToken(store, req) {
  handleChange(true);
 }
 
-// if (module.hot) {
+// if (module?.hot) {
 // module.hot.dispose((data) => {
 // data.reloaded = true;
 // });

diff --git a/packages/volto/src/server.jsx b/packages/volto/src/server.jsx
@@ -36,7 +36,7 @@ import userSession from '@plone/volto/reducers/userSession/userSession';
 
 import ErrorPage from '@plone/volto/error';
 
-import languages from '@plone/volto/constants/Languages';
+import languages from '@plone/volto/constants/Languages.cjs';
 
 import configureStore from '@plone/volto/store';
 import { ReduxAsyncConnect, loadOnServer } from './helpers/AsyncConnect';
@@ -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 };
  });
  });

diff --git a/packages/volto/test-setup-config.js → packages/volto/test-setup-config.jsx b/packages/volto/test-setup-config.js → packages/volto/test-setup-config.jsx
diff --git a/packages/volto/types/components/manage/Blocks/Image/Edit.d.ts b/packages/volto/types/components/manage/Blocks/Image/Edit.d.ts
@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default _default;
diff --git a/packages/volto/types/constants/Languages.d.cts b/packages/volto/types/constants/Languages.d.cts
@@ -0,0 +1,15 @@
+export let ca: string;
+export let de: string;
+export let en: string;
+export let es: string;
+export let eu: string;
+export let fi: string;
+export let fr: string;
+export let hi: string;
+export let it: string;
+export let nl: string;
+export let ro: string;
+export let ja: string;
+export let pt: string;
+export let pt_BR: string;
+export let zh_CN: string;
diff --git a/styles/Vocab/Plone/accept.txt b/styles/Vocab/Plone/accept.txt
@@ -4,6 +4,7 @@
 `plone.volto`
 [Aa]sync
 [Bb]ackend
+CommonJS
 JavaScript
 npm
 nvm