Merge branch 'master' into prefix_path_router

* master: (59 commits) Back to development (generator-volto) Release generate-volto 5.9.1 Prepare for release Add missing --noninteractive in the generator template Add user form password reset request (#3710) Usability fixes in addon control panel (#3707) Fix convenience api folder versions spanish translation (#3709) basque translation (#3708) Remove no longer present option in cypress github action, by default, headless is true (#3711) More disable flaky test regarding many users/groups (related to #3705) (#3714) [WIP] Lazyload sentry (#3012) Comment out flaky test for now regarding many users/groups (#3705) Back to development Release 16.0.0-alpha.40 Prepare for release Working copy actions now render errors if they fail (#3388) Undo ControlPanel: Fetches all the transactions from @Transactions endpoint and display them in Undo-Controlpanel (#3457) Update to use Plone 6 beta 2 (#3700) Updated deprecated moment.js code (#3160) ...
plone · Oct 3, 2022 · 5d9a57a · 5d9a57a
2 parents 102f3c3 + 7044eca
commit 5d9a57a
Show file tree

Hide file tree

Showing 100 changed files with 7,228 additions and 12,110 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -45,7 +45,6 @@ jobs:
           record: true
           parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          # headless: true
           group: Core ${{ matrix.node-version }}
           spec: cypress/tests/core/basic/**/*.js
           start: |
@@ -110,7 +109,6 @@ jobs:
           record: true
           parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          # headless: true
           group: Core Blocks ${{ matrix.node-version }}
           spec: cypress/tests/core/blocks/**/*.js
           start: |
@@ -175,7 +173,6 @@ jobs:
           record: true
           parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          # headless: true
           group: Core Volto Slate ${{ matrix.node-version }}
           spec: cypress/tests/core/volto-slate/**/*.js
           start: |
@@ -196,9 +193,9 @@ jobs:
           name: cypress-videos
           path: cypress/videos
 
-  core6:
+  core5:
     runs-on: ubuntu-latest
-    name: Core Basic - Plone 6
+    name: Core Basic - Plone 5
     strategy:
       matrix:
         node-version: [16.x]
@@ -239,11 +236,10 @@ jobs:
           record: true
           parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          # headless: true
           group: Core Basic - Plone 6
           spec: cypress/tests/core/basic/**/*.js
           start: |
-            make start-test-acceptance-server DOCKER_IMAGE=plone/plone-backend:6.0.0b1 KGS=
+            make start-test-acceptance-server-5
             make start-test-acceptance-frontend
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone http://localhost:3000'
 
@@ -331,7 +327,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          # headless: true
           group: Coresandbox
           spec: cypress/tests/coresandbox/**/*.js
           start: |
@@ -397,7 +392,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          headless: true
           group: Guillotina
           spec: cypress/tests/guillotina/**/*.js
           start: |
@@ -465,7 +459,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          headless: true
           group: Multilingual
           spec: cypress/tests/multilingual/**/*.js
           start: |
@@ -555,7 +548,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          headless: true
           group: Working Copy
           spec: cypress/tests/workingCopy/**/*.js
           start: |
@@ -624,18 +616,22 @@ jobs:
         working-directory: ${{env.generator-directory}}
 
       # create a project
-      - run: yo @plone/volto my-volto-app --description "test volto project" --no-interactive
+      - run: yo @plone/volto my-volto-app --description "test volto project" --volto . --skip-install --no-interactive
 
       - name: Install yalc
         run: npm -g install yalc
 
       - name: Install a yalc'ed version of the current Volto in the project - publish
-        run: yalc publish
+        run: |
+          yalc publish
+          yalc publish packages/scripts
       - name: Install a yalc'ed version of the current Volto in the project - add
-        run: yalc add @plone/volto --no-pure
+        run: |
+          yalc add @plone/volto --no-pure
+          yalc add @plone/scripts --no-pure
         working-directory: ${{env.project-directory}}
       - name: Install a yalc'ed version of the current Volto in the project - install
-        run: yarn --force
+        run: yarn
         working-directory: ${{env.project-directory}}
 
       - name: Cypress acceptance tests
@@ -651,7 +647,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          headless: true
           group: Project Generator
           spec: cypress/tests/minimal/**/*.js
           start: |
@@ -722,7 +717,6 @@ jobs:
           record: true
           parallel: true
           browser: chrome
-          headless: true
           group: Seamless
           spec: cypress/tests/minimal/**/*.js
           start: |

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ yarn-error.log
 build
 
 # Other
+/cache
 .DS_Store
 .idea
 lighthouse-report.html

diff --git a/.storybook/main.js b/.storybook/main.js
@@ -31,6 +31,30 @@ const SVGLOADER = {
   ],
 };
 
+const defaultRazzleOptions = {
+  verbose: false,
+  debug: {},
+  buildType: 'iso',
+  cssPrefix: 'static/css',
+  jsPrefix: 'static/js',
+  enableSourceMaps: true,
+  enableReactRefresh: true,
+  enableTargetBabelrc: false,
+  enableBabelCache: true,
+  forceRuntimeEnvVars: [],
+  mediaPrefix: 'static/media',
+  staticCssInDev: false,
+  emitOnErrors: false,
+  disableWebpackbar: false,
+  browserslist: [
+    '>1%',
+    'last 4 versions',
+    'Firefox ESR',
+    'not ie 11',
+    'not dead',
+  ],
+};
+
 module.exports = {
   stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
   addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
@@ -50,6 +74,10 @@ module.exports = {
         plugins: razzleConfig.plugins,
       },
       webpack,
+      false,
+      undefined,
+      [],
+      defaultRazzleOptions,
     );
     const AddonConfigurationRegistry = require('../addon-registry');
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,16 +4,84 @@
 
 ### Breaking
 
+- Sentry integration is now lazy-loaded. The `sentryOptions` key from the `settings` registry becomes a callable that passes resolved sentry libraries. @tiberiuichim
+
 ### Feature
+- Complete eu translation. @erral
+
+
+- Complete spanish translation @erral
+
+- Added an option for users to set their own password through a confirmation email in the Add Users modal within the Users control panel. @JeffersonBledsoe #3710
 
 ### Bugfix
 
-- Remove wrapping ul or ol when deselecting list style @robgietema
+### Internal
+
+- Comment out flaky test for now regarding many users/groups @sneridagh
+- More disable flaky test regarding many users/groups @sneridagh
+- Remove no longer present option in cypress github action, by default, headless is true @sneridagh
+
+### Documentation
+
+## 16.0.0-alpha.40 (2022-10-01)
+
+### Feature
+
+- Show result of the addon install/uninstall/upgrade actions @erral
+- Working copy actions now render errors if they fail @pnicolli
+- lazyloading of rrule lib. @giuliaghisini
+
+### Bugfix
+
+- Fixed the `description` field not appearing in control panel fieldsets @JeffersonBledsoe #3696
+- Add missing `--noninteractive` in the `build` script in package.json @sneridagh
 
 ### Internal
 
+- Run yarn deduplicate on dependencies. @davisagli
+
 ### Documentation
 
+- Upgrade to Plone 6 beta 2 @sneridagh
+- Flip testing matrix for acceptance tests, make Plone 6 principal subject, Plone 5 as secondary @sneridagh
+
+## 16.0.0-alpha.39 (2022-09-28)
+
+### Bugfix
+
+- Fix call to `@plone/scripts/i18n` (now a commonJS module) @sneridagh
+
+### Internal
+
+- Fix storybook build for Razzle 4 @sneridagh
+- Update `@plone/scripts` to 2.1.1 @sneridagh
+
+## 16.0.0-alpha.38 (2022-09-27)
+
+### Breaking
+
+- Upgrade to Razzle 4 @davisagli
+- Jest downgraded from 27 to 26 @davisagli
+
+See https://6.dev-docs.plone.org/volto/upgrade-guide/index.html for more information.
+
+### Internal
+
+- Remove Razzle as direct dependency from @plone/scripts @sneridagh
+
+## 16.0.0-alpha.37 (2022-09-27)
+
+### Feature
+
+- Added resetOnCancel functionality in Form component @MdSahil-oss
+- volto-slate: introduce style-menu @nileshgulia1
+
+### Bugfix
+
+- Fix `listing` block in SSR, now that it is fully variations aware and the configuration is passed to the SSR `querystring` action. @sneridagh
+- Remove wrapping ul or ol when deselecting list style @robgietema
+
 ## 16.0.0-alpha.36 (2022-09-26)
 
 ### Bugfix
@@ -317,6 +385,10 @@ See https://6.dev-docs.plone.org/volto/upgrade-guide/index.html for more informa
 
 ## 16.0.0-alpha.17 (2022-07-25)
 
+### Feature
+
+- Added the `Undo controlpanel` to the controlpanels which can be used to undo transactions. @MdSahil-oss
+
 ### Bugfix
 
 - Make `crypto-random-string` a direct dep, fixing a hidden error since some updated dependency was requiring it directly but not anymore. @sneridagh
@@ -3449,7 +3521,7 @@ https://docs.voltocms.com/upgrade-guide/
 - Fix bug introduced in 7.9.0, properly return a list of results when dealing with batched api requests @tiberiuichim
 - In folder contents batch upload, use a subrequest to avoid breaking the global `content.data` state @tiberiuichim
 - Fix `null` response issue when passing custom `Accept:` headers to actions #1771 @avoinea
-- Removed all `<<<<<HEAD` artifacts from translations @steffenri
+- Removed all artifacts from translations @steffenri
 - Increase z-index of `block-add-button` @steffenri
 
 ## 7.11.1 (2020-08-27)

diff --git a/Makefile b/Makefile
@@ -13,11 +13,15 @@ MAKEFLAGS+=--no-builtin-rules
 # Project settings
 
 INSTANCE_PORT=8080
-DOCKER_IMAGE=plone/plone-backend:5.2.9
-KGS=plone.restapi==8.24.1 plone.volto==4.0.0a9 plone.rest==2.0.0a5
-TESTING_ADDONS=plone.app.robotframework==2.0.0b1 plone.app.testing==7.0.0a3
+DOCKER_IMAGE=plone/plone-backend:6.0.0b2
+KGS=
+TESTING_ADDONS=plone.app.robotframework==2.0.0b2 plone.app.testing==7.0.0a3
 NODEBIN = ./node_modules/.bin
 
+# Plone 5 legacy
+DOCKER_IMAGE5=plone/plone-backend:5.2.9
+KGS5=plone.restapi==8.29.0 plone.volto==4.0.0a13 plone.rest==2.0.0a5
+
 # Sphinx variables
 # You can set these variables from the command line.
 SPHINXOPTS      ?=
@@ -334,3 +338,9 @@ test-acceptance-guillotina-headless: ## Start the Guillotina Cypress Acceptance
 .PHONY: full-test-acceptance-guillotina
 full-test-acceptance-guillotina: ## Runs the Guillotina Full Acceptance Testing in headless mode
 	$(NODEBIN)/start-test "make start-test-acceptance-server-guillotina" http-get://localhost:8081 "make start-test-acceptance-frontend-guillotina" http://localhost:3000 "make test-acceptance-guillotina-headless"
+
+######### Plone 5 Acceptance tests
+
+.PHONY: start-test-acceptance-server-5
+start-test-acceptance-server-5: ## Start Test Acceptance Server Main Fixture Plone 5 (docker container)
+	docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e ADDONS='$(KGS5) $(TESTING_ADDONS)' -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors $(DOCKER_IMAGE5) ./bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING
diff --git a/api/buildout.cfg b/api/buildout.cfg
@@ -1,7 +1,7 @@
 [buildout]
 index = https://pypi.org/simple/
 extends =
-    http://dist.plone.org/release/5.2.9/versions.cfg
+    http://dist.plone.org/release/6.0.0b2/versions.cfg
     version-constraints.cfg
     versions.cfg
 parts = instance plonesite site-packages test robot-server

diff --git a/api/requirements.txt b/api/requirements.txt
@@ -1,4 +1 @@
-# Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt
-setuptools==42.0.2
-zc.buildout==2.13.4
-requests
+-r https://dist.plone.org/release/6.0-latest/requirements.txt
diff --git a/api/version-constraints.cfg b/api/version-constraints.cfg
@@ -13,10 +13,6 @@ zc.buildout =
 plone.restapi = >=8.16.2
 # new JSON only traversal
 plone.rest = >=2.0.0a1
-# Using working copy support in Volto requires it
-plone.app.iterate = >=4.0.2
-# plone.volto requires it
-plone.app.vocabularies = >=4.3.0
 plone.volto =
 
 # Testing tools version constraints

diff --git a/api/versions.cfg b/api/versions.cfg
@@ -5,10 +5,8 @@ async-generator = 1.10
 collective.folderishtypes = 3.0.0
 collective.recipe.plonesite = 1.12.0
 h11 = 0.12.0
-plone.app.iterate = 4.0.2
-plone.app.vocabularies = 4.3.0
-plone.rest = 2.0.0a5
-plone.restapi = 8.22.0
+plone.restapi = 8.30.0
+plone.volto = 4.0.0a13
 prompt-toolkit = 2.0.10
 pyOpenSSL = 21.0.0
 robotframework-debuglibrary = 2.2.2
@@ -46,5 +44,5 @@ sniffio = 1.2.0
 # trio==0.19.0
 sortedcontainers = 2.4.0
 
-# Added by buildout at 2022-02-14 13:57:43.277710
-plone.volto = 4.0.0a3
+# Added by buildout at 2022-10-03 10:56:44.762553
+plone.rest = 2.0.0a5
diff --git a/babel.js b/babel.js
@@ -1,13 +1,14 @@
 module.exports = function (api) {
   api.cache(true);
-  const presets = ['razzle/babel'];
-  const plugins = [
+  const presets = [
     [
-      '@babel/plugin-transform-react-jsx',
+      'razzle/babel',
       {
-        runtime: 'automatic',
+        '@babel/preset-react': { runtime: 'automatic' },
       },
     ],
+  ];
+  const plugins = [
     'lodash',
     '@babel/plugin-proposal-export-default-from', // Stage 1
     '@babel/plugin-syntax-export-namespace-from', // Stage 4