Skip to content

Commit

Permalink
add mix settings
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Jan 17, 2017
1 parent 7cf27b2 commit a205b12
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 37 deletions.
19 changes: 0 additions & 19 deletions gulpfile.js

This file was deleted.

11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
{
"private": true,
"scripts": {
"prod": "gulp --production",
"dev": "gulp watch"
"mix": "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"
},
"devDependencies": {
"axios": "^0.15.2",
"bootstrap-sass": "^3.3.7",
"gulp": "^3.9.1",
"jquery": "^3.1.0",
"laravel-elixir": "^6.0.0-14",
"laravel-elixir-vue-2": "^0.2.0",
"laravel-elixir-webpack-official": "^1.0.2",
"laravel-mix": "^0.4.0",
"lodash": "^4.16.2",
"vue": "^2.0.1"
}
Expand Down
8 changes: 6 additions & 2 deletions public/css/app.css

Large diffs are not rendered by default.

51 changes: 41 additions & 10 deletions public/js/app.js

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
let mix = require('laravel-mix').mix;

/*
|--------------------------------------------------------------------------
| Mix Asset Management
|--------------------------------------------------------------------------
|
| Mix provides a clean, fluent API for defining some Webpack build steps
| for your Laravel application. By default, we are compiling the Sass
| file for your application, as well as bundling up your JS files.
|
*/

mix.js('resources/assets/js/app.js', 'public/js')
.sass('resources/assets/sass/app.scss', 'public/css');

0 comments on commit a205b12

Please sign in to comment.