Merge pull request #984 from Workiva/batch/react_18_upgrade/over_react

btr-rmconsole-6[bot] · web-flow · commit 7db04edc1643 · 2025-08-01T19:51:58.000Z
Rollout React 18 to tests and example apps
diff --git a/README.md b/README.md
@@ -85,8 +85,7 @@ and add an HTML element with a unique identifier where you’ll mount your OverR
           // OverReact component render() output will show up here.
         </div>
 
-        <script src="packages/react/react.js"></script>
-        <script src="packages/react/react_dom.js"></script>
+        <script src="packages/react/js/react.dev.js"></script>
 
         <!-- NOTE: "index" should correspond to the
              name of the `.dart` file that contains your `main()` entrypoint. -->
@@ -95,8 +94,8 @@ and add an HTML element with a unique identifier where you’ll mount your OverR
     </html>
     ```
 
-    > __Note:__ When serving your application in production, use `packages/react/react_with_react_dom_prod.js`
-    file instead of the un-minified `react.js` / `react_dom.js` files shown in the example above.
+    > __Note:__ When serving your application in production, use `packages/react/js/react.min.js`
+    file instead of the un-minified `packages/react/js/react.dev.js` file shown in the example above.
 
 1. Import the `over_react` and `react_dom` libraries into `index.dart`. Then [build some components](#building-custom-components) and mount / render a React tree within the HTML element you created in the previous step by calling `react_dom.render()` within the `main()` entrypoint of your Dart application.
 
diff --git a/app/over_react_redux/todo_client/pubspec.yaml b/app/over_react_redux/todo_client/pubspec.yaml
@@ -8,7 +8,7 @@ dependencies:
   color: ^3.0.0
   memoize: ^3.0.0
   meta: ^1.16.0
-  over_react: '>=4.8.4 <6.0.0'
+  over_react: ^5.4.5
   json_annotation: ^4.6.0
   redux: '>=3.0.0 <6.0.0'
   redux_dev_tools: '>=0.4.0 <0.8.0'
@@ -21,7 +21,7 @@ dev_dependencies:
   dart_dev: ^4.0.0
   glob: ^2.0.0
   json_serializable: ^6.0.0
-  over_react_test: '>=2.10.2 <4.0.0'
+  over_react_test: ^3.0.2
   pedantic: ^1.8.0
   test: ^1.15.7
   test_html_builder: ^3.0.0
diff --git a/app/over_react_redux/todo_client/test/unit/_templates/react_components_test_template.html b/app/over_react_redux/todo_client/test/unit/_templates/react_components_test_template.html
@@ -1,8 +1,7 @@
 <!-- See: https://pub.dev/packages/test_html_builder -->
 <html>
     <head>
-        <script src="packages/react/react_with_addons.js"></script>
-        <script src="packages/react/react_dom.js"></script>
+        <script src="packages/react/js/react.dev.js"></script>
         <script src="packages/todo_client/src/test_fixtures/mock_js_objects.js"></script>
         <script src="https://unpkg.com/@material-ui/core/umd/material-ui.development.js" crossorigin="anonymous"></script>
 
diff --git a/app/over_react_redux/todo_client/test/unit/_templates/react_test_template.html b/app/over_react_redux/todo_client/test/unit/_templates/react_test_template.html
@@ -1,8 +1,7 @@
 <!-- See: https://pub.dev/packages/test_html_builder -->
 <html>
     <head>
-        <script src="packages/react/react_with_addons.js"></script>
-        <script src="packages/react/react_dom.js"></script>
+        <script src="packages/react/js/react.dev.js"></script>
 
         {{testScript}}
 
diff --git a/app/over_react_redux/todo_client/web/index.html b/app/over_react_redux/todo_client/web/index.html
@@ -13,8 +13,7 @@
 
   <div id="todo-container"></div>
 
-  <script src="packages/react/react.js"></script>
-  <script src="packages/react/react_dom.js"></script>
+  <script src="packages/react/js/react.dev.js"></script>
   <script src="https://unpkg.com/@material-ui/core/umd/material-ui.development.js" crossorigin="anonymous"></script>
 
   <!-- Serve compiled output. -->
diff --git a/example/boilerplate_versions/index.html b/example/boilerplate_versions/index.html
@@ -33,8 +33,7 @@
 <body>
 <div id="content"></div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="main.dart.js"></script>
 </body>
diff --git a/example/builder/index.html b/example/builder/index.html
@@ -33,8 +33,7 @@
 <body>
 <div id="content"></div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="main.dart.js"></script>
 </body>
diff --git a/example/context/index.html b/example/context/index.html
@@ -33,8 +33,7 @@
 <body>
 <div id="content"></div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="main.dart.js"></script>
 </body>
diff --git a/example/error_boundary/index.html b/example/error_boundary/index.html
@@ -33,8 +33,7 @@
 <body>
 <div id="content"></div>
 
-<script src="packages/react/react_prod.js"></script>
-<script src="packages/react/react_dom_prod.js"></script>
+<script src="packages/react/js/react.min.js"></script>
 
 <script type="application/javascript" defer src="main.dart.js"></script>
 </body>
diff --git a/example/hooks/index.html b/example/hooks/index.html
@@ -33,8 +33,7 @@
 <body>
 <div id="content"></div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="main.dart.js"></script>
 </body>
diff --git a/example/suspense/index.html b/example/suspense/index.html
@@ -29,8 +29,7 @@
   <body>
     <div id="content"></div>
 
-    <script src="packages/react/react_prod.js"></script>
-    <script src="packages/react/react_dom_prod.js"></script>
+    <script src="packages/react/js/react.min.js"></script>
     <script>
       const defaultMessageContext = React.createContext('default context value');
       window.TestJsComponent = React.forwardRef(function (props, ref) {
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -36,8 +36,8 @@ dev_dependencies:
   dependency_validator: ^3.0.0
   glob: ^2.0.1
   io: ^1.0.0
-  react_testing_library: ^3.0.1
-  over_react_test: ^3.0.0
+  react_testing_library: ^3.1.1
+  over_react_test: ^3.0.2
   test: ^1.20.0
   workiva_analysis_options: ^1.4.0
   yaml: ^3.1.0
diff --git a/test/over_react_component_declaration_non_null_safe_test.html b/test/over_react_component_declaration_non_null_safe_test.html
@@ -19,8 +19,7 @@
 <head>
     <title>OverReact Unit Tests - over_react component_declaration</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
     <script src="packages/react_testing_library/js/react-testing-library.js"></script>
 
     <link rel="x-dart-test"  href="over_react_component_declaration_non_null_safe_test.dart">
diff --git a/test/over_react_component_declaration_test.html b/test/over_react_component_declaration_test.html
@@ -19,8 +19,7 @@
 <head>
     <title>OverReact Unit Tests - over_react component_declaration</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
     <script src="packages/react_testing_library/js/react-testing-library.js"></script>
 
     <link rel="x-dart-test"  href="over_react_component_declaration_test.dart">
diff --git a/test/over_react_component_test.html b/test/over_react_component_test.html
@@ -19,8 +19,7 @@
   <head>
     <title>OverReact Tests - over_react component</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
     <script src="packages/react_testing_library/js/react-testing-library.js"></script>
     <script>
       const defaultMessageContext = React.createContext('default context value');
diff --git a/test/over_react_dom_test.html b/test/over_react_dom_test.html
@@ -19,8 +19,7 @@
 <head>
     <title>OverReact Unit Tests - over_react.react.dom library</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <link rel="x-dart-test"  href="over_react_dom_test.dart">
     <script src="packages/test/dart.js"></script>
diff --git a/test/over_react_prod_test.html b/test/over_react_prod_test.html
@@ -19,8 +19,7 @@
 <head>
   <title>OverReact Unit Tests - react.dart prod</title>
   <!-- javascript -->
-  <script src="packages/react/react_prod.js"></script>
-  <script src="packages/react/react_dom_prod.js"></script>
+  <script src="packages/react/js/react.min.js"></script>
   <script src="packages/react_testing_library/js/react-testing-library.js"></script>
 
   <script>
diff --git a/test/over_react_redux_test.html b/test/over_react_redux_test.html
@@ -19,8 +19,7 @@
 <head>
     <title>OverReact Tests - over_react_redux</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <link rel="x-dart-test"  href="over_react_redux_test.dart">
     <script src="packages/test/dart.js"></script>
diff --git a/test/over_react_util_test.html b/test/over_react_util_test.html
@@ -19,8 +19,7 @@
 <head>
     <title>OverReact Unit Tests - over_react util</title>
     <!-- javascript -->
-    <script src="packages/react/react_with_addons.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
     <script src="packages/react_testing_library/js/react-testing-library.js"></script>
 
     <script>
diff --git a/tools/analyzer_plugin/playground/pubspec.yaml b/tools/analyzer_plugin/playground/pubspec.yaml
@@ -3,7 +3,7 @@ version: 0.0.0
 environment:
   sdk: ">=2.13.0 <3.0.0"
 dependencies:
-  over_react: '>=3.5.3 <6.0.0'
+  over_react: ^5.4.5
 dev_dependencies:
   build_runner: ^2.0.0
   build_web_compilers: ^3.0.0
diff --git a/web/component1/index.html b/web/component1/index.html
@@ -82,8 +82,7 @@ <h2>Component That Throws an Uncaught Error</h2>
         </div>
     </div>
 
-    <script src="packages/react/react.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <!--un comment to serve in Dart 1-->
     <!--<script type="application/dart" src="index.dart"></script>-->
diff --git a/web/component2/index.html b/web/component2/index.html
@@ -132,8 +132,7 @@ <h2>Ref Examples</h2>
         </div>
     </div>
 
-    <script src="packages/react/react.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <!--un comment to serve in Dart 1-->
     <!--<script type="application/dart" src="index.dart"></script>-->
diff --git a/web/flux_to_redux/advanced/examples/flux_implementation/index.html b/web/flux_to_redux/advanced/examples/flux_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/flux_to_redux/advanced/examples/influx_implementation/index.html b/web/flux_to_redux/advanced/examples/influx_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/flux_to_redux/advanced/examples/redux_implementation/index.html b/web/flux_to_redux/advanced/examples/redux_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/flux_to_redux/simple/examples/flux_implementation/index.html b/web/flux_to_redux/simple/examples/flux_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/flux_to_redux/simple/examples/influx_implementation/index.html b/web/flux_to_redux/simple/examples/influx_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/flux_to_redux/simple/examples/redux_implementation/index.html b/web/flux_to_redux/simple/examples/redux_implementation/index.html
@@ -31,8 +31,7 @@
     Loading...
 </div>
 
-<script src="packages/react/react.js"></script>
-<script src="packages/react/react_dom.js"></script>
+<script src="packages/react/js/react.dev.js"></script>
 
 <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/over_react_redux/examples/dev_tools/index.html b/web/over_react_redux/examples/dev_tools/index.html
@@ -31,8 +31,7 @@
         Loading...
     </div>
 
-    <script src="packages/react/react.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/over_react_redux/examples/multiple_stores/index.html b/web/over_react_redux/examples/multiple_stores/index.html
@@ -29,8 +29,7 @@
 <body>
     <div id="content"></div>
 
-    <script src="packages/react/react.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
diff --git a/web/over_react_redux/examples/simple/index.html b/web/over_react_redux/examples/simple/index.html
@@ -29,8 +29,7 @@
 <body>
     <div id="content"></div>
 
-    <script src="packages/react/react.js"></script>
-    <script src="packages/react/react_dom.js"></script>
+    <script src="packages/react/js/react.dev.js"></script>
 
     <script type="application/javascript" defer src="index.dart.js"></script>
 </body>
