Skip to content

Commit b304b9a

Browse files
cknittcknitt
authored
Use a single vendored @rescript/react package across the repo (#7525)
* Use a single vendored @rescript/react package across the repo * CHANGELOG * Use workspace:^ everywhere
1 parent d438bb0 commit b304b9a

52 files changed

Lines changed: 656 additions & 4449 deletions

Some content is hidden

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

‎.yarn/patches/@rescript-react-npm-0.14.0-e462ba0c5d.patch‎

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

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
- Improve default argument type mismatch errors. https://github.com/rescript-lang/rescript/pull/8389
3333
- Resolve workspace dependencies in editor analysis. https://github.com/rescript-lang/rescript/pull/8392
3434
- Build system: Add OpenTelemetry tracing support for cli commands. https://github.com/rescript-lang/rescript/pull/8370
35+
- Use a single vendored @rescript/react package across the repo. https://github.com/rescript-lang/rescript/pull/7525
3536

3637
#### :house: Internal
3738

‎biome.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"!**/tests/analysis_tests/**/src",
5757
"!**/tests/build_tests/**/src",
5858
"!**/tests/commonjs_tests/src",
59+
"!**/tests/dependencies/**/src",
5960
"!**/tests/docstring_tests",
6061
"!**/tests/gentype_tests",
6162
"**/tests/gentype_tests/typescript-react-example/**",

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
"tests/analysis_tests/**",
104104
"tests/docstring_tests",
105105
"tests/gentype_tests/**",
106+
"tests/tests",
106107
"tests/tools_tests",
107108
"tests/commonjs_tests",
108109
"scripts/res"

‎packages/playground/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"serve-bundle": "node serve-bundle.mjs"
1111
},
1212
"dependencies": {
13-
"@rescript/react": "patch:@rescript/react@npm%3A0.14.0#~/.yarn/patches/@rescript-react-npm-0.14.0-e462ba0c5d.patch",
13+
"@rescript/react": "workspace:^",
1414
"rescript": "workspace:^"
1515
},
1616
"devDependencies": {

‎tests/analysis_tests/tests-reanalyze/deadcode-benchmark/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"clean": "rescript clean"
77
},
88
"dependencies": {
9-
"@rescript/react": "link:../../../dependencies/rescript-react",
9+
"@rescript/react": "workspace:^",
1010
"rescript": "workspace:^"
1111
}
1212
}

‎tests/analysis_tests/tests-reanalyze/deadcode/expected/deadcode.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:12
3232
addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:20
3333
addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:34
34-
addValueReference ComponentAsProp.res:6:4 --> React.res:15:0
34+
addValueReference ComponentAsProp.res:6:4 --> React.res:16:0
3535
Scanning CreateErrorHandler1.cmt Source:CreateErrorHandler1.res
3636
addValueDeclaration +notification CreateErrorHandler1.res:3:6 path:+CreateErrorHandler1.Error1
3737
addValueReference CreateErrorHandler1.res:3:6 --> CreateErrorHandler1.res:3:21
@@ -157,7 +157,7 @@
157157
addValueReference DeadTest.res:117:32 --> DeadTest.res:117:12
158158
addValueReference DeadTest.res:117:19 --> React.res:7:0
159159
addTypeReference _none_:1:-1 --> DeadTest.res:117:12
160-
addValueReference DeadTest.res:117:4 --> React.res:15:0
160+
addValueReference DeadTest.res:117:4 --> React.res:16:0
161161
addValueReference DeadTest.res:119:16 --> DeadTest.res:117:4
162162
addVariantCaseDeclaration A DeadTest.res:140:11 path:+DeadTest.WithInclude.t
163163
addVariantCaseDeclaration A DeadTest.res:143:13 path:+DeadTest.WithInclude.T.t
@@ -299,10 +299,10 @@
299299
addValueReference DynamicallyLoadedComponent.res:2:32 --> DynamicallyLoadedComponent.res:2:12
300300
addValueReference DynamicallyLoadedComponent.res:2:19 --> React.res:7:0
301301
addTypeReference _none_:1:-1 --> DynamicallyLoadedComponent.res:2:12
302-
addValueReference DynamicallyLoadedComponent.res:2:4 --> React.res:15:0
302+
addValueReference DynamicallyLoadedComponent.res:2:4 --> React.res:16:0
303303
Scanning EmptyArray.cmt Source:EmptyArray.res
304304
addValueDeclaration +make EmptyArray.res:5:6 path:+EmptyArray.Z
305-
addValueReference EmptyArray.res:5:6 --> React.res:15:0
305+
addValueReference EmptyArray.res:5:6 --> React.res:16:0
306306
addValueReference EmptyArray.res:10:9 --> EmptyArray.res:5:6
307307
Scanning ErrorHandler.cmt Source:ErrorHandler.res
308308
addValueDeclaration +notify ErrorHandler.res:7:6 path:+ErrorHandler.Make
@@ -394,15 +394,15 @@
394394
addValueReference Hooks.res:17:32 --> React.res:7:0
395395
addValueReference Hooks.res:16:50 --> Hooks.res:16:32
396396
addValueReference Hooks.res:16:37 --> React.res:7:0
397-
addValueReference Hooks.res:16:16 --> React.res:15:0
397+
addValueReference Hooks.res:16:16 --> React.res:16:0
398398
addValueReference Hooks.res:19:5 --> ImportHookDefault.res:6:0
399399
addValueReference Hooks.res:22:7 --> React.res:7:0
400400
addValueReference Hooks.res:22:32 --> React.res:7:0
401401
addValueReference Hooks.res:21:50 --> Hooks.res:21:32
402402
addValueReference Hooks.res:21:37 --> React.res:7:0
403-
addValueReference Hooks.res:21:16 --> React.res:15:0
403+
addValueReference Hooks.res:21:16 --> React.res:16:0
404404
addTypeReference _none_:1:-1 --> Hooks.res:4:12
405-
addValueReference Hooks.res:4:4 --> React.res:15:0
405+
addValueReference Hooks.res:4:4 --> React.res:16:0
406406
addValueReference Hooks.res:28:4 --> Hooks.res:4:4
407407
addRecordLabelDeclaration vehicle Hooks.res:32:14 path:+Hooks.Inner.props
408408
addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
@@ -414,7 +414,7 @@
414414
addValueReference Hooks.res:32:66 --> Hooks.res:32:14
415415
addValueReference Hooks.res:32:34 --> React.res:7:0
416416
addTypeReference _none_:1:-1 --> Hooks.res:32:14
417-
addValueReference Hooks.res:32:6 --> React.res:15:0
417+
addValueReference Hooks.res:32:6 --> React.res:16:0
418418
addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
419419
addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
420420
addTypeReference Hooks.res:36:68 --> Hooks.res:1:16
@@ -424,10 +424,10 @@
424424
addValueReference Hooks.res:36:68 --> Hooks.res:36:16
425425
addValueReference Hooks.res:36:36 --> React.res:7:0
426426
addTypeReference _none_:1:-1 --> Hooks.res:36:16
427-
addValueReference Hooks.res:36:8 --> React.res:15:0
427+
addValueReference Hooks.res:36:8 --> React.res:16:0
428428
addValueReference Hooks.res:42:25 --> React.res:3:0
429429
addValueReference Hooks.res:42:25 --> React.res:3:0
430-
addValueReference Hooks.res:42:6 --> React.res:15:0
430+
addValueReference Hooks.res:42:6 --> React.res:16:0
431431
addTypeReference Hooks.res:50:2 --> Hooks.res:1:16
432432
addValueReference Hooks.res:48:4 --> Hooks.res:48:31
433433
addTypeReference Hooks.res:50:14 --> Hooks.res:1:16
@@ -442,7 +442,7 @@
442442
addValueReference Hooks.res:68:18 --> Hooks.res:68:18
443443
addValueReference Hooks.res:68:4 --> Hooks.res:66:14
444444
addTypeReference _none_:1:-1 --> Hooks.res:66:14
445-
addValueReference Hooks.res:66:6 --> React.res:15:0
445+
addValueReference Hooks.res:66:6 --> React.res:16:0
446446
Scanning IgnoreInterface.cmt Source:IgnoreInterface.res
447447
Scanning IgnoreInterface.cmti Source:IgnoreInterface.resi
448448
Scanning ImmutableArray.cmt Source:ImmutableArray.res
@@ -966,7 +966,7 @@
966966
Scanning JsxV4.cmt Source:JsxV4.res
967967
addValueDeclaration +make JsxV4.res:4:23 path:+JsxV4.C
968968
addValueReference JsxV4.res:4:36 --> React.res:3:0
969-
addValueReference JsxV4.res:4:23 --> React.res:15:0
969+
addValueReference JsxV4.res:4:23 --> React.res:16:0
970970
addValueReference JsxV4.res:7:9 --> JsxV4.res:4:23
971971
Scanning LetPrivate.cmt Source:LetPrivate.res
972972
addValueDeclaration +y LetPrivate.res:7:4 path:+LetPrivate

‎tests/analysis_tests/tests-reanalyze/deadcode/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"clean": "rescript clean"
77
},
88
"dependencies": {
9-
"@rescript/react": "link:../../../dependencies/rescript-react",
9+
"@rescript/react": "workspace:^",
1010
"rescript": "workspace:^"
1111
}
1212
}

‎tests/analysis_tests/tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"clean": "rescript clean"
77
},
88
"dependencies": {
9-
"@rescript/react": "link:../../dependencies/rescript-react",
9+
"@rescript/react": "workspace:^",
1010
"rescript": "workspace:^"
1111
}
1212
}

‎tests/analysis_tests/tests/src/expected/Completion.res.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,6 +2054,26 @@ Path Res
20542054
"tags": [],
20552055
"detail": "module Result",
20562056
"documentation": null
2057+
}, {
2058+
"label": "RescriptReactErrorBoundary",
2059+
"kind": 9,
2060+
"tags": [],
2061+
"detail": "module RescriptReactErrorBoundary",
2062+
"documentation": null,
2063+
"data": {
2064+
"modulePath": "RescriptReactErrorBoundary",
2065+
"filePath": "src/Completion.res"
2066+
}
2067+
}, {
2068+
"label": "RescriptReactRouter",
2069+
"kind": 9,
2070+
"tags": [],
2071+
"detail": "module RescriptReactRouter",
2072+
"documentation": null,
2073+
"data": {
2074+
"modulePath": "RescriptReactRouter",
2075+
"filePath": "src/Completion.res"
2076+
}
20572077
}, {
20582078
"label": "RescriptTools",
20592079
"kind": 9,

0 commit comments

Comments
 (0)