Merge branch 'release/1.1.8' into v1

nystudio107 · Jul 17, 2022 · 97a5439 · 97a5439
2 parents 7d80edf + 8e0ee0d
commit 97a5439
Show file tree

Hide file tree

Showing 6 changed files with 540 additions and 477 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Route Map Changelog
 
+## 1.1.8 - 2022.07.17
+### Changed
+* Cast `$siteId` params to be an integer, even though it should be either an `int` or `null` already ([#22](https://github.com/nystudio107/craft-routemap/issues/22))
+
 ## 1.1.7 - 2021.07.17
 ### Changed
 * Switched documentation system to VitePress

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-routemap",
   "description": "Returns a list of Craft/Vue/React route rules and element URLs for ServiceWorkers from Craft entries",
   "type": "craft-plugin",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "keywords": [
     "craft",
     "cms",

diff --git a/docs/Makefile b/docs/Makefile
@@ -5,7 +5,7 @@ DOCKERRUN=docker container run \
 	--rm \
 	-p 3002:3002 \
 	-t \
-	-v `pwd`:/app \
+	-v "${CURDIR}":/app \
 	${CONTAINER}:${TAG}
 DOCSDEST?=../../../sites/nystudio107/web/docs/route-map
 
@@ -17,7 +17,7 @@ docker:
 		-t ${CONTAINER}:${TAG} \
 		--build-arg TAG=${TAG} \
 		--no-cache
-build: clean docker install
+build: docker install
 	${DOCKERRUN} \
 		run docs:build
 	rm -rf ${DOCSDEST}
@@ -34,7 +34,7 @@ install: docker
 lint: docker install
 	${DOCKERRUN} \
 		run docs:lint
-clean: docker
+clean:
 	rm -rf node_modules/
 	rm -f package-lock.json
 npm: docker