Skip to content

Commit

Permalink
build: remove unnecessary polyfills from tests (angular#42567)
Browse files Browse the repository at this point in the history 
Removes the polyfills for `MutationObserver` and `setPrototypeOf` from our testing setup, because none of the browsers that we support require them. It also removes a bit of code and one external dependency.

PR Close angular#42567
  • Loading branch information
@crisbeto @alxhub
crisbeto authored and alxhub committed Jun 14, 2021
1 parent 4001e9d commit a66dd88
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 82 deletions.
1 change: 0 additions & 1 deletion karma-js.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ module.exports = function(config) {
included: false,
watched: false
},
{pattern: 'node_modules/mutation-observer/index.js', included: false, watched: false},

{pattern: 'node_modules/rxjs/**', included: false, watched: false, served: true},
'node_modules/reflect-metadata/Reflect.js',
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
"karma-sauce-launcher": "^2.0.2",
"madge": "^4.0.2",
"multimatch": "^5.0.0",
"mutation-observer": "^1.0.3",
"nock": "^13.0.3",
"ora": "^5.0.0",
"prettier": "^2.3.0",
Expand Down
107 changes: 32 additions & 75 deletions test-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,42 +134,6 @@ Promise


function loadCustomElementsPolyfills() {
var loadedPromise = Promise.resolve();

// The custom elements polyfill relies on `MutationObserver`.
if (!window.MutationObserver) {
loadedPromise = loadedPromise
.then(function() {
return System.import('node_modules/mutation-observer/index.js');
})
.then(function(MutationObserver) {
window.MutationObserver = MutationObserver;
});
}

// The custom elements polyfill relies on `Object.setPrototypeOf()`.
if (!Object.setPrototypeOf) {
var getDescriptor = function getDescriptor(obj, prop) {
var descriptor;
while (obj && !descriptor) {
descriptor = Object.getOwnPropertyDescriptor(obj, prop);
obj = Object.getPrototypeOf(obj);
}
return descriptor || {};
};
var setPrototypeOf = function setPrototypeOf(obj, proto) {
for (var prop in proto) {
if (!obj.hasOwnProperty(prop)) {
Object.defineProperty(obj, prop, getDescriptor(proto, prop));
}
}
return obj;
};

Object.defineProperty(setPrototypeOf, '$$shimmed', {value: true});
Object.setPrototypeOf = setPrototypeOf;
}

// The custom elements polyfill will patch properties and methods on `(HTML)Element` and `Node`
// (among others), including `(HTML)Element#innerHTML` and `Node#removeChild()`:
// https://github.com/webcomponents/custom-elements/blob/4f7072c0dbda4beb505d16967acfffd33337b325/src/Patch/Element.js#L28-L73
Expand Down Expand Up @@ -209,46 +173,39 @@ function loadCustomElementsPolyfills() {
// Allow ES5 functions as custom element constructors.
'node_modules/@webcomponents/custom-elements/src/native-shim.js';

loadedPromise = loadedPromise
.then(function() {
return System.import(polyfillPath);
})
.then(function() {
// `packages/compiler/test/schema/schema_extractor.ts` relies on
// `HTMLElement.name`, but custom element polyfills will replace
// `HTMLElement` with an anonymous function.
Object.defineProperty(HTMLElement, 'name', {value: 'HTMLElement'});
return System.import(polyfillPath).then(function() {
// `packages/compiler/test/schema/schema_extractor.ts` relies on
// `HTMLElement.name`, but custom element polyfills will replace
// `HTMLElement` with an anonymous function.
Object.defineProperty(HTMLElement, 'name', {value: 'HTMLElement'});

// Create helper functions on `window` for patching/restoring
// properties/methods.
Object.keys(patchConfig).forEach(function(prop) {
var patchMethod = '$$patch_' + prop;
var restoreMethod = '$$restore_' + prop;

if (!patchTargets[prop]) {
// No patching detected. Create no-op functions.
window[patchMethod] = window[restoreMethod] = function() {};
} else {
var patchTarget = patchTargets[prop];
var originalDescriptor = originalDescriptors[prop];
var patchedDescriptor =
Object.getOwnPropertyDescriptor(patchTarget, prop);

window[patchMethod] = function() {
Object.defineProperty(patchTarget, prop, patchedDescriptor);
};
window[restoreMethod] = function() {
Object.defineProperty(patchTarget, prop, originalDescriptor);
};

// Restore `prop`. The patch will be manually applied only during the
// `@angular/elements` tests that need it.
window[restoreMethod]();
}
});
});

return loadedPromise;
// Create helper functions on `window` for patching/restoring
// properties/methods.
Object.keys(patchConfig).forEach(function(prop) {
var patchMethod = '$$patch_' + prop;
var restoreMethod = '$$restore_' + prop;

if (!patchTargets[prop]) {
// No patching detected. Create no-op functions.
window[patchMethod] = window[restoreMethod] = function() {};
} else {
var patchTarget = patchTargets[prop];
var originalDescriptor = originalDescriptors[prop];
var patchedDescriptor = Object.getOwnPropertyDescriptor(patchTarget, prop);

window[patchMethod] = function() {
Object.defineProperty(patchTarget, prop, patchedDescriptor);
};
window[restoreMethod] = function() {
Object.defineProperty(patchTarget, prop, originalDescriptor);
};

// Restore `prop`. The patch will be manually applied only during the
// `@angular/elements` tests that need it.
window[restoreMethod]();
}
});
});
}

function onlySpecFiles(path) {
Expand Down
5 changes: 0 additions & 5 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9178,11 +9178,6 @@ multimatch@*, multimatch@^5.0.0:
arrify "^2.0.1"
minimatch "^3.0.4"

mutation-observer@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==

mute-stdout@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
Expand Down

0 comments on commit a66dd88

Please sign in to comment.