From 0e0c2bad454ac43fc12c8ee587c963de583f099c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= Date: Fri, 28 Oct 2022 15:14:57 +0200 Subject: [PATCH] chore(node): upgrade to Node 18 LTS --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 6 +----- .github/workflows/code_quality.yml | 6 +++--- .github/workflows/release.yml | 2 +- .github/workflows/unstable.yml | 2 +- Dockerfile | 2 +- README.md | 4 ++-- frontend/package.json | 4 ++-- frontend/vite.config.ts | 4 +--- package-lock.json | 12 ++++++------ package.json | 4 ++-- tauri/package.json | 4 ++-- 12 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index ab8f8b0b..30bed680 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.1/containers/typescript-node/.devcontainer/base.Dockerfile -ARG VARIANT="16" +ARG VARIANT="18" FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT} # [Optional] Uncomment this section to install additional OS packages. diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6dd5c3cf..af243a87 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,13 +6,9 @@ "dockerfile": "Dockerfile", // Update 'VARIANT' to pick a Node version: 10, 12, 14... "args": { - "VARIANT": "16" + "VARIANT": "18" } }, - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.shell.linux": "/usr/bin/zsh" - }, // Add the IDs of extensions you want installed when the container is created. "extensions": [ "octref.vetur", diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml index e84188a8..fd6e3ddd 100644 --- a/.github/workflows/code_quality.yml +++ b/.github/workflows/code_quality.yml @@ -34,7 +34,7 @@ jobs: - name: Setup node environment ⚙️ uses: actions/setup-node@v3.5.1 with: - node-version: 16 + node-version: 18 cache: 'npm' check-latest: true @@ -57,7 +57,7 @@ jobs: - name: Setup node environment ⚙️ uses: actions/setup-node@v3.5.1 with: - node-version: 16 + node-version: 18 cache: 'npm' check-latest: true @@ -143,7 +143,7 @@ jobs: - name: Setup node environment ⚙️ uses: actions/setup-node@v3.5.1 with: - node-version: 16 + node-version: 18 cache: 'npm' check-latest: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab6be364..caa022b9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -84,7 +84,7 @@ jobs: - name: Setup node environment ⚙️ uses: actions/setup-node@v3.5.1 with: - node-version: 16 + node-version: 18 cache: 'npm' check-latest: true diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml index b3f99c6c..48839e14 100644 --- a/.github/workflows/unstable.yml +++ b/.github/workflows/unstable.yml @@ -90,7 +90,7 @@ jobs: - name: Setup node environment ⚙️ uses: actions/setup-node@v3.5.1 with: - node-version: 16 + node-version: 18 cache: 'npm' check-latest: true diff --git a/Dockerfile b/Dockerfile index 714f9714..edf6e3be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ## This dockerfile builds the client entirely in a Docker context -FROM node:16-alpine AS build +FROM node:18-alpine AS build # Set build arguments ARG DEFAULT_SERVERS diff --git a/README.md b/README.md index 5dee0d1d..19e3da91 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ This is an experimental web client for Jellyfin based on Vue.js. We welcome all ## Dependencies -- [Node.js LTS](https://nodejs.org/en/download) `>=16.13.1 <17.0.0` -- npm `>=8.1.2` (included in Node.js) +- [Node.js LTS](https://nodejs.org/en/download) `>=18.12.0 <19.0.0` +- npm `>=8.19.2` (included in Node.js) - Jellyfin Server `>=10.7.0` ## Getting Started diff --git a/frontend/package.json b/frontend/package.json index cebe453b..3f9ebb10 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -74,8 +74,8 @@ "vue-tsc": "0.34.16" }, "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } } diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 1840da65..2448fb68 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -20,9 +20,7 @@ export default defineConfig(async ({ mode }): Promise => { port: 3000 }, define: { - __COMMIT_HASH__: JSON.stringify( - process.env.COMMIT_HASH || process.env.CF_PAGES_COMMIT_SHA || '' - ) + __COMMIT_HASH__: JSON.stringify(process.env.COMMIT_HASH || '') }, plugins: [ vue(), diff --git a/package-lock.json b/package-lock.json index 3852b3e2..ff7f512b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,8 +11,8 @@ "tauri" ], "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } }, @@ -68,8 +68,8 @@ "vue-tsc": "0.34.16" }, "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } }, @@ -12955,8 +12955,8 @@ "@tauri-apps/tauricon": "1.0.2" }, "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } } diff --git a/package.json b/package.json index bb4d16d6..b4fbc52f 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "tauri" ], "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } } diff --git a/tauri/package.json b/tauri/package.json index c56f43ea..9b40446b 100644 --- a/tauri/package.json +++ b/tauri/package.json @@ -17,8 +17,8 @@ "@tauri-apps/tauricon": "1.0.2" }, "engines": { - "node": ">=16.13.1 <17.0.0", - "npm": ">=8.1.2", + "node": ">=18.12.0 <19.0.0", + "npm": ">=8.19.2", "yarn": "Yarn is not supported. Please use NPM." } }