diff --git a/.github/actions/setup-meteor/action.yaml b/.github/actions/setup-meteor/action.yaml index b96960585d..68a7305e4c 100644 --- a/.github/actions/setup-meteor/action.yaml +++ b/.github/actions/setup-meteor/action.yaml @@ -3,5 +3,5 @@ description: "Setup Meteor" runs: using: "composite" steps: - - run: curl "https://install.meteor.com/?release=3.0.4" | sh + - run: curl "https://install.meteor.com/?release=3.1" | sh shell: bash diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml index 188b49af71..c616662038 100644 --- a/.github/workflows/node.yaml +++ b/.github/workflows/node.yaml @@ -481,27 +481,27 @@ jobs: - server-core-integration - shared-lib - openapi - node-version: [20.x, 22.x] + node-version: [22.x] include: # include additional configs, to run certain packages only for a certain version of node - - node-version: 20.x + - node-version: 22.x package-name: corelib send-coverage: true - - node-version: 20.x + - node-version: 22.x package-name: job-worker send-coverage: true # No tests for the gateways yet - # - node-version: 20.x + # - node-version: 22.x # package-name: playout-gateway - # - node-version: 20.x + # - node-version: 22.x # package-name: mos-gateway - - node-version: 20.x + - node-version: 22.x package-name: live-status-gateway send-coverage: true - - node-version: 20.x + - node-version: 22.x package-name: webui # manual meteor-lib as it only needs a couple of versions - - node-version: 20.x + - node-version: 22.x package-name: meteor-lib send-coverage: true diff --git a/.github/workflows/prerelease-libs.yml b/.github/workflows/prerelease-libs.yml index 7ca1a31f2a..cfbb129dda 100644 --- a/.github/workflows/prerelease-libs.yml +++ b/.github/workflows/prerelease-libs.yml @@ -53,7 +53,7 @@ jobs: - blueprints-integration - server-core-integration - shared-lib - node-version: [20.x, 22.x] + node-version: [22.x] steps: - uses: actions/checkout@v4 diff --git a/.node-version b/.node-version index 10fef252a9..8b84b727be 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.18 +22.11 diff --git a/meteor/.meteor/release b/meteor/.meteor/release index b1e86a359f..8d20e1a2d3 100644 --- a/meteor/.meteor/release +++ b/meteor/.meteor/release @@ -1 +1 @@ -METEOR@3.0.4 +METEOR@3.1 diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions index 6048cd7897..b49eda45ce 100644 --- a/meteor/.meteor/versions +++ b/meteor/.meteor/versions @@ -1,7 +1,7 @@ accounts-base@3.0.3 -accounts-password@3.0.2 +accounts-password@3.0.3 allow-deny@2.0.0 -babel-compiler@7.11.1 +babel-compiler@7.11.2 babel-runtime@1.5.2 base64@1.0.13 binary-heap@1.0.12 @@ -10,18 +10,18 @@ callback-hook@1.6.0 check@1.4.4 core-runtime@1.0.0 ddp@1.4.2 -ddp-client@3.0.2 +ddp-client@3.0.3 ddp-common@1.4.4 ddp-rate-limiter@1.2.2 -ddp-server@3.0.2 +ddp-server@3.0.3 diff-sequence@1.1.3 dynamic-import@0.7.4 -ecmascript@0.16.9 +ecmascript@0.16.10 ecmascript-runtime@0.8.3 ecmascript-runtime-client@0.12.2 ecmascript-runtime-server@0.11.1 ejson@1.1.4 -email@3.1.0 +email@3.1.1 facts-base@1.0.2 fetch@0.1.5 geojson-utils@1.0.12 @@ -29,16 +29,16 @@ id-map@1.2.0 inter-process-messaging@0.1.2 localstorage@1.2.1 logging@1.3.5 -meteor@2.0.1 -minimongo@2.0.1 +meteor@2.0.2 +minimongo@2.0.2 modern-browsers@0.1.11 -modules@0.20.2 +modules@0.20.3 modules-runtime@0.13.2 -mongo@2.0.2 -mongo-decimal@0.1.4 +mongo@2.0.3 +mongo-decimal@0.2.0 mongo-dev-server@1.1.1 mongo-id@1.0.9 -npm-mongo@4.17.4 +npm-mongo@6.10.0 ordered-dict@1.2.0 promise@1.0.0 random@1.2.2 @@ -51,9 +51,8 @@ routepolicy@1.1.2 sha@1.0.10 socket-stream-client@0.5.3 tracker@1.3.4 -typescript@5.4.3 -underscore@1.6.4 -url@1.3.4 -webapp@2.0.3 +typescript@5.6.3 +url@1.3.5 +webapp@2.0.4 webapp-hashing@1.1.2 zodern:types@1.0.13 diff --git a/meteor/Dockerfile b/meteor/Dockerfile index cee205aede..13c52fa295 100644 --- a/meteor/Dockerfile +++ b/meteor/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental # BUILD WEBUI -FROM node:20 +FROM node:22 COPY packages /opt/core/packages WORKDIR /opt/core/packages @@ -14,8 +14,8 @@ RUN yarn install && yarn build # RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib # BUILD IMAGE -FROM node:20 -RUN curl "https://install.meteor.com/?release=3.0.4" | sh +FROM node:22 +RUN curl "https://install.meteor.com/?release=3.1" | sh # Temporary change the NODE_ENV env variable, so that all libraries are installed: ENV NODE_ENV_TMP $NODE_ENV @@ -50,7 +50,7 @@ RUN npm install RUN mv /opt/bundle/programs/web.browser/assets /opt/bundle/programs/web.browser/app/assets || true # DEPLOY IMAGE -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata diff --git a/meteor/Dockerfile.circle b/meteor/Dockerfile.circle index 1e39e80f81..8cb4d3971f 100644 --- a/meteor/Dockerfile.circle +++ b/meteor/Dockerfile.circle @@ -1,5 +1,5 @@ # DEPLOY IMAGE -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata diff --git a/meteor/package.json b/meteor/package.json index c8ed1b5128..6b63793d08 100644 --- a/meteor/package.json +++ b/meteor/package.json @@ -3,7 +3,7 @@ "version": "1.52.0-in-development", "private": true, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "scripts": { "preinstall": "node -v", @@ -88,7 +88,7 @@ "@types/koa-static": "^4.0.4", "@types/koa__cors": "^5.0.0", "@types/koa__router": "^12.0.4", - "@types/node": "^20.17.6", + "@types/node": "^22.9.3", "@types/request": "^2.48.12", "@types/semver": "^7.5.6", "@types/underscore": "^1.11.15", diff --git a/meteor/yarn.lock b/meteor/yarn.lock index a01cc3dc27..34729e9fbe 100644 --- a/meteor/yarn.lock +++ b/meteor/yarn.lock @@ -1557,19 +1557,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=12.0.0": - version: 20.6.3 - resolution: "@types/node@npm:20.6.3" - checksum: 444a6f1f41cfa8d3e20ce0108e6e43960fb2ae0e481f233bb1c14d6252aa63a92e021de561cd317d9fdb411688f871065f40175a1f18763282dee2613a08f8a3 - languageName: node - linkType: hard - -"@types/node@npm:^20.17.6": - version: 20.17.6 - resolution: "@types/node@npm:20.17.6" +"@types/node@npm:*, @types/node@npm:>=12.0.0, @types/node@npm:^22.9.3": + version: 22.9.3 + resolution: "@types/node@npm:22.9.3" dependencies: - undici-types: ~6.19.2 - checksum: d51dbb9881c94d0310b32b5fd8013e3261595c61bc888fa27258469c93c3dc0b3c4d20a9f28f3f5f79562f6737e28e7f3dd04940dc8b4d966d34aaf318f7f69b + undici-types: ~6.19.8 + checksum: 274cced37a8a11cd89827c551de73980a174e00bef0768c10c1fb7d3887a26b4fade25f870e3fd870432b93546e092cdbe0979e65110c0839982dc2b5938aabc languageName: node linkType: hard @@ -2297,7 +2290,7 @@ __metadata: "@types/koa-static": ^4.0.4 "@types/koa__cors": ^5.0.0 "@types/koa__router": ^12.0.4 - "@types/node": ^20.17.6 + "@types/node": ^22.9.3 "@types/request": ^2.48.12 "@types/semver": ^7.5.6 "@types/underscore": ^1.11.15 @@ -7065,7 +7058,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:10.2.0": +"lru-cache@npm:10.2.0, lru-cache@npm:^9.1.1 || ^10.0.0": version: 10.2.0 resolution: "lru-cache@npm:10.2.0" checksum: eee7ddda4a7475deac51ac81d7dd78709095c6fa46e8350dc2d22462559a1faa3b81ed931d5464b13d48cbd7e08b46100b6f768c76833912bc444b99c37e25db @@ -7097,13 +7090,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^9.1.1 || ^10.0.0": - version: 10.0.1 - resolution: "lru-cache@npm:10.0.1" - checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181 - languageName: node - linkType: hard - "make-dir@npm:^3.1.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" @@ -10348,14 +10334,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.2": - version: 2.6.2 - resolution: "tslib@npm:2.6.2" - checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad - languageName: node - linkType: hard - -"tslib@npm:^2.6.3": +"tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3": version: 2.7.0 resolution: "tslib@npm:2.7.0" checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28 @@ -10571,7 +10550,7 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.19.2": +"undici-types@npm:~6.19.8": version: 6.19.8 resolution: "undici-types@npm:6.19.8" checksum: de51f1b447d22571cf155dfe14ff6d12c5bdaec237c765085b439c38ca8518fc360e88c70f99469162bf2e14188a7b0bcb06e1ed2dc031042b984b0bb9544017 diff --git a/package.json b/package.json index 8a279813ee..95a4ef24bc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "private": true, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "scripts": { "postinstall": "run install:packages && run install:meteor", diff --git a/packages/blueprints-integration/package.json b/packages/blueprints-integration/package.json index d32f58ee43..39a9a5eafc 100644 --- a/packages/blueprints-integration/package.json +++ b/packages/blueprints-integration/package.json @@ -29,7 +29,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/corelib/package.json b/packages/corelib/package.json index 52533e7332..dd45f266e6 100644 --- a/packages/corelib/package.json +++ b/packages/corelib/package.json @@ -30,7 +30,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/documentation/package.json b/packages/documentation/package.json index 7fabd6dc65..50a06e3144 100644 --- a/packages/documentation/package.json +++ b/packages/documentation/package.json @@ -15,7 +15,7 @@ "write-heading-ids": "docusaurus write-heading-ids" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "devDependencies": { "@docusaurus/core": "3.2.1", diff --git a/packages/job-worker/package.json b/packages/job-worker/package.json index 8a7e17f85b..605e132301 100644 --- a/packages/job-worker/package.json +++ b/packages/job-worker/package.json @@ -31,7 +31,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/live-status-gateway/Dockerfile b/packages/live-status-gateway/Dockerfile index 42e11dafa6..00617c036a 100644 --- a/packages/live-status-gateway/Dockerfile +++ b/packages/live-status-gateway/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental # BUILD IMAGE -FROM node:20 +FROM node:22 WORKDIR /opt COPY package.json lerna.json yarn.lock tsconfig.json ./ @@ -15,7 +15,7 @@ RUN yarn build RUN yarn install --check-files --frozen-lockfile --production --force --ignore-scripts # purge dev-dependencies # DEPLOY IMAGE -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY --from=0 /opt/package.json /opt/package.json diff --git a/packages/live-status-gateway/Dockerfile.circle b/packages/live-status-gateway/Dockerfile.circle index 637941030a..cbbb344049 100644 --- a/packages/live-status-gateway/Dockerfile.circle +++ b/packages/live-status-gateway/Dockerfile.circle @@ -1,4 +1,4 @@ -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY package.json /opt/ diff --git a/packages/live-status-gateway/package.json b/packages/live-status-gateway/package.json index bf768b847e..f3e8b76c79 100644 --- a/packages/live-status-gateway/package.json +++ b/packages/live-status-gateway/package.json @@ -37,7 +37,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "keywords": [ "broadcast", diff --git a/packages/meteor-lib/package.json b/packages/meteor-lib/package.json index 0abbc9d479..f02c35e95a 100644 --- a/packages/meteor-lib/package.json +++ b/packages/meteor-lib/package.json @@ -30,7 +30,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/mos-gateway/Dockerfile b/packages/mos-gateway/Dockerfile index fe28949d7a..52e575565e 100644 --- a/packages/mos-gateway/Dockerfile +++ b/packages/mos-gateway/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental # BUILD IMAGE -FROM node:20 +FROM node:22 WORKDIR /opt COPY . . @@ -13,7 +13,7 @@ RUN yarn plugin import workspace-tools RUN yarn workspaces focus mos-gateway --production # purge dev-dependencies # DEPLOY IMAGE -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY --from=0 /opt/package.json /opt/package.json diff --git a/packages/mos-gateway/Dockerfile.circle b/packages/mos-gateway/Dockerfile.circle index 10373c3df9..a648ccbb25 100644 --- a/packages/mos-gateway/Dockerfile.circle +++ b/packages/mos-gateway/Dockerfile.circle @@ -1,4 +1,4 @@ -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY package.json /opt/ diff --git a/packages/mos-gateway/package.json b/packages/mos-gateway/package.json index 3b93188b06..084e6869ee 100644 --- a/packages/mos-gateway/package.json +++ b/packages/mos-gateway/package.json @@ -48,7 +48,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "keywords": [ "mos", diff --git a/packages/openapi/package.json b/packages/openapi/package.json index 78e975d6f4..06d6429b40 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -28,7 +28,7 @@ }, "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json", "engines": { - "node": ">=20.18" + "node": ">=18.18" }, "files": [ "/api", diff --git a/packages/package.json b/packages/package.json index fbe2eeb83b..9320553c24 100644 --- a/packages/package.json +++ b/packages/package.json @@ -45,7 +45,7 @@ "@types/ejson": "^2.2.2", "@types/got": "^9.6.12", "@types/jest": "^29.5.11", - "@types/node": "^20.17.6", + "@types/node": "^22.9.3", "@types/node-fetch": "^2.6.11", "@types/object-path": "^0.11.4", "@types/underscore": "^1.11.15", diff --git a/packages/playout-gateway/Dockerfile b/packages/playout-gateway/Dockerfile index 604a358748..8b83b08e24 100644 --- a/packages/playout-gateway/Dockerfile +++ b/packages/playout-gateway/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:experimental # BUILD IMAGE -FROM node:20 +FROM node:22 WORKDIR /opt COPY . . @@ -13,7 +13,7 @@ RUN yarn plugin import workspace-tools RUN yarn workspaces focus playout-gateway --production # purge dev-dependencies # DEPLOY IMAGE -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY --from=0 /opt/package.json /opt/package.json diff --git a/packages/playout-gateway/Dockerfile.circle b/packages/playout-gateway/Dockerfile.circle index 1d2821e54d..f9007eab3d 100644 --- a/packages/playout-gateway/Dockerfile.circle +++ b/packages/playout-gateway/Dockerfile.circle @@ -1,4 +1,4 @@ -FROM node:20-alpine +FROM node:22-alpine RUN apk add --no-cache tzdata COPY package.json /opt/ diff --git a/packages/playout-gateway/package.json b/packages/playout-gateway/package.json index a4864865f4..591e2d1d34 100644 --- a/packages/playout-gateway/package.json +++ b/packages/playout-gateway/package.json @@ -40,7 +40,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "keywords": [ "broadcast", diff --git a/packages/server-core-integration/package.json b/packages/server-core-integration/package.json index 9b2a3cc289..48e8f81660 100644 --- a/packages/server-core-integration/package.json +++ b/packages/server-core-integration/package.json @@ -48,7 +48,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/shared-lib/package.json b/packages/shared-lib/package.json index ca62e23353..8b28c643c3 100644 --- a/packages/shared-lib/package.json +++ b/packages/shared-lib/package.json @@ -29,7 +29,7 @@ "license-validate": "run -T sofie-licensecheck" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" }, "files": [ "/dist", diff --git a/packages/webui/package.json b/packages/webui/package.json index 90458dd48e..7bb1ce4a49 100644 --- a/packages/webui/package.json +++ b/packages/webui/package.json @@ -108,6 +108,6 @@ "xml2js": "^0.6.2" }, "engines": { - "node": ">=20.18" + "node": ">=22.11" } } diff --git a/packages/yarn.lock b/packages/yarn.lock index a56b8fdcd7..345bc72e4f 100644 --- a/packages/yarn.lock +++ b/packages/yarn.lock @@ -6465,12 +6465,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:>=12.0.0, @types/node@npm:>=13.7.0, @types/node@npm:^20.17.6": - version: 20.17.6 - resolution: "@types/node@npm:20.17.6" +"@types/node@npm:*, @types/node@npm:>=12.0.0, @types/node@npm:>=13.7.0, @types/node@npm:^22.9.3": + version: 22.9.3 + resolution: "@types/node@npm:22.9.3" dependencies: - undici-types: ~6.19.2 - checksum: d51dbb9881c94d0310b32b5fd8013e3261595c61bc888fa27258469c93c3dc0b3c4d20a9f28f3f5f79562f6737e28e7f3dd04940dc8b4d966d34aaf318f7f69b + undici-types: ~6.19.8 + checksum: 274cced37a8a11cd89827c551de73980a174e00bef0768c10c1fb7d3887a26b4fade25f870e3fd870432b93546e092cdbe0979e65110c0839982dc2b5938aabc languageName: node linkType: hard @@ -21026,7 +21026,7 @@ asn1@evs-broadcast/node-asn1: "@types/ejson": ^2.2.2 "@types/got": ^9.6.12 "@types/jest": ^29.5.11 - "@types/node": ^20.17.6 + "@types/node": ^22.9.3 "@types/node-fetch": ^2.6.11 "@types/object-path": ^0.11.4 "@types/underscore": ^1.11.15 @@ -26834,7 +26834,7 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"undici-types@npm:~6.19.2": +"undici-types@npm:~6.19.8": version: 6.19.8 resolution: "undici-types@npm:6.19.8" checksum: de51f1b447d22571cf155dfe14ff6d12c5bdaec237c765085b439c38ca8518fc360e88c70f99469162bf2e14188a7b0bcb06e1ed2dc031042b984b0bb9544017