upgrade to latest Volto 16 final, use yarn 3 refs #249852

.yarnrc.yml

@@ -0,0 +1,5 @@
+defaultSemverRangePrefix: ""
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

Makefile

@@ -48,3 +48,28 @@ start-backend-docker:		## Starts a Docker-based backend
 .PHONY: help
 help:		## Show this help.
 	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
+
+.PHONY: install
+install: ## Install the frontend
+	@echo "Install frontend"
+	$(MAKE) omelette
+	$(MAKE) preinstall
+	yarn install
+
+.PHONY: preinstall
+preinstall: ## Preinstall task, checks if missdev (mrs-developer) is present and runs it
+	if [ -f $$(pwd)/mrs.developer.json ]; then make develop; fi
+
+
+.PHONY: develop
+develop: ## Runs missdev in the local project (mrs.developer.json should be present)
+	npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https
+
+.PHONY: omelette
+omelette: ## Creates the omelette folder that contains a link to the installed version of Volto (a softlink pointing to node_modules/@plone/volto)
+	if [ ! -d omelette ]; then ln -sf node_modules/@plone/volto omelette; fi
+
+.PHONY: patches
+patches:
+	/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true
+

mrs.developer.json

@@ -199,13 +199,6 @@
     "develop": false,
     "path": "src"
   },
-  "volto-sustainability-theme": {
-    "url": "git@github.com:eea/volto-sustainability-theme.git",
-    "https": "https://github.com/eea/volto-sustainability-theme.git",
-    "package": "@eeacms/volto-sustainability-theme",
-    "branch": "develop",
-    "path": "src"
-  },
   "volto-circularity-policy": {
     "url": "git@github.com:eea/volto-circularity-policy.git",
     "https": "https://github.com/eea/volto-circularity-policy.git",

package.json

@@ -5,11 +5,9 @@
   "version": "0.20.0",
   "scripts": {
     "start": "razzle start",
-    "postinstall": "yarn omelette && yarn patches",
+    "postinstall": "make omelette && make patches",
     "analyze": "BUNDLE_ANALYZE=true razzle build",
-    "omelette": "ln -sf node_modules/@plone/volto/ omelette",
     "repack": "rm -rf node_modules && rm -rf yarn.lock && yarn",
-    "patches": "/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true",
     "build": "razzle build --noninteractive",
     "start:prod": "NODE_ENV=production node build/server.js",
     "i18n": "rm -rf build/messages && NODE_ENV=production i18n",
@@ -28,16 +26,7 @@
     "src/addons/*"
   ],
   "addons": [
-    "@kitconcept/volto-blocks-grid",
-    "@eeacms/volto-quote-block",
-    "@eeacms/volto-statistic-block",
-    "@eeacms/volto-tags-block",
-    "@eeacms/volto-timeline-block",
-    "@eeacms/volto-description-block",
-    "@eeacms/volto-call-to-action-block",
-    "@eeacms/volto-hero-block",
     "@eeacms/volto-eea-kitkat",
-    "@eeacms/volto-slate-label",
     "@eeacms/volto-searchlib",
     "@eeacms/volto-globalsearch",
     "@eeacms/volto-datahub",
@@ -136,29 +125,21 @@
     "ignoreFiles": "theme/themes/default/**/*.overrides"
   },
   "engines": {
-    "node": "^12 || ^14 || ^16"
+    "node": "^14 || ^16"
   },
   "dependencies": {
-    "@eeacms/volto-call-to-action-block": "4.0.0",
     "@eeacms/volto-circularity-policy": "2.0.7",
-    "@eeacms/volto-datahub": "1.0.18",
-    "@eeacms/volto-description-block": "1.0.1",
-    "@eeacms/volto-eea-design-system": "1.0.0-alpha.9",
+    "@eeacms/volto-datahub": "1.0.6",
+    "@eeacms/volto-eea-design-system": "1.0.1",
     "@eeacms/volto-eea-kitkat": "13.0.0",
     "@eeacms/volto-eea-website-theme": "1.11.0",
-    "@eeacms/volto-globalsearch": "1.0.14",
-    "@eeacms/volto-hero-block": "5.0.0",
+    "@eeacms/volto-globalsearch": "1.0.2",
     "@eeacms/volto-plotlycharts": "5.0.8",
-    "@eeacms/volto-quote-block": "1.0.1",
-    "@eeacms/volto-searchlib": "0.4.29",
-    "@eeacms/volto-slate-label": "0.4.4",
-    "@eeacms/volto-statistic-block": "1.0.1",
-    "@eeacms/volto-tags-block": "1.0.2",
-    "@eeacms/volto-timeline-block": "1.0.1",
-    "@kitconcept/volto-blocks-grid": "5.1.1",
-    "@plone/volto": "16.0.0-alpha.46"
+    "@eeacms/volto-searchlib": "0.4.10",
+    "@plone/volto": "16.16.0"
   },
   "devDependencies": {
+    "@plone/scripts": "^2.1.2",
     "@storybook/addon-actions": "^6.3.0",
     "@storybook/addon-controls": "6.3.0",
     "@storybook/addon-essentials": "^6.3.0",
@@ -169,6 +150,7 @@
     "mrs-developer": "*",
     "postcss": "8.3.11",
     "prettier": "2.0.5",
+    "razzle": "4.2.17",
     "release-it": "^15.1.3",
     "stylelint": "14.0.1",
     "stylelint-config-idiomatic-order": "8.1.0",
@@ -177,5 +159,6 @@
   },
   "resolutions": {
     "d3-array": "2.12.1"
-  }
+  },
+  "packageManager": "yarn@3.4.1"
 }