Update setup

.github/workflows/backend.yml

@@ -85,57 +85,3 @@ jobs:
   #     - name: "Test Codebase"
   #       run: hatch run test
 
-  release:
-    runs-on: ubuntu-latest
-    needs:
-      - config
-      - code-quality
-      - test
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}
-          labels: |
-            org.label-schema.docker.cmd=docker run -d -p 8080:8080 ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}:latest
-          flavor:
-            latest=false
-          tags: |
-            type=ref,event=branch
-            type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          platforms: linux/amd64
-          context: backend
-          file: backend/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            PLONE_VERSION=${{ needs.config.outputs.PLONE_VERSION }}

.github/workflows/frontend.yml

@@ -75,7 +75,7 @@ jobs:
       - name: Unit Tests
         id: unit
         if: ${{ success() || failure() }}
-        run: make test
+        run: make ci-test
 
       - name: Report
         if: ${{ success() || failure() }}
@@ -87,54 +87,3 @@ jobs:
           echo '| i18n | ${{ steps.i18n.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
           echo '| Unit Tests | ${{ steps.unit.conclusion == 'failure' && '❌' || ' ✅' }} |' >> $GITHUB_STEP_SUMMARY
 
-  release:
-    runs-on: ubuntu-latest
-    needs:
-      - meta
-      - code-analysis
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}
-          labels: |
-            org.label-schema.docker.cmd=docker run -d -p 3000:3000 ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}:latest
-          flavor: latest=false
-          tags: |
-            type=ref,event=branch
-            type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          platforms: linux/amd64
-          context: frontend/
-          file: frontend/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            VOLTO_VERSION=${{ needs.meta.outputs.VOLTO_VERSION }}

frontend/.eslintrc.js

@@ -50,7 +50,7 @@ module.exports = {
           ['@plone/volto-slate', `${coreLocation}/packages/volto-slate/src`],
           ['@plone/registry', `${coreLocation}/packages/registry/src`],
           [
-            'volto-form-block',
+            '@plone/volto-form-block',
             `${projectRootPath}/packages/volto-form-block/src`,
           ],
           ...addonAliases,

frontend/Makefile

@@ -23,7 +23,7 @@ PLONE_VERSION=6
 DOCKER_IMAGE=plone/server-dev:${PLONE_VERSION}
 DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:${PLONE_VERSION}
 
-ADDON_NAME='volto-form-block'
+ADDON_NAME='@plone/volto-form-block'
 IMAGE_NAME=ghcr.io/collective/volto-form-block-frontend
 IMAGE_TAG=latest
 VOLTO_VERSION = $(shell cat ./mrs.developer.json | python -c "import sys, json; print(json.load(sys.stdin)['core']['tag'])")
@@ -93,7 +93,7 @@ test: ## Run unit tests
 ci-test: ## Run unit tests in CI
 	# Unit Tests need the i18n to be built
 	VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n
-	CI=1 RAZZLE_JEST_CONFIG=$(CURRENT_DIR)/jest-addon.config.js pnpm --filter @plone/volto test -- --passWithNoTests
+	CI=1 pnpm test --passWithNoTests
 
 .PHONY: backend-docker-start
 backend-docker-start:	## Starts a Docker-based backend for development

frontend/mrs.developer.json

@@ -4,6 +4,7 @@
     "package": "@plone/volto",
     "url": "git@github.com:plone/volto.git",
     "https": "https://github.com/plone/volto.git",
-    "branch": "18.23.0"
+    "tag": "19.0.0-alpha.13",
+    "filterBlobs": true
   }
 }

frontend/package.json

@@ -17,28 +17,47 @@
     "start:prod": "pnpm --filter @plone/volto start:prod",
     "build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build",
     "build:deps": "pnpm --filter @plone/registry --filter @plone/components build",
-    "i18n": "pnpm --filter volto-form-block i18n && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n",
-    "test": "RAZZLE_JEST_CONFIG=$(pwd)/jest-addon.config.js pnpm --filter @plone/volto test -- --passWithNoTests",
+    "i18n": "pnpm --filter @plone/volto-form-block i18n && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n",
+    "test": "pnpm --filter @plone/volto-form-block exec vitest",
     "lint": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --max-warnings=0 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
     "lint:fix": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --fix 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
     "prettier": "prettier --check 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
     "prettier:fix": "prettier --write 'packages/**/src/**/*.{js,jsx,ts,tsx}' ",
     "stylelint": "stylelint 'packages/**/src/**/*.{css,scss,less}' --allow-empty-input",
     "stylelint:fix": "stylelint 'packages/**/src/**/*.{css,scss,less}' --fix --allow-empty-input",
-    "dry-release": "pnpm --filter volto-form-block dry-release",
-    "release": "pnpm --filter volto-form-block release",
-    "release-major-alpha": "pnpm --filter volto-form-block release-major-alpha",
-    "release-alpha": "pnpm --filter volto-form-block release-alpha",
+    "dry-release": "pnpm --filter @plone/volto-form-block dry-release",
+    "release": "pnpm --filter @plone/volto-form-block release",
+    "release-major-alpha": "pnpm --filter @plone/volto-form-block release-major-alpha",
+    "release-alpha": "pnpm --filter @plone/volto-form-block release-alpha",
     "storybook": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto storybook dev -p 6006 -c $(pwd)/.storybook",
     "storybook-build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build-storybook -c $(pwd)/.storybook"
   },
   "dependencies": {
     "@plone/volto": "workspace:*",
     "@plone/registry": "workspace:*",
-    "volto-form-block": "workspace:*"
+    "@plone/volto-form-block": "workspace:*"
   },
   "devDependencies": {
     "mrs-developer": "^2.2.0"
   },
-  "packageManager": "pnpm@9.4.0"
+  "pnpm": {
+    "overrides": {
+      "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
+      "react-refresh": "^0.14.2"
+    },
+    "ignoredBuiltDependencies": [
+      "@parcel/watcher"
+    ],
+    "onlyBuiltDependencies": [
+      "core-js",
+      "core-js-pure",
+      "cypress",
+      "es5-ext",
+      "esbuild",
+      "full-icu",
+      "lightningcss-cli",
+      "unrs-resolver"
+    ]
+  },
+  "packageManager": "pnpm@10.20.0"
 }

frontend/packages/volto-form-block/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "volto-form-block",
-  "version": "3.9.2",
+  "name": "@plone/volto-form-block",
+  "version": "0.0.0",
   "description": "Volto block to build a form",
   "main": "src/index.js",
   "license": "MIT",
@@ -13,10 +13,11 @@
     "form"
   ],
   "author": "Plone Community",
-  "homepage": "https://github.com/collective/volto-form-block#readme",
+  "homepage": "https://github.com/plone/form-block#readme",
   "repository": {
     "type": "git",
-    "url": "git@github.com:collective/volto-form-block.git"
+    "url": "git@github.com:plone/form-block.git",
+    "directory": "frontend/packages/volto-form-block"
   },
   "publishConfig": {
     "access": "public"
@@ -28,21 +29,25 @@
     "release-major-alpha": "release-it major --preRelease=alpha",
     "release-alpha": "release-it --preRelease=alpha"
   },
-  "addons": [
-    "volto-subblocks"
-  ],
+  "addons": [],
   "dependencies": {
     "@hcaptcha/react-hcaptcha": "^0.3.6",
     "file-saver": "^2.0.5",
-    "react-google-recaptcha-v3": "^1.8.0",
-    "volto-subblocks": "^2.1.0"
+    "react-google-recaptcha-v3": "^1.8.0"
   },
   "peerDependencies": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@plone/scripts": "^3.6.1",
-    "release-it": "^17.1.1"
+    "@plone/types": "workspace:*",
+    "@types/lodash": "^4.14.201",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.1",
+    "lodash": "4.17.21",
+    "release-it": "^19.0.5",
+    "typescript": "^5.7.3",
+    "vitest": "^3.1.2"
   }
 }

frontend/packages/volto-form-block/src/components/ViewSchemaForm.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { defineMessages, useIntl } from 'react-intl';
 import { Form } from '@plone/volto/components/manage/Form';
-import { submitForm } from 'volto-form-block/actions';
+import { submitForm } from '@plone/volto-form-block/actions';
 import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { tryParseJSON } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { extractInvariantErrors } from '@plone/volto/helpers/FormValidation/FormValidation';

frontend/packages/volto-form-block/src/components/Widgets/HoneypotCaptchaWidget.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import TextWidget from '@plone/volto/components/manage/Widgets/TextWidget';
 
-import 'volto-form-block/components/Widgets/HoneypotCaptchaWidget.css';
+import '@plone/volto-form-block/components/Widgets/HoneypotCaptchaWidget.css';
 
 /* By default, captcha token is setted, and becames empty if user/bot fills the field. */
 const HoneypotCaptchaWidget = ({

frontend/packages/volto-form-block/src/index.js

@@ -8,22 +8,22 @@ import {
   exportCsvFormData,
   clearFormData,
   sendOTP,
-} from 'volto-form-block/reducers';
+} from '@plone/volto-form-block/reducers';
 
-import { schemaFormBlockSchema } from 'volto-form-block/components/schema';
-import schemaFormBlockEdit from 'volto-form-block/components/EditSchemaForm';
-import schemaFormBlockView from 'volto-form-block/components/ViewSchemaForm';
+import { schemaFormBlockSchema } from '@plone/volto-form-block/components/schema';
+import schemaFormBlockEdit from '@plone/volto-form-block/components/EditSchemaForm';
+import schemaFormBlockView from '@plone/volto-form-block/components/ViewSchemaForm';
 
-import HoneypotCaptchaWidget from 'volto-form-block/components/Widgets/HoneypotCaptchaWidget';
-import NorobotsCaptchaWidget from 'volto-form-block/components/Widgets/NorobotsCaptchaWidget';
-import GoogleReCaptchaWidget from 'volto-form-block/components/Widgets/GoogleReCaptchaWidget';
+import HoneypotCaptchaWidget from '@plone/volto-form-block/components/Widgets/HoneypotCaptchaWidget';
+import NorobotsCaptchaWidget from '@plone/volto-form-block/components/Widgets/NorobotsCaptchaWidget';
+import GoogleReCaptchaWidget from '@plone/volto-form-block/components/Widgets/GoogleReCaptchaWidget';
 
 export {
   submitForm,
   getFormData,
   exportCsvFormData,
   sendOTP,
-} from 'volto-form-block/actions';
+} from '@plone/volto-form-block/actions';
 
 defineMessages({
   textarea: {

frontend/packages/volto-form-block/src/reducers/index.js

@@ -9,7 +9,7 @@ import {
   CLEAR_FORM_DATA,
   SEND_OTP,
   RESET_OTP,
-} from 'volto-form-block/actions';
+} from '@plone/volto-form-block/actions';
 
 function download(filename, text) {
   var element = document.createElement('a');

frontend/packages/volto-form-block/towncrier.toml

@@ -5,7 +5,7 @@ title_format = "## {version} ({project_date})"
 underlines = ["", "", ""]
 template = "./node_modules/@plone/scripts/templates/towncrier_template.jinja"
 start_string = "<!-- towncrier release notes start -->\n"
-issue_format = "[#{issue}](https://github.com/collective/volto-form-block/issue/{issue})"
+issue_format = "[#{issue}](https://github.com/plone/form-block/issue/{issue})"
 
 [[tool.towncrier.type]]
 directory = "breaking"