Merge pull request #5 from kitconcept/update18.8.2

Update to 18.8.2
kitconcept · Feb 10, 2025 · 8cff727 · 8cff727
2 parents 71ee053 + 55f9fb9
commit 8cff727
Show file tree

Hide file tree

Showing 16 changed files with 5,998 additions and 5,278 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,16 +1,14 @@
 const fs = require('fs');
 const projectRootPath = __dirname;
-const AddonConfigurationRegistry = require('@plone/registry/src/addon-registry');
+const { AddonRegistry } = require('@plone/registry/addon-registry');
 
 let coreLocation;
 if (fs.existsSync(`${projectRootPath}/core`))
   coreLocation = `${projectRootPath}/core`;
 else if (fs.existsSync(`${projectRootPath}/../../core`))
   coreLocation = `${projectRootPath}/../../core`;
 
-const registry = new AddonConfigurationRegistry(
-  `${coreLocation}/packages/volto`,
-);
+const { registry } = AddonRegistry.init(`${coreLocation}/packages/volto`);
 
 // Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
 const addonAliases = Object.keys(registry.packages).map((o) => [
@@ -22,6 +20,27 @@ module.exports = {
   extends: `${coreLocation}/packages/volto/.eslintrc`,
   rules: {
     'import/no-unresolved': 1,
+    'import/named': 'error',
+    'react/jsx-filename-extension': [1, { extensions: ['.tsx', '.jsx'] }],
+    'no-restricted-imports': [
+      'error',
+      {
+        name: '@plone/volto/components',
+        message:
+          'Importing from barrel files is not allowed. Please use direct imports of the modules instead.',
+      },
+      {
+        name: '@plone/volto/helpers',
+        message:
+          'Importing from barrel files is not allowed. Please use direct imports of the modules instead.',
+      },
+      {
+        name: '@plone/volto/actions',
+        message:
+          'Importing from barrel files is not allowed. Please use direct imports of the modules instead.',
+      },
+    ],
+    'react/jsx-key': [2, { checkFragmentShorthand: true }],
   },
   settings: {
     'import/resolver': {
@@ -30,10 +49,7 @@ module.exports = {
           ['@plone/volto', `${coreLocation}/packages/volto/src`],
           ['@plone/volto-slate', `${coreLocation}/packages/volto-slate/src`],
           ['@plone/registry', `${coreLocation}/packages/registry/src`],
-          [
-            '@kitconcept/volto-iframe-block',
-            './packages/volto-iframe-block/src',
-          ],
+          ['@kitconcept/volto-light-theme', './packages/volto-light-theme/src'],
           ...addonAliases,
         ],
         extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],

diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -10,7 +10,7 @@ on:
       - ".github/workflows/acceptance.yml"
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
   CYPRESS_RETRIES: 2
 
 jobs:
@@ -26,7 +26,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
   ADDON_NAME: volto-iframe-block
 
 jobs:
@@ -27,7 +27,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -9,7 +9,7 @@ on:
       - ".github/workflows/code.yml"
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
 
 jobs:
   codeanalysis:
@@ -25,7 +25,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -9,7 +9,7 @@ on:
       - ".github/workflows/i18n.yml"
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
 
 jobs:
   unit:
@@ -25,7 +25,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -9,7 +9,7 @@ on:
       - ".github/workflows/storybook.yml"
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
 
 permissions:
   contents: write
@@ -27,7 +27,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -9,7 +9,7 @@ on:
       - ".github/workflows/unit.yml"
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
 
 jobs:
   unit:
@@ -25,7 +25,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Enable corepack
-        run: corepack enable
+        run: npm i -g corepack@latest && corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -107,9 +107,9 @@ module.exports = {
       [],
       defaultRazzleOptions,
     );
-    const AddonConfigurationRegistry = require('@plone/registry/src/addon-registry');
+    const { AddonRegistry } = require('@plone/registry/addon-registry');
 
-    const registry = new AddonConfigurationRegistry(projectRootPath);
+    const { registry } = AddonRegistry.init(projectRootPath);
 
     config = lessPlugin({ registry }).modifyWebpackConfig({
       env: { target: 'web', dev: 'dev' },

diff --git a/Makefile b/Makefile
@@ -20,7 +20,6 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 GIT_FOLDER=$(CURRENT_DIR)/.git
-PRE_COMMIT=pipx run --spec 'pre-commit==3.7.1' pre-commit
 
 PLONE_VERSION=6
 DOCKER_IMAGE=plone/server-dev:${PLONE_VERSION}
@@ -37,7 +36,6 @@ help: ## Show this help
 .PHONY: install
 install: ## Installs the add-on in a development environment
 	@echo "$(GREEN)Install$(RESET)"
-	if [ -d $(GIT_FOLDER) ]; then $(PRE_COMMIT) install; else echo "$(RED) Not installing pre-commit$(RESET)";fi
 	pnpm dlx mrs-developer missdev --no-config --fetch-https
 	pnpm i
 	make build-deps

diff --git a/mrs.developer.json b/mrs.developer.json
@@ -4,6 +4,6 @@
     "package": "@plone/volto",
     "url": "git@github.com:plone/volto.git",
     "https": "https://github.com/plone/volto.git",
-    "tag": "18.0.0-alpha.40"
+    "tag": "18.8.2"
   }
 }
diff --git a/packages/volto-iframe-block/news/5.internal b/packages/volto-iframe-block/news/5.internal
@@ -0,0 +1 @@
+Update to latest Volto. @sneridagh
diff --git a/packages/volto-iframe-block/src/components/Data.jsx b/packages/volto-iframe-block/src/components/Data.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { BlockDataForm, Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import { defineMessages } from 'react-intl';
 import { IframeBlockSchema } from './schema';
 

diff --git a/packages/volto-iframe-block/src/components/Edit.jsx b/packages/volto-iframe-block/src/components/Edit.jsx
@@ -3,7 +3,8 @@ import { toast } from 'react-toastify';
 import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 import { defineMessages } from 'react-intl';
-import { Icon, SidebarPortal } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import applicationSVG from '@plone/volto/icons/application.svg';

diff --git a/...lto-iframe-block/src/components/schema.js → ...to-iframe-block/src/components/schema.jsx b/...lto-iframe-block/src/components/schema.js → ...to-iframe-block/src/components/schema.jsx