Skip to content

Commit

Permalink
Upgrade to NodeJS 18
Browse files Browse the repository at this point in the history
  • Loading branch information
threema-danilo committed Dec 9, 2022
1 parent 2da8d62 commit 84390d9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
22 changes: 13 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
version: 2
version: 2.1

orbs:
browser-tools: circleci/[email protected]

references:
test-steps: &test-steps
- checkout
- restore_cache:
keys:
- v3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "package.json" }}
- v4-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "package.json" }}
- browser-tools/install-browser-tools
- run: npm install
- run: npm run build
- run: npm run ${BUILDTARGET}
- run: npm run ${TESTTARGET}
- save_cache:
key: v3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "package.json" }}
key: v4-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "package.json" }}
paths:
- node_modules

jobs:
unittest:
docker:
- image: circleci/node:16-browsers
- image: cimg/node:18.12-browsers
steps: *test-steps
environment:
BUILDTARGET: build:unittests
TESTTARGET: test:unit
uitest-firefox:
docker:
- image: circleci/node:16-browsers
- image: cimg/node:18.12-browsers
steps: *test-steps
environment:
BUILDTARGET: build:uitests
TESTTARGET: test:ui firefox
uitest-chrome:
docker:
- image: circleci/node:16-browsers
- image: cimg/node:18.12-browsers
steps: *test-steps
environment:
BUILDTARGET: build:uitests
TESTTARGET: test:ui chrome
lint:
docker:
- image: circleci/node:16-browsers
- image: cimg/node:18.12
steps:
- checkout
- restore_cache:
keys:
- v3-dependencies-lint-node14-{{ arch }}-{{ checksum "package.json" }}
- v4-dependencies-lint-node14-{{ arch }}-{{ checksum "package.json" }}
- run: npm install
- run: npm run lint
- save_cache:
key: v3-dependencies-lint-node14-{{ arch }}-{{ checksum "package.json" }}
key: v4-dependencies-lint-node14-{{ arch }}-{{ checksum "package.json" }}
paths:
- node_modules
docker-build:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# First, build Threema Web in a node container

FROM docker.io/node:16 AS builder
FROM docker.io/node:18 AS builder
ENV NODE_ENV=production

COPY . /opt/threema-web/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ is documented [here](https://threema-ch.github.io/app-remote-protocol/).

Threema Web is written using [TypeScript](https://www.typescriptlang.org/) and
[AngularJS 1](https://www.angularjs.org/). Dependencies are managed with
[npm](https://www.npmjs.com/). You currently need Node.js 16 to build Threema
[npm](https://www.npmjs.com/). You currently need Node.js 18 to build Threema
Web. (Note that Node.js is only a build dependency, the result is plain old
client-side JavaScript.)

If your default NodeJS version is not 16, use nvm to install it:
If your default NodeJS version is not 18, use nvm to install it:

nvm install
nvm use
Expand Down

0 comments on commit 84390d9

Please sign in to comment.