Merge branch 'release/3.1.49' into v3

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Retour Changelog
 
+## 3.1.49 - 2021.03.03
+### Changed
+* Dockerized the buildchain, using `craft-plugin-manifest` for the webpack HMR bridge
+
 ## 3.1.48 - 2021.02.27
 ### Added
 * Added support for both 8.x and 9.x versions of `league/csv` for peer compatibility

Dockerfile

@@ -0,0 +1,8 @@
+ARG TAG=12-alpine
+FROM nystudio107/node-dev-base:$TAG
+
+WORKDIR /app/buildchain/
+
+CMD ["run build"]
+
+ENTRYPOINT ["npm"]

Makefile

@@ -0,0 +1,51 @@
+TAG?=12-alpine
+CONTAINER?=retour-buildchain
+DEST?=../../sites/nystudio107/web/docs/retour
+
+.PHONY: dist docker docs install npm
+
+dist: docker docs install
+	docker container run \
+		--name ${CONTAINER} \
+		--rm \
+		-t \
+		-v `pwd`:/app \
+		nystudio107/${CONTAINER}:${TAG} \
+		run build
+docker:
+	docker build \
+		. \
+		-t nystudio107/${CONTAINER}:${TAG} \
+		--build-arg TAG=${TAG} \
+		--no-cache
+docs:
+	docker container run \
+		--name ${CONTAINER} \
+		--rm \
+		-t \
+		-v `pwd`:/app \
+		nystudio107/${CONTAINER}:${TAG} \
+		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} \
+		install
+npm:
+	docker container run \
+		--name ${CONTAINER} \
+		--network plugindev_default \
+		--rm \
+		-t \
+		-p 8080:8080 \
+		-v `pwd`:/app \
+		nystudio107/${CONTAINER}:${TAG} \
+		$(filter-out $@,$(MAKECMDGOALS))
+%:
+	@:
+# ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line

buildchain/example.env

@@ -0,0 +1,6 @@
+# webpack example settings for Docker
+PUBLIC_PATH=""
+DEVSERVER_PUBLIC="http://localhost:8080"
+DEVSERVER_HOST="0.0.0.0"
+DEVSERVER_POLL=0
+DEVSERVER_PORT=8080

buildchain/package.json

@@ -135,6 +135,7 @@
     "check-types": "tsc",
     "debug": "nodemon -L",
     "dev": "nodemon -L",
+    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm run docs:build",
     "lint": "tsc --noEmit && eslint '../../src/**/*.{js,ts,vue}' --fix"
   },
   "version": "1.0.0"

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-retour",
     "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
     "type": "craft-plugin",
-    "version": "3.1.48",
+    "version": "3.1.49",
     "keywords": [
         "craftcms",
         "craft-plugin",
@@ -28,6 +28,7 @@
     },
     "require": {
         "craftcms/cms": "^3.0.0",
+        "nystudio107/craft-plugin-manifest": "^1.0.0",
         "league/csv": "^8.2 || ^9.0"
     },
     "autoload": {