Commit 37541efd authored by Maik Messerschmidt's avatar Maik Messerschmidt
Browse files

Updated webpack.mix.js to optionally include resources/experiment/webpack.mix.js

parent abc0dd4b
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"/experiment/js/main.js": "/experiment/js/main.js",
"/experiment/js/run-trial.js": "/experiment/js/run-trial.js",
"/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css"
}
......@@ -13,8 +13,7 @@ const mix = require('laravel-mix');
mix.js('resources/js/app.js', 'public/js')
.sass('resources/sass/app.scss', 'public/css')
// .sass('resources/sass/range.scss', 'public/experiment/css')
// .copy('node_modules/jspsych/css/jspsych.css', 'public/experiment/css')
.js('resources/experiment/js/main.js', 'public/experiment/js')
.js('resources/experiment/js/run-trial.js', 'public/experiment/js')
.sourceMaps()
// Include project specific files, if they exists.
try { require('resources/experiment/webpack.mix.js') }
catch (e){}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment