@plone/volto 16.0.0-alpha.19 → 16.0.0-alpha.21

package/.github/workflows/acceptance.yml

@@ -33,7 +33,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -47,7 +47,6 @@ jobs:
           browser: chrome
           # headless: true
           group: Core ${{ matrix.node-version }}
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/core/basic/**/*.js
           start: |
             make start-test-acceptance-server
@@ -99,7 +98,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -113,7 +112,6 @@ jobs:
           browser: chrome
           # headless: true
           group: Core Blocks ${{ matrix.node-version }}
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/core/blocks/**/*.js
           start: |
             make start-test-acceptance-server
@@ -165,7 +163,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -179,7 +177,6 @@ jobs:
           browser: chrome
           # headless: true
           group: Core Volto Slate ${{ matrix.node-version }}
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/core/volto-slate/**/*.js
           start: |
             make start-test-acceptance-server
@@ -230,7 +227,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -244,7 +241,6 @@ jobs:
           browser: chrome
           # headless: true
           group: Core Basic - Plone 6
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/core/basic/**/*.js
           start: |
             make start-test-acceptance-server DOCKER_IMAGE=plone/plone-backend:6.0.0a4
@@ -323,7 +319,7 @@ jobs:
       #     CI: true
 
       - name: Cypress Coresandbox Acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -337,7 +333,6 @@ jobs:
           browser: chrome
           # headless: true
           group: Coresandbox
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/coresandbox/**/*.js
           start: |
             make start-test-acceptance-server-coresandbox
@@ -389,7 +384,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_API: guillotina
@@ -404,7 +399,6 @@ jobs:
           browser: chrome
           headless: true
           group: Guillotina
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/guillotina/**/*.js
           start: |
             make start-test-acceptance-server-guillotina
@@ -459,7 +453,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -473,7 +467,6 @@ jobs:
           browser: chrome
           headless: true
           group: Multilingual
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/multilingual/**/*.js
           start: |
             make start-test-acceptance-server-multilingual
@@ -550,7 +543,7 @@ jobs:
       #     CI: true
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -564,7 +557,6 @@ jobs:
           browser: chrome
           headless: true
           group: Working Copy
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/workingCopy/**/*.js
           start: |
             make start-test-acceptance-server-workingcopy
@@ -647,7 +639,7 @@ jobs:
         working-directory: ${{env.project-directory}}
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -661,7 +653,6 @@ jobs:
           browser: chrome
           headless: true
           group: Project Generator
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/minimal/**/*.js
           start: |
             make start-test-acceptance-server
@@ -719,7 +710,7 @@ jobs:
       - run: yarn --frozen-lockfile
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         env:
           BABEL_ENV: production
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -733,7 +724,6 @@ jobs:
           browser: chrome
           headless: true
           group: Seamless
-          config: integrationFolder=cypress/tests
           spec: cypress/tests/minimal/**/*.js
           start: |
             make start-test-acceptance-server

package/.github/workflows/unit.yml

@@ -12,21 +12,10 @@ jobs:
 
       # node setup
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-
-      # node cache
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v1
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       # node install
       - run: yarn --frozen-lockfile

package/.storybook/main.js

@@ -1,4 +1,5 @@
 const webpack = require('webpack');
+const fs = require('fs');
 const path = require('path');
 const makeLoaderFinder = require('razzle-dev-utils/makeLoaderFinder');
 const fileLoaderFinder = makeLoaderFinder('file-loader');
@@ -83,7 +84,15 @@ module.exports = {
       },
     };
 
-    // console.dir(resultConfig, { depth: null });
+    // Addons have to be loaded with babel
+    const addonPaths = registry.addonNames.map((addon) =>
+      fs.realpathSync(registry.packages[addon].modulePath),
+    );
+    resultConfig.module.rules[1].exclude = (input) =>
+      // exclude every input from node_modules except from @plone/volto
+      /node_modules\/(?!(@plone\/volto)\/)/.test(input) &&
+      // If input is in an addon, DON'T exclude it
+      !addonPaths.some((p) => input.includes(p));
 
     return resultConfig;
   },

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## 16.0.0-alpha.21 (2022-08-03)
+
+### Bugfix
+
+- Fix ArrayWidget choices when editing a recently created content item. @davisagli
+
+### Internal
+
+- Fix propTypes for Pagination component @davisagli
+
+## 16.0.0-alpha.20 (2022-08-01)
+
+### Breaking
+
+- Use `Cypress` 10.3.0 (migrate from 9.x.x). Cypress 10 has some interesting goodies, being the native support of Apple Silicon Computers the main of it. See https://docs.voltocms.com/upgrade-guide/ for more information.
+
+### Bugfix
+
+- Make Search page title translatable @erral
+
+### Documentation
+
+- Minor clean up of volto-slate upgrade guide. @stevepiercy
+
+- Rework documentation on how to write a Slate plugin @ksuess
+
 ## 16.0.0-alpha.19 (2022-07-28)
 
 ### Breaking
@@ -21,6 +47,7 @@
 
 - Allow passing `allowedChildren` option to the BlockButton, to strip elements in headlines @tiberiuichim
 - Upgrade to latest `@plone/scripts` @sneridagh
+- Update browserlist definitions @sneridagh
 
 ### Documentation
 
@@ -454,6 +481,7 @@ Use next release instead: https://github.com/plone/volto/releases/tag/16.0.0-alp
 - Improve Cypress integration, using Cypress official Github Action. Improve some flaky tests that showed up, and were known as problematic. Refactor and rename all the Github actions giving them meaningful names, and group them by type. Enable Cypress Dashboard for Volto. @sneridagh
 - Stop using `xmlrpc` library for issuing the setup/teardown in core, use a `cy.request` instead. @sneridagh
 - Added Cypress environment variables for adjusting the backend URL of commands @JeffersonBledsoe #3271
+- Fixed Storybook configuration for add-ons @pnicolli
 
 ### Documentation
 

package/babel.js

@@ -12,6 +12,7 @@ module.exports = function (api) {
     '@babel/plugin-proposal-export-default-from', // Stage 1
     '@babel/plugin-syntax-export-namespace-from', // Stage 4
     '@babel/plugin-proposal-throw-expressions', // Stage 2
+    '@babel/plugin-proposal-nullish-coalescing-operator', // Stage 4
     [
       'babel-plugin-root-import', // Required for the ~ imports to work
       {

package/cypress.config.js

@@ -0,0 +1,12 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  viewportWidth: 1280,
+  chromeWebSecurity: false,
+  projectId: 'hvviu4',
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+    excludeSpecPattern: ['*~'],
+    specPattern: 'cypress/tests/**/*.{js,jsx,ts,tsx}',
+  },
+});

package/locales/ca/LC_MESSAGES/volto.po

@@ -2255,6 +2255,7 @@ msgstr "Actualitzacions d'esquemes"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/de/LC_MESSAGES/volto.po

@@ -2252,6 +2252,7 @@ msgstr "Aktualisierungen Schema"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/en/LC_MESSAGES/volto.po

@@ -2246,6 +2246,7 @@ msgstr ""
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/es/LC_MESSAGES/volto.po

@@ -2256,6 +2256,7 @@ msgstr "Actualización de esquema"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/eu/LC_MESSAGES/volto.po

@@ -2253,6 +2253,7 @@ msgstr "Eskemaren eguneraketak"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/fr/LC_MESSAGES/volto.po

@@ -2263,6 +2263,7 @@ msgstr ""
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/it/LC_MESSAGES/volto.po

@@ -2246,6 +2246,7 @@ msgstr "Aggiornamenti dello schema"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/ja/LC_MESSAGES/volto.po

@@ -2254,6 +2254,7 @@ msgstr "スキーマの更新"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/nl/LC_MESSAGES/volto.po

@@ -2265,6 +2265,7 @@ msgstr ""
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/pt/LC_MESSAGES/volto.po

@@ -2254,6 +2254,7 @@ msgstr ""
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/pt_BR/LC_MESSAGES/volto.po

@@ -2256,6 +2256,7 @@ msgstr "Atualizações do esquema"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/ro/LC_MESSAGES/volto.po

@@ -2246,6 +2246,7 @@ msgstr "Actualizări de schemă"
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2022-07-19T18:15:23.786Z\n"
+"POT-Creation-Date: 2022-07-31T08:01:44.333Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2248,6 +2248,7 @@ msgstr ""
 #: components/manage/Blocks/Search/layout/RightColumnFacets
 #: components/manage/Blocks/Search/layout/TopSideFacets
 #: components/manage/Blocks/Search/schema
+#: components/theme/Search/Search
 #: components/theme/SearchWidget/SearchWidget
 # defaultMessage: Search
 msgid "Search"

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "16.0.0-alpha.19",
+  "version": "16.0.0-alpha.21",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -227,6 +227,7 @@
     "@babel/plugin-proposal-export-default-from": "7.10.4",
     "@babel/plugin-proposal-export-namespace-from": "7.10.4",
     "@babel/plugin-proposal-json-strings": "7.10.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
     "@babel/plugin-proposal-throw-expressions": "7.10.4",
     "@loadable/babel-plugin": "5.13.2",
     "@loadable/component": "5.14.1",
@@ -255,7 +256,7 @@
     "connected-react-router": "6.8.0",
     "coveralls": "3.0.2",
     "crypto-random-string": "3.2.0",
-    "cypress": "9.6.1",
+    "cypress": "10.3.1",
     "cypress-axe": "0.14.0",
     "cypress-file-upload": "5.0.8",
     "debug": "4.3.2",

package/src/components/manage/Widgets/ArrayWidget.jsx

@@ -162,6 +162,8 @@ class ArrayWidget extends Component {
     choices: PropTypes.arrayOf(
       PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
     ),
+    vocabLoading: PropTypes.bool,
+    vocabLoaded: PropTypes.bool,
     items: PropTypes.shape({
       vocabulary: PropTypes.object,
     }),
@@ -227,6 +229,21 @@ class ArrayWidget extends Component {
     }
   }
 
+  componentDidUpdate() {
+    if (
+      !this.props.items?.choices?.length &&
+      !this.props.choices?.length &&
+      this.props.vocabLoading === undefined &&
+      !this.props.vocabLoaded
+    ) {
+      this.props.getVocabulary({
+        vocabNameOrURL: this.props.vocabBaseUrl,
+        size: -1,
+        subrequest: this.props.lang,
+      });
+    }
+  }
+
   /**
    * Handle the field change, store it in the local state and back to simple
    * array of tokens for correct serialization
@@ -384,6 +401,8 @@ export default compose(
         return {
           choices: vocabState.items,
           vocabBaseUrl,
+          vocabLoading: vocabState.loading,
+          vocabLoaded: vocabState.loaded,
           lang: state.intl.locale,
         };
       }

package/src/components/theme/Pagination/Pagination.jsx

@@ -128,7 +128,9 @@ Pagination.propTypes = {
   /**
    * Page sizes to choose from
    */
-  pageSizes: PropTypes.arrayOf(PropTypes.number),
+  pageSizes: PropTypes.arrayOf(
+    PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  ),
   /**
    * Handler called when changing the page
    */

package/src/components/theme/Search/Search.jsx

@@ -14,7 +14,7 @@ import { Portal } from 'react-portal';
 import { Container, Pagination, Button, Header } from 'semantic-ui-react';
 import qs from 'query-string';
 import classNames from 'classnames';
-
+import { defineMessages, injectIntl } from 'react-intl';
 import config from '@plone/volto/registry';
 import { Helmet } from '@plone/volto/helpers';
 import { searchContent } from '@plone/volto/actions';
@@ -23,6 +23,13 @@ import { SearchTags, Toolbar, Icon } from '@plone/volto/components';
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';
 
+const messages = defineMessages({
+  Search: {
+    id: 'Search',
+    defaultMessage: 'Search',
+  },
+});
+
 /**
  * Search class.
  * @class SearchComponent
@@ -145,7 +152,7 @@ class Search extends Component {
     const { settings } = config;
     return (
       <Container id="page-search">
-        <Helmet title="Search" />
+        <Helmet title={this.props.intl.formatMessage(messages.Search)} />
         <div className="container">
           <article id="content">
             <header>
@@ -316,16 +323,20 @@ class Search extends Component {
   }
 }
 
-export const __test__ = connect(
-  (state, props) => ({
-    items: state.search.items,
-    searchableText: qs.parse(props.history.location.search).SearchableText,
-    pathname: props.history.location.pathname,
-  }),
-  { searchContent },
+export const __test__ = compose(
+  injectIntl,
+  connect(
+    (state, props) => ({
+      items: state.search.items,
+      searchableText: qs.parse(props.history.location.search).SearchableText,
+      pathname: props.history.location.pathname,
+    }),
+    { searchContent },
+  ),
 )(Search);
 
 export default compose(
+  injectIntl,
   connect(
     (state, props) => ({
       items: state.search.items,

package/cypress/plugins/index.js

@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-};

package/cypress.json

@@ -1,8 +0,0 @@
-{
-  "baseUrl": "http://localhost:3000",
-  "viewportWidth": 1280,
-  "ignoreTestFiles": ["*~"],
-  "integrationFolder": "cypress/tests/core",
-  "chromeWebSecurity": false,
-  "projectId": "hvviu4"
-}