Skip to content

Commit

Permalink
casual node 18 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
tommartensen committed Nov 28, 2023
1 parent 4c9bcdb commit 74b05f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY . .

RUN make server cli

FROM node:16.20.2 as ui-builder
FROM node:18 as ui-builder

COPY ui ui

Expand Down
14 changes: 7 additions & 7 deletions ui/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ all: deps lint-check test build

.PHONY: deps
deps: package.json
yarn install --frozen-lockfile
NODE_OPTIONS=--openssl-legacy-provider yarn install --frozen-lockfile

SOURCES := $(shell ls *.json) tailwind.config.js yarn.lock
SOURCES += $(shell find public)
Expand All @@ -20,7 +20,7 @@ SOURCES += $(shell find src -name '*.css' -print)
.PHONY: build
build: deps $(SOURCES)
@echo "+ $@"
yarn build
NODE_OPTIONS=--openssl-legacy-provider yarn build

# checks that files respect linting / formatting rules (primary used in CI)
.PHONY: lint-check
Expand All @@ -32,7 +32,7 @@ lint-check: deps $(SOURCES)
.PHONY: test
test: deps $(SOURCES)
@echo "+ $@"
yarn test --watchAll=false
NODE_OPTIONS=--openssl-legacy-provider yarn test --watchAll=false

#################
## Development ##
Expand All @@ -42,26 +42,26 @@ test: deps $(SOURCES)
.PHONY: start
start-dev-server: deps
@echo "+ $@"
yarn start
NODE_OPTIONS=--openssl-legacy-provider yarn start

# generates sources (e.g. API client). Right now it does depend on some resources generated by the
# root Makefile (e.g. Swagger definitions)
.PHONY: gen-src
gen-src:
@echo "+ $@"
yarn gen:src
NODE_OPTIONS=--openssl-legacy-provider yarn gen:src

# attempts to lint / format files where it's possible to do automatically (it'll change the files)
.PHONY: lint
lint: deps $(SOURCES)
@echo "+ $@"
yarn lint
NODE_OPTIONS=--openssl-legacy-provider yarn lint

# runs unit tests in an interactive watch mode
.PHONY: test-watch
test-watch: deps $(SOURCES)
@echo "+ $@"
yarn test
NODE_OPTIONS=--openssl-legacy-provider yarn test

##########
## Misc ##
Expand Down

0 comments on commit 74b05f3

Please sign in to comment.