4.6.1 Release

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v4.6.1]
+
+### Fix
+- Fix error when building assets. Updated `@yarnpkg/shell` from `^2.4.1` to `^3.0.0` ([#1168](https://github.com/userfrosting/UserFrosting/issues/1168)).
+- Set `psr/log` in `composer.json` to avoid conflict with dependencies.
+
 ## [v4.6.0]
 
 ### Changed Requirements
@@ -1098,3 +1104,4 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [v4.5.0]: https://github.com/userfrosting/UserFrosting/compare/v4.4.5...v4.5.0
 [v4.5.1]: https://github.com/userfrosting/UserFrosting/compare/v4.5.0...v4.5.1
 [v4.6.0]: https://github.com/userfrosting/UserFrosting/compare/v4.5.0...v4.6.0
+[v4.6.1]: https://github.com/userfrosting/UserFrosting/compare/v4.6.0...v4.6.1

app/defines.php

@@ -11,7 +11,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.6.0');
+define('UserFrosting\VERSION', '4.6.1');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '^7.3 | ^8.0');
 define('UserFrosting\PHP_RECOMMENDED_VERSION', '^8.0');

app/sprinkles/core/composer.json

@@ -30,6 +30,7 @@
         "composer/semver": "^3.2.4",
         "doctrine/dbal": "^2.5",
         "filp/whoops": "^2.14.0",
+        "psr/log": "^1.0.1",
         "illuminate/cache": "^8.5",
         "illuminate/database": "^8.5",
         "illuminate/events": "^8.5",

build/package.json

@@ -7,7 +7,7 @@
     "@userfrosting/merge-package-dependencies": "^3.0.1",
     "@userfrosting/ts-log-adapter-gulplog": "^1.0.0",
     "@userfrosting/vinyl-fs-vpath": "^3.0.2",
-    "@yarnpkg/shell": "^2.4.1",
+    "@yarnpkg/shell": "^3.0.0",
     "bower": "^1.8.12",
     "del": "^6.0.0",
     "dotenv": "^10.0.0",