From 3c9f8d9f7e67ace5e3ee88cc3d5932c2f36c97e9 Mon Sep 17 00:00:00 2001 From: Kayn Ty Date: Tue, 8 May 2018 13:24:02 +0200 Subject: [PATCH] ok add bootstrap dependencies --- assets/js/parts/main.js | 13 +++++++++++++ webpack.config.js | 9 +++++---- yarn.lock | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/assets/js/parts/main.js b/assets/js/parts/main.js index 3250c05c..01dae208 100755 --- a/assets/js/parts/main.js +++ b/assets/js/parts/main.js @@ -1,3 +1,16 @@ +var $ = require('jquery'); +// JS is equivalent to the normal "bootstrap" package +// no need to set this to a variable, just require it +require('bootstrap-sass'); + +// or you can include specific pieces +// require('bootstrap-sass/javascripts/bootstrap/tooltip'); +// require('bootstrap-sass/javascripts/bootstrap/popover'); + +$(document).ready(function () { + $('[data-toggle="popover"]').popover(); +}); + console.log('hello console for main.js'); var stuff = ['initialstuff']; angular diff --git a/webpack.config.js b/webpack.config.js index adccd8e6..a5d4fc89 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,11 +21,12 @@ Encore // empty the outputPath dir before each build .cleanupOutputBeforeBuild() -// show OS notifications when builds finish/fail -// .enableBuildNotifications() + // .addEntry('') + // show OS notifications when builds finish/fail + .enableBuildNotifications() -// create hashed filenames (e.g. app.abc123.css) -// .enableVersioning() + // create hashed filenames (e.g. app.abc123.css) + .enableVersioning() ; // export the final configuration diff --git a/yarn.lock b/yarn.lock index 80610da8..7ed205ce 100755 --- a/yarn.lock +++ b/yarn.lock @@ -2128,7 +2128,7 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -font-awesome@^5: +font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"