Skip to content

Commit

Permalink
Merge branch 'release/1.0.26' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Welch committed Jan 4, 2022
2 parents 4394e44 + 8198f2b commit 052770c
Show file tree
Hide file tree
Showing 208 changed files with 7,089 additions and 17,553 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Webperf Changelog

## 1.0.26 - 2022.01.04
### Changed
* Updated the buildchain to use Node 16
* Changed buildchain to Vite from webpack 5

## 1.0.25 - 2021.07.17
### Changed
* Switched documentation system to VitePress
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile → buildchain/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG TAG=14-alpine
ARG TAG=16-alpine
FROM nystudio107/node-dev-base:$TAG

WORKDIR /app/buildchain/
Expand Down
24 changes: 9 additions & 15 deletions Makefile → buildchain/Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
TAG?=14-alpine
CONTAINER?=$(shell basename $(CURDIR))-buildchain
TAG?=16-alpine
CONTAINER?=$(shell basename $(dir $(CURDIR)))-buildchain
DOCKERRUN=docker container run \
--name ${CONTAINER} \
--rm \
-t \
--network plugindev_default \
-p 8080:8080 \
-v `pwd`:/app \
-p 3001:3001 \
-v "${CURDIR}"/../:/app \
${CONTAINER}:${TAG}

.PHONY: build dev docker install npm
.PHONY: build dev docker install clean npm

build: docker install
build: clean docker install
${DOCKERRUN} \
run build
dev: docker install
Expand All @@ -26,15 +26,9 @@ docker:
install: docker
${DOCKERRUN} \
install --ignore-scripts
update: docker
rm -f buildchain/package-lock.json
${DOCKERRUN} \
install --ignore-scripts
update-clean: docker
rm -f buildchain/package-lock.json
rm -rf buildchain/node_modules/
${DOCKERRUN} \
install --ignore-scripts
clean:
rm -rf node_modules/
rm -f package-lock.json
npm: docker
${DOCKERRUN} \
$(filter-out $@,$(MAKECMDGOALS))
Expand Down
6 changes: 0 additions & 6 deletions buildchain/example.env

This file was deleted.

8 changes: 0 additions & 8 deletions buildchain/nodemon.json

This file was deleted.

Loading

0 comments on commit 052770c

Please sign in to comment.