Skip to content

Commit 3a8a71f

Browse files
author
Sourcegraph
committed
Update tests and example apps to run on React 18
1 parent 664b185 commit 3a8a71f

File tree

9 files changed

+32
-34
lines changed

9 files changed

+32
-34
lines changed

‎test/executables/react_18_upgrade_test.dart‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ void main() {
2929
script: react18CodemodScript,
3030
input: d.dir('project', [
3131
d.file('dev.html', /*language=html*/ '''
32-
<script src="packages/react/react.js"></script>
33-
<script src="packages/react/react_dom.js"></script>'''),
32+
<script src="packages/react/js/react.dev.js"></script>
33+
'''),
3434
d.file('dev_with_addons.html', /*language=html*/ '''
35-
<script src="packages/react/react_with_addons.js"></script>
36-
<script src="packages/react/react_dom.js"></script>'''),
35+
<script src="packages/react/js/react.dev.js"></script>
36+
'''),
3737
]),
3838
expectedOutput: d.dir('project', [
3939
d.file('dev.html', /*language=html*/ '''
@@ -49,11 +49,11 @@ void main() {
4949
script: react18CodemodScript,
5050
input: d.dir('project', [
5151
d.file('prod.html', /*language=html*/ '''
52-
<script src="packages/react/react_prod.js"></script>
53-
<script src="packages/react/react_dom_prod.js"></script>'''),
52+
<script src="packages/react/js/react.min.js"></script>
53+
'''),
5454
d.file('prod_with_addons.html', /*language=html*/ '''
55-
<script src="packages/react/react_with_react_dom_prod.js"></script>
56-
<script src="packages/react/react_dom_prod.js"></script>''')
55+
<script src="packages/react/js/react.min.js"></script>
56+
''')
5757
]),
5858
expectedOutput: d.dir('project', [
5959
d.file('prod.html', /*language=html*/ '''
@@ -71,11 +71,11 @@ void main() {
7171
script: react18CodemodScript,
7272
input: d.dir('project', [
7373
d.file('dev.html', /*language=html*/ '''
74-
<link href="packages/react/react.js">
75-
<link href="packages/react/react_dom.js">'''),
74+
<link href="packages/react/js/react.dev.js">
75+
'''),
7676
d.file('dev_with_addons.html', /*language=html*/ '''
77-
<link href="packages/react/react_with_addons.js">
78-
<link href="packages/react/react_dom.js">'''),
77+
<link href="packages/react/js/react.dev.js">
78+
'''),
7979
]),
8080
expectedOutput: d.dir('project', [
8181
d.file('dev.html', /*language=html*/ '''
@@ -91,11 +91,11 @@ void main() {
9191
script: react18CodemodScript,
9292
input: d.dir('project', [
9393
d.file('prod.html', /*language=html*/ '''
94-
<link href="packages/react/react_prod.js">
95-
<link href="packages/react/react_dom_prod.js">'''),
94+
<link href="packages/react/js/react.min.js">
95+
'''),
9696
d.file('prod_with_addons.html', /*language=html*/ '''
97-
<link href="packages/react/react_with_react_dom_prod.js">
98-
<link href="packages/react/react_dom_prod.js">''')
97+
<link href="packages/react/js/react.min.js">
98+
''')
9999
]),
100100
expectedOutput: d.dir('project', [
101101
d.file('prod.html', /*language=html*/ '''
@@ -114,10 +114,10 @@ void main() {
114114
input: d.dir('project', [
115115
d.file('main.dart', /*language=dart*/ '''
116116
List<String> _reactHtmlHeaders = const [
117-
'<script src="packages/react/react.js"></script>',
118-
'<script src="packages/react/react_dom.js"></script>',
119-
'<link rel="preload" href="packages/react/react.js" as="script">',
120-
'<link rel="preload" href="packages/react/react_dom.js" as="script">',
117+
'<script src="packages/react/js/react.dev.js"></script>',
118+
'',
119+
'<link rel="preload" href="packages/react/js/react.dev.js" as="script">',
120+
'',
121121
];
122122
''')
123123
]),
@@ -140,8 +140,7 @@ void main() {
140140
<html>
141141
<head>
142142
<title>{{testName}}</title>
143-
<script src="packages/react/react_with_addons.js"></script>
144-
<script src="packages/react/react_dom.js"></script>
143+
<script src="packages/react/js/react.dev.js"></script>
145144
<script src="packages/unify_ui/js/unify-ui.browser.dev.esm.js" type="module"></script>
146145
<script src="packages/react_testing_library/js/react-testing-library.js"></script>
147146
<!--In order to debug unit tests, use application/dart rather than x-dart-test-->

‎test/rmui_bundle_updater_suggestors/dart_script_updater_test.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ void main() {
405405
<html>
406406
<head>
407407
<title>{{testName}}</title>
408-
<script src="packages/react/react_with_addons.js"></script>
409-
<script src="packages/react/react_dom.js"></script>
408+
<script src="packages/react/js/react.dev.js"></script>
410409
<script src="packages/react_testing_library/js/react-testing-library.js"></script>
411410
<!--In order to debug unit tests, use application/dart rather than x-dart-test-->
412411
<!--<script type="application/dart" src="generated_runner_test.dart"></script>-->

‎test/rmui_bundle_updater_suggestors/html_script_updater_test.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void main() {
128128
' <link rel="preconnect" href="https://sandbox.wdesk.com">\n'
129129
' \n'
130130
' <!-- PRELOAD SCRIPTS -->\n'
131-
' <link rel="preload" href="packages/react/react_with_react_dom_prod.js" as="script">\n'
131+
' <link rel="preload" href="packages/react/js/react.min.js" as="script">\n'
132132
' <link rel="preload" href="$rmuiBundleProd" as="script">\n'
133133
' <link rel="preload" href="main.dart.js" as="script">\n'
134134
' \n'
@@ -141,7 +141,7 @@ void main() {
141141
' <div id="shell-container" aria-hidden="true" tabindex="-1"></div>\n'
142142
' \n'
143143
' <!-- SCRIPTS -->\n'
144-
' <script src="packages/react/react_with_react_dom_prod.js"></script>\n'
144+
' <script src="packages/react/js/react.min.js"></script>\n'
145145
' <script src="$rmuiBundleProd"></script>\n'
146146
' <script defer src="main.dart.js"></script>\n'
147147
' </body>\n'
@@ -167,7 +167,7 @@ void main() {
167167
' <link rel="preconnect" href="https://sandbox.wdesk.com">\n'
168168
' \n'
169169
' <!-- PRELOAD SCRIPTS -->\n'
170-
' <link rel="preload" href="packages/react/react_with_react_dom_prod.js" as="script">\n'
170+
' <link rel="preload" href="packages/react/js/react.min.js" as="script">\n'
171171
' <link rel="preload" href="$rmuiBundleProdUpdated" crossorigin="" as="script">\n'
172172
' <link rel="preload" href="main.dart.js" as="script">\n'
173173
' \n'
@@ -180,7 +180,7 @@ void main() {
180180
' <div id="shell-container" aria-hidden="true" tabindex="-1"></div>\n'
181181
' \n'
182182
' <!-- SCRIPTS -->\n'
183-
' <script src="packages/react/react_with_react_dom_prod.js"></script>\n'
183+
' <script src="packages/react/js/react.min.js"></script>\n'
184184
' <script src="$rmuiBundleProdUpdated" type="module"></script>\n'
185185
' <script defer src="main.dart.js"></script>\n'
186186
' </body>\n'

‎test/test_fixtures/over_react_null_safe_project/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name: over_react_null_safe_project
22
environment:
33
sdk: '>=2.19.0 <3.0.0'
44
dependencies:
5-
over_react: ^5.0.0
5+
over_react: ^5.4.5

‎test/test_fixtures/over_react_project/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name: over_react_project
22
environment:
33
sdk: '>=2.11.0 <3.0.0'
44
dependencies:
5-
over_react: ^5.0.0
5+
over_react: ^5.4.5

‎test/test_fixtures/required_props/test_consuming_package/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ name: test_consuming_package
22
environment:
33
sdk: '>=2.11.0 <3.0.0'
44
dependencies:
5-
over_react: ^5.0.0
5+
over_react: ^5.4.5
66
test_package:
77
path: ../test_package

‎test/test_fixtures/required_props/test_package/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ environment:
33
sdk: '>=2.11.0 <3.0.0'
44
dependencies:
55
meta: ^1.16.0
6-
over_react: ^5.0.0
6+
over_react: ^5.4.5

‎test/test_fixtures/rmui_project/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: rmui_project
22
environment:
33
sdk: '>=2.11.0 <3.0.0'
44
dependencies:
5-
over_react: ^5.0.0
5+
over_react: ^5.4.5
66
react_material_ui:
77
hosted:
88
name: react_material_ui

‎test/test_fixtures/wsd_project/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: wsd_project
22
environment:
33
sdk: '>=2.11.0 <3.0.0'
44
dependencies:
5-
over_react: ^5.0.0
5+
over_react: ^5.4.5
66
web_skin_dart:
77
hosted:
88
name: web_skin_dart

0 commit comments

Comments
 (0)