status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Consul UI to Node 18 (#19252) 

* Upgrading node to node 18

* Ensure we're on latest version of yarn as well

* add comma to make frontend tests run

* Use Node 18 Alpine image in UI build dockerfile

* delete package-lock.json

---------

Co-authored-by: wenincode <tyler.wendlandt@hashicorp.com>
Co-authored-by: Ella Cai <ella.y.cai@gmail.com>
Co-authored-by: Ella Cai <ella@hashicorp.com>
This commit is contained in:
Chris Hut 2023-10-23 11:29:04 -07:00 committed by GitHub
parent 62dec7ee17
commit ee2f046383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 2062 additions and 2153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -104,7 +104,7 @@ jobs:
- name: Setup with node and yarn - name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '14' node-version: '18'
cache: 'yarn' cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock' cache-dependency-path: 'ui/yarn.lock'
@ -193,7 +193,7 @@ jobs:
- name: Setup with node and yarn - name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '14' node-version: '18'
cache: 'yarn' cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock' cache-dependency-path: 'ui/yarn.lock'
@ -244,7 +244,7 @@ jobs:
- name: Setup with node and yarn - name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '14' node-version: '18'
cache: 'yarn' cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock' cache-dependency-path: 'ui/yarn.lock'

12
.github/workflows/frontend.yml vendored
View File

@ -37,10 +37,10 @@ jobs:
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '16' node-version: '18'
- name: Install Yarn - name: Install Yarn
run: npm install -g yarn run: corepack enable
# Install dependencies. # Install dependencies.
- name: install yarn packages - name: install yarn packages
@ -57,10 +57,10 @@ jobs:
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '16' node-version: '18'
- name: Install Yarn - name: Install Yarn
run: npm install -g yarn run: corepack enable
# Install dependencies. # Install dependencies.
- name: install yarn packages - name: install yarn packages
@ -86,10 +86,10 @@ jobs:
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: '16' node-version: '18'
- name: Install Yarn - name: Install Yarn
run: npm install -g yarn run: corepack enable
- name: Install Chrome - name: Install Chrome
uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0 uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0

12
.github/workflows/nightly-test-1.17.x.yaml vendored
View File

@ -24,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -56,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -95,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -128,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -167,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -198,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock

12
.github/workflows/nightly-test-main.yaml vendored
View File

@ -24,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -56,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -95,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -128,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -167,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock
@ -198,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching # Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0 - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with: with:
node-version: 14 node-version: 18
cache: 'yarn' cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock cache-dependency-path: ./ui/yarn.lock

3
build-support/docker/Build-UI.dockerfile
View File

@ -1,10 +1,11 @@
# Copyright (c) HashiCorp, Inc. # Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1 # SPDX-License-Identifier: BUSL-1.1
FROM docker.mirror.hashicorp.services/circleci/node:16-browsers FROM docker.mirror.hashicorp.services/node:18-alpine
USER root USER root
RUN apk update && apk add make
RUN mkdir /consul-src RUN mkdir /consul-src
WORKDIR /consul-src WORKDIR /consul-src
CMD make dist-docker CMD make dist-docker

2
ui/.nvmrc
View File

@ -1 +1 @@
16 18

2
ui/package.json
View File

@ -24,6 +24,6 @@
"ember-basic-dropdown": "3.0.21" "ember-basic-dropdown": "3.0.21"
}, },
"engines": { "engines": {
"node": ">=14 <=16" "node": "18"
} }
} }

2
ui/packages/consul-ui/README.md
View File

@ -112,7 +112,7 @@ See [./docs/index.mdx](./docs/index.mdx#environment-variables)
We follow a `ui/**/**` branch naming pattern. This branch naming pattern allows We follow a `ui/**/**` branch naming pattern. This branch naming pattern allows
front-end focused builds, such as FE tests, to run automatically in Pull front-end focused builds, such as FE tests, to run automatically in Pull
Requests. Please note this only works if you are a member of the HashiCorp Requests. Please note this only works if you are a member of the HashiCorp
GitHub Org. If you are an external contributor these tests won't run and will GitHub Org. If you are an external contributor, these tests won't run and will
instead be run by a member of our team during review. instead be run by a member of our team during review.
Examples: Examples:

4
ui/packages/consul-ui/package.json
View File

@ -199,7 +199,7 @@
"webpack": "^5.74.0" "webpack": "^5.74.0"
}, },
"engines": { "engines": {
"node": ">=14 <=16" "node": "18"
}, },
"ember": { "ember": {
"edition": "octane" "edition": "octane"
@ -214,7 +214,7 @@
] ]
}, },
"volta": { "volta": {
"node": "14.20.1" "node": "18"
}, },
"dependencies": { "dependencies": {
"doctoc": "^2.0.0" "doctoc": "^2.0.0"

4160
ui/yarn.lock
View File

File diff suppressed because it is too large Load Diff