Skip to content

Commit 155dcb7

Browse files
rveterervetere
authored
Merge branch 'main' into main
2 parents ae337cc + 63e7bc5 commit 155dcb7

Some content is hidden

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

49 files changed

+4112
-3344
lines changed

‎.github/workflows/build.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ on:
1010
permissions: {}
1111

1212
env:
13-
NODE_VERSION: 20
13+
NODE_VERSION: 22
1414

1515
jobs:
1616
tests:
1717
strategy:
1818
matrix:
19-
node: ['16.14.0', '18', '20', '21']
19+
node: ['16.14.0', '18', '20', '22', '23']
2020
os: ['ubuntu']
2121
include:
2222
- os: macos
23-
node: '20'
23+
node: '22'
2424
- os: windows
25-
node: '20'
25+
node: '22'
2626

2727
name: Tests (Node.js v${{ matrix.node }}, ${{ matrix.os }})
2828
runs-on: ${{ matrix.os }}-latest
@@ -51,9 +51,22 @@ jobs:
5151
if: '${{ matrix.node != env.NODE_VERSION }}'
5252
run: pnpm test
5353

54-
- name: Upload coverage to Codecov
54+
- name: Upload coverage
5555
if: '${{ matrix.node == env.NODE_VERSION }}'
56-
uses: codecov/codecov-action@v4
56+
uses: coverallsapp/github-action@v2
57+
with:
58+
parallel: true
59+
flag-name: test-${{ matrix.os }}
60+
61+
finish:
62+
needs: tests
63+
if: ${{ always() }}
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Close parallel build
67+
uses: coverallsapp/github-action@v2
68+
with:
69+
parallel-finished: true
5770

5871
lint:
5972
name: Lint

‎.github/workflows/lock.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
permissions:
99
issues: write
1010
pull-requests: write
11+
discussions: write
1112

1213
concurrency:
1314
group: lock
@@ -18,4 +19,4 @@ jobs:
1819
steps:
1920
- uses: dessant/lock-threads@v5
2021
with:
21-
log-output: true
22+
log-output: true

‎benchmark/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"benchmark": "2.1.4",
1414
"cli-table": "0.3.11",
15-
"fast-glob": "3.3.2",
15+
"fast-glob": "3.3.3",
1616
"microtime": "3.1.1",
1717
"react-docgen5": "npm:[email protected]",
1818
"react-docgen6": "npm:[email protected]"

‎codecov.yml

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

‎package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
"license": "MIT",
1818
"devDependencies": {
1919
"@changesets/changelog-github": "0.5.0",
20-
"@changesets/cli": "2.27.3",
20+
"@changesets/cli": "2.27.12",
2121
"@types/node": "14.18.63",
22-
"@typescript-eslint/eslint-plugin": "7.11.0",
23-
"@typescript-eslint/parser": "7.11.0",
22+
"@typescript-eslint/eslint-plugin": "7.18.0",
23+
"@typescript-eslint/parser": "7.18.0",
2424
"@vitest/coverage-v8": "0.34.6",
2525
"cpy": "10.1.0",
26-
"eslint": "8.57.0",
27-
"eslint-config-next": "14.2.3",
28-
"eslint-config-prettier": "9.1.0",
29-
"eslint-plugin-prettier": "5.1.3",
26+
"eslint": "8.57.1",
27+
"eslint-config-next": "15.1.6",
28+
"eslint-config-prettier": "10.0.1",
29+
"eslint-plugin-prettier": "5.2.3",
3030
"execa": "7.2.0",
3131
"nx": "18.3.5",
32-
"prettier": "3.2.5",
33-
"prettier-plugin-tailwindcss": "0.5.14",
34-
"rimraf": "5.0.7",
32+
"prettier": "3.4.2",
33+
"prettier-plugin-tailwindcss": "0.6.11",
34+
"rimraf": "5.0.10",
3535
"tempy": "3.1.0",
36-
"typescript": "5.4.5",
36+
"typescript": "5.7.3",
3737
"vitest": "0.34.6"
3838
},
39-
"packageManager": "[email protected].8"
39+
"packageManager": "[email protected].9"
4040
}

‎packages/react-docgen-cli/CHANGELOG.md

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,73 @@
11
# Release Notes
22

3+
## 2.0.6
4+
5+
### Patch Changes
6+
7+
- Updated dependencies
8+
[[`639bf37`](https://github.com/reactjs/react-docgen/commit/639bf3799bd74c46c2163841fefd9f3cc847dce9)]:
9+
- [email protected]
10+
11+
## 2.0.5
12+
13+
### Patch Changes
14+
15+
- [#960](https://github.com/reactjs/react-docgen/pull/960)
16+
[`8b1c753`](https://github.com/reactjs/react-docgen/commit/8b1c753a353d1ff44c3eca6c5e391dec1198ab7e)
17+
Thanks [@renovate](https://github.com/apps/renovate)! - update dependency
18+
chalk to v5.4.1
19+
20+
- [#958](https://github.com/reactjs/react-docgen/pull/958)
21+
[`f5d644a`](https://github.com/reactjs/react-docgen/commit/f5d644a3041c227c4889059e787fcbaab57ec70e)
22+
Thanks [@renovate](https://github.com/apps/renovate)! - update dependency
23+
chalk to v5.4.0
24+
25+
- [#954](https://github.com/reactjs/react-docgen/pull/954)
26+
[`3c0cbb0`](https://github.com/reactjs/react-docgen/commit/3c0cbb0c2869488ac96291f1d491a93c8c1b5b06)
27+
Thanks [@renovate](https://github.com/apps/renovate)! - update dependency
28+
debug to v4.4.0
29+
30+
- [#963](https://github.com/reactjs/react-docgen/pull/963)
31+
[`972a1a3`](https://github.com/reactjs/react-docgen/commit/972a1a316affc8164ac957432b177bba09f1e667)
32+
Thanks [@renovate](https://github.com/apps/renovate)! - update dependency
33+
fast-glob to v3.3.3
34+
35+
## 2.0.4
36+
37+
### Patch Changes
38+
39+
- [#931](https://github.com/reactjs/react-docgen/pull/931)
40+
[`a10dd0c`](https://github.com/reactjs/react-docgen/commit/a10dd0c782f053b648cf9bab2042a9d31245fc3d)
41+
Thanks [@renovate](https://github.com/apps/renovate)! - fix(deps): update
42+
dependency debug to v4.3.5
43+
44+
- [`f723041`](https://github.com/reactjs/react-docgen/commit/f7230419af3680b9ed87a323c4fdf46ead667459)
45+
Thanks [@renovate[bot]](https://github.com/renovate%5Bbot%5D)! - fix(deps):
46+
update dependency debug to v4.3.6
47+
48+
- [#943](https://github.com/reactjs/react-docgen/pull/943)
49+
[`ef85698`](https://github.com/reactjs/react-docgen/commit/ef8569863974599f51b9c9e1c4b9202144fe7607)
50+
Thanks [@renovate](https://github.com/apps/renovate)! - update dependency
51+
debug to v4.3.7
52+
53+
- Updated dependencies
54+
[[`3033ca0`](https://github.com/reactjs/react-docgen/commit/3033ca0908eb53f6ae2ee8a40eb4ef96840ff7ad)]:
55+
- [email protected]
56+
357
## 2.0.3
458

559
### Patch Changes
660

7-
- Updated dependencies [[`afe8d02`](https://github.com/reactjs/react-docgen/commit/afe8d022d058a5d49c6fc144fb165c02f4a764d9)]:
61+
- Updated dependencies
62+
[[`afe8d02`](https://github.com/reactjs/react-docgen/commit/afe8d022d058a5d49c6fc144fb165c02f4a764d9)]:
863
- [email protected]
964

1065
## 2.0.2
1166

1267
### Patch Changes
1368

14-
- Updated dependencies [[`64bf1aa`](https://github.com/reactjs/react-docgen/commit/64bf1aa078148b4d44f8634252e5b726e24b8ee5)]:
69+
- Updated dependencies
70+
[[`64bf1aa`](https://github.com/reactjs/react-docgen/commit/64bf1aa078148b4d44f8634252e5b726e24b8ee5)]:
1571
- [email protected]
1672

1773
## 2.0.1

‎packages/react-docgen-cli/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-docgen/cli",
3-
"version": "2.0.3",
3+
"version": "2.0.6",
44
"description": "A CLI to extract information from React components for documentation generation.",
55
"repository": {
66
"type": "git",
@@ -31,11 +31,11 @@
3131
},
3232
"license": "MIT",
3333
"dependencies": {
34-
"chalk": "5.3.0",
34+
"chalk": "5.4.1",
3535
"commander": "11.1.0",
36-
"debug": "4.3.4",
37-
"fast-glob": "3.3.2",
38-
"react-docgen": "workspace:7.0.3",
36+
"debug": "4.4.0",
37+
"fast-glob": "3.3.3",
38+
"react-docgen": "workspace:7.1.1",
3939
"slash": "5.1.0"
4040
},
4141
"devDependencies": {

‎packages/react-docgen/CHANGELOG.md

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,48 @@
11
# Release Notes
22

3+
## 7.1.1
4+
5+
### Patch Changes
6+
7+
- [#969](https://github.com/reactjs/react-docgen/pull/969)
8+
[`639bf37`](https://github.com/reactjs/react-docgen/commit/639bf3799bd74c46c2163841fefd9f3cc847dce9)
9+
Thanks [@christon88](https://github.com/christon88)! - Expose more TypeScript
10+
types
11+
12+
## 7.1.0
13+
14+
### Minor Changes
15+
16+
- [#923](https://github.com/reactjs/react-docgen/pull/923)
17+
[`3033ca0`](https://github.com/reactjs/react-docgen/commit/3033ca0908eb53f6ae2ee8a40eb4ef96840ff7ad)
18+
Thanks [@rvetere](https://github.com/rvetere)! - Support generic types on
19+
`React.forwardRef` calls.
20+
21+
Example:
22+
23+
`react-docgen` will now find `IButtonProps`.
24+
25+
```ts
26+
export const FullWidthButton = forwardRef<HTMLButtonElement, IButtonProps>(
27+
() => {},
28+
);
29+
```
30+
331
## 7.0.3
432

533
### Patch Changes
634

7-
- [#890](https://github.com/reactjs/react-docgen/pull/890) [`afe8d02`](https://github.com/reactjs/react-docgen/commit/afe8d022d058a5d49c6fc144fb165c02f4a764d9) Thanks [@danez](https://github.com/danez)! - Do not throw error when using namespace specifiers in export statements
35+
- [#890](https://github.com/reactjs/react-docgen/pull/890)
36+
[`afe8d02`](https://github.com/reactjs/react-docgen/commit/afe8d022d058a5d49c6fc144fb165c02f4a764d9)
37+
Thanks [@danez](https://github.com/danez)! - Do not throw error when using
38+
namespace specifiers in export statements
839

940
## 7.0.2
1041

1142
### Patch Changes
1243

13-
- [`64bf1aa`](https://github.com/reactjs/react-docgen/commit/64bf1aa078148b4d44f8634252e5b726e24b8ee5) Thanks [@danez](https://github.com/danez)! - Fix handling of template literals
44+
- [`64bf1aa`](https://github.com/reactjs/react-docgen/commit/64bf1aa078148b4d44f8634252e5b726e24b8ee5)
45+
Thanks [@danez](https://github.com/danez)! - Fix handling of template literals
1446

1547
## 7.0.1
1648

@@ -341,7 +373,7 @@
341373
allows multiple resolvers to be chained.
342374

343375
```ts
344-
import { builtinResolvers } from "react-docgen";
376+
import { builtinResolvers } from 'react-docgen';
345377

346378
const { ChainResolver } = builtinResolvers;
347379
const resolver = new ChainResolver([resolver1, resolver2], {
@@ -370,7 +402,7 @@
370402
addition to functions.
371403

372404
```ts
373-
import type { ResolverClass, ResolverFunction } from "react-docgen";
405+
import type { ResolverClass, ResolverFunction } from 'react-docgen';
374406

375407
// This was the only option until now
376408
const functionResolver: ResolverFunction = (file: FileState) => {
@@ -625,7 +657,7 @@
625657
chained.
626658

627659
```ts
628-
import { builtinResolvers } from "react-docgen";
660+
import { builtinResolvers } from 'react-docgen';
629661

630662
const { ChainResolver } = builtinResolvers;
631663
const resolver = new ChainResolver([resolver1, resolver2], {
@@ -636,7 +668,7 @@
636668
- 80e4c74: Allow resolvers to be classes in addition to functions.
637669

638670
```ts
639-
import type { ResolverClass, ResolverFunction } from "react-docgen";
671+
import type { ResolverClass, ResolverFunction } from 'react-docgen';
640672

641673
// This was the only option until now
642674
const functionResolver: ResolverFunction = (file: FileState) => {

‎packages/react-docgen/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-docgen",
3-
"version": "7.0.3",
3+
"version": "7.1.1",
44
"description": "A library to extract information from React components for documentation generation.",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)