From 2146f048ddb38a4750cdd0a2e11d37ddcdd5a269 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 27 Feb 2019 10:38:29 +0100 Subject: [PATCH] Moved dependency declaration into extra config file Signed-off-by: Jim Martens --- _assets/gulp_config/dependencies.js | 13 +++++++++++++ _assets/javascripts/main.js | 6 ------ gulpfile.js | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 _assets/gulp_config/dependencies.js diff --git a/_assets/gulp_config/dependencies.js b/_assets/gulp_config/dependencies.js new file mode 100644 index 0000000..ae23642 --- /dev/null +++ b/_assets/gulp_config/dependencies.js @@ -0,0 +1,13 @@ +"use strict"; + +let dependencies = {}; + +dependencies.files = [ + "./node_modules/echo-js/dist/echo", + "./node_modules/popper.js/dist/popper", + "./node_modules/bootstrap/js/dist/util", + "./node_modules/bootstrap/js/dist/collapse", + "./node_modules/bootstrap/js/dist/tooltip", +]; + +module.exports = dependencies; \ No newline at end of file diff --git a/_assets/javascripts/main.js b/_assets/javascripts/main.js index ed40b19..2f256eb 100644 --- a/_assets/javascripts/main.js +++ b/_assets/javascripts/main.js @@ -1,11 +1,5 @@ "use strict"; -//= require popper.js/dist/popper -//= require echo-js/dist/echo -//= require bootstrap/js/dist/util -//= require bootstrap/js/dist/collapse -//= require bootstrap/js/dist/tooltip - $(function() { let mainMenu = $("#mainmenuNavbar"); mainMenu.on("show.bs.collapse", function () { diff --git a/gulpfile.js b/gulpfile.js index 639102e..a75112f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -21,6 +21,7 @@ const terser = require("gulp-terser"); // Include paths file. const paths = require("./_assets/gulp_config/paths"); +const dependencies = require("./_assets/gulp_config/dependencies"); // Uses Sass compiler to process styles, adds vendor prefixes, minifies, then // outputs file to the appropriate location. @@ -64,6 +65,7 @@ gulp.task("clean:styles", function () { gulp.task("build:scripts:global", function () { return gulp.src([ "node_modules/babel-polyfill/dist/polyfill.js", + dependencies.files, paths.jsFiles + "/global/lib" + paths.jsPattern, paths.jsFiles + "/global/*.js", paths.jsFiles + "/main.js"