Skip to content

Commit dbc4fae

Browse files
committed
feature #960 Update Encore and tweak some of its settings (Lyrkan)
This PR was merged into the master branch. Discussion ---------- Update Encore and tweak some of its settings This PR: * Updates the version of Encore to `^0.26` * Updates the related bundle to `^1.4` * Fixes the imported font paths that were not working anymore due to [the recent `resolve-url-loader` update](symfony/webpack-encore#540) * Enables integrity hashes by default * Adds `core-js@3` and configures Babel properly so polyfills are automatically added to the resulting build * Disables file versioning when not in production mode (which prevented from using the dev-server) Commits ------- 8ee0df5 Update Encore and tweak some of its settings
2 parents 2a330a3 + 8ee0df5 commit dbc4fae

24 files changed

+1144
-1331
lines changed

assets/scss/app.scss

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
// see https://github.com/thomaspark/bootswatch/issues/55#issuecomment-298093182
44
$web-font-path: 'data:text/css;base64,';
55

6+
// Make sure the bootstrap-sass and lato fonts are resolved correctly
7+
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
8+
$lato-font-path: '~lato-font/fonts';
9+
610
@import "~bootswatch/flatly/variables";
711
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
812
@import "~bootswatch/flatly/bootswatch";

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/translation": "*",
2727
"symfony/twig-bundle": "*",
2828
"symfony/validator": "*",
29-
"symfony/webpack-encore-bundle": "^1.1",
29+
"symfony/webpack-encore-bundle": "^1.4",
3030
"symfony/yaml": "*",
3131
"tgalopin/html-sanitizer-bundle": "^1.1",
3232
"twig/extensions": "^1.5",

composer.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"devDependencies": {
3-
"@symfony/webpack-encore": "^0.22.0",
3+
"@symfony/webpack-encore": "^0.26.0",
44
"bloodhound-js": "^1.2.3",
55
"bootstrap-sass": "^3.3.7",
66
"bootstrap-tagsinput": "^0.7.1",
77
"bootswatch": "^3.3.7",
8+
"core-js": "^3.0.0",
89
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
910
"font-awesome": "^4.7.0",
1011
"highlight.js": "^9.12.0",
File renamed without changes.

public/build/1.8ed0c19a.js

-42
This file was deleted.

public/build/1.a7e6a099.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/2.1a0b5d31.js

+42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/2.32ddb789.css

-1
This file was deleted.

public/build/2.ed209f1d.js

-1
This file was deleted.

0 commit comments

Comments
 (0)