Update Encore and tweak some of its settings

symfony · Mar 29, 2019 · d78ace6 · d78ace6
1 parent 31ce9ea
commit d78ace6
Show file tree

Hide file tree

Showing 24 changed files with 1,146 additions and 1,330 deletions.
diff --git a/assets/scss/app.scss b/assets/scss/app.scss
@@ -3,6 +3,10 @@
 // see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
 $web-font-path: 'data:text/css;base64,';
 
+// Make sure the bootstrap-sass and lato fonts are resolved correctly
+$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
+$lato-font-path: '~lato-font/fonts';
+
 @import "~bootswatch/flatly/variables";
 @import "~bootstrap-sass/assets/stylesheets/bootstrap";
 @import "~bootswatch/flatly/bootswatch";

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "symfony/translation": "*",
         "symfony/twig-bundle": "*",
         "symfony/validator": "*",
-        "symfony/webpack-encore-bundle": "^1.1",
+        "symfony/webpack-encore-bundle": "^1.4",
         "symfony/yaml": "*",
         "tgalopin/html-sanitizer-bundle": "^1.1",
         "twig/extensions": "^1.5",

diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -1,10 +1,11 @@
 {
   "devDependencies": {
-    "@symfony/webpack-encore": "^0.22.0",
+    "@symfony/webpack-encore": "^0.26.0",
     "bloodhound-js": "^1.2.3",
     "bootstrap-sass": "^3.3.7",
     "bootstrap-tagsinput": "^0.7.1",
     "bootswatch": "^3.3.7",
+    "core-js": "3",
     "eonasdan-bootstrap-datetimepicker": "^4.17.47",
     "font-awesome": "^4.7.0",
     "highlight.js": "^9.12.0",

diff --git a/public/build/0.830d5dde.js → public/build/0.c90fd7d1.js b/public/build/0.830d5dde.js → public/build/0.c90fd7d1.js
diff --git a/public/build/1.a7e6a099.js b/public/build/1.a7e6a099.js
diff --git a/public/build/1.bdd72f15.js b/public/build/1.bdd72f15.js
diff --git a/public/build/2.8cd86b12.js b/public/build/2.8cd86b12.js
diff --git a/public/build/2.dbd2ede0.js b/public/build/2.dbd2ede0.js