Commit 31e7a409 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '736-widgets-js-fehlt-in-mix' into 'development'

Resolve "Widgets.js fehlt in mix"

Closes #736

See merge request !1224
parents 88e6f124 13db291e
...@@ -12,6 +12,7 @@ let mix = require('laravel-mix'); ...@@ -12,6 +12,7 @@ let mix = require('laravel-mix');
*/ */
mix mix
// css
.less('resources/assets/less/default.less', 'public/css/themes/default.css', { .less('resources/assets/less/default.less', 'public/css/themes/default.css', {
strictMath: true strictMath: true
}) })
...@@ -30,8 +31,11 @@ mix ...@@ -30,8 +31,11 @@ mix
.babel(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js') .babel(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js')
.babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js') .babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js') .babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
// utility // utility
.babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js') .babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
.babel('resources/assets/js/scriptJoinPage.js', 'public/js/scriptJoinPage.js') .babel('resources/assets/js/widgets.js', 'public/js/widgets.js')
// source maps
.sourceMaps(false, 'inline-source-map') .sourceMaps(false, 'inline-source-map')
// versioning
.version(); .version();
\ No newline at end of file
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