Merge branch 'release/6.0.18'

* release/6.0.18:
  compiled assets
  Apply fixes from StyleCI (#921)
  updated webpack.stub to use .vue()
  upgrade assets
  fixing the workspace
  update the workspace filename and path
  roll back actions to use Ubuntu 18.04
  move actions to Ubuntu 20.04

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -10,4 +10,3 @@ Thumbs.db
 .DS_Store
 phpunit.xml
 .phpunit.result.cache
-*.code-workspace

.gitpod.yml

@@ -2,7 +2,7 @@
 image:
   file: Dockerfile
 
-workspaceLocation: canvas/.workspace.json
+workspaceLocation: canvas/gitpod.code-workspace
 checkoutLocation: canvas
 
 vscode:

.workspace.json → gitpod.code-workspace

@@ -1,7 +1,7 @@
 {
     "folders": [
         {
-            "path": ""
+            "path": "."
         },
         {
             "path": "../laravel"

public/js/app.js.LICENSE.txt

@@ -2,8 +2,8 @@
  * @license MIT */
 
 /*!
-  * Bootstrap v4.5.3 (https://getbootstrap.com/)
-  * Copyright 2011-2020 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap v4.6.0 (https://getbootstrap.com/)
+  * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 
@@ -52,7 +52,7 @@
  */
 
 /*!
- * FilePondPluginImageValidateSize 1.2.4
+ * FilePondPluginImageValidateSize 1.2.5
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=d73fab1014d52690314b",
-    "/css/app.css": "/css/app.css?id=08bd22e9b4628a5ecd91",
-    "/js/app.js.map": "/js/app.js.map?id=965ca5e3764fda4fc782",
-    "/css/app.css.map": "/css/app.css.map?id=a26e3f2697987381b236"
+    "/js/app.js": "/js/app.js?id=f89b5ad51f7113df42c2",
+    "/css/app.css": "/css/app.css?id=773fcc9361a4f8453523",
+    "/js/app.js.map": "/js/app.js.map?id=7e9c339d4fd45bc95652",
+    "/css/app.css.map": "/css/app.css.map?id=2491b80a4a260995478c"
 }

readme.md

@@ -1,6 +1,6 @@
 <p align="center">
     <a href="https://trycanvas.app">
-        <img src=".github/assets/header.png" alt="Canvas">
+        <img src=".github/assets/header.png" alt="Canvas homepage">
     </a>
 </p>
 

resources/stubs/webpack.mix.stub

@@ -1,4 +1,2 @@
-mix.js('resources/js/canvas-ui/app.js', 'public/js/canvas-ui.js').sass(
-    'resources/sass/canvas-ui.scss',
-    'public/css/canvas-ui.css'
-);
+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');

src/Console/InstallCommand.php

@@ -24,6 +24,20 @@ class InstallCommand extends Command
      */
     protected $description = 'Install the Canvas components and resources';
 
+    /**
+     * Create a new console command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        if (file_exists(config_path('canvas.php'))) {
+            $this->setHidden(true);
+        }
+    }
+
     /**
      * Execute the console command.
      *

src/Console/UiCommand.php

@@ -41,21 +41,19 @@ public function handle()
         $this->updateNodePackages(function ($packages) {
             return [
                 'axios' => '^0.21.1',
-                'bootstrap' => '^4.5.3',
-                'cross-env' => '^7.0.3',
+                'bootstrap' => '^4.6.0',
                 'highlight.js' => '^10.5.0',
                 'jquery' => '^3.5.1',
-                'laravel-mix' => '^5.0.7',
-                'lodash' => '^4.17.20',
                 'medium-zoom' => '^1.0.6',
                 'moment' => '^2.29.1',
                 'nprogress' => '^0.2.0',
                 'popper.js' => '^1.16.1',
                 'resolve-url-loader' => '^3.1.2',
-                'sass' => '^1.32.0',
-                'sass-loader' => '^10.1.0',
+                'sass' => '^1.32.4',
+                'sass-loader' => '^10.1.1',
                 'vue' => '^2.6.12',
                 'vue-infinite-loading' => '^2.4.5',
+                'vue-loader' => '^15.9.5',
                 'vue-meta' => '^2.4.0',
                 'vue-router' => '^3.4.9',
                 'vue-template-compiler' => '^2.6.12',
@@ -78,8 +76,8 @@ public function handle()
     /**
      * Update the "package.json" file.
      *
-     * @param  callable  $callback
-     * @param  bool  $dev
+     * @param callable $callback
+     * @param bool $dev
      * @return void
      */
     protected function updateNodePackages(callable $callback, $dev = true)