Merge branch 'release/1.1.13' into v1

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Cookies Changelog
 
+## 1.1.13 - 2021.03.31
+### Added
+* Added Dockerfile & Makefile for building docs
+
+### Fixed
+* No longer hardcode secure to be `true` for regular cookies via PR from jedimonkey (https://github.com/nystudio107/craft-cookies/issues/11)
+
 ## 1.1.12 - 2020.02.13
 ### Changed
 * Implemented `sameSite` for cookies, thank to a PR from Kenny Quan

Dockerfile

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

Makefile

@@ -0,0 +1,40 @@
+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/cookies
+
+.PHONY: build dev docker docs install npm
+
+build: docker install
+	${DOCKERRUN} \
+		run build
+dev: docker install
+	${DOCKERRUN} \
+		run dev
+docker:
+	docker build \
+		. \
+		-t ${CONTAINER}:${TAG} \
+		--build-arg TAG=${TAG} \
+		--no-cache
+docs: docker
+	${DOCKERRUN} \
+		run docs
+	rm -rf ${DOCSDEST}
+	mv ./docs/docs/.vuepress/dist ${DOCSDEST}
+install: docker
+	${DOCKERRUN} \
+		install
+npm: docker
+	${DOCKERRUN} \
+		$(filter-out $@,$(MAKECMDGOALS))
+%:
+	@:
+# ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line

buildchain/package.json

@@ -0,0 +1,36 @@
+{
+  "author": {
+    "email": "[email protected]",
+    "name": "Andrew Welch",
+    "url": "https://nystudio107.com"
+  },
+  "browser": "./src/Cookies.php",
+  "bugs": {
+    "email": "[email protected]",
+    "url": "https://nystudio107.com"
+  },
+  "dependencies": {
+  },
+  "description": "A simple plugin for setting and getting cookies from within Craft CMS templates.",
+  "devDependencies": {
+ },
+  "homepage": "https://nystudio107.com",
+  "keywords": [
+    "cookies",
+    "craftcms",
+    "craft",
+    "cms",
+    "plugin"
+  ],
+  "license": "SEE LICENSE IN LICENSE.md",
+  "name": "cookies",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nystudio107/craft-cookies.git"
+  },
+  "scripts": {
+    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm run docs:build"
+  },
+  "version": "1.1.13"
+}

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-cookies",
     "description": "A simple plugin for setting and getting cookies from within Craft CMS templates.",
     "type": "craft-plugin",
-    "version": "1.1.12",
+    "version": "1.1.13",
     "keywords": [
         "craft",
         "cms",

docs/docs/.vuepress/config.js

@@ -2,7 +2,6 @@ module.exports = {
     title: 'Cookies Documentation',
     description: 'Documentation for the Cookies plugin',
     base: '/docs/cookies/',
-    dest: '../../../../sites/nystudio107/web/docs/cookies',
     themeConfig: {
         sidebar: [
             ['/', 'Cookies plugin for Craft CMS 3.x'],