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

Update/bump libraries #42561

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,4 +1,4 @@
document.addEventListener( 'DOMContentLoaded', function(){
document.addEventListener( 'DOMContentLoaded', function () {
let premiumContentJWTToken = '';

/**
Expand Down Expand Up @@ -44,6 +44,6 @@ document.addEventListener( 'DOMContentLoaded', function(){
}

if ( typeof window !== 'undefined' ) {
window.addEventListener('message', handleIframeResult, false);
window.addEventListener( 'message', handleIframeResult, false );
}
} );
} );
2 changes: 1 addition & 1 deletion client/lib/media/test/actions.js
Expand Up @@ -38,7 +38,7 @@ jest.mock( 'lib/impure-lodash', () => ( {
return false;
}

return require.requireActual( 'lodash' ).isPlainObject( obj );
return jest.requireActual( 'lodash' ).isPlainObject( obj );
},
uniqueId: () => 'media-1',
} ) );
Expand Down
10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -249,7 +249,7 @@
"@wordpress/viewport": "^2.17.0",
"acorn": "^7.0.0",
"babel-eslint": "^10.0.3",
"babel-jest": "^25.1.0",
"babel-jest": "^26.0.0",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-plugin-dynamic-import-node": "^2.3.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
Expand All @@ -271,7 +271,7 @@
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.1",
"enzyme-to-json": "^3.4.3",
"eslint": "^6.8.0",
"eslint": "^7.0.0",
"eslint-config-prettier": "^6.9.0",
"eslint-config-wpcalypso": "^5.0.0",
"eslint-plugin-import": "^2.20.0",
Expand All @@ -297,8 +297,8 @@
"imports-loader": "^0.8.0",
"interpolate-components": "^1.1.1",
"is-number": "^7.0.0",
"jest": "^25.1.0",
"jest-docblock": "^25.1.0",
"jest": "^26.0.0",
"jest-docblock": "^26.0.0",
"jest-emotion": "^10.0.27",
"jest-enzyme": "^7.1.2",
"jest-fetch-mock": "^2.1.2",
Expand All @@ -322,7 +322,7 @@
"npm-run-all": "^4.1.5",
"photon": "^3.0.0",
"postcss-cli": "^6.1.3",
"prettier": "npm:wp-prettier@2.0.5-beta-1",
"prettier": "npm:wp-prettier@2.0.5-beta-2",
"qs": "^6.9.1",
"react": "^16.12.0",
"react-docgen-typescript-loader": "^3.6.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/calypso-build/package.json
Expand Up @@ -48,7 +48,7 @@
"@wordpress/browserslist-config": "^2.6.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.4.0",
"autoprefixer": "^9.7.3",
"babel-jest": "^25.1.0",
"babel-jest": "^26.0.0",
"babel-loader": "^8.0.6",
"browserslist": "^4.8.2",
"caniuse-api": "^3.0.0",
Expand All @@ -57,7 +57,7 @@
"enzyme-adapter-react-16": "^1.15.1",
"enzyme-to-json": "^3.4.3",
"file-loader": "^4.3.0",
"jest-config": "^25.1.0",
"jest-config": "^26.0.0",
"jest-emotion": "^10.0.27",
"jest-enzyme": "^7.1.2",
"node-sass": "^4.13.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-codemods/setup-tests.js
@@ -1,6 +1,6 @@
const fs = require( 'fs' );
const path = require( 'path' );
const api = require.requireActual( './api' );
const api = jest.requireActual( './api' );

function test_folder( dir ) {
const testFiles = fs
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-wpcalypso/package.json
Expand Up @@ -24,7 +24,7 @@
"directory": "packages/eslint-config-wpcalypso"
},
"peerDependencies": {
"eslint": "^6.0.0",
"eslint": "^7.0.0",
"eslint-plugin-jsdoc": "^18.0.0",
"eslint-plugin-wpcalypso": "^3.4.1 || ^4.0.0"
},
Expand Down
18 changes: 9 additions & 9 deletions test/client/setup-test-framework.js
Expand Up @@ -26,24 +26,24 @@ afterAll( () => {
let mockEnzymeSetup = false;

jest.mock( 'enzyme', () => {
const actualEnzyme = require.requireActual( 'enzyme' );
const actualEnzyme = jest.requireActual( 'enzyme' );
if ( ! mockEnzymeSetup ) {
mockEnzymeSetup = true;

// configure custom enzyme matchers for chai
const chai = require.requireActual( 'chai' );
const chaiEnzyme = require.requireActual( 'chai-enzyme' );
const chai = jest.requireActual( 'chai' );
const chaiEnzyme = jest.requireActual( 'chai-enzyme' );
chai.use( chaiEnzyme() );

// configure custom Enzyme matchers for Jest
require.requireActual( 'jest-enzyme' );
jest.requireActual( 'jest-enzyme' );

// configure enzyme 3 for React, from docs: http://airbnb.io/enzyme/docs/installation/index.html
const Adapter = require.requireActual( 'enzyme-adapter-react-16' );
const Adapter = jest.requireActual( 'enzyme-adapter-react-16' );
actualEnzyme.configure( { adapter: new Adapter() } );

// configure snapshot serializer for enzyme
const { createSerializer } = require.requireActual( 'enzyme-to-json' );
const { createSerializer } = jest.requireActual( 'enzyme-to-json' );
expect.addSnapshotSerializer( createSerializer( { mode: 'deep' } ) );
}
return actualEnzyme;
Expand All @@ -54,13 +54,13 @@ jest.mock( 'enzyme', () => {
let mockSinonSetup = false;

jest.mock( 'sinon', () => {
const actualSinon = require.requireActual( 'sinon' );
const actualSinon = jest.requireActual( 'sinon' );
if ( ! mockSinonSetup ) {
mockSinonSetup = true;

// configure custom sinon matchers for chai
const chai = require.requireActual( 'chai' );
const sinonChai = require.requireActual( 'sinon-chai' );
const chai = jest.requireActual( 'chai' );
const sinonChai = jest.requireActual( 'sinon-chai' );
chai.use( sinonChai );
actualSinon.assert.expose( chai.assert, { prefix: '' } );
}
Expand Down