diff --git a/.gitignore b/.gitignore index 9cb767a..02d2bd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -# Craft 3 .gitignore +# Craft .gitignore # -# Example .gitignore file for Craft 3 CMS projects +# Example .gitignore file for Craft CMS projects # # @author nystudio107 # @copyright Copyright (c) 2017 nystudio107 @@ -9,7 +9,7 @@ # @since 1.0.0 # @license MIT -# This file should be placed in your Craft 3 CMS project root directory +# This file should be placed in your Craft CMS project root directory # CRAFT ENVIRONMENT .env* diff --git a/CHANGELOG.md b/CHANGELOG.md index cbadf0a..d28cb48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # nystudio107/plugindev Change Log +## 1.1.23 - 2022.12.14 +### Added +* Added `nystudio107/craft-code-field` + +### Changed +* Added updated versions of nystudio107 plugins to reflect their beta/release status +* Added `craftcms/generator` to the `craft_v4` `composer.json` +* Bumped the minimum Craft CMS versions to the latest + ## 1.1.22 - 2022.09.11 ### Changed * Use fluent model config settings for `general.php` & `db.php` diff --git a/Makefile b/Makefile index b834456..fcb0b20 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,8 @@ up: done ; \ docker-compose up ; \ fi +down: + docker-compose down %: @: # ref: https://stackoverflow.com/questions/6273608/how-to-pass-argument-to-makefile-from-command-line diff --git a/README.md b/README.md index 1559c21..6cdcd9a 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ Composer will have already created a `.env` file in the `cms_v3/` & `cms_v4` dir To set up your local dev environment, follow these steps: -* Edit the `cms_v3/composer.json` file and change the line `"url": "/Users/andrew/webdev/craft_v3/*",` in `repostories` to point to your local plugin Git repositories for Craft CMS 3 -* Edit the `cms_v4/composer.json` file and change the line `"url": "/Users/andrew/webdev/craft_v4/*",` in `repostories` to point to your local plugin Git repositories for Craft CMS 4 +* Edit the `cms_v3/composer.json` file and change the line `"url": "/Users/andrew/webdev/craft_v3/*",` in `repositories` to point to your local plugin Git repositories for Craft CMS 3 +* Edit the `cms_v4/composer.json` file and change the line `"url": "/Users/andrew/webdev/craft_v4/*",` in `repositories` to point to your local plugin Git repositories for Craft CMS 4 * Edit the `docker-composer.yaml` file and change the line `- /Users/andrew/webdev/craft_v3:/Users/andrew/webdev/craft_v3` to point to your local Craft CMS 3 plugin Git repositories * Edit the `docker-composer.yaml` file and change the line `- /Users/andrew/webdev/craft_v4:/Users/andrew/webdev/craft_v4` to point to your local Craft CMS 4 plugin Git repositories diff --git a/cms_v3/composer.json b/cms_v3/composer.json index 5780b1b..ad1c9bc 100644 --- a/cms_v3/composer.json +++ b/cms_v3/composer.json @@ -6,11 +6,12 @@ "require": { "php": "^7.2.5 || ^8.0.2", "craftcms/aws-s3": "^1.3.0", - "craftcms/cms": "3.7.51", + "craftcms/cms": "^3.7.0", "craftcms/commerce": "^3.0.0", "craftcms/digital-products": "^2.0.0", "craftcms/feed-me": "^4.4.0", "craftcms/redactor": "^2.0.0", + "nystudio107/craft-code-field": "^3.0.0", "nystudio107/craft-connect": "^1.0.0", "nystudio107/craft-cookies": "^1.0.0", "nystudio107/craft-disqus": "^1.0.0", diff --git a/cms_v4/composer.json b/cms_v4/composer.json index 0948541..e370208 100644 --- a/cms_v4/composer.json +++ b/cms_v4/composer.json @@ -6,9 +6,10 @@ "require": { "php": "^8.0.2", "craftcms/aws-s3": "^2.0.0", - "craftcms/cms": "^4.2.1", + "craftcms/cms": "^4.3.5", "craftcms/commerce": "^4.0.0", "craftcms/redactor": "^3.0.0", + "nystudio107/craft-code-field": "^4.0.0", "nystudio107/craft-connect": "^4.0.0", "nystudio107/craft-cookies": "^4.0.0", "nystudio107/craft-disqus": "^4.0.0", @@ -17,17 +18,17 @@ "nystudio107/craft-fastcgicachebust": "^4.0.0-beta.1", "nystudio107/craft-icalendar": "^4.0.0", "nystudio107/craft-imageoptimize": "^4.0.0", - "nystudio107/craft-instantanalytics": "^4.0.0-beta.1", + "nystudio107/craft-instantanalytics": "^4.0.0", "nystudio107/craft-minify": "^4.0.0-beta.1", "nystudio107/craft-pathtools": "^4.0.0-beta.1", "nystudio107/craft-recipe": "^4.0.0", "nystudio107/craft-retour": "^4.0.0", "nystudio107/craft-richvariables": "^4.0.0", - "nystudio107/craft-routemap": "^4.0.0-beta.1", + "nystudio107/craft-routemap": "^4.0.0", "nystudio107/craft-seomatic": "^4.0.0", "nystudio107/craft-similar": "^4.0.0", "nystudio107/craft-templatecomments": "^4.0.0", - "nystudio107/craft-transcoder": "^4.0.0-beta.1", + "nystudio107/craft-transcoder": "^4.0.0", "nystudio107/craft-twigpack": "^4.0.0-beta.1", "nystudio107/craft-twigprofiler": "^4.0.0-beta.1", "nystudio107/craft-typogrify": "^4.0.0", @@ -35,9 +36,9 @@ "nystudio107/craft-vanillaforums": "^4.0.0-beta.1", "nystudio107/craft-vite": "^4.0.0", "nystudio107/craft-webperf": "^4.0.0", - "nystudio107/craft-youtubeliveembed": "^4.0.0-beta.1", + "nystudio107/craft-youtubeliveembed": "^4.0.0", "putyourlightson/craft-elements-panel": "^2.0.0", - "verbb/super-table": "^3.0.0-beta.1", + "verbb/super-table": "^3.0.0", "vlucas/phpdotenv": "^5.4.0", "yiisoft/yii2-redis": "^2.0.6" }, @@ -49,6 +50,7 @@ "codeception/module-rest": "^1.4.2", "codeception/module-yii2": "^1.1.5", "craftcms/ecs": "dev-main", + "craftcms/generator": "^1.0.0", "craftcms/phpstan": "dev-main", "craftcms/rector": "dev-main", "nystudio107/craft-autocomplete": "^1.10.0",