Merge branch 'release/2.6.0' into devmode-vite

nystudio107 · Apr 9, 2022 · bc543e2 · bc543e2
2 parents cdd34c0 + 0c3fb2e
commit bc543e2
Show file tree

Hide file tree

Showing 34 changed files with 2,289 additions and 1,542 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/devmode Change Log
 
+## 2.6.0 - 2022.04.08
+### Changed
+* Switched over to Craft CMS 4.0.0-beta.4
+
 ## 2.5.8 - 2022.04.08
 ### Changed
 * Run migrations first via `composer.json` scripts, because Craft won't apply Project Config if there are pending migrations

diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
diff --git a/cms/bootstrap.php b/cms/bootstrap.php
@@ -20,4 +20,4 @@
 define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production');
 
 // Set license key via .env
-define('CRAFT_LICENSE_KEY', getenv('LICENSE_KEY'));
+define('CRAFT_LICENSE_KEY', trim(getenv('LICENSE_KEY'), '"'));
diff --git a/cms/composer.json b/cms/composer.json
@@ -20,22 +20,22 @@
   "minimum-stability": "beta",
   "prefer-stable": true,
   "require": {
-    "craftcms/cms": "^3.7.26",
-    "craftcms/aws-s3": "^1.2",
-    "craftcms/redactor": "^2.3.0",
+    "php": "^8.0.2",
+    "craftcms/cms": "^4.0.0-beta.4",
+    "craftcms/aws-s3": "^2.0.0-beta.2",
     "jean85/pretty-package-versions": "^1.5 || ^2.0",
     "league/csv": "^8.2 || ^9.0",
-    "nystudio107/craft-imageoptimize": "^1.0.0",
-    "nystudio107/craft-fastcgicachebust": "^1.0.0",
-    "nystudio107/craft-icalendar": "^1.1.0",
-    "nystudio107/craft-minify": "^1.2.10",
-    "nystudio107/craft-typogrify": "^1.1.4",
-    "nystudio107/craft-transcoder": "^1.0.9",
-    "nystudio107/craft-disqus": "^1.1.3",
-    "nystudio107/craft-retour": "^3.0.0",
-    "nystudio107/craft-seomatic": "^3.2.0",
-    "nystudio107/craft-webperf": "^1.0.0",
-    "nystudio107/craft-vite": "^1.0.19",
+    "nystudio107/craft-imageoptimize": "^4.0.0-beta.2",
+    "nystudio107/craft-fastcgicachebust": "^4.0.0-beta.1",
+    "nystudio107/craft-icalendar": "^4.0.0-beta.1",
+    "nystudio107/craft-minify": "^4.0.0-beta.1",
+    "nystudio107/craft-typogrify": "^4.0.0-beta.1",
+    "nystudio107/craft-transcoder": "^4.0.0-beta.4",
+    "nystudio107/craft-disqus": "^4.0.0-beta.1",
+    "nystudio107/craft-retour": "^4.0.0-beta.1",
+    "nystudio107/craft-seomatic": "^4.0.0-beta.1",
+    "nystudio107/craft-webperf": "^4.0.0-beta.1",
+    "nystudio107/craft-vite": "^4.0.0-beta.1",
     "vlucas/phpdotenv": "^5.4.0",
     "yiisoft/yii2-redis": "^2.0.6"
   },
@@ -53,10 +53,7 @@
       "craftcms/plugin-installer": true,
       "yiisoft/yii2-composer": true
     },
-    "optimize-autoloader": true,
-    "platform": {
-      "php": "7.2.5"
-    }
+    "optimize-autoloader": true
   },
   "scripts": {
     "craft-update": [