Update dependencies, upgrade to Laravel Mix 6

.github/workflows/test.yml

@@ -6,28 +6,27 @@ on:
 jobs:
 
   test-js:
+    name: Test asset generation process on Node 14 LTS
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: ['12.x', '14.x']
-
-    name: Test asset generation process on Node ${{ matrix.node-version }}
 
     steps:
       - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js 14 LTS
         uses: actions/setup-node@v1
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: '14.x'
+
       - name: Try to build the assets
         run: |
           npm ci
           npm run production
+
       - name: Upload built assets
         uses: actions/upload-artifact@v1
         with:
           name: assets
           path: public/assets/dist
+
       - name: Upload mix manifest
         uses: actions/upload-artifact@v1
         with:
@@ -35,14 +34,14 @@ jobs:
           path: public/mix-manifest.json
 
   test-php:
+    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+
     runs-on: ${{ matrix.operating-system }}
     needs: test-js
     strategy:
       matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ['7.3', '7.4', '8.0']
-
-    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
+        operating-system: [ ubuntu-latest ]
+        php-versions: [ '7.3', '7.4', '8.0' ]
 
     steps:
       - uses: actions/checkout@v1

composer.json

@@ -35,6 +35,12 @@
     "roave/security-advisories": "dev-latest",
     "squizlabs/php_codesniffer": "^3.5"
   },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://satis.laravel-enlightn.com"
+    }
+  ],
   "autoload": {
     "files": [
       "app/Helper/functions.php"

package.json

@@ -13,27 +13,25 @@
     "url": "https://github.com/Kovah/LinkAce/issues"
   },
   "devDependencies": {
-    "cross-env": "^6.0.3",
-    "laravel-mix": "^5.0.9",
-    "resolve-url-loader": "^3.1.2",
-    "sass": "^1.32.6",
-    "sass-loader": "^8.0.2",
-    "vue-template-compiler": "^2.6.12"
+    "laravel-mix": "^6.0.13",
+    "postcss": "^8.1.14",
+    "sass": "^1.32.8",
+    "sass-loader": "^10.1.1"
   },
   "dependencies": {
     "bootstrap": "^4.6.0",
-    "jquery": "^3.5.1",
+    "jquery": "^3.6.0",
     "popper.js": "^1.16.1",
     "selectize": "github:selectize/selectize.js#master"
   },
   "scripts": {
-    "dev": "npm run development -- --watch",
-    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "npm run development -- --watch",
-    "watch-poll": "npm run watch -- --watch-poll",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "dev": "npm run development",
+    "development": "mix",
+    "watch": "mix watch",
+    "watch-poll": "mix watch -- --watch-options-poll=1000",
+    "hot": "mix watch --hot",
     "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "production": "mix --production",
     "test": "npm run production"
   }
 }

webpack.mix.js

@@ -2,23 +2,19 @@ const mix = require('laravel-mix');
 
 mix.options({
   processCssUrls: false
-});
-
-mix.disableNotifications();
-
-mix.setPublicPath('public');
+})
+  .disableNotifications()
+  .setPublicPath('public')
+  .version();
 
 mix.js('resources/assets/js/app.js', 'assets/dist/js')
-  .sourceMaps()
-  .version();
+  .sourceMaps();
 
 mix.combine([
   'node_modules/jquery/dist/jquery.min.js',
   'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',
   'node_modules/selectize/dist/js/standalone/selectize.js'
-], 'public/assets/dist/js/dependencies.js')
-  .version();
+], 'public/assets/dist/js/dependencies.js');
 
 mix.sass('resources/assets/sass/app.scss', 'assets/dist/css')
-  .sass('resources/assets/sass/app-dark.scss', 'assets/dist/css')
-  .version();
+  .sass('resources/assets/sass/app-dark.scss', 'assets/dist/css');