Merge pull request #4113 from laravel/yarn-fix

Make scripts work with Yarn

Merge pull request #4113 from laravel/yarn-fix
Make scripts work with Yarn
d9f54e34 · Taylor Otwell · GitHub · e0a3b265 · 3fa134d1 · d9f54e34
Commit d9f54e34 authored Jan 24, 2017 by Taylor Otwell Committed by GitHub Jan 24, 2017
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

package.json package.json +5 -5

webpack.mix.js webpack.mix.js +1 -1

No files found.
--- a/package.json
+++ b/package.json
 {
  "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",
    "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"
  }

--- a/webpack.mix.js
+++ b/webpack.mix.js
-let mix = require('laravel-mix').mix;
+const { mix } = require('laravel-mix');

 /*
 |--------------------------------------------------------------------------