#31 - Adds support for laravel mix 6 (#33)

* #31  - adds support for laravel mix 6

* fix tests

Author: glennforrest

src/Command/AssetMixCommand.php

@@ -298,6 +298,7 @@ private function updateVuePackagesArray($packages)
             'sass' => '^1.20.1',
             'sass-loader' => '^8.0.0',
             'vue' => '^2.5.18',
+            'vue-loader' => '^15.9.8',
             'vue-template-compiler' => '^2.6.10',
         ] + $packages;
     }
@@ -357,6 +358,7 @@ private function updateInertiavuePackagesArray($packages)
             'portal-vue' => '^1.5.1',
             'vue' => '^2.6.11',
             'vue-meta' => '^2.3.1',
+            'vue-loader' => '^15.9.8',
             'vue-template-compiler' => '^2.6.11',
             'bootstrap' => '^4.0.0',
         ] + $packages;

src/StubsPathTrait.php

@@ -149,7 +149,7 @@ public function getInertiaReactPackageJsonPath(): array
      */
     public function getVueWebpackMixJsPath(): array
     {
-        $webpackConfigPath = $this->getBaseCommonStubsPath() . 'webpack.mix.js';
+        $webpackConfigPath = $this->getBaseVueStubsPath() . 'webpack.mix.js';
 
         return [
             'from' => $webpackConfigPath,

stubs/common/package.json

@@ -2,17 +2,17 @@
     "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 --disable-host-check --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.19",
         "cross-env": "^7.0",
-        "laravel-mix": "^5.0.1",
+        "laravel-mix": "^6.0.34",
         "lodash": "^4.17.19",
         "resolve-url-loader": "^3.1.0",
         "sass": "^1.15.2",

stubs/inertia-react/webpack.mix.js

@@ -1,7 +1,7 @@
 const mix = require('laravel-mix');
 
 mix.setPublicPath('./webroot')
-    .react('assets/js/app.js', 'webroot/js')
+    .js('assets/js/app.js', 'webroot/js').react()
     .sass('assets/sass/app.scss', 'webroot/css')
     .webpackConfig({
         output: {

stubs/inertia-vue/webpack.mix.js

@@ -2,7 +2,7 @@ const mix = require('laravel-mix');
 const path = require('path');
 
 mix.setPublicPath('./webroot')
-    .js('assets/js/app.js', 'webroot/js')
+    .js('assets/js/app.js', 'webroot/js').vue()
     .sass('assets/sass/app.scss', 'webroot/css')
     .webpackConfig({
         output: {

stubs/react/webpack.mix.js

@@ -1,6 +1,6 @@
 const mix = require('laravel-mix');
 
 mix.setPublicPath('./webroot')
-    .react('assets/js/app.js', 'webroot/js')
+    .js('assets/js/app.js', 'webroot/js').react()
     .sass('assets/sass/app.scss', 'webroot/css')
     .version();

stubs/vue/webpack.mix.js

@@ -0,0 +1,6 @@
+const mix = require('laravel-mix');
+
+mix.setPublicPath('./webroot')
+    .js('assets/js/app.js', 'webroot/js').vue()
+    .sass('assets/sass/app.scss', 'webroot/css')
+    .version();

tests/TestCase/Command/AssetMixCommandTest.php

@@ -177,7 +177,7 @@ public function testGenerateCommandCreatesReactScaffolding()
             "@import '~bootstrap/scss/bootstrap';",
             file_get_contents($directoryPaths['to_assets_sass_app'])
         );
-        $this->assertStringContainsString(".react('assets/js/app.js', 'webroot/js')", $webpackMixJsContents);
+        $this->assertStringContainsString(".js('assets/js/app.js', 'webroot/js').react()", $webpackMixJsContents);
     }
 
     public function testGenerateCommandCreatesInertiaVueScaffolding()