diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b7d29d7f3..a9bef13364 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ parameters: references: images: go: &GOLANG_IMAGE docker.mirror.hashicorp.services/circleci/golang:1.16.3 - ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:12-browsers + ember: &EMBER_IMAGE docker.mirror.hashicorp.services/circleci/node:14-browsers paths: test-results: &TEST_RESULTS_DIR /tmp/test-results diff --git a/build-support/docker/Build-UI.dockerfile b/build-support/docker/Build-UI.dockerfile index bdc27d261a..b307d10923 100644 --- a/build-support/docker/Build-UI.dockerfile +++ b/build-support/docker/Build-UI.dockerfile @@ -1,9 +1,9 @@ -ARG ALPINE_VERSION=3.11 +ARG ALPINE_VERSION=3.13 FROM alpine:${ALPINE_VERSION} -ARG NODEJS_VERSION=12.15.0-r1 -ARG MAKE_VERSION=4.2.1-r2 -ARG YARN_VERSION=1.22.5 +ARG NODEJS_VERSION=14.16.1-r1 +ARG MAKE_VERSION=4.3-r0 +ARG YARN_VERSION=1.22.10 RUN apk update && \ apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} make=${MAKE_VERSION} && \ diff --git a/ui/package.json b/ui/package.json index 9a2d9a913c..d12c9e935a 100644 --- a/ui/package.json +++ b/ui/package.json @@ -18,5 +18,8 @@ "doctoc": "^2.0.0", "license-checker": "^25.0.1", "npm-run-all": "^4.1.5" + }, + "engines": { + "node": ">=10 <=14" } } diff --git a/ui/packages/consul-ui/.nvmrc b/ui/packages/consul-ui/.nvmrc index 48082f72f0..8351c19397 100644 --- a/ui/packages/consul-ui/.nvmrc +++ b/ui/packages/consul-ui/.nvmrc @@ -1 +1 @@ -12 +14 diff --git a/ui/packages/consul-ui/docs/upgrades.mdx b/ui/packages/consul-ui/docs/upgrades.mdx new file mode 100644 index 0000000000..76cbab1297 --- /dev/null +++ b/ui/packages/consul-ui/docs/upgrades.mdx @@ -0,0 +1,21 @@ +# Upgrades + +## Node + +Node upgrades should be done when it is convienient, preferably using the +latest Active LTS version (https://nodejs.org/en/about/releases/) that also +corresponds with the ember version we are on (https://github.com/ember-cli/ember-cli/blob/master/docs/node-support.md) + +Aswell as bumping our `.nvmrc` and `.circleci/config.yml` files, when bumping +node versions, please check with the rest of the team to see if there are +other repositories that should track the same node version as this repository. + +## Ember + +TBD + +## Other + +TBD + + diff --git a/ui/packages/consul-ui/package.json b/ui/packages/consul-ui/package.json index ad02642335..1655824701 100644 --- a/ui/packages/consul-ui/package.json +++ b/ui/packages/consul-ui/package.json @@ -173,7 +173,7 @@ "validated-changeset": "0.10.0" }, "engines": { - "node": "10.* || >= 12" + "node": ">=10 <=14" }, "ember": { "edition": "octane"