Merge pull request #610 from eea/develop

Develop
eea · Aug 29, 2024 · ef90c1b · ef90c1b
2 parents f66f7e8 + 42bd6e2
commit ef90c1b
Show file tree

Hide file tree

Showing 7 changed files with 418 additions and 13 deletions.
diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
@@ -0,0 +1,44 @@
+{
+   "files": [
+      {
+        "path": "build/public/static/js/*.js",
+        "maxSize": "50kB"
+      },
+      {
+        "path": "build/public/static/js/d3*.js",
+        "maxSize": "103kB"
+      },
+      {
+        "path": "build/public/static/js/constants-utmProjections*.js",
+        "maxSize": "60kB"
+      },
+      {
+        "path": "build/public/static/js/fortawesome-free-solid-svg-icons*.js",
+        "maxSize": "310kB"
+      },
+      {
+        "path": "build/public/static/js/ginkgo-bioworks-react-json-schema-form-builder-dist-index*.js",
+        "maxSize": "420kB"
+      },
+      {
+        "path": "build/public/static/js/highcharts*.js",
+        "maxSize": "100kB"
+      },
+      {
+        "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": "110kB"
+      },
+      {
+        "path": "build/public/static/js/client*.js",
+        "maxSize": "1.6MB"
+      }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
            node(label: 'docker') {
              script {
                try {
-                 sh '''docker pull eeacms/clms-backend; docker run -d --name="$BUILD_TAG-clms-backend" -e SITE="Plone" -e PROFILES="clms.addon:default clms.downloadtool:default clms.statstool:default clms.types:default" eeacms/clms-backend'''
+                 sh '''docker pull eeacms/clms-backend:5.30; docker run -d --name="$BUILD_TAG-clms-backend" -e SITE="Plone" -e PROFILES="clms.addon:default clms.downloadtool:default clms.statstool:default clms.types:default" eeacms/clms-backend:5.30'''
                  sh '''docker pull eeacms/volto-project-ci; docker run --name="$BUILD_TAG-cypress-clms" --link $BUILD_TAG-clms-backend:$BUILD_TAG-cypress-clms -e RAZZLE_API_PATH="http://$BUILD_TAG-clms-backend:8080/Plone" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/volto-project-ci cypress'''
                } finally {
                  try {
@@ -119,10 +119,29 @@ pipeline {
           }
 
 
+          stage('Bundlewatch') {
+            when {
+              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"
+                  sh "make develop"
+                  sh "make install"
+                  sh "make build"
+                  sh "make bundlewatch"
+                }
+              }
+            }
+          }
       }
     }
 
-
     stage('Pull Request') {
       when {
         allOf {

diff --git a/Makefile b/Makefile
@@ -55,6 +55,13 @@ install:	## Frontend: Install project and add-ons
 start:		## Frontend: Start
 	yarn start
 
+.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
@@ -1,7 +1,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/clms-frontend?sort=semver)](https://github.com/eea/clms-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/clms-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/master/display/redirect)
 [![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2F3.318.0&build=last&subject=release%20v3.318.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/3.318.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclms-frontend%2F3.319.0&build=last&subject=release%20v3.319.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/clms-frontend/job/3.319.0/lastBuild/display/redirect/)
 
 ## Backend
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "clms-frontend",
   "description": "Volto Frontend for CLMS site",
   "license": "MIT",
-  "version": "3.318.0",
+  "version": "3.319.0",
   "private": true,
   "workspaces": [
     "src/addons/volto-arcgis-block",
@@ -169,7 +169,7 @@
   "dependencies": {
     "@babel/runtime": "7.20.6",
     "@eeacms/volto-arcgis-block": "0.1.301",
-    "@eeacms/volto-clms-theme": "1.1.177",
+    "@eeacms/volto-clms-theme": "1.1.181",
     "@eeacms/volto-eea-kitkat": "^24.0.1",
     "@eeacms/volto-sentry-rancher-config": "5.0.0",
     "@plone/volto": "16.31.1",
@@ -189,6 +189,7 @@
   "devDependencies": {
     "@eeacms/volto-widget-geolocation": "^3.0.0",
     "@plone/scripts": "^2.1.2",
+    "bundlewatch": "0.3.3",
     "eslint-plugin-prettier": "3.1.3",
     "jest": "24.8.0",
     "jest-css-modules": "2.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1857,9 +1857,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-clms-theme@npm:1.1.177":
-  version: 1.1.177
-  resolution: "@eeacms/volto-clms-theme@npm:1.1.177"
+"@eeacms/volto-clms-theme@npm:1.1.181":
+  version: 1.1.181
+  resolution: "@eeacms/volto-clms-theme@npm:1.1.181"
   dependencies:
     "@eeacms/volto-accordion-block": 7.0.0
     "@eeacms/volto-arcgis-block": "*"
@@ -1895,7 +1895,7 @@ __metadata:
     volto-cookie-banner: 2.1.0
     volto-dropdownmenu: 4.0.0
     volto-form-block: 3.0.1
-  checksum: d17c513eaee2f2bb355a43e35678c3543aa36f6915f9ee4c56bfddb0bf9cb00a9fba9c1abc7144bdecc73c35e4964c5fb3e4c32973c0dd742228de53e43d300d
+  checksum: 2056eba4f52b9abba9fdc1c1825e4c8713ecb0f720ac66389751c1dcd84117aa52f64afd3ed88f0a30194afa2c8d95e04225328701249235595976fe25d74bb9
   languageName: node
   linkType: hard
 
@@ -5467,6 +5467,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^0.24.0":
+  version: 0.24.0
+  resolution: "axios@npm:0.24.0"
+  dependencies:
+    follow-redirects: ^1.14.4
+  checksum: 468cf496c08a6aadfb7e699bebdac02851e3043d4e7d282350804ea8900e30d368daa6e3cd4ab83b8ddb5a3b1e17a5a21ada13fc9cebd27b74828f47a4236316
+  languageName: node
+  linkType: hard
+
 "axobject-query@npm:^2.0.2":
   version: 2.2.0
   resolution: "axobject-query@npm:2.2.0"
@@ -6242,14 +6251,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bundlewatch@npm:0.3.3":
+  version: 0.3.3
+  resolution: "bundlewatch@npm:0.3.3"
+  dependencies:
+    axios: ^0.24.0
+    bytes: ^3.1.1
+    chalk: ^4.0.0
+    ci-env: ^1.17.0
+    commander: ^5.0.0
+    glob: ^7.1.2
+    gzip-size: ^6.0.0
+    jsonpack: ^1.1.5
+    lodash.merge: ^4.6.1
+    read-pkg-up: ^7.0.1
+  bin:
+    bundlewatch: lib/bin/index.js
+  checksum: ed47e5081664b667c512ef9c4f4d3b60228580939727b3ab39ff2f19c89b3fece7cdd0d0a175ed3ab0ade73a185b60ed9f9bc61a0b36c44f10835b2069f22c6a
+  languageName: node
+  linkType: hard
+
 "bytes@npm:3.0.0":
   version: 3.0.0
   resolution: "bytes@npm:3.0.0"
   checksum: a2b386dd8188849a5325f58eef69c3b73c51801c08ffc6963eddc9be244089ba32d19347caf6d145c86f315ae1b1fc7061a32b0c1aa6379e6a719090287ed101
   languageName: node
   linkType: hard
 
-"bytes@npm:3.1.2, bytes@npm:^3.0.0":
+"bytes@npm:3.1.2, bytes@npm:^3.0.0, bytes@npm:^3.1.1":
   version: 3.1.2
   resolution: "bytes@npm:3.1.2"
   checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
@@ -6617,7 +6646,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ci-env@npm:^1.14.0":
+"ci-env@npm:^1.14.0, ci-env@npm:^1.17.0":
   version: 1.17.0
   resolution: "ci-env@npm:1.17.0"
   checksum: e6a06d9a6c5abce1ab8fa0f1b0f80e7eb7615d59a937ed0a20a3589441cf49cff1fc64f4fa4b289e3b789dd4a1d9a8255f36a93ed3fc15b6e2be9b795d21fb46
@@ -6782,13 +6811,14 @@ __metadata:
   dependencies:
     "@babel/runtime": 7.20.6
     "@eeacms/volto-arcgis-block": 0.1.301
-    "@eeacms/volto-clms-theme": 1.1.177
+    "@eeacms/volto-clms-theme": 1.1.181
     "@eeacms/volto-eea-kitkat": ^24.0.1
     "@eeacms/volto-sentry-rancher-config": 5.0.0
     "@eeacms/volto-widget-geolocation": ^3.0.0
     "@plone/scripts": ^2.1.2
     "@plone/volto": 16.31.1
     babel-preset-razzle: 4.2.17
+    bundlewatch: 0.3.3
     cypress: 11.1.0
     cypress-axe: 1.0.0
     cypress-file-upload: 5.0.8
@@ -10658,6 +10688,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"follow-redirects@npm:^1.14.4":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5
+  languageName: node
+  linkType: hard
+
 "for-each@npm:^0.3.3":
   version: 0.3.3
   resolution: "for-each@npm:0.3.3"