From 77f4cfdb539a3f356dd2c5467181b7e70a249b26 Mon Sep 17 00:00:00 2001 From: Kevin Scott <151596+thekevinscott@users.noreply.github.com> Date: Tue, 17 Oct 2023 07:58:08 -0400 Subject: [PATCH] Update node version to 20 (#1237) --- .github/actions/setup-pnpm/action.yml | 24 ++++++++++++------------ .github/workflows/tests.yml | 26 +++++++++++++------------- internals/bundlers/package.json | 2 +- internals/common/package.json | 2 +- internals/http-server/package.json | 2 +- internals/test-runner/package.json | 2 +- internals/upscaler-cli/package.json | 2 +- internals/webdriver/package.json | 2 +- package.json | 1 - pnpm-lock.yaml | 15 --------------- scripts/package.json | 2 +- 11 files changed, 32 insertions(+), 48 deletions(-) diff --git a/.github/actions/setup-pnpm/action.yml b/.github/actions/setup-pnpm/action.yml index 6648311f1..71a722c8f 100644 --- a/.github/actions/setup-pnpm/action.yml +++ b/.github/actions/setup-pnpm/action.yml @@ -19,18 +19,18 @@ runs: version: 8 run_install: false - # - name: Get pnpm store directory - # shell: bash - # run: | - # echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV - - # - uses: actions/cache@v3 - # name: Setup pnpm cache - # with: - # path: ${{ env.STORE_PATH }} - # key: ${{ runner.os }}-${{ inputs.node-version }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - # restore-keys: | - # ${{ runner.os }}-${{ inputs.node-version }}-pnpm-store- + - name: Get pnpm store directory + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV + + - uses: actions/cache@v3 + name: Setup pnpm cache + with: + path: ${{ env.STORE_PATH }} + key: ${{ runner.os }}-${{ inputs.node-version }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-${{ inputs.node-version }}-pnpm-store- - name: Install dependencies shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d81630cc..6318ea161 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Lint' run: 'pnpm lint' @@ -39,7 +39,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Unit Tests / Vite' working-directory: ./packages/upscalerjs @@ -64,7 +64,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Unit Tests / Playwright' working-directory: ./packages/upscalerjs @@ -90,7 +90,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Unit Tests' working-directory: ./packages/upscalerjs @@ -114,7 +114,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Unit Tests' working-directory: ./packages/shared @@ -132,7 +132,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Unit Tests' working-directory: ./internals @@ -169,7 +169,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 @@ -194,7 +194,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Integration Tests' run: pnpm test:integration:clientside @@ -213,7 +213,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 @@ -238,7 +238,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 @@ -259,7 +259,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Integration Tests' run: pnpm test:integration:model:serverside @@ -276,7 +276,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 - name: 'Memory Leak Tests' run: pnpm test:integration:memory-leaks @@ -293,7 +293,7 @@ jobs: - name: 'Setup PNPM with Node 16' uses: ./.github/actions/setup-pnpm with: - node-version: 16 + node-version: 20 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 diff --git a/internals/bundlers/package.json b/internals/bundlers/package.json index c7533d2b5..e81116cce 100644 --- a/internals/bundlers/package.json +++ b/internals/bundlers/package.json @@ -73,7 +73,7 @@ } }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "devDependencies": { "@types/ejs": "^3.1.2", diff --git a/internals/common/package.json b/internals/common/package.json index bea52f06d..aac1c3798 100644 --- a/internals/common/package.json +++ b/internals/common/package.json @@ -66,6 +66,6 @@ "test": "wireit" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" } } diff --git a/internals/http-server/package.json b/internals/http-server/package.json index 79e640e25..1baf25151 100644 --- a/internals/http-server/package.json +++ b/internals/http-server/package.json @@ -55,7 +55,7 @@ "test": "wireit" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "devDependencies": { "wireit": "latest", diff --git a/internals/test-runner/package.json b/internals/test-runner/package.json index 0680a9402..99e294355 100644 --- a/internals/test-runner/package.json +++ b/internals/test-runner/package.json @@ -59,7 +59,7 @@ "test": "wireit" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "devDependencies": { "wireit": "latest", diff --git a/internals/upscaler-cli/package.json b/internals/upscaler-cli/package.json index 4f94eded7..0c196faad 100644 --- a/internals/upscaler-cli/package.json +++ b/internals/upscaler-cli/package.json @@ -29,6 +29,6 @@ "test": "vitest" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" } } diff --git a/internals/webdriver/package.json b/internals/webdriver/package.json index 174149854..5b0149065 100644 --- a/internals/webdriver/package.json +++ b/internals/webdriver/package.json @@ -46,7 +46,7 @@ "test": "wireit" }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "devDependencies": { "wireit": "latest", diff --git a/package.json b/package.json index a8d5b87e6..87674dce8 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,6 @@ "fast-folder-size": "2.2.0", "fs-extra": "11.1.1", "glob": "^10.3.3", - "heapdump": "0.3.15", "inquirer": "9.2.10", "jest": "29.6.3", "jest-canvas-mock": "2.5.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e21be3fab..414f2cd29 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -146,9 +146,6 @@ importers: glob: specifier: ^10.3.3 version: 10.3.3 - heapdump: - specifier: 0.3.15 - version: 0.3.15 inquirer: specifier: 9.2.10 version: 9.2.10 @@ -10264,14 +10261,6 @@ packages: /he@1.2.0: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} - /heapdump@0.3.15: - resolution: {integrity: sha512-n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==} - engines: {node: '>=0.10.0'} - requiresBuild: true - dependencies: - nan: 2.16.0 - dev: true - /history@4.10.1: resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==} dependencies: @@ -12762,10 +12751,6 @@ packages: engines: {node: '>=12.0.0'} dev: false - /nan@2.16.0: - resolution: {integrity: sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==} - dev: true - /nanoid@3.3.3: resolution: {integrity: sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} diff --git a/scripts/package.json b/scripts/package.json index 7259ac3ba..b408c14b0 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -2,7 +2,7 @@ "name": "@upscalerjs/scripts", "private": true, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, "scripts": { "__run_command": "ts-node --esm --project ./tsconfig.json"