Skip to content

Commit b6d15d8

Browse files
committed
Revert "Remove several packages from DEPS"
Looks like we have tests that require these This reverts commit 7a9cc03. Review-Url: https://codereview.chromium.org/2980303002 .
1 parent 7a9cc03 commit b6d15d8

File tree

4 files changed

+28
-102
lines changed

4 files changed

+28
-102
lines changed

.packages

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ browser:pkg/browser/lib
2020
charcode:third_party/pkg/charcode/lib
2121
charted:third_party/observatory_pub_packages/packages/charted/lib
2222
cli_util:third_party/pkg/cli_util/lib
23+
code_transformers:third_party/pkg/code_transformers/lib
2324
collection:third_party/pkg/collection/lib
2425
compiler:pkg/compiler/lib
2526
# Compiler is imported as compiler_unsupported so it can work outside the SDK.
@@ -43,6 +44,7 @@ http:third_party/pkg/http/lib
4344
http_multi_server:third_party/pkg/http_multi_server/lib
4445
http_parser:third_party/pkg/http_parser/lib
4546
http_throttle:third_party/pkg/http_throttle/lib
47+
initialize:third_party/pkg/initialize/lib
4648
intl:third_party/pkg/intl/lib
4749
isolate:third_party/pkg/isolate/lib
4850
js:pkg/js/lib
@@ -61,7 +63,9 @@ microlytics:pkg/microlytics/lib
6163
mime:third_party/pkg/mime/lib
6264
mustache4dart:third_party/pkg/mustache4dart/lib
6365
oauth2:third_party/pkg/oauth2/lib
66+
observable:third_party/pkg/observable/lib
6467
observatory:runtime/observatory/lib
68+
observe:third_party/pkg/observe/lib
6569
package_config:third_party/pkg_tested/package_config/lib
6670
package_resolver:third_party/pkg_tested/package_resolver/lib
6771
path:third_party/pkg/path/lib
@@ -80,6 +84,7 @@ shelf:third_party/pkg/shelf/lib
8084
shelf_packages_handler:third_party/pkg/shelf_packages_handler/lib
8185
shelf_static:third_party/pkg/shelf_static/lib
8286
shelf_web_socket:third_party/pkg/shelf_web_socket/lib
87+
smoke:third_party/pkg/smoke/lib
8388
source_map_stack_trace:third_party/pkg/source_map_stack_trace/lib
8489
source_maps:third_party/pkg/source_maps/lib
8590
source_span:third_party/pkg/source_span/lib
@@ -98,5 +103,6 @@ unittest:third_party/pkg/unittest/lib
98103
usage:third_party/pkg/usage/lib
99104
utf:third_party/pkg/utf/lib
100105
watcher:third_party/pkg/watcher/lib
106+
web_components:third_party/pkg/web_components/lib
101107
web_socket_channel:third_party/pkg/web_socket_channel/lib
102108
yaml:third_party/pkg/yaml/lib

DEPS

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ vars = {
5858
"charcode_tag": "@v1.1.1",
5959
"chrome_rev" : "@19997",
6060
"cli_util_tag" : "@0.1.0",
61+
"code_transformers_tag": "@v0.5.1",
6162
"collection_tag": "@1.13.0",
6263
"convert_tag": "@2.0.1",
6364
"crypto_tag" : "@2.0.1",
@@ -75,6 +76,7 @@ vars = {
7576
"http_tag" : "@0.11.3+13",
7677
"http_throttle_tag" : "@1.0.1",
7778
"idl_parser_rev": "@7fbe68cab90c38147dee4f48c30ad0d496c17915",
79+
"initialize_tag": "@v0.6.2+5",
7880
"intl_tag": "@0.14.0",
7981
"isolate_tag": "@1.0.0",
8082
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
@@ -87,7 +89,9 @@ vars = {
8789
"mime_rev": "@75890811d4af5af080351ba8a2853ad4c8df98dd",
8890
"mustache4dart_tag" : "@v1.1.0",
8991
"oauth2_tag": "@1.0.2",
92+
"observable_tag": "@0.17.0",
9093
"observatory_pub_packages_rev": "@26aad88f1c1915d39bbcbff3cad589e2402fdcf1",
94+
"observe_tag": "@0.15.0",
9195
"package_config_tag": "@1.0.0",
9296
"package_resolver_tag": "@1.0.2+1",
9397
"path_tag": "@1.4.1",
@@ -105,6 +109,7 @@ vars = {
105109
"shelf_packages_handler_tag": "@1.0.0",
106110
"shelf_tag": "@0.6.7+2",
107111
"shelf_web_socket_tag": "@0.2.1",
112+
"smoke_tag" : "@v0.3.6+2",
108113
"source_map_stack_trace_tag": "@1.1.4",
109114
"source_maps-0.9.4_rev": "@38524",
110115
"source_maps_tag": "@0.10.4",
@@ -120,6 +125,7 @@ vars = {
120125
"usage_tag": "@3.3.0",
121126
"utf_tag": "@0.9.0+3",
122127
"watcher_tag": "@0.9.7+3",
128+
"web_components_rev": "@6349e09f9118dce7ae1b309af5763745e25a9d61",
123129
"web_socket_channel_tag": "@1.0.4",
124130
"WebCore_rev": "@3c45690813c112373757bbef53de1602a62af609",
125131
"yaml_tag": "@2.1.12",
@@ -197,6 +203,9 @@ deps = {
197203
(Var("github_mirror") % "crypto") + Var("crypto_tag"),
198204
Var("dart_root") + "/third_party/pkg/csslib":
199205
(Var("github_mirror") % "csslib") + Var("csslib_tag"),
206+
Var("dart_root") + "/third_party/pkg/code_transformers":
207+
(Var("github_mirror") % "code_transformers") +
208+
Var("code_transformers_tag"),
200209
Var("dart_root") + "/third_party/dart-services":
201210
(Var("github_mirror") % "dart-services") +
202211
Var("dart_services_rev"),
@@ -224,6 +233,8 @@ deps = {
224233
Var("dart_root") + "/third_party/pkg/http_throttle":
225234
(Var("github_mirror") % "http_throttle") +
226235
Var("http_throttle_tag"),
236+
Var("dart_root") + "/third_party/pkg/initialize":
237+
(Var("github_mirror") % "initialize") + Var("initialize_tag"),
227238
Var("dart_root") + "/third_party/pkg/intl":
228239
(Var("github_mirror") % "intl") + Var("intl_tag"),
229240
Var("dart_root") + "/third_party/pkg/isolate":
@@ -248,6 +259,10 @@ deps = {
248259
+ Var("mustache4dart_tag"),
249260
Var("dart_root") + "/third_party/pkg/oauth2":
250261
(Var("github_mirror") % "oauth2") + Var("oauth2_tag"),
262+
Var("dart_root") + "/third_party/pkg/observable":
263+
(Var("github_mirror") % "observable") + Var("observable_tag"),
264+
Var("dart_root") + "/third_party/pkg/observe":
265+
(Var("github_mirror") % "observe") + Var("observe_tag"),
251266
Var("dart_root") + "/third_party/observatory_pub_packages":
252267
(Var("github_mirror") % "observatory_pub_packages")
253268
+ Var("observatory_pub_packages_rev"),
@@ -286,6 +301,8 @@ deps = {
286301
Var("dart_root") + "/third_party/pkg/shelf_web_socket":
287302
(Var("github_mirror") % "shelf_web_socket") +
288303
Var("shelf_web_socket_tag"),
304+
Var("dart_root") + "/third_party/pkg/smoke":
305+
(Var("github_mirror") % "smoke") + Var("smoke_tag"),
289306
Var("dart_root") + "/third_party/pkg/source_maps":
290307
(Var("github_mirror") % "source_maps") + Var("source_maps_tag"),
291308
Var("dart_root") + "/third_party/pkg/source_span":
@@ -319,6 +336,9 @@ deps = {
319336
(Var("github_mirror") % "utf") + Var("utf_tag"),
320337
Var("dart_root") + "/third_party/pkg/watcher":
321338
(Var("github_mirror") % "watcher") + Var("watcher_tag"),
339+
Var("dart_root") + "/third_party/pkg/web_components":
340+
(Var("github_mirror") % "web-components") +
341+
Var("web_components_rev"),
322342
Var("dart_root") + "/third_party/pkg/web_socket_channel":
323343
(Var("github_mirror") % "web_socket_channel") +
324344
Var("web_socket_channel_tag"),

tests/html/utils.dart

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'dart:html';
55
import 'dart:js' as js;
66
import 'dart:typed_data';
77
import 'package:unittest/unittest.dart';
8+
export 'package:web_components/polyfill.dart';
89

910
/**
1011
* Verifies that [actual] has the same graph structure as [expected].
@@ -166,54 +167,3 @@ void upgradeCustomElements(Node node) {
166167
js.context['CustomElements'].callMethod('upgradeAll', [node]);
167168
}
168169
}
169-
170-
/**
171-
* A future that completes once all custom elements in the initial HTML page
172-
* have been upgraded.
173-
*
174-
* This is needed because the native implementation can update the elements
175-
* while parsing the HTML document, but the custom element polyfill cannot,
176-
* so it completes this future once all elements are upgraded.
177-
*/
178-
// TODO(jmesserly): rename to webComponentsReady to match the event?
179-
Future customElementsReady = () {
180-
if (_isReady) return new Future.value();
181-
182-
// Not upgraded. Wait for the polyfill to fire the WebComponentsReady event.
183-
// Note: we listen on document (not on document.body) to allow this polyfill
184-
// to be loaded in the HEAD element.
185-
return document.on['WebComponentsReady'].first;
186-
}();
187-
188-
// Return true if we are using the polyfill and upgrade is complete, or if we
189-
// have native document.register and therefore the browser took care of it.
190-
// Otherwise return false, including the case where we can't find the polyfill.
191-
bool get _isReady {
192-
// If we don't have dart:js, assume things are ready
193-
if (js.context == null) return true;
194-
195-
var customElements = js.context['CustomElements'];
196-
if (customElements == null) {
197-
// Return true if native document.register, otherwise false.
198-
// (Maybe the polyfill isn't loaded yet. Wait for it.)
199-
return document.supportsRegisterElement;
200-
}
201-
202-
return customElements['ready'] == true;
203-
}
204-
205-
/**
206-
* *Note* this API is primarily intended for tests. In other code it is better
207-
* to write it in a style that works with or without the polyfill, rather than
208-
* using this method.
209-
*
210-
* Synchronously trigger evaluation of pending lifecycle events, which otherwise
211-
* need to wait for a [MutationObserver] to signal the changes in the polyfill.
212-
* This method can be used to resolve differences in timing between native and
213-
* polyfilled custom elements.
214-
*/
215-
void customElementsTakeRecords([Node node]) {
216-
var customElements = js.context['CustomElements'];
217-
if (customElements == null) return;
218-
customElements.callMethod('takeRecords', [node]);
219-
}

tests/lib_strong/html/utils.dart

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'dart:html';
55
import 'dart:js' as js;
66
import 'dart:typed_data';
77
import 'package:unittest/unittest.dart';
8+
export 'package:web_components/polyfill.dart';
89

910
/**
1011
* Verifies that [actual] has the same graph structure as [expected].
@@ -166,54 +167,3 @@ void upgradeCustomElements(Node node) {
166167
js.context['CustomElements'].callMethod('upgradeAll', [node]);
167168
}
168169
}
169-
170-
/**
171-
* A future that completes once all custom elements in the initial HTML page
172-
* have been upgraded.
173-
*
174-
* This is needed because the native implementation can update the elements
175-
* while parsing the HTML document, but the custom element polyfill cannot,
176-
* so it completes this future once all elements are upgraded.
177-
*/
178-
// TODO(jmesserly): rename to webComponentsReady to match the event?
179-
Future customElementsReady = () {
180-
if (_isReady) return new Future.value();
181-
182-
// Not upgraded. Wait for the polyfill to fire the WebComponentsReady event.
183-
// Note: we listen on document (not on document.body) to allow this polyfill
184-
// to be loaded in the HEAD element.
185-
return document.on['WebComponentsReady'].first;
186-
}();
187-
188-
// Return true if we are using the polyfill and upgrade is complete, or if we
189-
// have native document.register and therefore the browser took care of it.
190-
// Otherwise return false, including the case where we can't find the polyfill.
191-
bool get _isReady {
192-
// If we don't have dart:js, assume things are ready
193-
if (js.context == null) return true;
194-
195-
var customElements = js.context['CustomElements'];
196-
if (customElements == null) {
197-
// Return true if native document.register, otherwise false.
198-
// (Maybe the polyfill isn't loaded yet. Wait for it.)
199-
return document.supportsRegisterElement;
200-
}
201-
202-
return customElements['ready'] == true;
203-
}
204-
205-
/**
206-
* *Note* this API is primarily intended for tests. In other code it is better
207-
* to write it in a style that works with or without the polyfill, rather than
208-
* using this method.
209-
*
210-
* Synchronously trigger evaluation of pending lifecycle events, which otherwise
211-
* need to wait for a [MutationObserver] to signal the changes in the polyfill.
212-
* This method can be used to resolve differences in timing between native and
213-
* polyfilled custom elements.
214-
*/
215-
void customElementsTakeRecords([Node node]) {
216-
var customElements = js.context['CustomElements'];
217-
if (customElements == null) return;
218-
customElements.callMethod('takeRecords', [node]);
219-
}

0 commit comments

Comments
 (0)