From 5ce5fa528364e635cf619fc0c44be5766872f183 Mon Sep 17 00:00:00 2001 From: Andrew Calcutt Date: Fri, 10 Jan 2025 20:19:11 -0500 Subject: [PATCH] Update recommended node to v22 + Update docker images to use node 22 (#1438) * Update recommended node * update dockerfile to node 22 * Update CHANGELOG.md --- CHANGELOG.md | 1 + Dockerfile | 2 +- Dockerfile_light | 2 +- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8508880..6f2e824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # tileserver-gl changelog ## 5.1.0-pre.0 +* Update recommended node to v22 + Update docker images to use node 22 (https://github.com/maptiler/tileserver-gl/pull/1438) by @acalcutt * Upgrade Express to v5 + Canvas to v3 + code cleanup (https://github.com/maptiler/tileserver-gl/pull/1429) by @acalcutt * Terrain Preview and simple Elevation Query (https://github.com/maptiler/tileserver-gl/pull/1425 and https://github.com/maptiler/tileserver-gl/pull/1432) by @okimiko * add progressive rendering option for static jpeg images (#1397) by @samuel-git diff --git a/Dockerfile b/Dockerfile index facc777..69132fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN mkdir -p /etc/apt/keyrings; \ curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \ apt-get -qq update; \ apt-get install -y nodejs; \ npm i -g npm@latest; \ diff --git a/Dockerfile_light b/Dockerfile_light index 6a6595b..f16f25d 100644 --- a/Dockerfile_light +++ b/Dockerfile_light @@ -16,7 +16,7 @@ RUN set -ex; \ gnupg; \ mkdir -p /etc/apt/keyrings; \ curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \ - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \ apt-get -qq update; \ apt-get install -y nodejs; \ npm i -g npm@latest; \ diff --git a/README.md b/README.md index cf310ba..4be0b9d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Vector and raster maps with GL styles. Server-side rendering by MapLibre GL Nati Download vector tiles from [OpenMapTiles](https://data.maptiler.com/downloads/planet/). ## Getting Started with Node -Make sure you have Node.js version **18.17.0** or above installed. Node 20 is recommended. (running `node -v` it should output something like `v20.x.x`). Running without docker requires [Native dependencies](https://maptiler-tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first. +Make sure you have Node.js version **18.17.0** or above installed. Node 22 is recommended. (running `node -v` it should output something like `v22.x.x`). Running without docker requires [Native dependencies](https://maptiler-tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first. Install `tileserver-gl` with server-side raster rendering of vector tiles with npm. diff --git a/package-lock.json b/package-lock.json index 7fcd23e..58f5b3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "yaml-lint": "^1.7.0" }, "engines": { - "node": ">=18.17.0 <21" + "node": ">=18.17.0 <23" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 3d40623..0605f1d 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ ], "license": "BSD-2-Clause", "engines": { - "node": ">=18.17.0 <21" + "node": ">=18.17.0 <23" }, "repository": { "url": "git+https://github.com/maptiler/tileserver-gl.git",