honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(zone.js): patch shadydom (#31717)

Browse Source 
Close #31686

PR Close #31717
This commit is contained in:
JiaLiPassion 2019-07-21 19:44:13 +09:00 committed by Miško Hevery
parent a86850e3f2
commit 35a025fbca
6 changed files with 302 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/zone.js/lib/browser/shadydom.ts
View File

@ -10,15 +10,17 @@ Zone.__load_patch('shadydom', (global: any, Zone: ZoneType, api: _ZonePrivate) =
// in web components, shadydom will patch addEventListener/removeEventListener of
// Node.prototype and WindowPrototype, this will have conflict with zone.js
// so zone.js need to patch them again.
const windowPrototype = Object.getPrototypeOf(window);
if (windowPrototype && windowPrototype.hasOwnProperty('addEventListener')) {
(windowPrototype as any)[Zone.__symbol__('addEventListener')] = null;
(windowPrototype as any)[Zone.__symbol__('removeEventListener')] = null;
api.patchEventTarget(global, [windowPrototype]);
}
if (Node.prototype.hasOwnProperty('addEventListener')) {
(Node.prototype as any)[Zone.__symbol__('addEventListener')] = null;
(Node.prototype as any)[Zone.__symbol__('removeEventListener')] = null;
api.patchEventTarget(global, [Node.prototype]);
const HTMLSlotElement = global.HTMLSlotElement;
const prototypes = [
Object.getPrototypeOf(window), Node.prototype, Text.prototype, Element.prototype,
HTMLElement.prototype, HTMLSlotElement && HTMLSlotElement.prototype, DocumentFragment.prototype,
Document.prototype
];
prototypes.forEach(function(proto) {
if (proto && proto.hasOwnProperty('addEventListener')) {
proto[Zone.__symbol__('addEventListener')] = null;
proto[Zone.__symbol__('removeEventListener')] = null;
api.patchEventTarget(global, [proto]);
}
});
});

230
packages/zone.js/test/BUILD.bazel
View File

@ -1,6 +1,5 @@
load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
load("//packages/zone.js/test:karma_test.bzl", "karma_test")
package(default_visibility = ["//:__pkg__"])
@ -184,17 +183,12 @@ jasmine_node_test(
],
)
ts_library(
name = "test_browser_lib",
testonly = True,
srcs = glob(["browser/*.ts"]) + [
"extra/cordova.spec.ts",
"mocha-patch.spec.ts",
"jasmine-patch.spec.ts",
"common_tests.ts",
"browser_entry_point.ts",
],
deps = [
env_srcs = [
"browser-env-setup.ts",
"browser_symbol_setup.ts",
]
env_deps = [
":common_spec_env",
":common_spec_srcs",
":common_spec_util",
@ -205,166 +199,74 @@ ts_library(
"@npm//rxjs",
"@npm//shelljs",
"@npm//systemjs",
],
)
ts_library(
name = "browser_env_setup",
testonly = True,
srcs = [
"browser-env-setup.ts",
"browser_symbol_setup.ts",
],
deps = [
":common_spec_env",
],
)
rollup_bundle(
name = "browser_test_env_setup_rollup",
testonly = True,
entry_point = ":browser-env-setup.ts",
deps = [
":browser_env_setup",
],
)
filegroup(
name = "browser_test_env_setup_rollup.es5",
testonly = True,
srcs = [":browser_test_env_setup_rollup"],
output_group = "umd",
)
rollup_bundle(
name = "browser_test_rollup",
testonly = True,
entry_point = ":browser_entry_point.ts",
globals = {
"electron": "electron",
},
deps = [
":test_browser_lib",
],
)
filegroup(
name = "browser_test_rollup.es5",
testonly = True,
srcs = [":browser_test_rollup"],
output_group = "umd",
)
genrule(
name = "browser_test_trim_map",
testonly = True,
srcs = [
":browser_test_rollup.es5",
],
outs = [
"browser_test_rollup_trim_map.js",
],
cmd = " && ".join([
"cp $(@D)/browser_test_rollup.umd.js $@",
]),
)
genrule(
name = "browser_test_env_setup_trim_map",
testonly = True,
srcs = [
":browser_test_env_setup_rollup.es5",
],
outs = [
"browser_test_env_setup_rollup_trim_map.js",
],
cmd = " && ".join([
"cp $(@D)/browser_test_env_setup_rollup.umd.js $@",
]),
)
_karma_test_required_dist_files = [
"//packages/zone.js/dist:task-tracking-dist-dev-test",
"//packages/zone.js/dist:wtf-dist-dev-test",
"//packages/zone.js/dist:webapis-notification-dist-dev-test",
"//packages/zone.js/dist:webapis-media-query-dist-dev-test",
"//packages/zone.js/dist:zone-patch-canvas-dist-dev-test",
"//packages/zone.js/dist:zone-patch-fetch-dist-dev-test",
"//packages/zone.js/dist:zone-patch-resize-observer-dist-dev-test",
"//packages/zone.js/dist:zone-patch-user-media-dist-dev-test",
":browser_test_trim_map",
]
karma_web_test_suite(
name = "karma_jasmine_test",
srcs = [
"fake_entry.js",
],
bootstrap = [
":browser_test_env_setup_trim_map",
"//packages/zone.js/dist:zone-testing-bundle-dist-dev-test",
] + _karma_test_required_dist_files,
static_files = [
":assets/sample.json",
":assets/worker.js",
":assets/import.html",
],
tags = ["zone_karma_test"],
runtime_deps = [
"@npm//karma-browserstack-launcher",
],
)
env_entry_point = ":browser-env-setup.ts"
karma_web_test_suite(
name = "karma_jasmine_evergreen_test",
srcs = [
"fake_entry.js",
],
bootstrap = [
":browser_test_env_setup_trim_map",
test_srcs = glob(
["browser/*.ts"],
exclude = ["browser/shadydom.spec.ts"],
) + [
"extra/cordova.spec.ts",
"mocha-patch.spec.ts",
"jasmine-patch.spec.ts",
"common_tests.ts",
"browser_entry_point.ts",
]
test_deps = [
":common_spec_env",
":common_spec_srcs",
":common_spec_util",
":error_spec_srcs",
"//packages/zone.js/lib",
"@npm//@types/shelljs",
"@npm//@types/systemjs",
"@npm//rxjs",
"@npm//shelljs",
"@npm//systemjs",
]
test_entry_point = ":browser_entry_point.ts"
karma_tests = {
"browser_test": ["//packages/zone.js/dist:zone-testing-bundle-dist-dev-test"],
"browser_green_test": [
"//packages/zone.js/dist:zone-evergreen-dist-dev-test",
"//packages/zone.js/dist:zone-testing-dist-dev-test",
] + _karma_test_required_dist_files,
data = [
"//:browser-providers.conf.js",
"//tools:jasmine-seed-generator.js",
],
static_files = [
":assets/sample.json",
":assets/worker.js",
":assets/import.html",
],
tags = ["zone_karma_test"],
runtime_deps = [
"@npm//karma-browserstack-launcher",
],
}
karma_test(
name = "browser_test",
bootstraps = karma_tests,
ci = True,
env_deps = env_deps,
env_entry_point = env_entry_point,
env_srcs = env_srcs,
test_deps = test_deps,
test_entry_point = test_entry_point,
test_srcs = test_srcs,
)
karma_web_test_suite(
name = "karma_jasmine_test_ci",
srcs = [
"fake_entry.js",
karma_test(
name = "browser_shadydom",
bootstraps = {"browser_shadydom": [
"//packages/zone.js/dist:zone-testing-bundle-dist-dev-test",
"//packages/zone.js/dist:webapis-shadydom-dist-dev-test",
]},
ci = False,
env_deps = [
"//packages/zone.js/lib",
],
bootstrap = [
":saucelabs.js",
":browser_test_env_setup_trim_map",
"//packages/zone.js/dist:zone-testing-bundle-dist-test",
] + _karma_test_required_dist_files,
config_file = "//:karma-js.conf.js",
configuration_env_vars = ["KARMA_WEB_TEST_MODE"],
data = [
"//:browser-providers.conf.js",
"//tools:jasmine-seed-generator.js",
env_entry_point = ":browser_shadydom_setup.ts",
env_srcs = ["browser_shadydom_setup.ts"],
test_deps = [
"//packages/zone.js/lib",
],
static_files = [
":assets/sample.json",
":assets/worker.js",
":assets/import.html",
],
tags = ["zone_karma_test"],
# Visible to //:test_web_all target
visibility = ["//:__pkg__"],
runtime_deps = [
"@npm//karma-browserstack-launcher",
test_entry_point = ":browser_shadydom_entry_point.ts",
test_srcs = [
"browser/shadydom.spec.ts",
"browser_shadydom_entry_point.ts",
],
)

36
packages/zone.js/test/browser/shadydom.spec.ts Normal file
View File

@ -0,0 +1,36 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
describe('shadydom', () => {
const div = document.createElement('div');
const text = document.createTextNode('text');
const span = document.createElement('span');
const fragment = document.createDocumentFragment();
document.body.appendChild(div);
document.body.appendChild(text);
document.body.appendChild(span);
document.body.appendChild(fragment);
const targets = [
{name: 'window', target: window}, {name: 'div', target: div}, {name: 'text', target: text},
{name: 'span', target: span}, {name: 'document', target: document},
{name: 'fragment', target: fragment}
];
targets.forEach((t: any) => {
it(`test for prototype ${t.name}`, () => {
const target = t.target;
const zone = Zone.current.fork({name: 'zone'});
const logs: string[] = [];
zone.run(
() => { target.addEventListener('click', () => { logs.push(Zone.current.name); }); });
const event = document.createEvent('MouseEvent');
event.initEvent('click', true, true);
target.dispatchEvent(event);
expect(logs).toEqual(['zone']);
});
});
});

8
packages/zone.js/test/browser_shadydom_entry_point.ts Normal file
View File

@ -0,0 +1,8 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import './browser/shadydom.spec';

25
packages/zone.js/test/browser_shadydom_setup.ts Normal file
View File

@ -0,0 +1,25 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
function initAddEventListeners() {
const HTMLSlotElement = (window as any).HTMLSlotElement;
const prototypes = [
Object.getPrototypeOf(window), Node.prototype, Text.prototype, Element.prototype,
Object.getPrototypeOf(window), HTMLElement.prototype,
HTMLSlotElement && HTMLSlotElement.prototype, DocumentFragment.prototype, Document.prototype
];
prototypes.forEach(proto => {
proto.addEventListener = function(eventName: string, callback: any) {
this.callback = callback;
};
proto.dispatchEvent = function(event: any) {
this.callback && this.callback.call(this, event);
};
});
}
initAddEventListeners();

144
packages/zone.js/test/karma_test.bzl Normal file
View File

@ -0,0 +1,144 @@
load("//tools:defaults.bzl", "ts_library")
load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
load("@npm_bazel_karma//:index.bzl", "karma_web_test_suite")
def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point):
ts_library(
name = name + "_env",
testonly = True,
srcs = env_srcs,
deps = env_deps,
)
rollup_bundle(
name = name + "_env_rollup",
testonly = True,
entry_point = env_entry_point,
deps = [
":" + name + "_env",
],
)
native.filegroup(
name = name + "_env_rollup.es5",
testonly = True,
srcs = [":" + name + "_env_rollup"],
output_group = "umd",
)
native.genrule(
name = name + "_env_trim_map",
testonly = True,
srcs = [
":" + name + "_env_rollup.es5",
],
outs = [
name + "_env_rollup_trim_map.js",
],
cmd = " && ".join([
"cp $(@D)/" + name + "_env_rollup.umd.js $@",
]),
)
ts_library(
name = name + "_test",
testonly = True,
srcs = test_srcs,
deps = test_deps,
)
rollup_bundle(
name = name + "_rollup",
testonly = True,
entry_point = test_entry_point,
globals = {
"electron": "electron",
},
deps = [
":" + name + "_test",
],
)
native.filegroup(
name = name + "_rollup.es5",
testonly = True,
srcs = [":" + name + "_rollup"],
output_group = "umd",
)
native.genrule(
name = name + "_trim_map",
testonly = True,
srcs = [
":" + name + "_rollup.es5",
],
outs = [
name + "_rollup_trim_map.js",
],
cmd = " && ".join([
"cp $(@D)/" + name + "_rollup.umd.js $@",
]),
)
def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point, bootstraps, ci):
first = True
for subname in bootstraps:
bootstrap = bootstraps[subname]
firstFlag = first
if first:
first = False
karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point)
_karma_test_required_dist_files = [
"//packages/zone.js/dist:task-tracking-dist-dev-test",
"//packages/zone.js/dist:wtf-dist-dev-test",
"//packages/zone.js/dist:webapis-notification-dist-dev-test",
"//packages/zone.js/dist:webapis-media-query-dist-dev-test",
"//packages/zone.js/dist:zone-patch-canvas-dist-dev-test",
"//packages/zone.js/dist:zone-patch-fetch-dist-dev-test",
"//packages/zone.js/dist:zone-patch-resize-observer-dist-dev-test",
"//packages/zone.js/dist:zone-patch-user-media-dist-dev-test",
":" + name + "_trim_map",
]
karma_web_test_suite(
name = subname + "_karma_jasmine_test",
srcs = [
"fake_entry.js",
],
bootstrap = [
":" + name + "_env_trim_map",
] + bootstrap +
_karma_test_required_dist_files,
static_files = [
":assets/sample.json",
":assets/worker.js",
":assets/import.html",
],
tags = ["zone_karma_test"],
runtime_deps = [
"@npm//karma-browserstack-launcher",
],
)
if ci and firstFlag:
karma_web_test_suite(
name = "karma_jasmine_test_ci",
srcs = [
"fake_entry.js",
],
bootstrap = [
":saucelabs.js",
":" + name + "_env_trim_map",
"//packages/zone.js/dist:zone-testing-bundle-dist-test",
] + _karma_test_required_dist_files,
config_file = "//:karma-js.conf.js",
configuration_env_vars = ["KARMA_WEB_TEST_MODE"],
data = [
"//:browser-providers.conf.js",
"//tools:jasmine-seed-generator.js",
],
static_files = [
":assets/sample.json",
":assets/worker.js",
":assets/import.html",
],
tags = ["zone_karma_test"],
# Visible to //:test_web_all target
visibility = ["//:__pkg__"],
runtime_deps = [
"@npm//karma-browserstack-launcher",
],
)