Merge pull request #82 from eea/develop

Develop
eea · Aug 30, 2024 · 20bec91 · 20bec91
2 parents 82a0f37 + 385b55b
commit 20bec91
Show file tree

Hide file tree

Showing 7 changed files with 1,582 additions and 1,420 deletions.
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
@@ -0,0 +1,28 @@
+{
+   "files": [
+      {
+        "path": "build/public/static/js/*.js",
+        "maxSize": "50kB"
+      },
+      {
+        "path": "build/public/static/js/d3*.js",
+        "maxSize": "103kB"
+      },
+      {
+        "path": "build/public/static/js/draft-js*.js",
+        "maxSize": "125kB"
+      },
+      {
+        "path": "build/public/static/js/prettier-standalone*.js",
+        "maxSize": "140kB"
+      },
+      {
+        "path": "build/public/static/js/react-sortable*.js",
+        "maxSize": "70kB"
+      },
+      {
+        "path": "build/public/static/js/client*.js",
+        "maxSize": "1.2MB"
+      }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,33 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.9.0](https://github.com/eea/advisory-board-frontend/compare/1.8.0...1.9.0) - 30 August 2024
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-climate-advisory-board-policy@0.1.49 [EEA Jenkins - [`775b3ee`](https://github.com/eea/advisory-board-frontend/commit/775b3ee0462fb617294d97a93e9e6052ec2e4aee)]
+- Release @eeacms/volto-climate-advisory-board-policy@0.1.48 [EEA Jenkins - [`8a6819b`](https://github.com/eea/advisory-board-frontend/commit/8a6819b019e01f7c734873b61d51f4b1c84536a5)]
+- Release @eeacms/volto-eea-design-system@1.32.2 [EEA Jenkins - [`5ae176f`](https://github.com/eea/advisory-board-frontend/commit/5ae176f92c1ce2cace30795ee9252342e8614abd)]
+- Release @eeacms/volto-eea-design-system@1.32.1 [EEA Jenkins - [`3bd07be`](https://github.com/eea/advisory-board-frontend/commit/3bd07be1b4085d2e5f635f1e63a89f0f330680e9)]
+- Release @eeacms/volto-eea-design-system@1.32.0 [EEA Jenkins - [`f457608`](https://github.com/eea/advisory-board-frontend/commit/f4576087ed375030708c3a999959cad82f14d67f)]
+- Release @eeacms/volto-eea-design-system@1.31.2 [EEA Jenkins - [`17507ca`](https://github.com/eea/advisory-board-frontend/commit/17507caf22a1b12335ad237c6afe2da30565044a)]
+
+#### :house: Documentation changes
+
+- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`216f5ee`](https://github.com/eea/advisory-board-frontend/commit/216f5eed2d6a185ee6fdb9f20fb79d8eda70447b)]
+
+#### :hammer_and_wrench: Others
+
+- test: remove debug [valentinab25 - [`2236114`](https://github.com/eea/advisory-board-frontend/commit/2236114e4b9cfb105f90f841cb3aad1b1904a507)]
+- test: Allow yarn.lock change in bundlewatch [valentinab25 - [`fe07cc7`](https://github.com/eea/advisory-board-frontend/commit/fe07cc7a9092574966dee21499ab34c8e0e884f5)]
+- test: add missing } [valentinab25 - [`ef0313a`](https://github.com/eea/advisory-board-frontend/commit/ef0313ae447231aa668a811ee6c7ef7d98ec2d6c)]
+- test: Allow yarn.lock change in bundlewatch [valentinab25 - [`11b6e85`](https://github.com/eea/advisory-board-frontend/commit/11b6e852e9b4b8c620c51270ba1c11b232f58c0a)]
+- test: Allow yarn.lock change in bundlewatch [valentinab25 - [`cfb05b0`](https://github.com/eea/advisory-board-frontend/commit/cfb05b08a3aaa97e4959c1cb8e93b75adfafecbc)]
+- test: Allow yarn.lock change in bundlewatch [valentinab25 - [`638df09`](https://github.com/eea/advisory-board-frontend/commit/638df090b906719adec20fb2c630ab10554ecfbd)]
+- update resoltion and dependencies pins [Teodor - [`6dc86ce`](https://github.com/eea/advisory-board-frontend/commit/6dc86cebbdd0324a038c23e68f157760a4940bb0)]
+- revert to previous design system [Teodor - [`1f71288`](https://github.com/eea/advisory-board-frontend/commit/1f71288a5025c5ca1efdf4d786f9dff67876e9e6)]
+- test: add bundlewatch in Makefile [valentinab25 - [`3da916f`](https://github.com/eea/advisory-board-frontend/commit/3da916fb7ae57207ad9b3852460afacf4e178629)]
+- Add bundlewatch check Refs #262124 [valentinab25 - [`89ee2ba`](https://github.com/eea/advisory-board-frontend/commit/89ee2ba9c71f2a6021418268bf0649147a751d4f)]
 ### [1.8.0](https://github.com/eea/advisory-board-frontend/compare/1.7.0...1.8.0) - 19 July 2024
 
 #### :rocket: Dependency updates

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,6 +15,9 @@ pipeline {
   stages {
 
     stage('Integration tests') {
+     parallel {
+
+     stage("Cypress") {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
@@ -25,10 +28,7 @@ pipeline {
         }
       }
       steps {
-        parallel(
-
-          "Cypress": {
-            node(label: 'docker') {
+        node(label: 'docker') {
               script {
                 try {
                   sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
@@ -60,14 +60,35 @@ pipeline {
                     sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
                     sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
                     sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
-
                   }
                 }
               }
             }
           }
+        }
 
-        )
+    	  stage('Bundlewatch') {
+       	    when {
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+              branch 'develop'
+            }
+      	    steps {
+              node(label: 'docker-big-jobs') {
+                script {
+                  checkout scm
+                  env.NODEJS_HOME = "${tool 'NodeJS'}"
+              	  env.PATH="${env.NODEJS_HOME}/bin:${env.PATH}"
+                  env.CI=false
+                  sh "yarn config set -H enableImmutableInstalls false"
+                  sh "yarn"
+                  sh "make develop"
+                  sh "make install"
+                  sh "make build"
+                  sh "make bundlewatch"
+                }
+              }
+            }
+          }
       }
     }
 

diff --git a/Makefile b/Makefile
@@ -60,6 +60,14 @@ preinstall: ## Preinstall task, checks if missdev (mrs-developer) is present and
 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: build
+build:                  ## Build frontend
+	NODE_OPTIONS="--max-old-space-size=16384" yarn build
+
+.PHONY: bundlewatch
+bundlewatch:
+	yarn bundlewatch --config .bundlewatch.config.json
+
 .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

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/advisory-board-frontend?sort=semver)](https://github.com/eea/advisory-board-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/master/lastBuild/display/redirect)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.8.0&build=last&subject=release%20v1.8.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.8.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.9.0&build=last&subject=release%20v1.9.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.9.0/lastBuild/display/redirect/)
 
 
 ## Documentation

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "advisory-board-frontend",
   "description": "A Volto-powered Plone frontend",
   "license": "MIT",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
@@ -139,53 +139,66 @@
     "node": "^14 || ^16"
   },
   "resolutions": {
-    "@eeacms/volto-eea-kitkat": "<25.0.0",
-    "@eeacms/volto-eea-website-theme": "<2.0.0",
-    "@eeacms/volto-controlpanel": "<1.0.0",
-    "@eeacms/volto-nextcloud-video-block": "<1.0.0",
-    "@eeacms/volto-anchors": "<1.0.0",
-    "@eeacms/volto-quote-block": "<2.0.0",
-    "@eeacms/volto-statistic-block": "<5.0.0",
-    "@eeacms/volto-tags-block": "<2.0.0",
-    "@eeacms/volto-call-to-action-block": "<5.0.0",
-    "@eeacms/volto-hero-block": "<7.0.0",
-    "@eeacms/volto-timeline-block": "<2.0.0",
-    "@eeacms/volto-description-block": "<2.0.0",
-    "@eeacms/volto-slate-label": "<1.0.0",
-    "@plone-collective/volto-sentry": "^0.3.1",
-    "@eeacms/volto-accordion-block": "<11.0.0",
-    "@eeacms/volto-banner": "<4.0.0",
-    "@eeacms/volto-block-divider": "<7.0.0",
-    "@eeacms/volto-block-image-cards": "<2.0.0",
-    "@eeacms/volto-block-style": "<7.0.0",
-    "@eeacms/volto-columns-block": "<8.0.0",
-    "@eeacms/volto-corsproxy": "<4.0.0",
-    "@eeacms/volto-group-block": "<7.0.0",
-    "@eeacms/volto-listing-block": "<8.0.0",
-    "@eeacms/volto-matomo": "<5.0.0",
-    "@eeacms/volto-metadata-block": "<7.0.0",
-    "@eeacms/volto-object-widget": "<7.0.0",
-    "@eeacms/volto-resize-helper": "<2.0.0",
-    "@eeacms/volto-sentry-rancher-config": "<5.0.0",
-    "@eeacms/volto-slate-footnote": "<7.0.0",
-    "@eeacms/volto-slate-metadata-mentions": "<8.0.0",
-    "@eeacms/volto-slate-zotero": "<6.0.0",
-    "@eeacms/volto-tabs-block": "<8.0.0",
-    "@eeacms/volto-taxonomy": "<5.0.0",
-    "@eeacms/volto-toolbar-actions": "<2.0.0",
-    "@eeacms/volto-block-data-table": "<1.0.0",
-    "@eeacms/volto-widget-geolocation": "<6.0.0",
-    "@eeacms/volto-widget-dataprovenance": "<1.0.0",
-    "@eeacms/volto-widget-temporal-coverage": "<6.0.0",
-    "@eeacms/volto-widget-toggle": "<4.0.0",
-    "@eeacms/volto-widget-theme-picker": "<2.0.0",
-    "@eeacms/countup": "^2.0.6"
+    "@eeacms/volto-controlpanel": "0.3.0",
+    "@eeacms/volto-nextcloud-video-block": "0.4.8",
+    "@eeacms/volto-anchors": "0.7.0",
+    "@eeacms/volto-quote-block": "1.2.3",
+    "@eeacms/volto-statistic-block": "4.1.0",
+    "@eeacms/volto-tags-block": "1.2.4",
+    "@eeacms/volto-call-to-action-block": "4.3.1",
+    "@eeacms/volto-hero-block": "6.0.1",
+    "@eeacms/volto-timeline-block": "1.1.5",
+    "@eeacms/volto-description-block": "1.2.4",
+    "@eeacms/volto-slate-label": "0.6.0",
+    "@plone-collective/volto-sentry": "0.3.1",
+    "@eeacms/volto-accordion-block": "10.4.6",
+    "@eeacms/volto-banner": "3.1.5",
+    "@eeacms/volto-block-divider": "6.2.0",
+    "@eeacms/volto-block-image-cards": "1.3.8",
+    "@eeacms/volto-block-style": "6.1.0",
+    "@eeacms/volto-columns-block": "7.1.0",
+    "@eeacms/volto-corsproxy": "3.1.5",
+    "@eeacms/volto-group-block": "6.4.0",
+    "@eeacms/volto-listing-block": "7.1.0",
+    "@eeacms/volto-matomo": "4.2.1",
+    "@eeacms/volto-metadata-block": "6.0.6",
+    "@eeacms/volto-object-widget": "6.0.0",
+    "@eeacms/volto-resize-helper": "1.3.4",
+    "@eeacms/volto-sentry-rancher-config": "4.0.0",
+    "@eeacms/volto-slate-footnote": "6.3.0",
+    "@eeacms/volto-slate-metadata-mentions": "7.0.3",
+    "@eeacms/volto-slate-zotero": "5.2.7",
+    "@eeacms/volto-tabs-block": "7.5.1",
+    "@eeacms/volto-taxonomy": "4.1.2",
+    "@eeacms/volto-toolbar-actions": "1.0.3",
+    "@eeacms/volto-block-data-table": "0.1.2",
+    "@eeacms/volto-widget-geolocation": "5.3.1",
+    "@eeacms/volto-widget-dataprovenance": "0.4.3",
+    "@eeacms/volto-widget-temporal-coverage": "5.2.0",
+    "@eeacms/volto-widget-toggle": "3.1.4",
+    "@eeacms/volto-widget-theme-picker": "1.1.5",
+    "@eeacms/countup": "2.0.6",
+    "@eeacms/volto-embed": "9.1.1",
+    "@eeacms/volto-datablocks": "6.4.1",
+    "@eeacms/volto-datahub": "1.0.33",
+    "@eeacms/volto-eea-design-system": "1.23.7",
+    "@eeacms/volto-eea-kitkat": "24.0.1",
+    "@eeacms/volto-eea-map": "3.3.1",
+    "@eeacms/volto-eea-website-theme": "1.33.2",
+    "@eeacms/volto-globalsearch": "1.1.0",
+    "@eeacms/volto-plotlycharts": "9.2.0",
+    "@eeacms/volto-redmine-helpdesk": "0.2.0",
+    "@eeacms/volto-searchlib": "0.9.2",
+    "@elastic/search-ui": "1.21.2",
+    "@eeacms/volto-tableau": "7.2.1",
+    "@plone-collective/volto-authomatic": "2.0.1",
+    "d3-array": "^2.12.1"
   },
   "dependencies": {
-    "@eeacms/volto-climate-advisory-board-policy": "0.1.47",
-    "@eeacms/volto-eea-design-system": "1.31.1",
-    "@eeacms/volto-eea-kitkat": "<25.0.0",
-    "@eeacms/volto-eea-website-theme": "<2.0.0",
+    "@eeacms/volto-climate-advisory-board-policy": "0.1.49",
+    "@eeacms/volto-eea-design-system": "^1.31.1",
+    "@eeacms/volto-eea-kitkat": "^24.0.1",
+    "@eeacms/volto-eea-website-theme": "^1.33.2",
     "@eeacms/volto-newsletter-block": "^0.1.14",
     "@eeacms/volto-spotlight": "^2.0.10",
     "@plone-collective/volto-authomatic": "1.3.0",
@@ -199,6 +212,7 @@
     "@storybook/addon-essentials": "^6.3.0",
     "@storybook/addon-links": "^6.3.0",
     "@storybook/react": "^6.3.0",
+    "bundlewatch": "0.3.3",
     "cypress-fail-fast": "7.0.0",
     "eslint-plugin-prettier": "3.1.3",
     "jest-junit": "8.0.0",