Merge branch 'hotfix/6.0.46'

* hotfix/6.0.46: merge changes from #571 #785 #1269 dependency updates
austintoddj · May 24, 2023 · fd32e79 · fd32e79
2 parents 71b809c + 9888c06
commit fd32e79
Show file tree

Hide file tree

Showing 10 changed files with 990 additions and 927 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/app.css.map b/public/css/app.css.map
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/app.js.LICENSE.txt b/public/js/app.js.LICENSE.txt
@@ -73,17 +73,6 @@
  * Copyright (c) 2013, salesforce.com
  */
 
-/*!
- * Sizzle CSS Selector Engine v2.3.9
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2022-12-19
- */
-
 /*!
  * The buffer module from node.js, for the browser.
  *
@@ -98,17 +87,14 @@
  */
 
 /*!
- * jQuery JavaScript Library v3.6.3
+ * jQuery JavaScript Library v3.7.0
  * https://jquery.com/
  *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2022-12-20T21:28Z
+ * Date: 2023-05-11T18:29Z
  */
 
 /*!

diff --git a/public/js/app.js.map b/public/js/app.js.map
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=134755e6625c05aafb6f709cd528b3fb",
-    "/css/app.css": "/css/app.css?id=271fea4ceefb8589535f4ec52facf74c"
+    "/js/app.js": "/js/app.js?id=324e18fcae063bb1f1ca2906c7bb439b",
+    "/css/app.css": "/css/app.css?id=fba32a97663f92be37a5efdb5fa67cfa"
 }
diff --git a/src/Canvas.php b/src/Canvas.php
@@ -3,6 +3,7 @@
 namespace Canvas;
 
 use Canvas\Models\User;
+use Composer\InstalledVersions;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -20,9 +21,7 @@ public static function installedVersion(): string
             return '';
         }
 
-        $dependencies = json_decode(file_get_contents(base_path('composer.lock')), true)['packages'];
-
-        return collect($dependencies)->firstWhere('name', 'austintoddj/canvas')['version'];
+        return InstalledVersions::getPrettyVersion('austintoddj/canvas');
     }
 
     /**

diff --git a/src/Http/Controllers/UploadsController.php b/src/Http/Controllers/UploadsController.php
@@ -25,7 +25,7 @@ public function store()
         // are not supported at this time
         $file = reset($payload);
 
-        $path = $file->storePublicly(Canvas::baseStoragePath(), [
+        $path = $file->store(Canvas::baseStoragePath(), [
             'disk' => config('canvas.storage_disk'),
         ]);
 

diff --git a/yarn.lock b/yarn.lock