From 0d8692fa7f1c89ca37ff90536c19e95577811e91 Mon Sep 17 00:00:00 2001 From: Jiri Kozel Date: Wed, 18 Dec 2024 11:01:15 +0100 Subject: [PATCH] Upgrade LTC to Node 22 + upgrade some dependencies --- .env.demo | 2 +- .env.dev | 2 +- .env.test | 2 +- .github/workflows/code_quality.yml | 2 +- .nvmrc | 2 +- CHANGELOG.md | 8 ++++++++ client/docker/Dockerfile.production | 2 +- doc/dependencies.md | 4 ++-- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.env.demo b/.env.demo index 07247a63b..1ef1c249b 100644 --- a/.env.demo +++ b/.env.demo @@ -65,7 +65,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://localhost/client/ -LAYMAN_CLIENT_VERSION=v1.18.0 +LAYMAN_CLIENT_VERSION=00c3ceac509354cd2d53fce30041e63e35efaa69 # extra hosts to be added to /etc/hosts EXTRA_HOST1=1.2.3.4:1.2.3.4 diff --git a/.env.dev b/.env.dev index c9d842fe4..6dc40aea9 100644 --- a/.env.dev +++ b/.env.dev @@ -65,7 +65,7 @@ LAYMAN_CLIENT_URL=http://layman_client:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://localhost:3000/client/ -LAYMAN_CLIENT_VERSION=v1.18.0 +LAYMAN_CLIENT_VERSION=00c3ceac509354cd2d53fce30041e63e35efaa69 ############################################################################## diff --git a/.env.test b/.env.test index 461c840f9..f9596b1fb 100644 --- a/.env.test +++ b/.env.test @@ -65,7 +65,7 @@ LAYMAN_CLIENT_URL=http://layman_client_test:3000/client/ # client LAYMAN_CLIENT_PUBLIC_URL=http://layman_test_run_1:8000/client/ -LAYMAN_CLIENT_VERSION=v1.18.0 +LAYMAN_CLIENT_VERSION=00c3ceac509354cd2d53fce30041e63e35efaa69 ############################################################################## diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index 9bb470554..e8d9cd89a 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - run: npm install --global remark-cli remark-validate-links remark-lint-no-dead-urls - run: remark --version - run: make remark diff --git a/.nvmrc b/.nvmrc index 0828ab794..92f279e3e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18 \ No newline at end of file +v22 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e174295c..04c499d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,18 @@ ## v2.0.0 {release-date} ### Upgrade requirements +- Change environment variable [LAYMAN_CLIENT_VERSION](doc/env-settings.md#LAYMAN_CLIENT_VERSION): + ``` + LAYMAN_CLIENT_VERSION=00c3ceac509354cd2d53fce30041e63e35efaa69 + ``` ### Migrations and checks #### Schema migrations #### Data migrations ### Changes +- [#1028](https://github.com/LayerManager/layman/issues/1028) Upgrade Node.js of Laymen Test Client from v18 to v22 and dependencies: + - eslint-config-next 13 -> 14 + - next 13 -> 14 + - semantic-ui-react 2 -> 3.0.0-beta.2 - All changes from [v1.23.1](#v1231) and [v1.23.2](#v1232). ## v1.23.2 diff --git a/client/docker/Dockerfile.production b/client/docker/Dockerfile.production index 3054ba7e9..60254b99d 100644 --- a/client/docker/Dockerfile.production +++ b/client/docker/Dockerfile.production @@ -1,4 +1,4 @@ -FROM node:18-alpine +FROM node:22-alpine RUN mkdir /code WORKDIR /code diff --git a/doc/dependencies.md b/doc/dependencies.md index af70d5e9f..229adf13a 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -24,9 +24,9 @@ | [firefox](https://www.mozilla.org/firefox/) | 95+ | MPL | Dockerfile | prod | bin | for client-side map rendering and integration testing | | [firefox-geckodriver](https://www.ubuntuupdates.org/package/ubuntu_mozilla_security/bionic/main/base/firefox-geckodriver) | 95+ | MPL | Dockerfile | prod | bin | for client-side map rendering and integration testing | | [pipenv](https://pypi.org/project/pipenv/) | 2020.11.15 | MIT | Dockerfile | prod | bin | to install Python dependencies | -| [node.js](https://nodejs.org/) | 18 | MIT | client/docker/Dockerfile | prod | bin | to run Layman Test Client | +| [node.js](https://nodejs.org/) | 22 | MIT | client/docker/Dockerfile | prod | bin | to run Layman Test Client | | [node.js](https://nodejs.org/) | 16 | MIT | timgen/Dockerfile | prod | bin | to run Timgen | -| [npm](https://www.npmjs.com/get-npm) | 8 | Artistic License 2.0 | client/docker/Dockerfile | prod | bin | to install node.js dependencies | +| [npm](https://www.npmjs.com/get-npm) | 10 | Artistic License 2.0 | client/docker/Dockerfile | prod | bin | to install node.js dependencies | | [gunicorn](https://gunicorn.org/) | 20 | MIT | requirements.production.txt | opt | bin | as Flask production server | | [nginx](http://nginx.org/) | 1.16 | BSD 2-Clause | docker-compose.yml | opt | bin | as production server |