Merge pull request #46 from kitconcept/upgradetolatest

Upgrade to latest Volto and Plone

backend/.gitignore

@@ -5,6 +5,7 @@
 *.egg-info
 *.pyc
 *.pyo
+*.mo
 
 # tools related
 build/

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.0.11
+ARG PLONE_VERSION=6.0.13
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 WORKDIR /app

backend/Dockerfile.acceptance

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.0.11
+ARG PLONE_VERSION=6.0.13
 FROM plone/server-builder:${PLONE_VERSION} as builder
 
 WORKDIR /app

backend/constraints.txt

@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.11/constraints.txt
+-c https://dist.plone.org/release/6.0.13/constraints.txt

backend/mx.ini

@@ -5,8 +5,8 @@
 
 [settings]
 main-package = -e .[test]
-version-overrides =
-    plone.volto==4.4.1
+; version-overrides =
+;     plone.volto==4.4.1
 
 ; example section to use packages from git
 ; [example.contenttype]

backend/version.txt

@@ -1 +1 @@
-6.0.11
+6.0.13

frontend/Makefile

@@ -43,6 +43,7 @@ clean: ## Clean environment
 install: ## Installs the add-on in a development environment
 	pnpm dlx mrs-developer missdev --no-config --fetch-https
 	pnpm i
+	make build-deps
 
 .PHONY: start
 start: ## Starts Volto, allowing reloading of the add-on during development
@@ -52,6 +53,15 @@ start: ## Starts Volto, allowing reloading of the add-on during development
 build: ## Build a production bundle for distribution of the project with the add-on
 	pnpm build
 
+core/packages/registry/dist: core/packages/registry/src
+	pnpm --filter @plone/registry build
+
+core/packages/components/dist: core/packages/components/src
+	pnpm --filter @plone/components build
+
+.PHONY: build-deps
+build-deps: core/packages/registry/dist core/packages/components/dist ## Build dependencies
+
 .PHONY: i18n
 i18n: ## Sync i18n
 	pnpm --filter $(ADDON_NAME) i18n

frontend/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.35"
+    "tag": "18.0.0-alpha.42"
   }
 }

frontend/package.json

@@ -13,9 +13,9 @@
   ],
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "start": "pnpm build:deps && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto start",
+    "start": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto start",
     "start:prod": "pnpm --filter @plone/volto start:prod",
-    "build": "pnpm build:deps && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build",
+    "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-intranet i18n",
     "test": "RAZZLE_JEST_CONFIG=$(pwd)/jest-addon.config.js pnpm --filter @plone/volto test -- --passWithNoTests",
@@ -29,8 +29,8 @@
     "release": "pnpm --filter volto-intranet release",
     "release-major-alpha": "pnpm --filter volto-intranet release-major-alpha",
     "release-alpha": "pnpm --filter volto-intranet release-alpha",
-    "storybook": "pnpm build:deps && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto storybook dev -p 6006 -c $(pwd)/.storybook",
-    "build-storybook": "pnpm build:deps && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build-storybook -c $(pwd)/.storybook"
+    "storybook": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto storybook dev -p 6006 -c $(pwd)/.storybook",
+    "build-storybook": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build-storybook -c $(pwd)/.storybook"
   },
   "dependencies": {
     "@plone/volto": "workspace:*",