-
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/4.0.1' into v4
- Loading branch information
Showing
35 changed files
with
3,890 additions
and
2,007 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| name: Build and Deploy Docs | ||
| env: | ||
| DOCS_DEST_DIR: /cookies/ | ||
| DOCS_DEST_DIR: /cookies/v4/ | ||
| on: | ||
| push: | ||
| branches: | ||
| - v1 | ||
| - v4 | ||
| paths: | ||
| - 'docs/**' | ||
| pull_request: | ||
| branches: | ||
| - v1 | ||
| - v4 | ||
| paths: | ||
| - 'docs/**' | ||
| workflow_dispatch: | ||
|
|
@@ -22,11 +22,11 @@ jobs: | |
| strategy: | ||
| fail-fast: true | ||
| matrix: | ||
| node-version: [14.x] | ||
| node-version: [ 20.x ] | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v4 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v2 | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| - run: npm ci | ||
|
|
@@ -35,7 +35,7 @@ jobs: | |
| - name: rsync deployments | ||
| uses: burnett01/[email protected] | ||
| with: | ||
| switches: -avzr --delete | ||
| switches: -avzr | ||
| path: ./dist/ | ||
| remote_path: ${{ secrets.NYS_DOCS_ROOT }}${{ env.DOCS_DEST_DIR }} | ||
| remote_host: ${{ secrets.NYS_DEPLOY_REMOTE_HOST }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| name: Code Analysis | ||
|
|
||
| on: | ||
| pull_request: null | ||
| push: | ||
| branches: | ||
| - develop-v4 | ||
| workflow_dispatch: | ||
| permissions: | ||
| contents: read | ||
| jobs: | ||
| code_analysis: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| actions: | ||
| - name: 'PHPStan' | ||
| run: composer phpstan | ||
| - name: 'Coding Standards' | ||
| run: composer fix-cs | ||
| name: ${{ matrix.actions.name }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Cache Composer dependencies | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: /tmp/composer-cache | ||
| key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }} | ||
| - name: Setup PHP | ||
| id: setup-php | ||
| uses: shivammathur/setup-php@v2 | ||
| with: | ||
| php-version: 8.2 | ||
| extensions: 'ctype,curl,dom,iconv,imagick,intl,json,mbstring,openssl,pcre,pdo,reflection,spl,zip' | ||
| ini-values: post_max_size=256M, max_execution_time=180, memory_limit=512M | ||
| tools: composer:v2 | ||
| - name: Install Composer dependencies | ||
| run: composer install --no-interaction --no-ansi --no-progress | ||
| - run: ${{ matrix.actions.run }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: Create Release | ||
| run-name: Create release for ${{ github.event.client_payload.version }} | ||
|
|
||
| on: | ||
| repository_dispatch: | ||
| types: | ||
| - craftcms/new-release | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: ncipollo/release-action@v1 | ||
| with: | ||
| body: ${{ github.event.client_payload.notes }} | ||
| makeLatest: ${{ github.event.client_payload.latest }} | ||
| name: ${{ github.event.client_payload.version }} | ||
| prerelease: ${{ github.event.client_payload.prerelease }} | ||
| tag: ${{ github.event.client_payload.tag }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,28 @@ | ||
| # Cookies Changelog | ||
|
|
||
| ## 4.0.0 - 2022.05.10 | ||
| ### Added | ||
| * Initial Craft CMS 4 release | ||
|
|
||
| ### Fixed | ||
| * Fixed an issue where `sameSite` must be of type boolean ([#37](https://github.com/nystudio107/craft-cookies/issues/37)) | ||
|
|
||
| ## 4.0.0-beta.1 - 2022.03.09 | ||
|
|
||
| ## 4.0.1 - 2024.02.12 | ||
| ### Added | ||
| * Added `ServicesTrait` for the plugin service component registration | ||
| * Add `phpstan` and `ecs` code linting | ||
| * Add `code-analysis.yaml` GitHub action | ||
|
|
||
| * Initial Craft CMS 4 compatibility | ||
|
|
||
| ## 1.1.15 - 2021.06.18 | ||
| ### Added | ||
| * Build docs via GitHub Actions CI | ||
|
|
||
| ### Changed | ||
| * Switched documentation system to VitePress | ||
|
|
||
| ### Fixed | ||
| * Remove blank, unused Settings page | ||
|
|
||
| ## 1.1.14 - 2021.04.15 | ||
| ### Changed | ||
| * Move settings from the `composer.json` “extra” to the plugin main class | ||
| * Updated docs to use node 20 & a new sitemap plugin | ||
| * PHPstan code cleanup | ||
| * ECS code cleanup | ||
|
|
||
| ### Fixed | ||
| * Removed duplicate example for Setting Secure Cookies in the docs (https://github.com/nystudio107/craft-cookies/issues/23) | ||
| * Fixed an issue where the `samesite` option defaulted to a `bool` when it should have defaulted to the string `Lax` | ||
|
|
||
| ## 1.1.13 - 2021.03.31 | ||
| ## 4.0.0 - 2022.05.10 | ||
| ### Added | ||
| * Added Dockerfile & Makefile for building docs | ||
| * Initial Craft CMS 4 release | ||
|
|
||
| ### 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 | ||
|
|
||
| ## 1.1.11 - 2018.12.06 | ||
| ### Changed | ||
| * Fixed an issue where `getSecure()` would return nothing due to an improper parameter passed to `unserialize()` | ||
|
|
||
| ## 1.1.10 - 2018.07.22 | ||
| ### Changed | ||
| * If the passed in domain is empty, use the `defaultCookieDomain` config setting | ||
| * Don't unserialize any classes in secure cookie data | ||
| * Code cleanup | ||
|
|
||
| ## 1.1.9 - 2018.02.01 | ||
| ### Changed | ||
| * Renamed the composer package name to `craft-cookies` | ||
| * Check to ensure a cookie exists before accessing it in `getSecure()` | ||
|
|
||
| ## 1.1.8 - 2018.01.23 | ||
| ### Changed | ||
| * Fixed an issue with removing cookies | ||
| * Added try/catch so errors are logged instead of exceptions thrown | ||
|
|
||
| ## 1.1.7 - 2017.12.06 | ||
| ### Changed | ||
| * Updated to require craftcms/cms `^3.0.0-RC1` | ||
| * Switched to `Craft::$app->view->registerTwigExtension` to register the Twig extension | ||
|
|
||
| ## 1.1.6 - 2017.08.05 | ||
| ### Changed | ||
| * Craft 3 beta 23 compatibility | ||
|
|
||
| ## 1.1.5 - 2017.07.09 | ||
| ### Changed | ||
| * Craft 3 beta 20 compatibility | ||
| * Fixed an issue where `sameSite` must be of type boolean ([#37](https://github.com/nystudio107/craft-cookies/issues/37)) | ||
|
|
||
| ## 1.1.4 - 2017.03.24 | ||
| ### Changed | ||
| * `hasSettings` -> `hasCpSettings` for Craft 3 beta 8 compatibility | ||
| ## 4.0.0-beta.1 - 2022.03.09 | ||
|
|
||
| ## 1.1.3 - 2017.03.12 | ||
| ### Added | ||
| * Added `craft/cms` as a composer dependency | ||
| * Added code inspection typehinting for the plugin & services | ||
|
|
||
| ### Changed | ||
| * Code refactor/cleanup | ||
|
|
||
| ## 1.1.2 - 2017.02.17 | ||
| ### Changed | ||
| * Code cleanup | ||
| * Added a new colored icon | ||
|
|
||
| ## 1.1.1 - 2017.02.10 | ||
| ### Changed | ||
| * Cleaned up `composer.json` | ||
|
|
||
| ## 1.1.0 - 2017.02.01 | ||
| ### Added | ||
| - Ported the plugin to Craft 3 | ||
| * Initial Craft CMS 4 compatibility |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| /vendor | ||
| /node_modules | ||
| /docs/.vitepress/dist | ||
| /docs/.vitepress/cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,47 @@ | ||
| TAG?=14-alpine | ||
| CONTAINER?=$(shell basename $(dir $(CURDIR)))-docs | ||
| DOCKERRUN=docker container run \ | ||
| --name ${CONTAINER} \ | ||
| --rm \ | ||
| -p 3002:3002 \ | ||
| -t \ | ||
| -v `pwd`:/app \ | ||
| ${CONTAINER}:${TAG} | ||
| DOCSDEST?=../../../sites/nystudio107/web/docs/cookies | ||
| MAJOR_VERSION?=4 | ||
| TAG?=20-alpine | ||
| CONTAINER?=$(shell basename $(dir $(CURDIR)))-v${MAJOR_VERSION}-docs | ||
| DOCS_DEV_PORT?=400${MAJOR_VERSION} | ||
| DOCS_DEST?=../../../sites/nystudio107/web/docs/cookies/v4 | ||
| IMAGE_INFO=$(shell docker image inspect $(CONTAINER):$(TAG)) | ||
| IMAGE_NAME=${CONTAINER}:${TAG} | ||
| DOCKER_RUN=docker container run --rm -it -v "${CURDIR}":/app | ||
|
|
||
| .PHONY: docker build dev fix install lint clean npm | ||
| .PHONY: build clean dev fix image-build image-check lint npm ssh | ||
|
|
||
| docker: | ||
| docker build \ | ||
| . \ | ||
| -t ${CONTAINER}:${TAG} \ | ||
| --build-arg TAG=${TAG} \ | ||
| --no-cache | ||
| build: clean docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:build | ||
| rm -rf ${DOCSDEST} | ||
| mv ./docs/.vitepress/dist ${DOCSDEST} | ||
| dev: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:dev | ||
| fix: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:fix | ||
| install: docker | ||
| ${DOCKERRUN} \ | ||
| install | ||
| lint: docker install | ||
| ${DOCKERRUN} \ | ||
| run docs:lint | ||
| # Perform a dist build via npm run docs:build | ||
| build: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:build | ||
| rm -rf ${DOCS_DEST} | ||
| mv ./docs/.vitepress/dist ${DOCS_DEST} | ||
| # Remove node_modules/ & package-lock.json | ||
| clean: | ||
| rm -rf node_modules/ | ||
| rm -f package-lock.json | ||
| npm: docker | ||
| ${DOCKERRUN} \ | ||
| $(filter-out $@,$(MAKECMDGOALS)) | ||
| # Run the development server via npm run docs:dev | ||
| dev: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ -e DOCS_DEV_PORT="${DOCS_DEV_PORT}" -p ${DOCS_DEV_PORT}:${DOCS_DEV_PORT} ${IMAGE_NAME} run docs:dev | ||
| # Fix the docs with textlint via npm run docs:fix | ||
| fix: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:fix | ||
| # Build the Docker image & run npm install | ||
| image-build: | ||
| docker build . -t ${IMAGE_NAME} --build-arg TAG=${TAG} --no-cache | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} install | ||
| # Ensure the image has been created | ||
| image-check: | ||
| ifeq ($(IMAGE_INFO), []) | ||
| image-check: image-build | ||
| endif | ||
| # Lint the docs with textlint via npm run docs:lint | ||
| lint: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} run docs:lint | ||
| # Run the passed in npm command | ||
| npm: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ ${IMAGE_NAME} $(filter-out $@,$(MAKECMDGOALS)) $(MAKEFLAGS) | ||
| # Open a shell inside of the container | ||
| ssh: image-check | ||
| ${DOCKER_RUN} --name ${CONTAINER}-$@ --entrypoint=/bin/sh ${IMAGE_NAME} | ||
| %: | ||
| @: | ||
| # ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line |
Oops, something went wrong.