From 7ec19843c7dbf01f557d2931b3c32cd98d4e4ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Lambe=CC=81?= <julien@themosis.com>
Date: Wed, 30 Jan 2019 19:47:46 +0100
Subject: [PATCH] Update laravel-mix version and fix default public path.

---
 package.json   | 11 ++++++-----
 webpack.mix.js |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f5f0828..36052cb 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
   "version": "1.0.0",
   "description": "Themosis framework boilerplate plugin.",
   "scripts": {
-    "dev": "NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "production": "NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+    "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "hot": "cross-env NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "author": "Themosis",
   "license": "GPL-2.0-or-later",
@@ -15,6 +15,7 @@
   },
   "homepage": "https://github.com/themosis/theme#readme",
   "devDependencies": {
-    "laravel-mix": "^3.0.0"
+    "cross-env": "^5.2.0",
+    "laravel-mix": "^4.0.0"
   }
 }
diff --git a/webpack.mix.js b/webpack.mix.js
index 54bd1ce..bac49ed 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -10,6 +10,7 @@ let mix = require('laravel-mix');
  | file for your application, as well as bundling up your JS files.
  |
  */
+mix.setPublicPath('./');
 
 mix.js('assets/js/index.js', 'dist/').sass('assets/sass/style.scss', 'dist/');