Move Bootstrap to yarn

vmcj · vmcj · commit 8b9f4ca8cda7 · 2025-11-11T15:56:29.000Z
diff --git a/webapp/composer.json b/webapp/composer.json
@@ -100,7 +100,6 @@
 		"symfony/validator": "6.4.*",
 		"symfony/web-profiler-bundle": "6.4.*",
 		"symfony/yaml": "6.4.*",
-		"twbs/bootstrap": "^5.2.0",
 		"twig/extra-bundle": "^3.5",
 		"twig/markdown-extra": "^3.5",
 		"twig/string-extra": "^3.5",
diff --git a/webapp/composer.lock b/webapp/composer.lock
diff --git a/webapp/package.json b/webapp/package.json
@@ -2,6 +2,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^7.1.0",
     "@melloware/coloris": "^0.25.0",
+    "bootstrap": "^5.3.8",
     "bootstrap-toggle": "^2.2.2",
     "d3": "3.5.17",
     "datatables.net-bs5": "^2.3.4",
diff --git a/webapp/public/css/bootstrap.min.css b/webapp/public/css/bootstrap.min.css
@@ -1 +1 @@
-../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css
+../../node_modules/bootstrap/dist/css/bootstrap.min.css
diff --git a/webapp/public/css/bootstrap.min.css.map b/webapp/public/css/bootstrap.min.css.map
diff --git a/webapp/public/js/bootstrap.bundle.min.js b/webapp/public/js/bootstrap.bundle.min.js
@@ -1 +1 @@
-../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js
+../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/webapp/public/js/bootstrap.bundle.min.js.map b/webapp/public/js/bootstrap.bundle.min.js.map
diff --git a/webapp/symfony.lock b/webapp/symfony.lock
@@ -689,9 +689,6 @@
     "theseer/tokenizer": {
         "version": "1.2.0"
     },
-    "twbs/bootstrap": {
-        "version": "v4.3.1"
-    },
     "twig/extra-bundle": {
         "version": "v3.3.0"
     },
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
@@ -17,6 +17,11 @@ bootstrap-toggle@^2.2.2:
   resolved "https://registry.yarnpkg.com/bootstrap-toggle/-/bootstrap-toggle-2.2.2.tgz#2b88534fc1b998674f877f98ba0d8b5b743e96fe"
   integrity sha512-AkYD/i3NGCEksIb/PmmUrrxpa0DYi7Si30e9Ldhou2t1HTd9npoXUsxJJjFPvlV7iLUptlysWTcYD7i3DKV6qg==
 
+bootstrap@^5.3.8:
+  version "5.3.8"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed"
+  integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==
+
 d3@3.5.17:
   version "3.5.17"
   resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css`
	`1`	`+../../node_modules/bootstrap/dist/css/bootstrap.min.css`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js`
	`1`	`+../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js`