Skip to content

Commit

Permalink
Merge branch 'release/1.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Jun 18, 2024
2 parents f6bfc72 + 3f5a32d commit 47a4a09
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 9 deletions.
1 change: 1 addition & 0 deletions .docker-config/php-dev-craft/v3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
1 change: 1 addition & 0 deletions .docker-config/php-dev-craft/v4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
1 change: 1 addition & 0 deletions .docker-config/php-dev-craft/v5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
1 change: 1 addition & 0 deletions .docker-config/php-prod-craft/v3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
1 change: 1 addition & 0 deletions .docker-config/php-prod-craft/v4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
1 change: 1 addition & 0 deletions .docker-config/php-prod-craft/v5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN set -eux; \
gifsicle \
jpegoptim \
libwebp-tools \
libavif \
linux-headers \
nano \
optipng \
Expand Down
2 changes: 1 addition & 1 deletion .docker-config/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM postgres:12-alpine
FROM postgres:13-alpine
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
# nystudio107/plugindev Change Log

## 1.2.4 - 2024.06.18
## Added
* Add `nystudio107/craft-cookies` to the `cms_v5/composer.json`
* Add `nystudio107/craft-minify` to the `cms_v5/composer.json`
* Add `nystudio107/craft-retour` to the `cms_v5/composer.json`
* Add `nystudio107/craft-webperf` to the `cms_v5/composer.json`
* Add `craftcms/commerce` to the `cms_v5/composer.json`
* Add `codeception` to the `cms_v5/composer.json`
* Add `putyourlightson/craft-campaign` to the `cms_v5/composer.json`
* Add `verbb/doxster` to the `cms_v5/composer.json`
* Add `craftcms/feed-me` to the `cms_v5/composer.json`
* Add `craftcms/shopify` to the `cms_v5/composer.json`
* Add `craftcms/digital-products` to the `cms_v5/composer.json`
* Add `spicyweb/craft-neo` to the `cms_v5/composer.json`
* Add `libavif` to the PHP containers
* Add `nystudio107/craft-typogrify` to the `cms_v5/composer.json`
* Add `nystudio107/craft-imageoptimize` to the `cms_v5/composer.json`
* Add `craftcms/aws-s3` to the `cms_v5/composer.json`
* Add `craftcms/cloud` to the `cms_v4/composer.json` & `cms_v5/composer.json`
* Add `nystudio107/craft-twigpack` to the `cms_v5/composer.json`
* Add `nystudio107/craft-emptycoalesce` to the `cms_v5/composer.json`
* Add `nystudio107/craft-templatecomments` to the `cms_v5/composer.json`
* Add `solspace/craft-calendar` to the `cms_v5/composer.json`
* Add `nystudio107/craft-templatecomments` to the `cms_v5/composer.json`
* Add `nystudio107/craft-twigprofiler` to the `cms_v5/composer.json`
* Add `nystudio107/craft-similar` to the `cms_v5/composer.json`

### Changed
* Use `postgres:13-alpine` for Craft 5 support

## 1.2.3 - 2024.01.30
### Added
* Add `nystudio107/craft-autocomplete` to the `cms_v5/composer.json`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ You can run the following from terminal in the `cms_v3` or `cms_v4` CMS director
- `make codecept xxx` - runs the [Codeception](https://codeception.com/) testing framework with the passed in commands, e.g.: `make codecept run -c ./vendor/putyourlightson/craft-blitz` in the php container
- `make ecs xxx` - runs [Easy Coding Standard](https://github.com/symplify/easy-coding-standard) using the [Craft CMS ECS config](https://github.com/craftcms/ecs), with the passed in path, e.g.: `make ecs check vendor/nystudio107/craft-seomatic/src`. To automatically fix, add the `--fix` flag, e.g.: `make -- ecs check vendor/nystudio107/craft-seomatic/src --fix`. Additional settings are available in the `ecs.php` file
- `make mysql` - switches the project to use the MySQL database container; just reload the browser
- `make phpstan xxx` - runs [PHPStan](https://github.com/phpstan/phpstan) using the [Craft CMS PHPStan config](https://github.com/craftcms/phpstan), with the passed in path, e.g.: `make phpstan analyze vendor/nystudio107/craft-seomatic/src`. Additional settings are available in the `phpstan.neon` file
- `make phpstan xxx` - runs [PHPStan](https://github.com/phpstan/phpstan) using the [Craft CMS PHPStan config](https://github.com/craftcms/phpstan), with the passed in path, e.g.: `make phpstan analyze vendor/nystudio107/craft-seomatic/src` or `make -- phpstan analyze -c vendor/nystudio107/craft-seomatic/phpstan.neon`. Additional settings are available in the `phpstan.neon` file
- `make postgres` - switches the project to use the Postgres database container; just reload the browser
- `make rector xxx` - runs [Rector](https://github.com/rectorphp/rector) using the [Craft CMS Rector config](https://github.com/craftcms/rector), with the passed in path, e.g.: `make rector process vendor/nystudio107/craft-seomatic/src`. Additional settings are available in the `rector.php` file
- `make ssh` - opens up a Unix shell inside the PHP container for the project
Expand Down
6 changes: 6 additions & 0 deletions cms_v3/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
"prefer-stable": true,
"require": {
"php": "^7.2.5 || ^8.0.2",
"besteadfast/craft-preparse-field": "^1.0.0",
"craftcms/aws-s3": "^1.3.0",
"craftcms/cms": "^3.0.0",
"craftcms/ckeditor": "^1.0.0",
"craftcms/commerce": "^3.0.0",
"craftcms/digital-products": "^2.0.0",
"craftcms/feed-me": "^4.4.0",
"craftcms/redactor": "^2.0.0",
"markhuot/craftql": "^1.0.0",
"nystudio107/craft-code-field": "^3.0.0",
"nystudio107/craft-connect": "^1.0.0",
"nystudio107/craft-cookies": "^1.0.0",
Expand Down Expand Up @@ -41,9 +44,12 @@
"nystudio107/craft-youtubeliveembed": "^1.0.0",
"nystudio107/craft-vite": "^1.0.0",
"nystudio107/twig-bundle-installer": "^1.0.0",
"putyourlightson/craft-blitz": "^3.0.0",
"putyourlightson/craft-campaign": "^1.0.0",
"putyourlightson/craft-elements-panel": "^1.1",
"solspace/craft-calendar": "^3.0.0",
"spicyweb/craft-neo": "^2.13.3",
"verbb/doxter": "^4.0.0",
"verbb/super-table": "^2.7.0",
"vlucas/phpdotenv": "^5.4.0",
"yiisoft/yii2-redis": "^2.0.6"
Expand Down
5 changes: 5 additions & 0 deletions cms_v4/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"prefer-stable": true,
"require": {
"php": "^8.0.2",
"besteadfast/craft-preparse-field": "^2.0.0",
"craftcms/aws-s3": "^2.0.0",
"craftcms/ckeditor": "^3.0.0",
"craftcms/cloud": "^1.41.0",
"craftcms/cms": "^4.0.0",
"craftcms/commerce": "^4.0.0",
"craftcms/digital-products": "^3.0.0",
Expand Down Expand Up @@ -44,7 +46,10 @@
"nystudio107/craft-youtubeliveembed": "^4.0.0",
"nystudio107/twig-bundle-installer": "^1.0.0",
"putyourlightson/craft-elements-panel": "^2.0.0",
"putyourlightson/craft-blitz": "^4.0.0",
"solspace/craft-calendar": "^4.0.0",
"spicyweb/craft-neo": "^4.0.0",
"verbb/doxter": "^5.0.0",
"verbb/super-table": "^3.0.0",
"verbb/vizy": "^2.0.0",
"vlucas/phpdotenv": "^5.4.0",
Expand Down
45 changes: 38 additions & 7 deletions cms_v5/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,55 @@
"prefer-stable": true,
"require": {
"php": "^8.2.0",
"craftcms/cms": "^5.0.0-alpha.1",
"craftcms/ckeditor": "4.0.x-dev",
"craftcms/redactor": "4.0.x-dev",
"craftcms/cloud": "^2.0.0",
"craftcms/cms": "^5.0.0",
"craftcms/aws-s3": "^2.1.0",
"nystudio107/craft-closure": "^1.0.1",
"nystudio107/craft-code-field": "^5.0.0-beta.1",
"nystudio107/craft-seomatic": "^5.0.0-beta.1",
"nystudio107/craft-code-field": "^5.0.0",
"nystudio107/craft-cookies": "^5.0.0",
"nystudio107/craft-emptycoalesce": "^5.0.0",
"nystudio107/craft-fastcgicachebust": "^5.0.0",
"nystudio107/craft-imageoptimize": "^5.0.0",
"nystudio107/craft-minify": "^5.0.0",
"nystudio107/craft-retour": "^5.0.0",
"nystudio107/craft-seomatic": "^5.0.0",
"nystudio107/craft-similar": "^5.0.0",
"nystudio107/craft-templatecomments": "^5.0.0",
"nystudio107/craft-twigpack": "^5.0.0",
"nystudio107/craft-twigprofiler": "^5.0.0",
"nystudio107/craft-twig-base-templates": "^1.0.0",
"nystudio107/craft-vite": "^5.0.0-beta.1",
"nystudio107/craft-typogrify": "^5.0.0",
"nystudio107/craft-vite": "^5.0.0",
"nystudio107/craft-webperf": "^5.0.0",
"nystudio107/twig-bundle-installer": "^1.0.0",
"vlucas/phpdotenv": "^5.4.0",
"yiisoft/yii2-redis": "^2.0.6"
},
"require-dev": {
"codeception/codeception": "^5.0.11",
"codeception/module-asserts": "^3.0.0",
"codeception/module-datafactory": "^3.0.0",
"codeception/module-phpbrowser": "^3.0.0",
"codeception/module-rest": "^3.3.2",
"codeception/module-yii2": "^1.1.9",
"craftcms/ecs": "dev-main",
"craftcms/generator": "2.0.x-dev",
"craftcms/phpstan": "dev-main",
"craftcms/rector": "dev-main",
"nystudio107/craft-autocomplete": "^1.12.0"
"composer-plugin-api": "^1.0 || ^2.0",
"composer/composer": "^1.0 || ^2.0",
"craftcms/commerce": "^5.0.0",
"craftcms/ckeditor": "^4.0.0",
"craftcms/digital-products": "^4.0.0",
"craftcms/feed-me": "^6.0.0",
"craftcms/redactor": "^4.0.0",
"craftcms/shopify": "^5.0.0",
"nystudio107/craft-autocomplete": "^1.12.0",
"putyourlightson/craft-blitz": "^5.0.0",
"putyourlightson/craft-campaign": "^3.0.0",
"solspace/craft-calendar": "^5.0.0",
"spicyweb/craft-neo": "^5.0.0",
"verbb/doxter": "^6.0.0"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 47a4a09

Please sign in to comment.