Merge branch 'release/1.2.16' into v1

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Transcoder Changelog
 
+## 1.2.16 - 2021.04.06
+### Added
+* Added `make update` to update NPM packages
+* Added `make update-clean` to completely remove `node_modules/`, then update NPM packages
+
+### Changed
+* More consistent `makefile` build commands
+* Use Tailwind CSS `^2.1.0` with JIT
+* Move settings from the `composer.json` “extra” to the plugin main class
+* Move the manifest service registration to the constructor
+* Remove deprecated ManifestController
+
 ## 1.2.15 - 2021.03.03
 ### Changed
 * Dockerized the buildchain, using `craft-plugin-manifest` for the webpack HMR bridge

Dockerfile

@@ -1,4 +1,4 @@
-ARG TAG=12-alpine
+ARG TAG=14-alpine
 FROM nystudio107/node-dev-base:$TAG
 
 WORKDIR /app/buildchain/

Makefile

@@ -1,50 +1,48 @@
-TAG?=12-alpine
-CONTAINER?=transcoder-buildchain
-DEST?=../../sites/nystudio107/web/docs/transcoder
+TAG?=14-alpine
+CONTAINER?=$(shell basename $(CURDIR))-buildchain
+DOCKERRUN=docker container run \
+	--name ${CONTAINER} \
+	--rm \
+	-t \
+	--network plugindev_default \
+	-p 8080:8080 \
+	-v `pwd`:/app \
+	${CONTAINER}:${TAG}
+DOCSDEST?=../../sites/nystudio107/web/docs/transcoder
 
-.PHONY: dist docker docs install npm
+.PHONY: build dev docker docs install npm
 
-dist: docker docs install
-	docker container run \
-		--name ${CONTAINER} \
-		--rm \
-		-t \
-		-v `pwd`:/app \
-		nystudio107/${CONTAINER}:${TAG} \
+build: docker install
+	${DOCKERRUN} \
 		run build
+dev: docker install
+	${DOCKERRUN} \
+		run dev
 docker:
 	docker build \
 		. \
-		-t nystudio107/${CONTAINER}:${TAG} \
+		-t ${CONTAINER}:${TAG} \
 		--build-arg TAG=${TAG} \
 		--no-cache
-docs:
-	docker container run \
-		--name ${CONTAINER} \
-		--rm \
-		-t \
-		-v `pwd`:/app \
-		nystudio107/${CONTAINER}:${TAG} \
+docs: docker
+	${DOCKERRUN} \
 		run docs
-	rm -rf ${DEST}
-	mv ./docs/docs/.vuepress/dist ${DEST}
-install:
-	docker container run \
-		--name ${CONTAINER} \
-		--rm \
-		-t \
-		-v `pwd`:/app \
-		nystudio107/${CONTAINER}:${TAG} \
+	rm -rf ${DOCSDEST}
+	mv ./docs/docs/.vuepress/dist ${DOCSDEST}
+install: docker
+	${DOCKERRUN} \
 		install
-npm:
-	docker container run \
-		--name ${CONTAINER} \
-		--network plugindev_default \
-		--rm \
-		-t \
-		-p 8080:8080 \
-		-v `pwd`:/app \
-		nystudio107/${CONTAINER}:${TAG} \
+update: docker
+	rm -f buildchain/package-lock.json
+	${DOCKERRUN} \
+		install
+update-clean: docker
+	rm -f buildchain/package-lock.json
+	rm -rf buildchain/node_modules/
+	${DOCKERRUN} \
+		install
+npm: docker
+	${DOCKERRUN} \
 		$(filter-out $@,$(MAKECMDGOALS))
 %:
 	@: