Skip to content

Commit ce100b2

Browse files
author
Andrew Welch
committed
Merge branch 'release/1.2.20' into v1
2 parents df9dca5 + 0a1f6b5 commit ce100b2

35 files changed

+3021
-2260
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Transcoder Changelog
22

3+
## 1.2.20 - 2022.01.04
4+
### Changed
5+
* Switch to Node 16 via `16-alpine` Docker tag by default
6+
* Update to Tailwind CSS `^3.0.0`
7+
* Changed buildchain to Vite from webpack 5
8+
9+
### Fixed
10+
* Use `${CURDIR}` instead of `pwd` to be cross-platform compatible with Windows WSL2
11+
312
## 1.2.19 - 2021.05.16
413
### Changed
514
* Refactor to better directory structure

buildchain/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG TAG=14-alpine
1+
ARG TAG=16-alpine
22
FROM nystudio107/node-dev-base:$TAG
33

44
WORKDIR /app/buildchain/

buildchain/Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
TAG?=14-alpine
1+
TAG?=16-alpine
22
CONTAINER?=$(shell basename $(dir $(CURDIR)))-buildchain
33
DOCKERRUN=docker container run \
44
--name ${CONTAINER} \
55
--rm \
66
-t \
77
--network plugindev_default \
88
-p 3001:3001 \
9-
-v `pwd`/../:/app \
9+
-v "${CURDIR}"/../:/app \
1010
${CONTAINER}:${TAG}
1111

12-
.PHONY: build dev docker install npm
12+
.PHONY: build dev docker install clean npm
1313

14-
build: docker install
14+
build: clean docker install
1515
${DOCKERRUN} \
1616
run build
1717
dev: docker install
@@ -26,6 +26,9 @@ docker:
2626
install: docker
2727
${DOCKERRUN} \
2828
install
29+
clean:
30+
rm -rf node_modules/
31+
rm -f package-lock.json
2932
npm: docker
3033
${DOCKERRUN} \
3134
$(filter-out $@,$(MAKECMDGOALS))

0 commit comments

Comments
 (0)