[4.x] Update to Mix v6 (#1039)

* Update to Mix v6 * Apply fixes from StyleCI (#1038)
laravel · Mar 23, 2021 · 90216ca · 90216ca
1 parent cb39fdc
commit 90216ca
Show file tree

Hide file tree

Showing 7 changed files with 20,362 additions and 14,428 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,30 +2,30 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "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",
+        "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"
     },
     "devDependencies": {
         "axios": "^0.21",
         "bootstrap": "^4.5.0",
-        "cross-env": "^5.1",
         "highlight.js": "^10.4.1",
         "jquery": "^3.5",
-        "laravel-mix": "^5.0.5",
+        "laravel-mix": "^6.0.6",
         "lodash": "^4.17.19",
         "moment": "^2.10.6",
         "moment-timezone": "^0.5.21",
         "popper.js": "^1.12",
         "resolve-url-loader": "^3.1.2",
         "sass": "^1.15.2",
-        "sass-loader": "^7.1.0",
-        "sql-formatter": "^2.3.1",
+        "sass-loader": "^11.0.1",
+        "sql-formatter": "^4.0.2 ",
         "vue": "^2.5.7",
         "vue-json-pretty": "^1.6.2",
+        "vue-loader": "^15.9.6",
         "vue-router": "^3.0.1",
         "vue-template-compiler": "^2.5.21"
     }

diff --git a/public/app-dark.css b/public/app-dark.css
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=784d14e9c5825eae73d9",
-    "/app.css": "/app.css?id=428958f8fb1feeff0a98",
-    "/app-dark.css": "/app-dark.css?id=57a25a32a7efccdf2de0"
+    "/app.js": "/app.js?id=44cad02cd377aaf1fb4e",
+    "/app-dark.css": "/app-dark.css?id=bc22d805b64b5a2ecaaa",
+    "/app.css": "/app.css?id=d2d43f24f2a54d31e084"
 }
diff --git a/webpack.mix.js b/webpack.mix.js
@@ -1,5 +1,6 @@
 const mix = require('laravel-mix');
 const webpack = require('webpack');
+const path = require('path');
 
 /*
  |--------------------------------------------------------------------------
@@ -23,10 +24,10 @@ mix.options({
 })
     .setPublicPath('public')
     .js('resources/js/app.js', 'public')
+    .vue()
     .sass('resources/sass/app.scss', 'public')
     .sass('resources/sass/app-dark.scss', 'public')
     .version()
-    .copy('public', '../../telescopetest/public/vendor/telescope')
     .webpackConfig({
         resolve: {
             symlinks: false,