Skip to content

Commit c3fb60a

Browse files
committed
Fixing bootstrap import (js) and old webpack config (fixes #2875)
1 parent 29f67d0 commit c3fb60a

15 files changed

+341
-543
lines changed

assets/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require('../css/app.scss');
33

44
global.$ = global.jQuery = require('jquery');
55

6-
import 'bootstrap/js/src/index.js';
6+
import 'bootstrap';
77

88
import './adminlte.js';
99
import 'jquery.are-you-sure';

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
22
"devDependencies": {
33
"@fortawesome/fontawesome-free": "^5.8.1",
4-
"@symfony/webpack-encore": "^0.21",
4+
"@symfony/webpack-encore": "^0.27",
55
"bootstrap": "^4.1.0",
66
"bootstrap-rtl": "^3.3.4",
77
"codemirror": "^5.47.0",
8-
"cssnano": "^4.1.7",
98
"featherlight": "^1.7.13",
109
"jquery": "^3.3.1",
1110
"jquery-highlight": "^3.4.0",
1211
"jquery.are-you-sure": "^1.9.0",
1312
"node-sass": "^4.9.4",
1413
"popper.js": "^1.14.5",
15-
"postcss-loader": "^3.0.0",
1614
"sass-loader": "^7.1.0",
1715
"select2": "4.0.5",
1816
"select2-bootstrap-theme": "^0.1.0-beta.10",

postcss.config.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/Resources/public/app-rtl.css

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Resources/public/app-rtl.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Resources/public/app.css

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Resources/public/app.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Resources/public/app.js

Lines changed: 13 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Resources/public/form-type-code-editor.css

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)