-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
3 changed files
with
28 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ jobs: | |
path: .yarn/cache | ||
key: ${{ hashFiles('yarn.lock') }} | ||
- run: yarn | ||
- run: yarn add -D @fortawesome/[email protected] @fortawesome/[email protected] @fortawesome/[email protected] | ||
- run: yarn format:enforce | ||
- run: yarn lint | ||
- run: yarn test | ||
|
@@ -36,7 +37,6 @@ jobs: | |
path: .yarn/cache | ||
key: ${{ hashFiles('yarn.lock') }} | ||
- run: yarn | ||
- run: yarn add -D @fortawesome/[email protected] @fortawesome/[email protected] @fortawesome/[email protected] | ||
- run: yarn format:enforce | ||
- run: yarn lint | ||
- run: yarn test | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,9 +41,9 @@ | |
"@angular/language-service": "~13.3.0", | ||
"@angular/platform-browser": "~13.3.0", | ||
"@angular/platform-browser-dynamic": "~13.3.0", | ||
"@fortawesome/fontawesome-svg-core": "~1.2.36", | ||
"@fortawesome/free-regular-svg-icons": "^5.15.4", | ||
"@fortawesome/free-solid-svg-icons": "^5.15.4", | ||
"@fortawesome/fontawesome-svg-core": "^6.1.0", | ||
"@fortawesome/free-regular-svg-icons": "^6.1.0", | ||
"@fortawesome/free-solid-svg-icons": "^6.1.0", | ||
"@types/jasmine": "~4.0.0", | ||
"@types/node": "~16.11.26", | ||
"@typescript-eslint/eslint-plugin": "5.15.0", | ||
|
@@ -80,7 +80,7 @@ | |
"svg" | ||
], | ||
"peerDependencies": { | ||
"@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2" | ||
"@fortawesome/fontawesome-svg-core": "~1.2.27 || ~1.3.0-beta2 || ^6.1.0" | ||
}, | ||
"schematics": "./schematics/collection.json", | ||
"packageManager": "[email protected]" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters