Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4113 from laravel/yarn-fix 

Make scripts work with Yarn
This commit is contained in:
Taylor Otwell 2017-01-24 10:19:25 -06:00 committed by GitHub
parent e0a3b26517 3fa134d1f1
commit d9f54e3454
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -1,16 +1,16 @@
{ {
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "cross-env NODE_ENV=development 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": "cross-env NODE_ENV=development webpack --watch --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": "cross-env NODE_ENV=development webpack-dev-server --inline --hot --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": "cross-env NODE_ENV=production webpack --progress --hide-modules --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": { "devDependencies": {
"axios": "^0.15.2", "axios": "^0.15.2",
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"jquery": "^3.1.0", "jquery": "^3.1.0",
"laravel-mix": "^0.4.0", "laravel-mix": "^0.5.0",
"lodash": "^4.16.2", "lodash": "^4.16.2",
"vue": "^2.0.1" "vue": "^2.0.1"
} }

2
webpack.mix.js
View File

@ -1,4 +1,4 @@
let mix = require('laravel-mix').mix; const { mix } = require('laravel-mix');
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------