From e86ece0247511b6f726e1c71d1bb9175499534ba Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 28 Jan 2023 04:14:38 +0100 Subject: [PATCH 1/7] upgrade node version to 19.4 --- webapp/.nvmrc | 2 +- webapp/Dockerfile | 2 +- webapp/package.json | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapp/.nvmrc b/webapp/.nvmrc index d60d573ec..cb77acbfe 100644 --- a/webapp/.nvmrc +++ b/webapp/.nvmrc @@ -1 +1 @@ -v16.19.0 \ No newline at end of file +v19.4.0 \ No newline at end of file diff --git a/webapp/Dockerfile b/webapp/Dockerfile index da4d37fea..479080e0b 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE (Is pushed to DockerHub for rebranding) ################################### ################################################################################## -FROM node:16.19.0-alpine3.17 as base +FROM node:19.4.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/webapp/package.json b/webapp/package.json index 438f25c4f..c33b66305 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -7,13 +7,13 @@ "license": "MIT", "private": false, "scripts": { - "dev": "nuxt", + "dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt", "dev:styleguide": "cross-env STYLEGUIDE_DEV=true yarn run dev", - "storybook": "start-storybook -p 3002 -s ./static -c storybook/", - "build": "nuxt build", - "start": "nuxt start", - "generate:maintenance": "nuxt generate -c nuxt.config.maintenance.js", - "generate": "nuxt generate", + "storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 3002 -s ./static -c storybook/", + "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt build", + "start": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt start", + "generate:maintenance": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate -c nuxt.config.maintenance.js", + "generate": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate", "lint": "eslint --ext .js,.vue .", "locales": "../scripts/translations/missing-keys.sh && ../scripts/translations/sort.sh", "precommit": "yarn lint", From c65f12872dbc50588c68b1918ec5e247a3dac4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 28 Jan 2023 10:30:53 +0100 Subject: [PATCH 2/7] Upgrade the Node version in the maintenance as well - Add `"nan": "2.17.0"` to package.json resolutions. --- webapp/Dockerfile.maintenance | 2 +- webapp/package.json | 3 +++ webapp/yarn.lock | 9 ++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index a6b9b9822..256d7b601 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:16.19.0-alpine3.17 as base +FROM node:19.4.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/webapp/package.json b/webapp/package.json index c33b66305..5afbd0250 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -108,5 +108,8 @@ "vue-jest": "~3.0.5", "vue-svg-loader": "~0.16.0", "vue-template-compiler": "^2.6.11" + }, + "resolutions": { + "nan": "2.17.0" } } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 67d0154a4..83313f40d 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -14439,10 +14439,10 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1: - version "2.13.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" - integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw== +nan@2.17.0, nan@^2.12.1: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nanoid@^3.1.23: version "3.1.23" @@ -21340,4 +21340,3 @@ zxcvbn@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30" integrity sha1-KOwXzwl0PtyrBW3dixsGJizHPDA= - \ No newline at end of file From fa29cf15407cb75a967da1fb21e110ae1da610cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Sat, 28 Jan 2023 10:31:27 +0100 Subject: [PATCH 3/7] Upgrade the Node version in main folder as well - Add `"nan": "2.17.0"` to package.json resolutions. --- .nvmrc | 2 +- package.json | 3 ++- yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.nvmrc b/.nvmrc index ce4572cce..cb77acbfe 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v17.9.0 \ No newline at end of file +v19.4.0 \ No newline at end of file diff --git a/package.json b/package.json index d00f1a0bf..d2b3ab369 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,8 @@ "slug": "^6.0.0" }, "resolutions": { - "set-value": "^2.0.1" + "set-value": "^2.0.1", + "nan": "2.17.0" }, "dependencies": {} } diff --git a/yarn.lock b/yarn.lock index 6103f10a2..0a91bc1d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4422,10 +4422,10 @@ mz@^2.4.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.9.2: - version "2.13.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.1.tgz#a15bee3790bde247e8f38f1d446edcdaeb05f2dd" - integrity sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA== +nan@2.17.0, nan@^2.9.2: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== nanomatch@^1.2.9: version "1.2.13" From d77969580011fab28596b8aa4c0c97045792fc7b Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 30 Jan 2023 12:05:49 +0100 Subject: [PATCH 4/7] fix some styleguid configurations --- webapp/maintenance/source/nuxt.config.maintenance.js | 2 +- webapp/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js index 9e11a5eb0..796f5adec 100644 --- a/webapp/maintenance/source/nuxt.config.maintenance.js +++ b/webapp/maintenance/source/nuxt.config.maintenance.js @@ -1,4 +1,4 @@ -import defaultConfig from './nuxt.config.js' +import defaultConfig from '../../nuxt.config.js' const { css, styleResources, manifest } = defaultConfig diff --git a/webapp/package.json b/webapp/package.json index 5afbd0250..508459dc2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -12,7 +12,7 @@ "storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 3002 -s ./static -c storybook/", "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt build", "start": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt start", - "generate:maintenance": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate -c nuxt.config.maintenance.js", + "generate:maintenance": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate -c maintenance/source/nuxt.config.maintenance.js", "generate": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate", "lint": "eslint --ext .js,.vue .", "locales": "../scripts/translations/missing-keys.sh && ../scripts/translations/sort.sh", From 9afb38b84eba5a85031239dd42efb5828f2b1096 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 30 Jan 2023 12:10:04 +0100 Subject: [PATCH 5/7] make docker work again --- webapp/maintenance/source/nuxt.config.maintenance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js index 796f5adec..fdda05c39 100644 --- a/webapp/maintenance/source/nuxt.config.maintenance.js +++ b/webapp/maintenance/source/nuxt.config.maintenance.js @@ -1,4 +1,4 @@ -import defaultConfig from '../../nuxt.config.js' +import defaultConfig from 'nuxt.config.js' const { css, styleResources, manifest } = defaultConfig From fc69848c1fb73bb162900062b6aa1608340f9199 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 30 Jan 2023 12:54:33 +0100 Subject: [PATCH 6/7] fix nuxt.config.js include --- webapp/maintenance/source/nuxt.config.maintenance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/maintenance/source/nuxt.config.maintenance.js b/webapp/maintenance/source/nuxt.config.maintenance.js index fdda05c39..9e11a5eb0 100644 --- a/webapp/maintenance/source/nuxt.config.maintenance.js +++ b/webapp/maintenance/source/nuxt.config.maintenance.js @@ -1,4 +1,4 @@ -import defaultConfig from 'nuxt.config.js' +import defaultConfig from './nuxt.config.js' const { css, styleResources, manifest } = defaultConfig From 15225d0dd46202433b8650c604841a25602673b5 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 30 Jan 2023 14:51:24 +0100 Subject: [PATCH 7/7] fix maintenance build --- webapp/maintenance/source/package.json | 8 ++++---- webapp/package.json | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index a548ab453..0242b70a0 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -8,9 +8,9 @@ "private": false, "main": "index.js", "scripts": { - "dev": "yarn run nuxt -c nuxt.config.maintenance.js", - "build": "yarn run nuxt build -c nuxt.config.maintenance.js", - "start": "yarn run nuxt start -c nuxt.config.maintenance.js", - "generate": "yarn run nuxt generate -c nuxt.config.maintenance.js" + "dev": "cross-env NODE_OPTIONS=--openssl-legacy-provider yarn run nuxt -c nuxt.config.maintenance.js", + "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider yarn run nuxt build -c nuxt.config.maintenance.js", + "start": "cross-env NODE_OPTIONS=--openssl-legacy-provider yarn run nuxt start -c nuxt.config.maintenance.js", + "generate": "cross-env NODE_OPTIONS=--openssl-legacy-provider yarn run nuxt generate -c nuxt.config.maintenance.js" } } diff --git a/webapp/package.json b/webapp/package.json index 508459dc2..bf85fbc5e 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -12,7 +12,6 @@ "storybook": "cross-env NODE_OPTIONS=--openssl-legacy-provider start-storybook -p 3002 -s ./static -c storybook/", "build": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt build", "start": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt start", - "generate:maintenance": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate -c maintenance/source/nuxt.config.maintenance.js", "generate": "cross-env NODE_OPTIONS=--openssl-legacy-provider nuxt generate", "lint": "eslint --ext .js,.vue .", "locales": "../scripts/translations/missing-keys.sh && ../scripts/translations/sort.sh",