Skip to content

Commit a6befe3

Browse files
committed
1 parent 6d9564b commit a6befe3

File tree

5 files changed

+26
-1
lines changed

5 files changed

+26
-1
lines changed

pkg/dev_compiler/lib/src/dependency_graph.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class HtmlSourceNode extends SourceNode {
134134

135135
HtmlSourceNode(uri, source, graph) : super(uri, source) {
136136
var prefix = 'package:dev_compiler/runtime';
137-
var files = ['harmony_feature_check.js', 'dart_runtime.js'];
137+
var files = ['harmony_feature_check.js', 'dart_runtime.js', 'dart_core.js'];
138138
if (graph._options.serverMode) {
139139
files.addAll(const ['messages_widget.js', 'messages.css']);
140140
}

pkg/dev_compiler/test/codegen/expect/html_input.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<html><head></head><body>
22
<script src="dev_compiler/runtime/harmony_feature_check.js"></script>
33
<script src="dev_compiler/runtime/dart_runtime.js"></script>
4+
<script src="dev_compiler/runtime/dart_core.js"></script>
45
<script>
56
/* placehorder for unimplemented code libraries */
67
var math = Math;

pkg/dev_compiler/test/codegen/expect/server_mode/html_input.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<html><head></head><body>
22
<script src="cached/c947f9f732203b97dd2882e63da78dbe/dev_compiler/runtime/harmony_feature_check.js"></script>
33
<script src="cached/e0c88ce05fb3615397b4fd408c68cf8a/dev_compiler/runtime/dart_runtime.js"></script>
4+
<script src="cached/cd344ed9303198405463664eacd77748/dev_compiler/runtime/dart_core.js"></script>
45
<script src="cached/fa4d5796ad409e1bbdbd3c64354488c4/dev_compiler/runtime/messages_widget.js"></script>
56
<link rel="stylesheet" href="cached/307a7ef1e0cd0544d55c6f768f5e3886/dev_compiler/runtime/messages.css">
67
<script>

pkg/dev_compiler/test/dependency_graph_test.dart

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ main() {
555555
index3.html
556556
|-- harmony_feature_check.js
557557
|-- dart_runtime.js
558+
|-- dart_core.js
558559
''');
559560
refreshStructureAndMarks(node, graph);
560561
expectGraph(node, '''
@@ -567,6 +568,7 @@ main() {
567568
| |-- a6.dart (part) [needs-rebuild]
568569
|-- harmony_feature_check.js [needs-rebuild]
569570
|-- dart_runtime.js [needs-rebuild]
571+
|-- dart_core.js [needs-rebuild]
570572
''');
571573
});
572574

@@ -583,6 +585,7 @@ main() {
583585
| |-- a6.dart (part) [needs-rebuild]
584586
|-- harmony_feature_check.js [needs-rebuild]
585587
|-- dart_runtime.js [needs-rebuild]
588+
|-- dart_core.js [needs-rebuild]
586589
''');
587590
clearMarks(node);
588591
expectGraph(node, '''
@@ -595,6 +598,7 @@ main() {
595598
| |-- a6.dart (part)
596599
|-- harmony_feature_check.js
597600
|-- dart_runtime.js
601+
|-- dart_core.js
598602
''');
599603

600604
refreshStructureAndMarks(node, graph);
@@ -608,6 +612,7 @@ main() {
608612
| |-- a6.dart (part)
609613
|-- harmony_feature_check.js
610614
|-- dart_runtime.js
615+
|-- dart_core.js
611616
''');
612617
});
613618

@@ -629,6 +634,7 @@ main() {
629634
| |-- a6.dart (part)
630635
|-- harmony_feature_check.js
631636
|-- dart_runtime.js
637+
|-- dart_core.js
632638
''');
633639
});
634640

@@ -653,6 +659,7 @@ main() {
653659
| |-- a6.dart (part)
654660
|-- harmony_feature_check.js
655661
|-- dart_runtime.js
662+
|-- dart_core.js
656663
''');
657664
});
658665
});
@@ -671,6 +678,7 @@ main() {
671678
index3.html
672679
|-- harmony_feature_check.js
673680
|-- dart_runtime.js
681+
|-- dart_core.js
674682
|-- messages_widget.js
675683
|-- messages.css
676684
''');
@@ -685,6 +693,7 @@ main() {
685693
| |-- a6.dart (part) [needs-rebuild]
686694
|-- harmony_feature_check.js [needs-rebuild]
687695
|-- dart_runtime.js [needs-rebuild]
696+
|-- dart_core.js [needs-rebuild]
688697
|-- messages_widget.js [needs-rebuild]
689698
|-- messages.css [needs-rebuild]
690699
''');
@@ -721,6 +730,7 @@ main() {
721730
'a2.dart',
722731
'harmony_feature_check.js',
723732
'dart_runtime.js',
733+
'dart_core.js',
724734
'index3.html',
725735
]);
726736

@@ -735,6 +745,7 @@ main() {
735745
| |-- a6.dart (part)
736746
|-- harmony_feature_check.js
737747
|-- dart_runtime.js
748+
|-- dart_core.js
738749
''');
739750
});
740751

@@ -887,6 +898,7 @@ main() {
887898
| |-- a6.dart (part)
888899
|-- harmony_feature_check.js
889900
|-- dart_runtime.js
901+
|-- dart_core.js
890902
''');
891903

892904
// Modify the file first:
@@ -909,6 +921,7 @@ main() {
909921
| |-- a6.dart (part)
910922
|-- harmony_feature_check.js
911923
|-- dart_runtime.js
924+
|-- dart_core.js
912925
''');
913926

914927
a2.source.contents.modificationTime++;
@@ -941,6 +954,7 @@ main() {
941954
| |-- a5.dart...
942955
|-- harmony_feature_check.js
943956
|-- dart_runtime.js
957+
|-- dart_core.js
944958
''');
945959
});
946960

@@ -960,6 +974,7 @@ main() {
960974
| |-- a6.dart (part)
961975
|-- harmony_feature_check.js
962976
|-- dart_runtime.js
977+
|-- dart_core.js
963978
''');
964979

965980
a2.source.contents.modificationTime++;
@@ -983,6 +998,7 @@ main() {
983998
| |-- a5.dart
984999
|-- harmony_feature_check.js
9851000
|-- dart_runtime.js
1001+
|-- dart_core.js
9861002
''');
9871003

9881004
a6.source.contents.modificationTime++;
@@ -1001,6 +1017,7 @@ main() {
10011017
| |-- a5.dart...
10021018
|-- harmony_feature_check.js
10031019
|-- dart_runtime.js
1020+
|-- dart_core.js
10041021
''');
10051022
});
10061023

@@ -1020,6 +1037,7 @@ main() {
10201037
| |-- a6.dart (part)
10211038
|-- harmony_feature_check.js
10221039
|-- dart_runtime.js
1040+
|-- dart_core.js
10231041
''');
10241042

10251043
a2.source.contents.modificationTime++;
@@ -1044,6 +1062,7 @@ main() {
10441062
| |-- a5.dart
10451063
|-- harmony_feature_check.js
10461064
|-- dart_runtime.js
1065+
|-- dart_core.js
10471066
''');
10481067
});
10491068

@@ -1063,6 +1082,7 @@ main() {
10631082
| |-- a6.dart (part)
10641083
|-- harmony_feature_check.js
10651084
|-- dart_runtime.js
1085+
|-- dart_core.js
10661086
''');
10671087

10681088
a2.source.contents.modificationTime++;
@@ -1086,6 +1106,7 @@ main() {
10861106
| |-- a6.dart (part)
10871107
|-- harmony_feature_check.js
10881108
|-- dart_runtime.js
1109+
|-- dart_core.js
10891110
''');
10901111

10911112
a5.source.contents.modificationTime++;
@@ -1103,6 +1124,7 @@ main() {
11031124
| |-- a6.dart (part)
11041125
|-- harmony_feature_check.js
11051126
|-- dart_runtime.js
1127+
|-- dart_core.js
11061128
''');
11071129
});
11081130
});

pkg/dev_compiler/test/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ function fail {
1212
# duplicated in the expected folder.
1313
DIFF_ARGS="-u -r -N --exclude=\*.map \
1414
--exclude=dart_runtime.js \
15+
--exclude=dart_core.js \
1516
--exclude=harmony_feature_check.js \
1617
--exclude=messages_widget.js \
1718
--exclude=messages.css \

0 commit comments

Comments
 (0)