Bump deps (#521)

* Bump deps

* linting

* React 17 support for enzyme
This commit is contained in:
Jaco Greeff 2020-10-23 14:12:11 +02:00 committed by GitHub
parent 8f5bb7e1ef
commit 60fa6d2c33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 744 additions and 688 deletions

View File

@ -8,15 +8,15 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^2.3.1",
"@polkadot/api": "^2.3.2-12",
"@polkadot/keyring": "^3.6.1",
"@polkadot/networks": "^3.6.1",
"@polkadot/types": "^2.3.1",
"@polkadot/types": "^2.3.2-12",
"@polkadot/util": "^3.6.1",
"@polkadot/util-crypto": "^3.6.1",
"babel-core": "^7.0.0-bridge.0",
"safe-buffer": "^5.2.1",
"typescript": "^4.0.2"
"typescript": "^4.0.3"
},
"scripts": {
"build": "yarn build:i18n && yarn build:code && yarn build:zip",
@ -36,9 +36,10 @@
},
"devDependencies": {
"@babel/core": "^7.12.3",
"@polkadot/dev": "^0.58.3",
"@types/jest": "^26.0.14",
"@polkadot/dev": "^0.59.3",
"@types/jest": "^26.0.15",
"babel-loader": "^8.1.0",
"browser-resolve": "^2.0.0",
"copy-webpack-plugin": "^6.2.1",
"extract-loader": "^5.1.0",
"file-loader": "^6.1.1",

View File

@ -6,9 +6,9 @@
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.12.1",
"@polkadot/api": "^2.3.1",
"@polkadot/api": "^2.3.2-12",
"@polkadot/extension-inject": "0.35.0-beta.32",
"@polkadot/keyring": "^3.6.1",
"@polkadot/ui-keyring": "^0.60.2-3"
"@polkadot/ui-keyring": "^0.61.2-1"
}
}

View File

@ -13,16 +13,16 @@
"@polkadot/extension-base": "0.35.0-beta.32",
"@polkadot/extension-inject": "0.35.0-beta.32",
"@polkadot/keyring": "^3.6.1",
"@polkadot/react-identicon": "^0.60.2-3",
"@polkadot/react-qr": "^0.60.2-3",
"@polkadot/react-identicon": "^0.61.2-1",
"@polkadot/react-qr": "^0.61.2-1",
"@polkadot/util": "^3.6.1",
"@polkadot/util-crypto": "^3.6.1",
"i18next": "^19.8.2",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-dropzone": "^11.2.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-dropzone": "^11.2.1",
"react-i18next": "^11.7.3",
"react-is": "^16.13.1",
"react-is": "^17.0.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"styled-components": "^5.2.0"
@ -37,6 +37,7 @@
"@types/react-router-dom": "^5.1.6",
"@types/sinon-chrome": "^2.2.10",
"@types/styled-components": "^5.1.4",
"@wojtekmaj/enzyme-adapter-react-17": "^0.1.1",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",
"sinon-chrome": "^3.0.1"

View File

@ -3,7 +3,7 @@
import '../../../../../__mocks__/chrome';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure, mount, ReactWrapper } from 'enzyme';
import { MemoryRouter } from 'react-router';
import React from 'react';
@ -12,6 +12,7 @@ import { ThemeProvider } from 'styled-components';
import { themes, Theme } from '../../components';
import Account from './Account';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('Account component', () => {

View File

@ -6,7 +6,7 @@ import '../../../../../__mocks__/chrome';
import { AuthorizeRequest } from '@polkadot/extension-base/background/types';
import { configure, mount, ReactWrapper } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import React from 'react';
import { ThemeProvider } from 'styled-components';
@ -15,6 +15,7 @@ import { Header } from '../../partials';
import Authorize from '.';
import Request from './Request';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('Authorize', () => {

View File

@ -4,7 +4,7 @@
import '../../../../../__mocks__/chrome';
import { configure, mount, ReactWrapper } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import React from 'react';
import { act } from 'react-dom/test-utils';
import { ThemeProvider } from 'styled-components';
@ -15,6 +15,7 @@ import { Header } from '../../partials';
import { flushAllPromises } from '../../testHelpers';
import CreateAccount from '.';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('Create Account', () => {

View File

@ -6,7 +6,7 @@ import '../../../../../__mocks__/chrome';
import React from 'react';
import { MemoryRouter, Route } from 'react-router';
import { configure, mount, ReactWrapper } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { act } from 'react-dom/test-utils';
import { ThemeProvider } from 'styled-components';
@ -17,6 +17,7 @@ import { flushAllPromises } from '../../testHelpers';
import AddressDropdown from './AddressDropdown';
import Derive from '.';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
const accounts = [

View File

@ -4,7 +4,7 @@
import '../../../../__mocks__/chrome';
import { act } from 'react-dom/test-utils';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure, mount, ReactWrapper } from 'enzyme';
import { MemoryRouter, Route } from 'react-router';
import React from 'react';
@ -15,6 +15,7 @@ import Export from './Export';
import * as messaging from '../messaging';
import { flushAllPromises } from '../testHelpers';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('Export component', () => {

View File

@ -182,7 +182,8 @@ export default function Request ({ account: { isExternal }, buttonText, isFirst,
payload={payload}
request={json}
/>
) : (
)
: (
<Extrinsic
isDecoded={true}
payload={payload}

View File

@ -5,7 +5,7 @@ import '../../../../../__mocks__/chrome';
import { SigningRequest } from '@polkadot/extension-base/background/types';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure, mount, ReactWrapper } from 'enzyme';
import { EventEmitter } from 'events';
import React, { useState } from 'react';
@ -21,6 +21,7 @@ import Extrinsic from './Extrinsic';
import Qr from './Qr';
import Signing from '.';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe.skip('Signing requests', () => {

10
packages/extension-ui/src/adapter.d.ts vendored Normal file
View File

@ -0,0 +1,10 @@
// Copyright 2019-2020 @polkadot/extension-ui authors & contributors
// SPDX-License-Identifier: Apache-2.0
// import { EnzymeAdapter } from 'enzyme';
// declare module '@wojtekmaj/enzyme-adapter-react-17' {
// export = EnzymeAdapter;
// }
declare module '@wojtekmaj/enzyme-adapter-react-17';

View File

@ -3,12 +3,13 @@
import '../../../__mocks__/chrome';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure } from 'enzyme';
import chrome from '@polkadot/extension-inject/chrome';
import { exportAccount } from './messaging';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('messaging sends message to background via extension port for', () => {

View File

@ -3,7 +3,7 @@
import '../../../../__mocks__/chrome';
import Adapter from 'enzyme-adapter-react-16';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { configure, mount, ReactWrapper } from 'enzyme';
import React from 'react';
import { MemoryRouter } from 'react-router';
@ -13,6 +13,7 @@ import { themes } from '../components';
import Header from './Header';
import Settings from './MenuSettings';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe('Header component', () => {

View File

@ -12,6 +12,6 @@
"@polkadot/phishing": "^0.1.9"
},
"devDependencies": {
"@polkadot/dev": "^0.58.3"
"@polkadot/dev": "^0.59.3"
}
}

1365
yarn.lock

File diff suppressed because it is too large Load Diff