Merge branch 'release/6.0.37'

* release/6.0.37:
  compiled assets
  laravel 9 compatibility
  fixes laravel 9/php exclusion
  exclude Laravel 9 tests on PHP v7
  Update GitHub Actions for Laravel 9
  Bump dependencies for Laravel 9
  Bump nanoid from 3.1.30 to 3.2.0
  Bump follow-redirects from 1.14.6 to 1.14.7

.github/workflows/tests.yml

@@ -15,15 +15,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [7.3, 7.4, 8.0]
-        laravel: [^6.0, ^7.0, ^8.0]
+        php: [7.3, 7.4, 8.0, 8.1]
+        laravel: [^6.0, ^7.0, ^8.0, ^9.0]
         include:
           - laravel: ^6.0
             testbench: ^4.0
           - laravel: ^7.0
             testbench: ^5.0
           - laravel: ^8.0
             testbench: ^6.0
+          - laravel: ^9.0
+            testbench: ^7.0
+        exclude:
+          - php: 7.3
+            laravel: ^9.0
+          - php: 7.4
+            laravel: ^9.0
+          - php: 8.1
+            laravel: ^6.0
+          - php: 8.1
+            laravel: ^7.0
 
     name: Laravel ${{ matrix.laravel }} on PHP ${{ matrix.php }}
 

composer.json

@@ -1,7 +1,13 @@
 {
     "name": "austintoddj/canvas",
     "description": "A Laravel publishing platform",
-    "keywords": ["blog", "canvas", "laravel", "publishing", "platform"],
+    "keywords": [
+        "blog",
+        "canvas",
+        "laravel",
+        "publishing",
+        "platform"
+    ],
     "license": "MIT",
     "homepage": "https://trycanvas.app",
     "support": {
@@ -17,12 +23,12 @@
     "require": {
         "php": "^7.3|^8.0",
         "ext-json": "*",
-        "laravel/framework": "^6.0|^7.0|^8.0"
+        "laravel/framework": "^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
         "phpunit/phpunit": "^9.0"
     },
     "autoload": {

public/js/app.js.LICENSE.txt

@@ -52,7 +52,7 @@
  */
 
 /*!
- * FilePondPluginImageValidateSize 1.2.6
+ * FilePondPluginImageValidateSize 1.2.7
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=9e5dee61c8dd6fea9532",
-    "/css/app.css": "/css/app.css?id=9dcde57dde05a868a057"
+    "/js/app.js": "/js/app.js?id=fc965861f0fae23e0488",
+    "/css/app.css": "/css/app.css?id=2b4576c721d635886915"
 }