diff --git a/.github/workflows/ingest-pull.yml b/.github/workflows/ingest-pull.yml index 77fb875..7930f39 100644 --- a/.github/workflows/ingest-pull.yml +++ b/.github/workflows/ingest-pull.yml @@ -5,7 +5,7 @@ on: types: [labeled] env: - NODE_VERSION: 20 + NODE_VERSION: 22 jobs: security: diff --git a/.github/workflows/ingest-push.yml b/.github/workflows/ingest-push.yml index ddcabac..417b5e3 100644 --- a/.github/workflows/ingest-push.yml +++ b/.github/workflows/ingest-push.yml @@ -9,7 +9,7 @@ on: types: [closed] env: - NODE_VERSION: 20 + NODE_VERSION: 22 IMAGE_NAME: ard-eventhub-europe-west3/ingest REGISTRY_DOMAIN: europe-west3-docker.pkg.dev diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c0b346..ab3f4b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.8.0] - 2024-06-26 -- chore: upgrade to Node.js 20 +- chore: upgrade to Node.js v22 - feat: switch subscription names from UUIDv4 to ULID - chore: swap yarn for bun (package manager only) - chore: swap eslint for biome (experimental) diff --git a/Dockerfile b/Dockerfile index af5b19f..b23a994 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ COPY . . RUN bun install # Load desired node image -FROM node:20-alpine +FROM node:22-alpine # Create app directory WORKDIR /web/app diff --git a/README.md b/README.md index 109e74f..8b559a4 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`] | Type | Name | License | | ------- | ------------------------------ | -------------------------------------------------------------------------------------------------- | -| Docker | `node:20-alpine` | [MIT](https://github.com/nodejs/node/tree/main?tab=readme-ov-file#license) | +| Docker | `node:22-alpine` | [MIT](https://github.com/nodejs/node/tree/main?tab=readme-ov-file#license) | | NPM | `@google-cloud/datastore` | [Apache License 2.0](https://github.com/googleapis/nodejs-datastore/blob/master/LICENSE) | | NPM | `@google-cloud/pubsub` | [Apache License 2.0](https://github.com/googleapis/nodejs-pubsub/blob/master/LICENSE) | | NPM | `@google-cloud/secret-manager` | [Apache License 2.0](https://github.com/googleapis/nodejs-secret-manager/blob/master/LICENSE) | @@ -96,7 +96,6 @@ This source code is provided under EUPL v1.2, except for the [`spdx-exceptions`] | NPM DEV | `chai` | [MIT](https://github.com/chaijs/chai/blob/master/LICENSE) | | NPM DEV | `chai-http` | [MIT](https://github.com/chaijs/chai-http/blob/master/package.json) | | NPM DEV | `docsify-cli` | [MIT](https://github.com/docsifyjs/docsify-cli/blob/master/LICENSE) | -| NPM DEV | `dotenv` | [BSD-2-Clause](https://github.com/motdotla/dotenv/blob/master/LICENSE) | | NPM DEV | `license-compliance` | [MIT](https://github.com/tmorell/license-compliance/blob/master/LICENSE) | | NPM DEV | `mocha` | [MIT](https://github.com/mochajs/mocha/blob/master/LICENSE) | | NPM DEV | `nodemon` | [MIT](https://github.com/remy/nodemon/blob/master/LICENSE) | diff --git a/bun.lockb b/bun.lockb index f969af4..9a31b1f 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 1dccef9..902b56c 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,15 @@ "description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.", "main": "./src/ingest/index.js", "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0", + "npm": ">=10.0.0" }, "scripts": { "docs:serve": "docsify serve . --port 3000", "coreId": "node ./src/coreId/index.js", - "ingest:local": "nodemon -r dotenv/config ./src/ingest/index.js", + "ingest:local": "node --trace-deprecation --env-file .env ./node_modules/nodemon/bin/nodemon ./src/ingest/index.js", "ingest:cloud": "node ./src/ingest/index.js", - "ingest:test": "mocha --recursive './src/**/*.test.js' --timeout 15000 --exit -r dotenv/config", + "ingest:test": "node --env-file .env ./node_modules/mocha/bin/mocha --recursive './src/**/*.test.js' --timeout 15000 --exit", "ingest:lint": "biome lint src", "docker:build": "docker build . -t swr/ard-eventhub", "docker:run": "docker run --env-file .env -p 8080:8080 --name ard-eventhub swr/ard-eventhub", @@ -47,7 +48,6 @@ "chai": "^4.4.1", "chai-http": "^4.4.0", "docsify-cli": "^4.4.4", - "dotenv": "16.4.5", "license-compliance": "^3.0.1", "mocha": "^10.5.1", "nodemon": "^3.1.4",