Skip to content

Commit

Permalink
Merge pull request #7 from girardinsamuel/fix/370
Browse files Browse the repository at this point in the history
Update NPM dependencies
  • Loading branch information
josephmancuso authored Dec 29, 2020
2 parents 3ad777b + 06b0c0d commit 960285e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
{
"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 --config=node_modules/laravel-mix/setup/webpack.config.js",
"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"
"dev": "npx mix",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"production": "mix --production"
},
"devDependencies": {
"axios": "^0.19",
"cross-env": "^5.1",
"laravel-mix": "^4.0.7",
"lodash": "^4.17.13",
"resolve-url-loader": "^2.3.1",
"sass": "^1.15.2",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.10"
"axios": "^0.19.2",
"cross-env": "^5.2.1",
"laravel-mix": "^6.0.5",
"lodash": "^4.17.20",
"postcss": "^8.2.1",
"resolve-url-loader": "^3.1.2",
"sass": "^1.30.0",
"sass-loader": "^7.3.1"
}
}
2 changes: 1 addition & 1 deletion webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let mix = require('laravel-mix');
mix.js('storage/static/js/app.js', 'storage/compiled/js')
.sass('storage/static/sass/style.scss', 'storage/compiled/css');

// Full API
// for full API refer to https://laravel-mix.com/docs/main/api
// mix.js(src, output);
// mix.react(src, output); <-- Identical to mix.js(), but registers React Babel compilation.
// mix.preact(src, output); <-- Identical to mix.js(), but registers Preact compilation.
Expand Down

0 comments on commit 960285e

Please sign in to comment.