Move Font-Awesome to Yarn

vmcj · vmcj · commit 3d1a448b5e00 · 2025-11-11T15:56:29.000Z
diff --git a/webapp/composer.json b/webapp/composer.json
@@ -64,7 +64,6 @@
 		"doctrine/doctrine-migrations-bundle": "^3.2",
 		"doctrine/orm": "^2.14",
 		"enshrined/svg-sanitize": "^0.22.0",
-		"fortawesome/font-awesome": "6.*",
 		"friendsofsymfony/rest-bundle": "^3.5",
 		"ircmaxell/password-compat": "*",
 		"jms/serializer-bundle": "^5.2",
diff --git a/webapp/composer.lock b/webapp/composer.lock
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^7.1.0",
     "@melloware/coloris": "^0.25.0",
     "bootstrap-toggle": "^2.2.2",
     "d3": "3.5.17",
diff --git a/webapp/public/css/fontawesome-all.min.css b/webapp/public/css/fontawesome-all.min.css
@@ -1 +1 @@
-../../vendor/fortawesome/font-awesome/css/all.min.css
+../../node_modules/@fortawesome/fontawesome-free/css/all.min.css
diff --git a/webapp/public/webfonts b/webapp/public/webfonts
@@ -1 +1 @@
-../vendor/fortawesome/font-awesome/webfonts
+../node_modules/@fortawesome/fontawesome-free/webfonts
diff --git a/webapp/symfony.lock b/webapp/symfony.lock
@@ -107,9 +107,6 @@
     "endclothing/prometheus_client_php": {
         "version": "1.0.1"
     },
-    "fortawesome/font-awesome": {
-        "version": "5.9.0"
-    },
     "friendsofphp/proxy-manager-lts": {
         "version": "v1.0.3"
     },
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@fortawesome/fontawesome-free@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz#8eb76278515341720aa74485266f8be121089529"
+  integrity sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA==
+
 "@melloware/coloris@^0.25.0":
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.25.0.tgz#7012c10dc510dca1660b3692ed3c812344aec6ca"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
	`3`	`+ "@fortawesome/fontawesome-free": "^7.1.0",`
`3`	`4`	`"@melloware/coloris": "^0.25.0",`
`4`	`5`	`"bootstrap-toggle": "^2.2.2",`
`5`	`6`	`"d3": "3.5.17",`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../vendor/fortawesome/font-awesome/css/all.min.css`
	`1`	`+../../node_modules/@fortawesome/fontawesome-free/css/all.min.css`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../vendor/fortawesome/font-awesome/webfonts`
	`1`	`+../node_modules/@fortawesome/fontawesome-free/webfonts`