diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6e3b8f30f6..55b620393c 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -6,7 +6,7 @@ runs: - name: Install node uses: actions/setup-node@v3 with: - node-version: 16.15.0 + node-version: 18.16.0 - name: Cache uses: actions/cache@v3 id: cache diff --git a/.nvmrc b/.nvmrc index 7fd023741b..8ddbc0c64a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v16.15.0 +v18.16.0 diff --git a/Dockerfile b/Dockerfile index afa01e9b83..3d6e67b0cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ ################################################### -# This Dockerfile is used by the docker-compose.yml +# This Dockerfile is used by the docker-compose.yml # file to build the development container. # Do not make any changes here unless you know what # you are doing. ################################################### -FROM node:16-bullseye as dev +FROM node:18-bullseye as dev RUN apt-get update -y && apt-get upgrade -y && apt-get install -y openssl WORKDIR /app -CMD ["sh", "./docker-start.sh"] +CMD ["sh", "./bin/docker-start"] diff --git a/docker-start.sh b/bin/docker-start similarity index 100% rename from docker-start.sh rename to bin/docker-start index a8f991a20a..c73f17b574 100644 --- a/docker-start.sh +++ b/bin/docker-start @@ -1,11 +1,11 @@ +#!/bin/sh + ##################################################### # This startup script is used by the docker container # to check if the node_modules folder is empty and # if so, run yarn to install the dependencies. ##################################################### -#!/bin/sh - if [ ! -d "node_modules" ] || [ "$(ls -A node_modules)" = "" ]; then yarn fi diff --git a/package.json b/package.json index 2a6db8aac3..033ef59b17 100644 --- a/package.json +++ b/package.json @@ -53,9 +53,12 @@ "resolutions": { "react-error-overlay": "6.0.9" }, + "engines": { + "node": ">=18.0.0" + }, "packageManager": "yarn@3.5.1", "browserslist": [ - "electron 12.0", + "electron 24.0", "defaults" ] } diff --git a/upcoming-release-notes/1117.md b/upcoming-release-notes/1117.md new file mode 100644 index 0000000000..63043673e5 --- /dev/null +++ b/upcoming-release-notes/1117.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [j-f1] +--- + +Recommend that the frontend be developed on using Node 18, correct Electron target version