From ce265a159121b6d815b055728d2c4b7b053db61e Mon Sep 17 00:00:00 2001 From: Ranko Orlic Date: Fri, 27 Dec 2024 13:00:27 +0100 Subject: [PATCH] fix: latest npm, deps and node --- .github/workflows/pr-build.yml | 2 +- Dockerfile | 8 +++--- package-lock.json | 48 +++++++++++++++++----------------- package.json | 12 ++++----- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 5034fb6..1028325 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - node-version: [18.x, 20.x] + node-version: [20.x, 22.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/Dockerfile b/Dockerfile index f9d834b..b5de25a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # build environment -FROM node:20-bullseye-slim AS builder +FROM node:22-bullseye-slim AS builder # fix vulnerabilities -ARG NPM_TAG=10.2.3 +ARG NPM_TAG=11.0.0 RUN npm install -g npm@${NPM_TAG} # build it WORKDIR /build @@ -10,7 +10,7 @@ RUN npm ci RUN npm run build # run environment -FROM node:20.9.0-bullseye-slim +FROM node:22.12.0-bullseye-slim # fix vulnerabilities # note: trivy insists this to be on the same RUN line RUN apt-get -y update && apt-get -y upgrade @@ -22,7 +22,7 @@ RUN npm install -g npm@${NPM_TAG} COPY --chown=node:node --from=builder /build/package*.json ./ COPY --chown=node:node --from=builder /build/dist ./ ## install dependancies -ENV NODE_ENV production +ENV NODE_ENV=production RUN npm ci --omit=dev ## install signal-handler wrapper RUN apt-get -y install dumb-init diff --git a/package-lock.json b/package-lock.json index 1c4814e..aac1d03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "license": "EUPL-1.2", "dependencies": { - "cron": "^3.1.7", + "cron": "^3.3.1", "minimist": "^1.2.8", "mustache": "^4.2.0", "node-fetch": "^3.3.1" @@ -18,9 +18,9 @@ "@types/cron": "^2.0.1", "@types/minimist": "^1.2.2", "@types/mustache": "^4.2.2", - "@types/node": "^22.0.3", - "@types/node-fetch": "^2.6.3", - "typescript": "^5.5.4" + "@types/node": "^22.10.2", + "@types/node-fetch": "^2.6.12", + "typescript": "^5.7.2" } }, "node_modules/@types/cron": { @@ -55,19 +55,19 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.0.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.3.tgz", - "integrity": "sha512-/e0NZtK2gs6Vk2DoyrXSZZ4AlamqTkx0CcKx1Aq8/P4ITlRgU9OtVf5fl+LXkWWJce1M89pkSlH6lJJEnK7bQA==", + "version": "22.10.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", + "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.11.1" + "undici-types": "~6.20.0" } }, "node_modules/@types/node-fetch": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz", - "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==", + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.12.tgz", + "integrity": "sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==", "dev": true, "license": "MIT", "dependencies": { @@ -96,13 +96,13 @@ } }, "node_modules/cron": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.7.tgz", - "integrity": "sha512-tlBg7ARsAMQLzgwqVxy8AZl/qlTc5nibqYwtNGoCrd+cV+ugI+tvZC1oT/8dFH8W455YrywGykx/KMmAqOr7Jw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/cron/-/cron-3.3.1.tgz", + "integrity": "sha512-KpvuzJEbeTMTfLsXhUuDfsFYr8s5roUlLKb4fa68GszWrA4783C7q6m9yj4vyc6neyD/V9e0YiADSX2c+yRDXg==", "license": "MIT", "dependencies": { "@types/luxon": "~3.4.0", - "luxon": "~3.4.0" + "luxon": "~3.5.0" } }, "node_modules/data-uri-to-buffer": { @@ -175,9 +175,9 @@ } }, "node_modules/luxon": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", - "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", + "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", "license": "MIT", "engines": { "node": ">=12" @@ -262,9 +262,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz", + "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==", "dev": true, "license": "Apache-2.0", "bin": { @@ -276,9 +276,9 @@ } }, "node_modules/undici-types": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz", - "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index 53ee76a..aa9bc1a 100644 --- a/package.json +++ b/package.json @@ -12,16 +12,16 @@ "license": "EUPL-1.2", "devDependencies": { "@types/cron": "^2.0.1", - "@types/mustache": "^4.2.2", "@types/minimist": "^1.2.2", - "@types/node": "^22.0.3", - "@types/node-fetch": "^2.6.3", - "typescript": "^5.5.4" + "@types/mustache": "^4.2.2", + "@types/node": "^22.10.2", + "@types/node-fetch": "^2.6.12", + "typescript": "^5.7.2" }, "dependencies": { - "cron": "^3.1.7", - "mustache": "^4.2.0", + "cron": "^3.3.1", "minimist": "^1.2.8", + "mustache": "^4.2.0", "node-fetch": "^3.3.1" } }