Skip to content

Commit 8fb3f61

Browse files
committed
Allow fontawesome-svg-core ^6.1.0 as a valid peer dependency
It also resolves #125 as there is now a clear rule for how to avoid type mess - make sure that versions of the Font Awesome packages are aligned. Now that Font Awesome 6 is stable, we make repository v6-first and only test v5 for compatibility. Fixes #351 Closes #125
1 parent a41f0c5 commit 8fb3f61

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

.github/workflows/check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
path: .yarn/cache
1515
key: ${{ hashFiles('yarn.lock') }}
1616
- run: yarn
17+
- run: yarn add -D @fortawesome/[email protected] @fortawesome/[email protected] @fortawesome/[email protected]
1718
- run: yarn format:enforce
1819
- run: yarn lint
1920
- run: yarn test
@@ -36,7 +37,6 @@ jobs:
3637
path: .yarn/cache
3738
key: ${{ hashFiles('yarn.lock') }}
3839
- run: yarn
39-
- run: yarn add -D @fortawesome/[email protected] @fortawesome/[email protected] @fortawesome/[email protected]
4040
- run: yarn format:enforce
4141
- run: yarn lint
4242
- run: yarn test

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"@angular/language-service": "~13.3.0",
4242
"@angular/platform-browser": "~13.3.0",
4343
"@angular/platform-browser-dynamic": "~13.3.0",
44-
"@fortawesome/fontawesome-svg-core": "~1.2.36",
45-
"@fortawesome/free-regular-svg-icons": "^5.15.4",
46-
"@fortawesome/free-solid-svg-icons": "^5.15.4",
44+
"@fortawesome/fontawesome-svg-core": "^6.1.0",
45+
"@fortawesome/free-regular-svg-icons": "^6.1.0",
46+
"@fortawesome/free-solid-svg-icons": "^6.1.0",
4747
"@types/jasmine": "~4.0.0",
4848
"@types/node": "~16.11.26",
4949
"@typescript-eslint/eslint-plugin": "5.15.0",
@@ -80,7 +80,7 @@
8080
"svg"
8181
],
8282
"peerDependencies": {
83-
"@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2"
83+
"@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2 || ^6.1.0"
8484
},
8585
"schematics": "./schematics/collection.json",
8686
"packageManager": "[email protected]"

yarn.lock

+23-23
Original file line numberDiff line numberDiff line change
@@ -1851,9 +1851,9 @@ __metadata:
18511851
"@angular/language-service": ~13.3.0
18521852
"@angular/platform-browser": ~13.3.0
18531853
"@angular/platform-browser-dynamic": ~13.3.0
1854-
"@fortawesome/fontawesome-svg-core": ~1.2.36
1855-
"@fortawesome/free-regular-svg-icons": ^5.15.4
1856-
"@fortawesome/free-solid-svg-icons": ^5.15.4
1854+
"@fortawesome/fontawesome-svg-core": ^6.1.0
1855+
"@fortawesome/free-regular-svg-icons": ^6.1.0
1856+
"@fortawesome/free-solid-svg-icons": ^6.1.0
18571857
"@types/jasmine": ~4.0.0
18581858
"@types/node": ~16.11.26
18591859
"@typescript-eslint/eslint-plugin": 5.15.0
@@ -1879,41 +1879,41 @@ __metadata:
18791879
typescript: ~4.6.2
18801880
zone.js: ~0.11.5
18811881
peerDependencies:
1882-
"@fortawesome/fontawesome-svg-core": ~1.2.27 || ~1.3.0-beta2
1882+
"@fortawesome/fontawesome-svg-core": ~1.2.27 || ~1.3.0-beta2 || ^6.1.0
18831883
languageName: unknown
18841884
linkType: soft
18851885

1886-
"@fortawesome/fontawesome-common-types@npm:^0.2.36":
1887-
version: 0.2.36
1888-
resolution: "@fortawesome/fontawesome-common-types@npm:0.2.36"
1889-
checksum: d604ac51da0b1597127fde70c64157b70ead6af7f2643ab7dfca268ef99d4ed0b4cc823afba206362422a622e389828408bec573df802bf4f02b118d0fa18dc8
1886+
"@fortawesome/fontawesome-common-types@npm:6.1.0":
1887+
version: 6.1.0
1888+
resolution: "@fortawesome/fontawesome-common-types@npm:6.1.0"
1889+
checksum: 09c6b6ff0b24b1950cf44e821f25ccc9cedcce97e7c969c0fbb4410cccdc0742ea44931d4240648eb2080360bb0fdb470c42d3d429d453d31810fd65f056e03c
18901890
languageName: node
18911891
linkType: hard
18921892

1893-
"@fortawesome/fontawesome-svg-core@npm:~1.2.36":
1894-
version: 1.2.36
1895-
resolution: "@fortawesome/fontawesome-svg-core@npm:1.2.36"
1893+
"@fortawesome/fontawesome-svg-core@npm:^6.1.0":
1894+
version: 6.1.0
1895+
resolution: "@fortawesome/fontawesome-svg-core@npm:6.1.0"
18961896
dependencies:
1897-
"@fortawesome/fontawesome-common-types": ^0.2.36
1898-
checksum: 3011d8c1452b5df52a62eaee8b1ec925b9fdfabcc170fd6da5eaac7cfdef56258b9292ddd06c30f03a6a8ed6faa886565211f2e469fee3c9831c32f93e9383d8
1897+
"@fortawesome/fontawesome-common-types": 6.1.0
1898+
checksum: cc901fb1ee6eed391a1771dcb565e9176892ce5b7c19bf172b5761936e70d581ef253caf5b99da0c34c8b7dc9a6e481ee6b4365a3796cf2ebffc82acf0f7e275
18991899
languageName: node
19001900
linkType: hard
19011901

1902-
"@fortawesome/free-regular-svg-icons@npm:^5.15.4":
1903-
version: 5.15.4
1904-
resolution: "@fortawesome/free-regular-svg-icons@npm:5.15.4"
1902+
"@fortawesome/free-regular-svg-icons@npm:^6.1.0":
1903+
version: 6.1.0
1904+
resolution: "@fortawesome/free-regular-svg-icons@npm:6.1.0"
19051905
dependencies:
1906-
"@fortawesome/fontawesome-common-types": ^0.2.36
1907-
checksum: 2e6039e3bb2125940ed2cb5738b6562b082755c1e45b73571ee92d976773ab81118c9efb9a7b57453b664a025613e81e1dafd2235aafeaadd8f0d75f8e1fe25e
1906+
"@fortawesome/fontawesome-common-types": 6.1.0
1907+
checksum: f44ec3101e2c5cac72309147e42a6c6152de96b5bdee1f51119f2fd57d43094464fecbac8fcb7dac7a47fcee3d3c2203fb514e6fdd1395a61c367ed3c86e7d2b
19081908
languageName: node
19091909
linkType: hard
19101910

1911-
"@fortawesome/free-solid-svg-icons@npm:^5.15.4":
1912-
version: 5.15.4
1913-
resolution: "@fortawesome/free-solid-svg-icons@npm:5.15.4"
1911+
"@fortawesome/free-solid-svg-icons@npm:^6.1.0":
1912+
version: 6.1.0
1913+
resolution: "@fortawesome/free-solid-svg-icons@npm:6.1.0"
19141914
dependencies:
1915-
"@fortawesome/fontawesome-common-types": ^0.2.36
1916-
checksum: eb037b703827ee37af3387a964afc7a190ff42a674ef46f4a6c295b634a38e849741eca78306b6423eaf3062d6ab1e7372aac5be2aec06f0fd9e8bd8110efcf9
1915+
"@fortawesome/fontawesome-common-types": 6.1.0
1916+
checksum: 41f762459d95388c1fdbd205493ff3750df8d3f6f937b1a51aaadaa62abbd563953168c04c9eb8a3628cec96271e2941be9ba5e214cc770e44dd0700f5649299
19171917
languageName: node
19181918
linkType: hard
19191919

0 commit comments

Comments
 (0)