Update @rescript/react dependency in workspace and use it for more tests

Author: cknitt

analysis/examples/larger-project/package.json

@@ -14,6 +14,6 @@
   },
   "dependencies": {
     "@glennsl/bs-json": "^5.0.4",
-    "@rescript/react": "^0.10.3"
+    "@rescript/react": "workspace:^"
   }
 }

biome.json

@@ -56,6 +56,7 @@
       "!**/tests/analysis_tests/**/src",
       "!**/tests/build_tests/**/src",
       "!**/tests/commonjs_tests/src",
+      "!**/tests/dependencies/**/src/**",
       "!**/tests/docstring_tests",
       "!**/tests/gentype_tests",
       "**/tests/gentype_tests/typescript-react-example/**",

package.json

@@ -103,6 +103,7 @@
     "tests/analysis_tests/**",
     "tests/docstring_tests",
     "tests/gentype_tests/**",
+    "tests/tests",
     "tests/tools_tests",
     "tests/commonjs_tests",
     "scripts/res"

packages/playground/package.json

@@ -10,7 +10,7 @@
     "serve-bundle": "node serve-bundle.mjs"
   },
   "dependencies": {
-    "@rescript/react": "patch:@rescript/react@npm%3A0.14.0#~/.yarn/patches/@rescript-react-npm-0.14.0-e462ba0c5d.patch",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   },
   "devDependencies": {

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

@@ -31,7 +31,7 @@
   addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:12
   addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:20
   addTypeReference _none_:1:-1 --> ComponentAsProp.res:6:34
-  addValueReference ComponentAsProp.res:6:4 --> React.res:15:0
+  addValueReference ComponentAsProp.res:6:4 --> React.res:16:0
   Scanning CreateErrorHandler1.cmt Source:CreateErrorHandler1.res
   addValueDeclaration +notification CreateErrorHandler1.res:3:6 path:+CreateErrorHandler1.Error1
   addValueReference CreateErrorHandler1.res:3:6 --> CreateErrorHandler1.res:3:21
@@ -157,7 +157,7 @@
   addValueReference DeadTest.res:117:32 --> DeadTest.res:117:12
   addValueReference DeadTest.res:117:19 --> React.res:7:0
   addTypeReference _none_:1:-1 --> DeadTest.res:117:12
-  addValueReference DeadTest.res:117:4 --> React.res:15:0
+  addValueReference DeadTest.res:117:4 --> React.res:16:0
   addValueReference DeadTest.res:119:16 --> DeadTest.res:117:4
   addVariantCaseDeclaration A DeadTest.res:140:11 path:+DeadTest.WithInclude.t
   addVariantCaseDeclaration A DeadTest.res:143:13 path:+DeadTest.WithInclude.T.t
@@ -299,10 +299,10 @@
   addValueReference DynamicallyLoadedComponent.res:2:32 --> DynamicallyLoadedComponent.res:2:12
   addValueReference DynamicallyLoadedComponent.res:2:19 --> React.res:7:0
   addTypeReference _none_:1:-1 --> DynamicallyLoadedComponent.res:2:12
-  addValueReference DynamicallyLoadedComponent.res:2:4 --> React.res:15:0
+  addValueReference DynamicallyLoadedComponent.res:2:4 --> React.res:16:0
   Scanning EmptyArray.cmt Source:EmptyArray.res
   addValueDeclaration +make EmptyArray.res:5:6 path:+EmptyArray.Z
-  addValueReference EmptyArray.res:5:6 --> React.res:15:0
+  addValueReference EmptyArray.res:5:6 --> React.res:16:0
   addValueReference EmptyArray.res:10:9 --> EmptyArray.res:5:6
   Scanning ErrorHandler.cmt Source:ErrorHandler.res
   addValueDeclaration +notify ErrorHandler.res:7:6 path:+ErrorHandler.Make
@@ -376,7 +376,7 @@
   addValueDeclaration +make Hooks.res:66:6 path:+Hooks.RenderPropRequiresConversion
   addRecordLabelDeclaration name Hooks.res:1:16 path:+Hooks.vehicle
   addRecordLabelDeclaration vehicle Hooks.res:4:12 path:+Hooks.props
-  addValueReference Hooks.res:5:26 --> React.res:134:0
+  addValueReference Hooks.res:5:26 --> React.res:135:0
   addTypeReference Hooks.res:10:29 --> Hooks.res:1:16
   addValueReference Hooks.res:10:29 --> Hooks.res:4:12
   addValueReference Hooks.res:10:75 --> Hooks.res:5:7
@@ -394,15 +394,15 @@
   addValueReference Hooks.res:17:32 --> React.res:7:0
   addValueReference Hooks.res:16:50 --> Hooks.res:16:32
   addValueReference Hooks.res:16:37 --> React.res:7:0
-  addValueReference Hooks.res:16:16 --> React.res:15:0
+  addValueReference Hooks.res:16:16 --> React.res:16:0
   addValueReference Hooks.res:19:5 --> ImportHookDefault.res:6:0
   addValueReference Hooks.res:22:7 --> React.res:7:0
   addValueReference Hooks.res:22:32 --> React.res:7:0
   addValueReference Hooks.res:21:50 --> Hooks.res:21:32
   addValueReference Hooks.res:21:37 --> React.res:7:0
-  addValueReference Hooks.res:21:16 --> React.res:15:0
+  addValueReference Hooks.res:21:16 --> React.res:16:0
   addTypeReference _none_:1:-1 --> Hooks.res:4:12
-  addValueReference Hooks.res:4:4 --> React.res:15:0
+  addValueReference Hooks.res:4:4 --> React.res:16:0
   addValueReference Hooks.res:28:4 --> Hooks.res:4:4
   addRecordLabelDeclaration vehicle Hooks.res:32:14 path:+Hooks.Inner.props
   addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
@@ -414,7 +414,7 @@
   addValueReference Hooks.res:32:66 --> Hooks.res:32:14
   addValueReference Hooks.res:32:34 --> React.res:7:0
   addTypeReference _none_:1:-1 --> Hooks.res:32:14
-  addValueReference Hooks.res:32:6 --> React.res:15:0
+  addValueReference Hooks.res:32:6 --> React.res:16:0
   addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
   addRecordLabelDeclaration vehicle Hooks.res:36:16 path:+Hooks.Inner.Inner2.props
   addTypeReference Hooks.res:36:68 --> Hooks.res:1:16
@@ -424,10 +424,10 @@
   addValueReference Hooks.res:36:68 --> Hooks.res:36:16
   addValueReference Hooks.res:36:36 --> React.res:7:0
   addTypeReference _none_:1:-1 --> Hooks.res:36:16
-  addValueReference Hooks.res:36:8 --> React.res:15:0
+  addValueReference Hooks.res:36:8 --> React.res:16:0
   addValueReference Hooks.res:42:25 --> React.res:3:0
   addValueReference Hooks.res:42:25 --> React.res:3:0
-  addValueReference Hooks.res:42:6 --> React.res:15:0
+  addValueReference Hooks.res:42:6 --> React.res:16:0
   addTypeReference Hooks.res:50:2 --> Hooks.res:1:16
   addValueReference Hooks.res:48:4 --> Hooks.res:48:31
   addTypeReference Hooks.res:50:14 --> Hooks.res:1:16
@@ -442,7 +442,7 @@
   addValueReference Hooks.res:68:18 --> Hooks.res:68:18
   addValueReference Hooks.res:68:4 --> Hooks.res:66:14
   addTypeReference _none_:1:-1 --> Hooks.res:66:14
-  addValueReference Hooks.res:66:6 --> React.res:15:0
+  addValueReference Hooks.res:66:6 --> React.res:16:0
   Scanning IgnoreInterface.cmt Source:IgnoreInterface.res
   Scanning IgnoreInterface.cmti Source:IgnoreInterface.resi
   Scanning ImmutableArray.cmt Source:ImmutableArray.res
@@ -966,7 +966,7 @@
   Scanning JsxV4.cmt Source:JsxV4.res
   addValueDeclaration +make JsxV4.res:4:23 path:+JsxV4.C
   addValueReference JsxV4.res:4:36 --> React.res:3:0
-  addValueReference JsxV4.res:4:23 --> React.res:15:0
+  addValueReference JsxV4.res:4:23 --> React.res:16:0
   addValueReference JsxV4.res:7:9 --> JsxV4.res:4:23
   Scanning LetPrivate.cmt Source:LetPrivate.res
   addValueDeclaration +y LetPrivate.res:7:4 path:+LetPrivate

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

@@ -6,7 +6,7 @@
     "clean": "rescript clean"
   },
   "dependencies": {
-    "@rescript/react": "link:../../../dependencies/rescript-react",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   }
 }

tests/analysis_tests/tests/package.json

@@ -6,7 +6,7 @@
     "clean": "rescript clean"
   },
   "dependencies": {
-    "@rescript/react": "link:../../dependencies/rescript-react",
+    "@rescript/react": "workspace:^",
     "rescript": "workspace:^"
   }
 }

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

@@ -2054,6 +2054,26 @@ Path Res
     "tags": [],
     "detail": "module Result",
     "documentation": null
+  }, {
+    "label": "RescriptReactErrorBoundary",
+    "kind": 9,
+    "tags": [],
+    "detail": "module RescriptReactErrorBoundary",
+    "documentation": null,
+    "data": {
+      "modulePath": "RescriptReactErrorBoundary",
+      "filePath": "src/Completion.res"
+    }
+  }, {
+    "label": "RescriptReactRouter",
+    "kind": 9,
+    "tags": [],
+    "detail": "module RescriptReactRouter",
+    "documentation": null,
+    "data": {
+      "modulePath": "RescriptReactRouter",
+      "filePath": "src/Completion.res"
+    }
   }, {
     "label": "RescriptTools",
     "kind": 9,

tests/analysis_tests/tests/src/expected/Fragment.res.txt

@@ -1,6 +1,6 @@
 Hover src/Fragment.res 6:19
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<SectionHeader.props<React.element>>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype SectionHeader.props<'children> = {children: 'children}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Fragment.res%22%2C1%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.element = Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<SectionHeader.props<React.element>>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C13%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype SectionHeader.props<'children> = {children: 'children}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Fragment.res%22%2C1%2C2%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.element = Jsx.element\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C0%2C0%5D)\n"}}
 
 Hover src/Fragment.res 9:56
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<React.fragmentProps>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.fragmentProps = {children?: element}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C41%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<React.fragmentProps>\n```\n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C13%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype React.fragmentProps = {children?: element}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C42%2C0%5D)\n"}}
 

tests/analysis_tests/tests/src/expected/JsxV4.res.txt

@@ -17,7 +17,7 @@ Path M4.make
   }]
 
 Hover src/JsxV4.res 14:9
-{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<M4.props<string, string, string>>\n```\n---\n Doc Comment For M4 \n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C12%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype M4.props<'first, 'fun, 'second> = {\n  first: 'first,\n  fun?: 'fun,\n  second?: 'second,\n}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22JsxV4.res%22%2C3%2C2%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\nReact.component<M4.props<string, string, string>>\n```\n---\n Doc Comment For M4 \n\n---\n\n```\n \n```\n```rescript\ntype React.component<'props> = Jsx.component<'props>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22React.res%22%2C13%2C0%5D)\n\n\n---\n\n```\n \n```\n```rescript\ntype M4.props<'first, 'fun, 'second> = {\n  first: 'first,\n  fun?: 'fun,\n  second?: 'second,\n}\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22JsxV4.res%22%2C3%2C2%5D)\n"}}
 
 Create Interface src/JsxV4.res
 module M4: {