From 570b896079fc5871fae9ba42c6819c5135523ff9 Mon Sep 17 00:00:00 2001 From: "sourcegraph-commit-signing-app[bot]" <188111114+sourcegraph-commit-signing-app[bot]@users.noreply.github.com> Date: Fri, 18 Jul 2025 02:02:30 +0000 Subject: [PATCH] Update tests and example apps to run on React 18 --- test/executables/react_18_upgrade_test.dart | 43 +++++++++---------- .../dart_script_updater_test.dart | 3 +- .../html_script_updater_test.dart | 8 ++-- .../over_react_null_safe_project/pubspec.yaml | 2 +- .../over_react_project/pubspec.yaml | 2 +- .../test_consuming_package/pubspec.yaml | 2 +- .../required_props/test_package/pubspec.yaml | 2 +- test/test_fixtures/rmui_project/pubspec.yaml | 2 +- test/test_fixtures/wsd_project/pubspec.yaml | 2 +- 9 files changed, 32 insertions(+), 34 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*/ ''' - - '''), + +'''), d.file('dev_with_addons.html', /*language=html*/ ''' - - '''), + +'''), ]), 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*/ ''' - - '''), + +'''), d.file('prod_with_addons.html', /*language=html*/ ''' - - ''') + +''') ]), 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*/ ''' - - '''), + +'''), d.file('dev_with_addons.html', /*language=html*/ ''' - - '''), + +'''), ]), 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*/ ''' - - '''), + +'''), d.file('prod_with_addons.html', /*language=html*/ ''' - - ''') + +''') ]), 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 _reactHtmlHeaders = const [ - '', - '', - '', - '', + '', + '', + '', + '', ]; ''') ]), @@ -140,8 +140,7 @@ void main() { {{testName}} - - + 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() { {{testName}} - - + 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() { ' \n' ' \n' ' \n' - ' \n' + ' \n' ' \n' ' \n' ' \n' @@ -141,7 +141,7 @@ void main() { ' \n' ' \n' ' \n' - ' \n' + ' \n' ' \n' ' \n' ' \n' @@ -167,7 +167,7 @@ void main() { ' \n' ' \n' ' \n' - ' \n' + ' \n' ' \n' ' \n' ' \n' @@ -180,7 +180,7 @@ void main() { ' \n' ' \n' ' \n' - ' \n' + ' \n' ' \n' ' \n' ' \n' diff --git a/test/test_fixtures/over_react_null_safe_project/pubspec.yaml b/test/test_fixtures/over_react_null_safe_project/pubspec.yaml index a1267be2..35364892 100644 --- a/test/test_fixtures/over_react_null_safe_project/pubspec.yaml +++ b/test/test_fixtures/over_react_null_safe_project/pubspec.yaml @@ -2,4 +2,4 @@ name: over_react_null_safe_project environment: sdk: '>=2.19.0 <3.0.0' dependencies: - over_react: ^5.0.0 + over_react: ^5.4.5 diff --git a/test/test_fixtures/over_react_project/pubspec.yaml b/test/test_fixtures/over_react_project/pubspec.yaml index 5949bbd1..4dd3dd89 100644 --- a/test/test_fixtures/over_react_project/pubspec.yaml +++ b/test/test_fixtures/over_react_project/pubspec.yaml @@ -2,4 +2,4 @@ name: over_react_project environment: sdk: '>=2.11.0 <3.0.0' dependencies: - over_react: ^5.0.0 + over_react: ^5.4.5 diff --git a/test/test_fixtures/required_props/test_consuming_package/pubspec.yaml b/test/test_fixtures/required_props/test_consuming_package/pubspec.yaml index 4ab8af6d..61f79e7f 100644 --- a/test/test_fixtures/required_props/test_consuming_package/pubspec.yaml +++ b/test/test_fixtures/required_props/test_consuming_package/pubspec.yaml @@ -2,6 +2,6 @@ name: test_consuming_package environment: sdk: '>=2.11.0 <3.0.0' dependencies: - over_react: ^5.0.0 + over_react: ^5.4.5 test_package: path: ../test_package diff --git a/test/test_fixtures/required_props/test_package/pubspec.yaml b/test/test_fixtures/required_props/test_package/pubspec.yaml index fda07fef..57fd3e9d 100644 --- a/test/test_fixtures/required_props/test_package/pubspec.yaml +++ b/test/test_fixtures/required_props/test_package/pubspec.yaml @@ -3,4 +3,4 @@ environment: sdk: '>=2.11.0 <3.0.0' dependencies: meta: ^1.16.0 - over_react: ^5.0.0 + over_react: ^5.4.5 diff --git a/test/test_fixtures/rmui_project/pubspec.yaml b/test/test_fixtures/rmui_project/pubspec.yaml index ab7118a2..49ed0563 100644 --- a/test/test_fixtures/rmui_project/pubspec.yaml +++ b/test/test_fixtures/rmui_project/pubspec.yaml @@ -2,7 +2,7 @@ name: rmui_project environment: sdk: '>=2.11.0 <3.0.0' dependencies: - over_react: ^5.0.0 + over_react: ^5.4.5 react_material_ui: hosted: name: react_material_ui diff --git a/test/test_fixtures/wsd_project/pubspec.yaml b/test/test_fixtures/wsd_project/pubspec.yaml index 3befe900..2e65e934 100644 --- a/test/test_fixtures/wsd_project/pubspec.yaml +++ b/test/test_fixtures/wsd_project/pubspec.yaml @@ -2,7 +2,7 @@ name: wsd_project environment: sdk: '>=2.11.0 <3.0.0' dependencies: - over_react: ^5.0.0 + over_react: ^5.4.5 web_skin_dart: hosted: name: web_skin_dart