From fd316240f32f536a35aab83b33bbb1fae7a674d9 Mon Sep 17 00:00:00 2001
From: "sourcegraph-commit-signing-app[bot]"
 <188111114+sourcegraph-commit-signing-app[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 23:04:39 +0000
Subject: [PATCH] Switch JS assets in FEWS apps to use React 18

---
 test/executables/react_18_upgrade_test.dart   | 43 +++++++++----------
 .../dart_script_updater_test.dart             |  3 +-
 .../html_script_updater_test.dart             |  8 ++--
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/test/executables/react_18_upgrade_test.dart b/test/executables/react_18_upgrade_test.dart
index 85924a9b..cd83c979 100644
--- a/test/executables/react_18_upgrade_test.dart
+++ b/test/executables/react_18_upgrade_test.dart
@@ -29,11 +29,11 @@ void main() {
           script: react18CodemodScript,
           input: d.dir('project', [
             d.file('dev.html', /*language=html*/ '''
-<script src="packages/react/react.js"></script>
-        <script src="packages/react/react_dom.js"></script>'''),
+<script src="packages/react/js/react.dev.js"></script>
+'''),
             d.file('dev_with_addons.html', /*language=html*/ '''
-<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>
+'''),
           ]),
           expectedOutput: d.dir('project', [
             d.file('dev.html', /*language=html*/ '''
@@ -49,11 +49,11 @@ void main() {
           script: react18CodemodScript,
           input: d.dir('project', [
             d.file('prod.html', /*language=html*/ '''
-<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>
+'''),
             d.file('prod_with_addons.html', /*language=html*/ '''
-<script src="packages/react/react_with_react_dom_prod.js"></script>
-        <script src="packages/react/react_dom_prod.js"></script>''')
+<script src="packages/react/js/react.min.js"></script>
+''')
           ]),
           expectedOutput: d.dir('project', [
             d.file('prod.html', /*language=html*/ '''
@@ -71,11 +71,11 @@ void main() {
           script: react18CodemodScript,
           input: d.dir('project', [
             d.file('dev.html', /*language=html*/ '''
-<link href="packages/react/react.js">
-        <link href="packages/react/react_dom.js">'''),
+<link href="packages/react/js/react.dev.js">
+'''),
             d.file('dev_with_addons.html', /*language=html*/ '''
-<link href="packages/react/react_with_addons.js">
-        <link href="packages/react/react_dom.js">'''),
+<link href="packages/react/js/react.dev.js">
+'''),
           ]),
           expectedOutput: d.dir('project', [
             d.file('dev.html', /*language=html*/ '''
@@ -91,11 +91,11 @@ void main() {
           script: react18CodemodScript,
           input: d.dir('project', [
             d.file('prod.html', /*language=html*/ '''
-<link href="packages/react/react_prod.js">
-        <link href="packages/react/react_dom_prod.js">'''),
+<link href="packages/react/js/react.min.js">
+'''),
             d.file('prod_with_addons.html', /*language=html*/ '''
-<link href="packages/react/react_with_react_dom_prod.js">
-        <link href="packages/react/react_dom_prod.js">''')
+<link href="packages/react/js/react.min.js">
+''')
           ]),
           expectedOutput: d.dir('project', [
             d.file('prod.html', /*language=html*/ '''
@@ -114,10 +114,10 @@ void main() {
           input: d.dir('project', [
             d.file('main.dart', /*language=dart*/ '''
               List<String> _reactHtmlHeaders = const [
-                '<script src="packages/react/react.js"></script>',
-                '<script src="packages/react/react_dom.js"></script>',
-                '<link rel="preload" href="packages/react/react.js" as="script">',
-                '<link rel="preload" href="packages/react/react_dom.js" as="script">',
+                '<script src="packages/react/js/react.dev.js"></script>',
+                '',
+                '<link rel="preload" href="packages/react/js/react.dev.js" as="script">',
+                '',
               ];
             ''')
           ]),
@@ -140,8 +140,7 @@ void main() {
                 <html>
                 <head>
                 <title>{{testName}}</title>
-                <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/unify_ui/js/unify-ui.browser.dev.esm.js" type="module"></script>
                 <script src="packages/react_testing_library/js/react-testing-library.js"></script>
                 <!--In order to debug unit tests, use application/dart rather than x-dart-test-->
diff --git a/test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart b/test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart
index 833df717..d8eaa029 100644
--- a/test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart
+++ b/test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart
@@ -405,8 +405,7 @@ void main() {
             <html>
             <head>
             <title>{{testName}}</title>
-            <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>
             <!--In order to debug unit tests, use application/dart rather than x-dart-test-->
             <!--<script type="application/dart" src="generated_runner_test.dart"></script>-->
diff --git a/test/rmui_bundle_updater_suggestors/html_script_updater_test.dart b/test/rmui_bundle_updater_suggestors/html_script_updater_test.dart
index a8378323..c446999a 100644
--- a/test/rmui_bundle_updater_suggestors/html_script_updater_test.dart
+++ b/test/rmui_bundle_updater_suggestors/html_script_updater_test.dart
@@ -128,7 +128,7 @@ void main() {
             '    <link rel="preconnect" href="https://sandbox.wdesk.com">\n'
             '    \n'
             '    <!-- PRELOAD SCRIPTS -->\n'
-            '    <link rel="preload" href="packages/react/react_with_react_dom_prod.js" as="script">\n'
+            '    <link rel="preload" href="packages/react/js/react.min.js" as="script">\n'
             '    <link rel="preload" href="$rmuiBundleProd" as="script">\n'
             '    <link rel="preload" href="main.dart.js" as="script">\n'
             '    \n'
@@ -141,7 +141,7 @@ void main() {
             '    <div id="shell-container" aria-hidden="true" tabindex="-1"></div>\n'
             '    \n'
             '    <!-- SCRIPTS -->\n'
-            '    <script src="packages/react/react_with_react_dom_prod.js"></script>\n'
+            '    <script src="packages/react/js/react.min.js"></script>\n'
             '    <script src="$rmuiBundleProd"></script>\n'
             '    <script defer src="main.dart.js"></script>\n'
             '  </body>\n'
@@ -167,7 +167,7 @@ void main() {
             '    <link rel="preconnect" href="https://sandbox.wdesk.com">\n'
             '    \n'
             '    <!-- PRELOAD SCRIPTS -->\n'
-            '    <link rel="preload" href="packages/react/react_with_react_dom_prod.js" as="script">\n'
+            '    <link rel="preload" href="packages/react/js/react.min.js" as="script">\n'
             '    <link rel="preload" href="$rmuiBundleProdUpdated" crossorigin="" as="script">\n'
             '    <link rel="preload" href="main.dart.js" as="script">\n'
             '    \n'
@@ -180,7 +180,7 @@ void main() {
             '    <div id="shell-container" aria-hidden="true" tabindex="-1"></div>\n'
             '    \n'
             '    <!-- SCRIPTS -->\n'
-            '    <script src="packages/react/react_with_react_dom_prod.js"></script>\n'
+            '    <script src="packages/react/js/react.min.js"></script>\n'
             '    <script src="$rmuiBundleProdUpdated" type="module"></script>\n'
             '    <script defer src="main.dart.js"></script>\n'
             '  </body>\n'