From ad1ed6df60e2ff0f8d5a343096aa2efff15a7c62 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sat, 5 Oct 2024 15:47:11 +0800
Subject: [PATCH] Laravel Vapor - Fix a problem with deployment (sync code from
 shipping portal)

---
 package.json   | 11 ++++++-----
 vapor.yml      |  2 +-
 webpack.mix.js | 11 ++++++++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 6b27498c..eb20f9fc 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,12 @@
     "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",
+        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --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",
         "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": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "dependencies": {
         "animate.css": "^4.1.1",
@@ -32,7 +32,6 @@
         "vue": "^2.7.14",
         "vue-avatar": "^2.1.8",
         "vue-debounce": "^2.6.0",
-        "vue-template-compiler": "^2.7.14",
         "vue-the-mask": "^0.11.1",
         "vuelidate": "^0.7.4",
         "vuex": "^3.1.1"
@@ -60,9 +59,11 @@
         "gulp-streamify": "^1.0.2",
         "gulp-uglify": "^3.0.0",
         "gulp-uglify-es": "^2.0.0",
-        "laravel-mix": "^5.0.9",
+        "laravel-mix": "^6.0.49",
         "lodash": "^4.17.13",
-        "resolve-url-loader": "^3.1.5"
+        "resolve-url-loader": "^3.1.5",
+        "vue-loader": "^15.11.1 ",
+        "vue-template-compiler": "^2.7.16"
     },
     "paths": {
         "build": {
diff --git a/vapor.yml b/vapor.yml
index 98132baf..bd4b8020 100644
--- a/vapor.yml
+++ b/vapor.yml
@@ -18,7 +18,7 @@ environments:
         build:
             - 'composer update'
             - 'npm install'
-            - 'npm run dev'
+            - 'npm run prod'
             - 'gulp build'
             # - 'rm -rf node_modules'
             # - 'php artisan optimize'
diff --git a/webpack.mix.js b/webpack.mix.js
index 59d5e97a..1b3aeab7 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -11,4 +11,13 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.js('./resources/assets/vue/app.js', 'public/vue').version();
+mix.webpackConfig({
+    watchOptions: {
+        poll: true,
+        aggregateTimeout: 2000,
+    },
+});
+
+mix.js('./resources/assets/vue/app.js', 'public/vue')
+   .vue()
+   .version()