Merge branch 'hotfix/6.0.47'

* hotfix/6.0.47: builds assets Apply fixes from StyleCI (#1304) adds laravel mix and node scripts to fix #1181 uses an svg instead of an icon #1300 updates dependencies and compiles assets updates highlightjs version fixes deprecated Github favicons #1300 Apply fixes from StyleCI (#1303) Corrected bug when CANVAS_PATH is empty in EmbedImageModal and FeaturedImageModal
austintoddj · Jun 22, 2023 · 20c73b7 · 20c73b7
2 parents fd32e79 + 291918f
commit 20c73b7
Show file tree

Hide file tree

Showing 22 changed files with 1,245 additions and 1,104 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/js/app.js b/public/js/app.js
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=324e18fcae063bb1f1ca2906c7bb439b",
+    "/js/app.js": "/js/app.js?id=b3fafb432499dab8ca1789ac2e4265f9",
     "/css/app.css": "/css/app.css?id=fba32a97663f92be37a5efdb5fa67cfa"
 }
diff --git a/resources/js/components/editor/EmbedImageModal.vue b/resources/js/components/editor/EmbedImageModal.vue
@@ -233,7 +233,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/AvatarModal.vue b/resources/js/components/modals/AvatarModal.vue
@@ -107,8 +107,7 @@ export default {
 
         getServerOptions() {
             return {
-                // TODO: This check shouldn't need to be here
-                url: this.settings.path === '/' ? `/api/uploads` : `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/FeaturedImageModal.vue b/resources/js/components/modals/FeaturedImageModal.vue
@@ -227,7 +227,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/views/PostStats.vue b/resources/js/views/PostStats.vue
@@ -225,20 +225,18 @@
                                     <div class="mr-auto">
                                         <div v-if="host === trans.other">
                                             <p class="mb-0 py-1">
-                                                <img
-                                                    :src="getDefaultFavicon(host)"
-                                                    :style="
-                                                        settings.user.dark_mode === true
-                                                            ? {
-                                                                  filter: 'invert(100%)',
-                                                              }
-                                                            : ''
-                                                    "
-                                                    :alt="host"
+                                                <svg
+                                                    xmlns="http://www.w3.org/2000/svg"
                                                     width="15"
                                                     height="15"
-                                                    class="mr-1"
-                                                />
+                                                    fill="currentColor"
+                                                    class="mr-1 bi bi-globe"
+                                                    viewBox="0 0 16 16"
+                                                >
+                                                    <path
+                                                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4a9.267 9.267 0 0 1 .64-1.539 6.7 6.7 0 0 1 .597-.933A7.025 7.025 0 0 0 2.255 4H4.09zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a6.958 6.958 0 0 0-.656 2.5h2.49zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5H4.847zM8.5 5v2.5h2.99a12.495 12.495 0 0 0-.337-2.5H8.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5H4.51zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12c.138.386.295.744.468 1.068.552 1.035 1.218 1.65 1.887 1.855V12H5.145zm.182 2.472a6.696 6.696 0 0 1-.597-.933A9.268 9.268 0 0 1 4.09 12H2.255a7.024 7.024 0 0 0 3.072 2.472zM3.82 11a13.652 13.652 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5H3.82zm6.853 3.472A7.024 7.024 0 0 0 13.745 12H11.91a9.27 9.27 0 0 1-.64 1.539 6.688 6.688 0 0 1-.597.933zM8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855.173-.324.33-.682.468-1.068H8.5zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 0 1-.312 2.5zm2.802-3.5a6.959 6.959 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5h2.49zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 0 0-3.072-2.472c.218.284.418.598.597.933zM10.855 4a7.966 7.966 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4h2.355z"
+                                                    />
+                                                </svg>
                                                 <a
                                                     v-tooltip="{
                                                         placement: 'right',
@@ -268,15 +266,20 @@
                                         </div>
                                         <div v-else>
                                             <p class="mb-0 py-1">
-                                                <img
-                                                    :src="getDefaultFavicon(host)"
-                                                    :alt="host"
+                                                <svg
+                                                    xmlns="http://www.w3.org/2000/svg"
                                                     width="15"
                                                     height="15"
-                                                    class="mr-1"
-                                                />
+                                                    fill="currentColor"
+                                                    class="mr-1 bi bi-globe"
+                                                    viewBox="0 0 16 16"
+                                                >
+                                                    <path
+                                                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm7.5-6.923c-.67.204-1.335.82-1.887 1.855A7.97 7.97 0 0 0 5.145 4H7.5V1.077zM4.09 4a9.267 9.267 0 0 1 .64-1.539 6.7 6.7 0 0 1 .597-.933A7.025 7.025 0 0 0 2.255 4H4.09zm-.582 3.5c.03-.877.138-1.718.312-2.5H1.674a6.958 6.958 0 0 0-.656 2.5h2.49zM4.847 5a12.5 12.5 0 0 0-.338 2.5H7.5V5H4.847zM8.5 5v2.5h2.99a12.495 12.495 0 0 0-.337-2.5H8.5zM4.51 8.5a12.5 12.5 0 0 0 .337 2.5H7.5V8.5H4.51zm3.99 0V11h2.653c.187-.765.306-1.608.338-2.5H8.5zM5.145 12c.138.386.295.744.468 1.068.552 1.035 1.218 1.65 1.887 1.855V12H5.145zm.182 2.472a6.696 6.696 0 0 1-.597-.933A9.268 9.268 0 0 1 4.09 12H2.255a7.024 7.024 0 0 0 3.072 2.472zM3.82 11a13.652 13.652 0 0 1-.312-2.5h-2.49c.062.89.291 1.733.656 2.5H3.82zm6.853 3.472A7.024 7.024 0 0 0 13.745 12H11.91a9.27 9.27 0 0 1-.64 1.539 6.688 6.688 0 0 1-.597.933zM8.5 12v2.923c.67-.204 1.335-.82 1.887-1.855.173-.324.33-.682.468-1.068H8.5zm3.68-1h2.146c.365-.767.594-1.61.656-2.5h-2.49a13.65 13.65 0 0 1-.312 2.5zm2.802-3.5a6.959 6.959 0 0 0-.656-2.5H12.18c.174.782.282 1.623.312 2.5h2.49zM11.27 2.461c.247.464.462.98.64 1.539h1.835a7.024 7.024 0 0 0-3.072-2.472c.218.284.418.598.597.933zM10.855 4a7.966 7.966 0 0 0-.468-1.068C9.835 1.897 9.17 1.282 8.5 1.077V4h2.355z"
+                                                    />
+                                                </svg>
                                                 <a
-                                                    :href="'http://' + host"
+                                                    :href="'https://' + host"
                                                     class="text-decoration-none text-primary"
                                                     target="_blank"
                                                 >
@@ -409,10 +412,6 @@ export default {
                     NProgress.done();
                 });
         },
-
-        getDefaultFavicon(host) {
-            return `https://favicons.githubusercontent.com/${host}`;
-        },
     },
 };
 </script>
diff --git a/resources/stubs/webpack.mix.stub b/resources/stubs/webpack.mix.stub
@@ -1,2 +1,4 @@
+const mix = require('laravel-mix');
+
 mix.js('resources/js/canvas-ui/app.js', 'public/js/canvas-ui.js').vue()
     .sass('resources/sass/canvas-ui.scss', 'public/css/canvas-ui.css');
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -13,12 +13,12 @@
     <link rel="stylesheet" href="//fonts.googleapis.com/css2?family=Karla&family=Merriweather:wght@400;700&display=swap">
 
     @if(\Canvas\Canvas::enabledDarkMode($jsVars['user']['dark_mode']))
-        <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.5.0/build/styles/sunburst.min.css">
+        <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/styles/sunburst.min.css">
     @else
-        <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.5.0/build/styles/github.min.css">
+        <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/styles/github.min.css">
     @endif
 
-    <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.5.0/build/highlight.min.js"></script>
+    <script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/highlight.min.js"></script>
 </head>
 <body class="mb-5"
     @if(\Canvas\Canvas::enabledDarkMode($jsVars['user']['dark_mode'])) data-theme="dark" @endif

diff --git a/resources/views/ui.blade.php b/resources/views/ui.blade.php
@@ -12,7 +12,7 @@
     <link rel="dns-prefetch" href="//fonts.gstatic.com">
     <link rel="stylesheet" href="//fonts.googleapis.com/css2?family=Karla&family=Merriweather:wght@400;700&display=swap">
 
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@10.1.2/build/styles/github.min.css">
+    <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.8.0/build/styles/github.min.css">
 </head>
 <body class="mb-5">
 

diff --git a/src/Canvas.php b/src/Canvas.php
@@ -41,7 +41,7 @@ public static function availableLanguageCodes(): array
     /**
      * Return an encoded string of app translations.
      *
-     * @param $locale
+     * @param  $locale
      * @return string
      */
     public static function availableTranslations($locale): string

diff --git a/src/Console/UiCommand.php b/src/Console/UiCommand.php
@@ -44,6 +44,7 @@ public function handle()
                 'bootstrap' => '^4.6.0',
                 'highlight.js' => '^10.5.0',
                 'jquery' => '^3.5.1',
+                'laravel-mix' => '^6.0.49',
                 'medium-zoom' => '^1.0.6',
                 'moment' => '^2.29.1',
                 'nprogress' => '^0.2.0',
@@ -60,6 +61,13 @@ public function handle()
             ] + $packages;
         });
 
+        $this->updateNodeScripts(function ($scripts) {
+            return [
+                'canvas.ui.dev' => 'mix',
+                'canvas.ui.prod' => 'mix --production',
+            ] + $scripts;
+        });
+
         // Sass configuration...
         copy(dirname(__DIR__, 2).'/resources/sass/ui.scss', resource_path('sass/canvas-ui.scss'));
 
@@ -70,7 +78,7 @@ public function handle()
         $this->flushNodeModules();
 
         $this->info('Installation complete.');
-        $this->comment('Please run "npm install && npm run dev" to build your assets.');
+        $this->comment('Please run "npm install && npm run canvas.ui.dev" to build your assets.');
     }
 
     /**
@@ -103,6 +111,36 @@ protected function updateNodePackages(callable $callback, $dev = true)
         );
     }
 
+    /**
+     * Update the "package.json" scripts.
+     *
+     * @param  callable  $callback
+     * @param  bool  $dev
+     * @return void
+     */
+    protected function updateNodeScripts(callable $callback)
+    {
+        if (! file_exists(base_path('package.json'))) {
+            return;
+        }
+
+        $configurationKey = 'scripts';
+
+        $packages = json_decode(file_get_contents(base_path('package.json')), true);
+
+        $packages[$configurationKey] = $callback(
+            array_key_exists($configurationKey, $packages) ? $packages[$configurationKey] : [],
+            $configurationKey
+        );
+
+        ksort($packages[$configurationKey]);
+
+        file_put_contents(
+            base_path('package.json'),
+            json_encode($packages, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT).PHP_EOL
+        );
+    }
+
     /**
      * Export the authentication views.
      *

diff --git a/src/Http/Controllers/PostController.php b/src/Http/Controllers/PostController.php
@@ -88,7 +88,7 @@ public function create(): JsonResponse
      * Store a newly created resource in storage.
      *
      * @param  PostRequest  $request
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      *
      * @throws Exception
@@ -159,7 +159,7 @@ public function store(PostRequest $request, $id): JsonResponse
     /**
      * Display the specified resource.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function show($id): JsonResponse
@@ -207,7 +207,7 @@ public function stats(string $id): JsonResponse
     /**
      * Remove the specified resource from storage.
      *
-     * @param $id
+     * @param  $id
      * @return mixed
      *
      * @throws Exception

diff --git a/src/Http/Controllers/TagController.php b/src/Http/Controllers/TagController.php
@@ -43,7 +43,7 @@ public function create(): JsonResponse
      * Store a newly created resource in storage.
      *
      * @param  TagRequest  $request
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function store(TagRequest $request, $id): JsonResponse
@@ -74,7 +74,7 @@ public function store(TagRequest $request, $id): JsonResponse
     /**
      * Display the specified resource.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function show($id): JsonResponse
@@ -87,7 +87,7 @@ public function show($id): JsonResponse
     /**
      * Display the specified relationship.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function posts($id): JsonResponse
@@ -100,7 +100,7 @@ public function posts($id): JsonResponse
     /**
      * Remove the specified resource from storage.
      *
-     * @param $id
+     * @param  $id
      * @return mixed
      *
      * @throws Exception

diff --git a/src/Http/Controllers/TopicController.php b/src/Http/Controllers/TopicController.php
@@ -43,7 +43,7 @@ public function create(): JsonResponse
      * Store a newly created resource in storage.
      *
      * @param  TopicRequest  $request
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function store(TopicRequest $request, $id): JsonResponse
@@ -74,7 +74,7 @@ public function store(TopicRequest $request, $id): JsonResponse
     /**
      * Display the specified resource.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function show($id): JsonResponse
@@ -87,7 +87,7 @@ public function show($id): JsonResponse
     /**
      * Display the specified relationship.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function posts($id): JsonResponse
@@ -100,7 +100,7 @@ public function posts($id): JsonResponse
     /**
      * Remove the specified resource from storage.
      *
-     * @param $id
+     * @param  $id
      * @return mixed
      *
      * @throws Exception

diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
@@ -47,7 +47,7 @@ public function create(): JsonResponse
      * Store a newly created resource in storage.
      *
      * @param  UserRequest  $request
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function store(UserRequest $request, $id): JsonResponse
@@ -92,7 +92,7 @@ public function store(UserRequest $request, $id): JsonResponse
     /**
      * Display the specified resource.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function show($id): JsonResponse
@@ -105,7 +105,7 @@ public function show($id): JsonResponse
     /**
      * Display the specified relationship.
      *
-     * @param $id
+     * @param  $id
      * @return JsonResponse
      */
     public function posts($id): JsonResponse
@@ -118,7 +118,7 @@ public function posts($id): JsonResponse
     /**
      * Remove the specified resource from storage.
      *
-     * @param $id
+     * @param  $id
      * @return mixed
      *
      * @throws Exception

diff --git a/src/Http/Middleware/Admin.php b/src/Http/Middleware/Admin.php
@@ -10,8 +10,8 @@ class Admin
     /**
      * Handle the incoming request.
      *
-     * @param $request
-     * @param $next
+     * @param  $request
+     * @param  $next
      * @return mixed
      */
     public function handle(Request $request, Closure $next)

diff --git a/src/Http/Middleware/Session.php b/src/Http/Middleware/Session.php
@@ -12,8 +12,8 @@ class Session
     /**
      * Handle the incoming request.
      *
-     * @param $request
-     * @param $next
+     * @param  $request
+     * @param  $next
      * @return Response
      */
     public function handle(Request $request, Closure $next)

diff --git a/tests/Http/Middleware/AdminTest.php b/tests/Http/Middleware/AdminTest.php
@@ -42,8 +42,8 @@ public function protectedRoutesProvider(): array
     /**
      * @dataProvider protectedRoutesProvider
      *
-     * @param $method
-     * @param $endpoint
+     * @param  $method
+     * @param  $endpoint
      */
     public function testContributorAccessIsRestricted($method, $endpoint)
     {
@@ -55,8 +55,8 @@ public function testContributorAccessIsRestricted($method, $endpoint)
     /**
      * @dataProvider protectedRoutesProvider
      *
-     * @param $method
-     * @param $endpoint
+     * @param  $method
+     * @param  $endpoint
      */
     public function testEditorAccessIsRestricted($method, $endpoint)
     {
@@ -68,8 +68,8 @@ public function testEditorAccessIsRestricted($method, $endpoint)
     /**
      * @dataProvider protectedRoutesProvider
      *
-     * @param $method
-     * @param $endpoint
+     * @param  $method
+     * @param  $endpoint
      */
     public function testAdminAccessIsGranted($method, $endpoint)
     {