Skip to content

Commit 326ba2c

Browse files
authoredMar 14, 2020
Bump deps (#264)
* Bump deps * Add appropriate .skip-*'s * Fix linting * Format test * typo :)
1 parent 0fca577 commit 326ba2c

File tree

22 files changed

+859
-1446
lines changed

22 files changed

+859
-1446
lines changed
 

‎package.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"packages/*"
88
],
99
"resolutions": {
10-
"@polkadot/api": "^1.5.0-beta.28",
11-
"@polkadot/keyring": "^2.6.1",
12-
"@polkadot/types": "^1.5.0-beta.28",
13-
"@polkadot/util": "^2.6.1",
14-
"@polkadot/util-crypto": "^2.6.1",
10+
"@polkadot/api": "^1.7.0-beta.10",
11+
"@polkadot/keyring": "^2.6.2",
12+
"@polkadot/types": "^1.7.0-beta.10",
13+
"@polkadot/util": "^2.6.2",
14+
"@polkadot/util-crypto": "^2.6.2",
1515
"babel-core": "^7.0.0-bridge.0",
1616
"typescript": "^3.8.3"
1717
},
1818
"scripts": {
1919
"build": "NODE_ENV=production polkadot-dev-build-ts",
20-
"build:zip": "(rm -rf ./master-build.zip && yarn build && cd packages/extension/build && zip -r -FS ../../../master-build.zip *) && (rm -rf ./master-src.zip && zip -r -x '*build*' -x '*node_modules*' -FS ./master-src.zip packages .babelrc.js .editorconfig .eslintignore .eslintrc.js babel.config.js CHANGELOG.md CONTRIBUTING.md jest.config.js lerna.json LICENSE package.json README.md tsconfig.json yarn.lock)",
20+
"build:zip": "(rm -rf ./master-build.zip && yarn build && cd packages/extension/build && zip -r -FS ../../../master-build.zip . -i *) && (rm -rf ./master-src.zip && zip -r -x '*build*' -x '*node_modules*' -FS ./master-src.zip packages .babelrc.js .editorconfig .eslintignore .eslintrc.js babel.config.js CHANGELOG.md CONTRIBUTING.md jest.config.js lerna.json LICENSE package.json README.md tsconfig.json yarn.lock)",
2121
"lint": "polkadot-dev-run-lint",
2222
"clean": "polkadot-dev-clean-build",
2323
"postinstall": "polkadot-dev-yarn-only",
@@ -26,9 +26,11 @@
2626
"watch": "cd packages/extension && webpack --config webpack.config.js --watch"
2727
},
2828
"devDependencies": {
29-
"@babel/core": "^7.8.6",
30-
"@polkadot/dev": "^0.50.16",
31-
"@polkadot/ts": "^0.3.6",
32-
"sinon-chrome": "^3.0.1"
29+
"@babel/core": "^7.8.7",
30+
"@polkadot/dev": "^0.50.31",
31+
"@polkadot/ts": "^0.3.8",
32+
"copy-webpack-plugin": "^5.1.1",
33+
"sinon-chrome": "^3.0.1",
34+
"url-loader": "^3.0.0"
3335
}
3436
}

‎packages/extension-chains/.skip-build

Whitespace-only changes.

‎packages/extension-chains/.skip-npm

Whitespace-only changes.

‎packages/extension-chains/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Jaco Greeff <jacogr@gmail.com>",
66
"license": "Apache-2",
77
"dependencies": {
8-
"@babel/runtime": "^7.8.4",
8+
"@babel/runtime": "^7.8.7",
99
"edgeware-node-types": "^1.2.0"
1010
},
1111
"peerDependencies": {

‎packages/extension-chains/src/edgeware-node-types/identity.ts

-90
This file was deleted.

‎packages/extension-chains/src/edgeware-node-types/index.ts

-11
This file was deleted.

‎packages/extension-chains/src/edgeware-node-types/signaling.ts

-54
This file was deleted.

‎packages/extension-chains/src/edgeware-node-types/treasuryReward.ts

-7
This file was deleted.

‎packages/extension-chains/src/edgeware-node-types/voting.ts

-134
This file was deleted.

‎packages/extension-chains/src/edgeware.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
// Generated via (in api) `yarn chain:info --ws wss://mainnet1.edgewa.re`
66

7-
// import { EdgewareTypes } from 'edgeware-node-types/dist';
8-
import { EdgewareTypes } from './edgeware-node-types';
7+
import { EdgewareTypes } from 'edgeware-node-types/dist';
98

109
export default {
1110
chain: 'Edgeware',

‎packages/extension-dapp/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Jaco Greeff <jacogr@gmail.com>",
66
"license": "Apache-2",
77
"dependencies": {
8-
"@babel/runtime": "^7.8.4",
8+
"@babel/runtime": "^7.8.7",
99
"@polkadot/extension-inject": "0.22.1"
1010
},
1111
"peerDependencies": {

‎packages/extension-inject/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"author": "Jaco Greeff <jacogr@gmail.com>",
66
"license": "Apache-2",
77
"dependencies": {
8-
"@babel/runtime": "^7.8.4"
8+
"@babel/runtime": "^7.8.7"
99
},
1010
"peerDependencies": {
1111
"@polkadot/api": "*"

‎packages/extension-inject/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import { Injected, InjectedWindow, InjectOptions } from './types';
66

7-
// It is recomemender to always use the function below to shield the extension and dapp from
7+
// It is recommended to always use the function below to shield the extension and dapp from
88
// any future changes. The exposed interface will manage access between the 2 environments,
99
// be it via window (current), postMessage (under consideration) or any other mechanism
1010
export function injectExtension (enable: (origin: string) => Promise<Injected>, { name, version }: InjectOptions): void {

‎packages/extension-ui/.skip-build

Whitespace-only changes.

‎packages/extension-ui/.skip-npm

Whitespace-only changes.

‎packages/extension-ui/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"author": "Jaco Greeff <jacogr@gmail.com>",
66
"license": "Apache-2",
77
"dependencies": {
8-
"@babel/runtime": "^7.8.4",
9-
"@polkadot/keyring": "^2.6.1",
10-
"@polkadot/react-identicon": "^0.52.0-beta.5",
11-
"@polkadot/react-qr": "^0.52.0-beta.5",
12-
"@polkadot/util": "^2.6.1",
13-
"@polkadot/util-crypto": "^2.6.1",
14-
"react": "^16.12.0",
15-
"react-dom": "^16.12.0",
16-
"react-is": "^16.12.0",
8+
"@babel/runtime": "^7.8.7",
9+
"@polkadot/keyring": "^2.6.2",
10+
"@polkadot/react-identicon": "^0.52.0-beta.7",
11+
"@polkadot/react-qr": "^0.52.0-beta.7",
12+
"@polkadot/util": "^2.6.2",
13+
"@polkadot/util-crypto": "^2.6.2",
14+
"react": "^16.13.0",
15+
"react-dom": "^16.13.0",
16+
"react-is": "^16.13.0",
1717
"react-router": "^5.1.2",
1818
"react-router-dom": "^5.1.2",
1919
"styled-components": "^5.0.1"

‎packages/extension-ui/src/messaging.test.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,23 @@
55
import Adapter from 'enzyme-adapter-react-16';
66
import { configure } from 'enzyme';
77
import extensionizer from 'extensionizer';
8+
89
import { exportAccount } from './messaging';
910

1011
configure({ adapter: new Adapter() });
1112

1213
describe('messaging sends message to background via extension port for', () => {
1314
test('exportAccount', () => {
1415
const callback = jest.fn();
15-
extensionizer.runtime.connect().onMessage.addListener(callback);
1616

17+
extensionizer.runtime.connect().onMessage.addListener(callback);
1718
exportAccount('HjoBp62cvsWDA3vtNMWxz6c9q13ReEHi9UGHK7JbZweH5g5', 'passw0rd');
1819

19-
expect(callback).toHaveBeenCalledWith(expect.objectContaining({
20-
message: 'pri(accounts.export)',
21-
request: { address: 'HjoBp62cvsWDA3vtNMWxz6c9q13ReEHi9UGHK7JbZweH5g5', password: 'passw0rd' }
22-
}));
20+
expect(callback).toHaveBeenCalledWith(
21+
expect.objectContaining({
22+
message: 'pri(accounts.export)',
23+
request: { address: 'HjoBp62cvsWDA3vtNMWxz6c9q13ReEHi9UGHK7JbZweH5g5', password: 'passw0rd' }
24+
})
25+
);
2326
});
2427
});

‎packages/extension/.skip-npm

Whitespace-only changes.

‎packages/extension/package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
"author": "Jaco Greeff <jacogr@gmail.com>",
66
"license": "Apache-2",
77
"dependencies": {
8-
"@polkadot/api": "^1.5.0-beta.28",
8+
"@polkadot/api": "^1.7.0-beta.10",
99
"@polkadot/extension-ui": "0.22.1",
10-
"@polkadot/keyring": "^2.6.1",
11-
"@polkadot/ui-keyring": "^0.52.0-beta.5",
10+
"@polkadot/keyring": "^2.6.2",
11+
"@polkadot/ui-keyring": "^0.52.0-beta.7",
1212
"extensionizer": "^1.0.1"
1313
},
1414
"devDependencies": {
15-
"@babel/runtime": "^7.8.4",
16-
"@types/chrome": "^0.0.98",
15+
"@babel/runtime": "^7.8.7",
16+
"@polkadot/dev": "^0.50.31",
17+
"@types/chrome": "^0.0.100",
1718
"@types/firefox-webext-browser": "^70.0.1",
1819
"babel-loader": "^8.0.6",
1920
"extract-loader": "^4.0.3",

‎packages/extension/src/background/handlers/Extension.test.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
// Copyright 2019-2020 @polkadot/extension authors & contributors
2+
// This software may be modified and distributed under the terms
3+
// of the Apache-2.0 license. See the LICENSE file for details.
4+
5+
import { ResponseAccountExport } from '@polkadot/extension/background/types';
6+
17
import Extension from '@polkadot/extension/background/handlers/Extension';
2-
import keyring from '@polkadot/ui-keyring';
3-
import { cryptoWaitReady } from '@polkadot/util-crypto';
48
import State from '@polkadot/extension/background/handlers/State';
5-
import { ResponseAccountExport } from '@polkadot/extension/background/types';
9+
import keyring from '@polkadot/ui-keyring';
610
import ExtensionStore from '@polkadot/ui-keyring/stores/Extension';
11+
import { cryptoWaitReady } from '@polkadot/util-crypto';
712

813
describe('Extension', () => {
914
async function createExtension (): Promise<Extension> {

‎packages/extension/src/background/handlers/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default function handler<TMessageType extends MessageTypes> ({ id, messag
3535

3636
// between the start and the end of the promise, the user may have closed
3737
// the tab, in which case port will be undefined
38-
assert(port, `Port has been disconnected`);
38+
assert(port, 'Port has been disconnected');
3939

4040
port.postMessage({ id, response });
4141
})

‎yarn.lock

+810-1,111
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.