Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport changes from upstream #2

Merged
merged 1 commit into from
Oct 6, 2017
Merged

Backport changes from upstream #2

merged 1 commit into from
Oct 6, 2017

Conversation

taion
Copy link
Contributor

@taion taion commented Oct 2, 2017

Closes #1

@@ -1,37 +0,0 @@
/**
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not relevant since we aren't running tests here.

const mock = require('jest-mock');
const {FakeTimers, installCommonGlobals} = require('jest-util');
const { JSDOM } = require('jsdom');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upstream hoisted these


this.document = new JSDOM(/* markup */ undefined, {
this.document = new JSDOM('<!DOCTYPE html>', {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from upstream

@@ -24,11 +23,21 @@ class JSDOMEnvironment {
global.Error.stackTraceLimit = 100;
installCommonGlobals(global, config.globals);

if (!global.requestAnimationFrame) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the fix to #1

* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
* This source code is licensed under the MIT license found in the
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upstream was relicensed

@taion
Copy link
Contributor Author

taion commented Oct 2, 2017

Let me know what you think. Technically this package is more like jest-environment-jsdom-11 than jest-environment-jsdom-11.0.0 per se, so if you don't want to maintain this, I can fork.

@stefan-koch-micro stefan-koch-micro merged commit fd91d6e into Micromeritics:master Oct 6, 2017
@taion taion deleted the backport branch December 13, 2017 19:00
@taion
Copy link
Contributor Author

taion commented Dec 13, 2017

Any chance of cutting a release here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants