diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b09f48caa1..93e0f2bf37 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.X] + node-version: [22.x] steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Node modules cache @@ -80,7 +80,7 @@ jobs: strategy: matrix: go-version: [1.23.X] - node-version: [16.X] + node-version: [22.x] steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Setup Go @@ -232,7 +232,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 with: - node-version: "16.X" + node-version: "22.x" registry-url: "https://npm.pkg.github.com" scope: "@weaveworks" - run: yarn diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml index 04439d86e8..f45fe9da30 100644 --- a/.github/workflows/prepare-release.yaml +++ b/.github/workflows/prepare-release.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 with: - node-version: 16.X + node-version: 22.x - name: Set up environment vars run: | echo "BRANCH=releases/${{ github.event.inputs.version }}" >> $GITHUB_ENV diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fb50104d8a..6691e3f425 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -51,7 +51,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 with: - node-version: "16.X" + node-version: "22.x" registry-url: "https://npm.pkg.github.com" scope: "@weaveworks" - run: yarn @@ -132,7 +132,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1 with: - node-version: 16.X + node-version: 22.x - name: Set env var env: GITHUB_EVENT_PULL_REQUEST_HEAD_REF: ${{ github.event.pull_request.head.ref }} diff --git a/doc/development-process.md b/doc/development-process.md index 84c1b4a9ef..d3b9bfa572 100644 --- a/doc/development-process.md +++ b/doc/development-process.md @@ -46,7 +46,7 @@ Step one, make sure you've installed the tools listed at the very top of this fi Step two, now you **must** **ALSO** have the following installed. -- [node](https://nodejs.org/en/) v16 - Install Node.js +- [node](https://nodejs.org/en/) v22 - Install Node.js Now you have those things installed, lets go! diff --git a/gitops-server.dockerfile b/gitops-server.dockerfile index 84bb7bc95c..bd72b3611d 100644 --- a/gitops-server.dockerfile +++ b/gitops-server.dockerfile @@ -1,5 +1,5 @@ # UI build -FROM node:16-bullseye@sha256:cd59a61258b82b86c1ff0ead50c8a689f6c3483c5ed21036e11ee741add419eb AS ui +FROM node:22-bookworm@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc AS ui RUN apt-get update -y && apt-get install -y build-essential RUN mkdir -p /home/app && chown -R node:node /home/app WORKDIR /home/app diff --git a/package.json b/package.json index f2057a94e6..6bc5b66ca1 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,10 @@ "distDir": "bin/dist", "source": "ui/index.html", "sourceMap": false, - "publicUrl": "./" + "publicUrl": "./", + "engines": { + "browsers": "> 0.5%, last 2 versions, not dead" + } }, "lib": { "includeNodeModules": false, @@ -134,5 +137,8 @@ "jest": "^29.0.0", "cross-spawn": "^7.0.5", "commander": "^11.0.0" + }, + "engines": { + "node": ">=22.0" } }