Skip to content

Commit 3d34377

Browse files
authored
React 0.2.x v7 updates (#575)
1 parent 432b921 commit 3d34377

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+6888
-79294
lines changed

.github/workflows/ci.yml

Lines changed: 59 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,75 @@ jobs:
88

99
strategy:
1010
matrix:
11-
node: [14]
12-
react: [
13-
16.x,
14-
17.x,
15-
18.x,
16-
beta
17-
]
18-
fontawesome-svg-core: [
19-
1.2.x,
20-
6.x
21-
]
22-
free-solid-svg-icons: [
23-
5.x,
24-
6.x
25-
]
11+
free-solid-svg-icons: [7.x, 6.x, 5.x]
12+
fontawesome-svg-core: [7.x, 6.x, 1.2.x]
13+
node-version: [20.x, 18.x]
14+
react: [19.x, 18.x, 17.x, 16.x]
15+
exclude:
16+
# For v7.x core, allow all icon versions
17+
# For v6.x and v1.2.x core, exclude v7.x icons
18+
- free-solid-svg-icons: '7.x'
19+
fontawesome-svg-core: '6.x'
20+
- free-solid-svg-icons: '7.x'
21+
fontawesome-svg-core: '1.2.x'
2622

2723
steps:
2824
- uses: actions/checkout@v1
29-
- uses: actions/setup-node@v1
25+
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v1
3028
with:
31-
node-version: ${{ matrix.node }}
32-
- name: npm install, build, and test
29+
node-version: ${{ matrix.node-version }}
30+
31+
- name: v7 core and icons install, build, and test
32+
if: ${{ matrix.fontawesome-svg-core == '7.x' && matrix.free-solid-svg-icons == '7.x' }}
3333
run: |
34-
npm install
34+
# Install base dependencies first
35+
npm install --no-audit --no-save
36+
# Install specific React version and its peer dependencies
37+
npm install --no-save react@${{ matrix.react }} react-dom@${{ matrix.react }} react-test-renderer@${{ matrix.react }}
38+
# Install v7 alpha packages from local tarballs
39+
npm install --no-save ./fortawesome-fontawesome-svg-core-7.0.0-alpha8.tgz ./fortawesome-fontawesome-common-types-7.0.0-alpha8.tgz ./fortawesome-free-solid-svg-icons-7.0.0-alpha8.tgz
40+
# Verify React version
41+
npm list react react-dom react-test-renderer
42+
# Build and test
3543
npm run build
44+
npm run lint
45+
npm run test
46+
47+
- name: v7 core with v5/v6 icons install, build, and test
48+
if: ${{ matrix.fontawesome-svg-core == '7.x' && matrix.free-solid-svg-icons != '7.x' }}
49+
run: |
50+
# Install base dependencies first
51+
npm install --no-audit --no-save
52+
# Install specific React version and its peer dependencies
3653
npm install --no-save react@${{ matrix.react }} react-dom@${{ matrix.react }} react-test-renderer@${{ matrix.react }}
54+
# Install v7 core and common types from local tarballs, but icons from npm
55+
npm install --no-save ./fortawesome-fontawesome-svg-core-7.0.0-alpha8.tgz ./fortawesome-fontawesome-common-types-7.0.0-alpha8.tgz
56+
npm install --no-save @fortawesome/free-solid-svg-icons@${{ matrix.free-solid-svg-icons }}
57+
# Verify React version
58+
npm list react react-dom react-test-renderer
59+
# Build and test
60+
npm run build
61+
npm run lint
62+
npm run test
63+
64+
- name: v6/v1.2.x install, build, and test
65+
if: ${{ matrix.fontawesome-svg-core != '7.x' }}
66+
run: |
67+
# Install base dependencies first
68+
npm install --no-audit --no-save
69+
# Install specific React version and its peer dependencies
70+
npm install --no-save react@${{ matrix.react }} react-dom@${{ matrix.react }} react-test-renderer@${{ matrix.react }}
71+
# Install Font Awesome packages from npm
3772
npm install --no-save @fortawesome/fontawesome-svg-core@${{ matrix.fontawesome-svg-core }} @fortawesome/free-solid-svg-icons@${{ matrix.free-solid-svg-icons }}
38-
npm list react react-dom react-test-renderer @fortawesome/fontawesome-svg-core @fortawesome/free-solid-svg-icons
73+
# Verify React version
74+
npm list react react-dom react-test-renderer
75+
# Build and test
76+
npm run build
3977
npm run lint
4078
npm run test
79+
4180
- name: dist
4281
run: |
4382
npm run dist

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
node_modules
22
.DS_Store
3+
bin/act
4+
fortawesome-react-fontawesome-*.tgz

.prettierrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
module.exports = {
22
semi: false,
3-
singleQuote: true
3+
singleQuote: true,
4+
tabWidth: 2,
5+
trailingComma: 'none',
46
}

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
nodejs 14.17.3
1+
nodejs 22.11.0
22
python 3.9.19 2.7.18

examples/create-react-app-typescript/.gitignore

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

examples/create-react-app-typescript/README.md

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

0 commit comments

Comments
 (0)