Skip to content

Rollout React 18 to tests and example apps #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sourcegraph-wk wants to merge 1 commit into from
Closed

Rollout React 18 to tests and example apps #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions test/executables/react_18_upgrade_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*/ '''
Expand All @@ -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*/ '''
Expand All @@ -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*/ '''
Expand All @@ -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*/ '''
Expand All @@ -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">',
'',
];
''')
]),
Expand All @@ -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-->
Expand Down
3 changes: 1 addition & 2 deletions test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>-->
Expand Down
8 changes: 4 additions & 4 deletions test/rmui_bundle_updater_suggestors/html_script_updater_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/test_fixtures/over_react_null_safe_project/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/test_fixtures/over_react_project/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/test_fixtures/required_props/test_consuming_package/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/test_fixtures/required_props/test_package/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/test_fixtures/rmui_project/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_fixtures/wsd_project/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading