From b6274c97a1c41aa5342691ac2541bd7dcadcb129 Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Sun, 22 Jan 2017 02:08:18 -0500 Subject: [PATCH 1/3] Bump Mix dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d023fbdd7f..194b47c833a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "axios": "^0.15.2", "bootstrap-sass": "^3.3.7", "jquery": "^3.1.0", - "laravel-mix": "^0.4.0", + "laravel-mix": "^0.5.0", "lodash": "^4.16.2", "vue": "^2.0.1" } From f4bc6e531ae57b550bd4d692cbf9311d4962c79f Mon Sep 17 00:00:00 2001 From: Diogo Azevedo Date: Sun, 22 Jan 2017 22:12:50 -0200 Subject: [PATCH 2/3] Use const and destructuring assignment --- webpack.mix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 8f109a88f9b..3e6f5712b7d 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,4 +1,4 @@ -let mix = require('laravel-mix').mix; +const { mix } = require('laravel-mix'); /* |-------------------------------------------------------------------------- From 3fa134d1f1c02d588e91cefb7d780028f8e67e3f Mon Sep 17 00:00:00 2001 From: Jeffrey Way Date: Tue, 24 Jan 2017 11:16:56 -0500 Subject: [PATCH 3/3] Make scripts work with Yarn --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 194b47c833a..5d8582c3ee0 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "private": true, "scripts": { - "dev": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development webpack --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 webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + "dev": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "hot": "node_modules/cross-env/bin/cross-env.js NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "production": "node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.15.2",