From 4021972d27ebbb731a571f9e01c301fc104217eb Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 18 Oct 2020 08:52:31 +0200 Subject: [PATCH] Bump deps (#3892) * Bump deps * Fix laminar --- package.json | 36 +- packages/apps-config/package.json | 6 +- .../apps-config/src/api/bundle/spec/acala.ts | 3 +- .../apps-config/src/api/bundle/spec/index.ts | 4 +- .../src/api/bundle/spec/laminar.ts | 8 + packages/apps-config/src/api/spec/index.ts | 2 - packages/apps-config/src/api/spec/laminar.ts | 10 - packages/apps-electron/package.json | 14 +- packages/apps-routing/package.json | 2 +- packages/apps/package.json | 20 +- .../apps/public/locales/en/app-contracts.json | 2 + packages/page-accounts/package.json | 8 +- packages/page-addresses/package.json | 8 +- packages/page-calendar/package.json | 2 +- packages/page-claims/package.json | 2 +- packages/page-contracts/package.json | 4 +- packages/page-contracts/src/Ink3Banner.tsx | 4 +- packages/page-council/package.json | 2 +- packages/page-democracy/package.json | 2 +- packages/page-explorer/package.json | 2 +- packages/page-extrinsics/package.json | 2 +- packages/page-generic-asset/package.json | 2 +- packages/page-js/package.json | 2 +- packages/page-parachains/package.json | 2 +- packages/page-poll/package.json | 2 +- packages/page-rpc/package.json | 2 +- packages/page-settings/package.json | 4 +- packages/page-signing/package.json | 2 +- packages/page-society/package.json | 2 +- packages/page-staking/package.json | 2 +- packages/page-storage/package.json | 2 +- packages/page-sudo/package.json | 2 +- packages/page-tech-comm/package.json | 2 +- packages/page-treasury/package.json | 2 +- packages/react-api/package.json | 6 +- packages/react-components/package.json | 18 +- packages/react-hooks/package.json | 2 +- packages/react-params/package.json | 2 +- packages/react-query/package.json | 2 +- packages/react-signer/package.json | 2 +- yarn.lock | 2601 ++++++++--------- 41 files changed, 1391 insertions(+), 1413 deletions(-) create mode 100644 packages/apps-config/src/api/bundle/spec/laminar.ts delete mode 100644 packages/apps-config/src/api/spec/laminar.ts diff --git a/package.json b/package.json index 4b21fe6543..c4bb8c3301 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,13 @@ "afterSign": "electron-builder-notarize" }, "resolutions": { - "@polkadot/api": "^2.2.2-10", - "@polkadot/api-contract": "^2.2.2-10", - "@polkadot/keyring": "^3.6.0-beta.15", - "@polkadot/networks": "^3.6.0-beta.15", - "@polkadot/types": "^2.2.2-10", - "@polkadot/util": "^3.6.0-beta.15", - "@polkadot/util-crypto": "^3.6.0-beta.15", + "@polkadot/api": "^2.2.2-11", + "@polkadot/api-contract": "^2.2.2-11", + "@polkadot/keyring": "^3.6.0-beta.16", + "@polkadot/networks": "^3.6.0-beta.16", + "@polkadot/types": "^2.2.2-11", + "@polkadot/util": "^3.6.0-beta.16", + "@polkadot/util-crypto": "^3.6.0-beta.16", "@polkadot/wasm-crypto": "^1.4.1", "babel-core": "^7.0.0-bridge.0", "typescript": "^4.0.3" @@ -81,11 +81,11 @@ "start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'" }, "devDependencies": { - "@babel/core": "^7.11.6", - "@babel/register": "^7.11.5", - "@babel/runtime": "^7.11.2", + "@babel/core": "^7.12.3", + "@babel/register": "^7.12.1", + "@babel/runtime": "^7.12.1", "@pinata/sdk": "^1.1.11", - "@polkadot/dev": "^0.58.2", + "@polkadot/dev": "^0.58.3", "@polkadot/ts": "^0.3.49", "@types/bn.js": "^4.11.6", "@types/chart.js": "^2.9.25", @@ -94,27 +94,27 @@ "@types/react-beautiful-dnd": "^13.0.0", "@types/react-copy-to-clipboard": "^4.3.0", "@types/react-dom": "^16.9.8", - "@types/react-router-dom": "^5.1.5", + "@types/react-router-dom": "^5.1.6", "@types/store": "^2.0.2", - "@types/styled-components": "^5.1.3", + "@types/styled-components": "^5.1.4", "@types/styled-theming": "^2.2.5", "concurrently": "^5.3.0", "devtron": "^1.4.0", "dnslink-cloudflare": "^3.0.0", - "electron": "^9.3.1", + "electron": "^9.3.2", "electron-builder": "^22.9.1", "electron-builder-notarize": "^1.2.0", "i18next-scanner": "^2.11.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "^16.14.0", + "react-dom": "^16.14.0", "source-map-explorer": "^2.5.0", "stylelint": "^13.7.2", "stylelint-config-recommended": "^3.0.0", "stylelint-config-styled-components": "^0.1.1", - "terser-webpack-plugin": "^4.2.2", + "terser-webpack-plugin": "^4.2.3", "webpack": "^4.44.2", "webpack-cli": "^3.3.12", - "webpack-merge": "^5.1.4", + "webpack-merge": "^5.2.0", "webpack-plugin-serve": "^1.1.0" } } diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index b09ce51ee1..342f63765d 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -12,10 +12,10 @@ "license": "Apache-2.0", "dependencies": { "@acala-network/type-definitions": "^0.4.0-beta.13", - "@babel/runtime": "^7.11.2", - "@edgeware/node-types": "^3.0.4", + "@babel/runtime": "^7.12.1", + "@edgeware/node-types": "^3.0.7", "@laminar/type-definitions": "^0.2.0-beta.141", - "@polkadot/networks": "^3.6.0-beta.15", + "@polkadot/networks": "^3.6.0-beta.16", "@subsocial/types": "^0.4.6" } } diff --git a/packages/apps-config/src/api/bundle/spec/acala.ts b/packages/apps-config/src/api/bundle/spec/acala.ts index c986f58e19..26cfaf6956 100644 --- a/packages/apps-config/src/api/bundle/spec/acala.ts +++ b/packages/apps-config/src/api/bundle/spec/acala.ts @@ -1,7 +1,8 @@ // Copyright 2017-2020 @polkadot/apps-config authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { typesBundleForPolkadot } from '@acala-network/type-definitions'; import { OverrideBundleDefinition } from '@polkadot/types/types'; +import { typesBundleForPolkadot } from '@acala-network/type-definitions'; + export default typesBundleForPolkadot.spec.acala as OverrideBundleDefinition; diff --git a/packages/apps-config/src/api/bundle/spec/index.ts b/packages/apps-config/src/api/bundle/spec/index.ts index 76de63f1ff..9d8261e1e0 100644 --- a/packages/apps-config/src/api/bundle/spec/index.ts +++ b/packages/apps-config/src/api/bundle/spec/index.ts @@ -2,7 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import acala from './acala'; +import laminar from './laminar'; export default { - acala + acala, + laminar }; diff --git a/packages/apps-config/src/api/bundle/spec/laminar.ts b/packages/apps-config/src/api/bundle/spec/laminar.ts new file mode 100644 index 0000000000..d20b6e01ca --- /dev/null +++ b/packages/apps-config/src/api/bundle/spec/laminar.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2020 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { OverrideBundleDefinition } from '@polkadot/types/types'; + +import { typesBundleForPolkadot } from '@laminar/type-definitions'; + +export default typesBundleForPolkadot.spec.acala as OverrideBundleDefinition; diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 906e4d2382..b4ea9d8a84 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -14,7 +14,6 @@ import encointerNodeTeeproxy from './encointer-node-teeproxy'; import equilibrium from './equilibrium'; import kilt from './kilt'; import kulupu from './kulupu'; -import laminar from './laminar'; import nodeTemplate from './node-template'; import nodle from './nodle'; import plasm from './plasm'; @@ -40,7 +39,6 @@ export default { 'encointer-node-notee': encointerNodeNotee, 'encointer-node-teeproxy': encointerNodeTeeproxy, kulupu, - laminar, 'mashnet-node': kilt, 'node-template': nodeTemplate, 'nodle-chain': nodle, diff --git a/packages/apps-config/src/api/spec/laminar.ts b/packages/apps-config/src/api/spec/laminar.ts deleted file mode 100644 index 03ebe87fe7..0000000000 --- a/packages/apps-config/src/api/spec/laminar.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017-2020 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import * as laminarDefinitions from '@laminar/type-definitions'; - -import { typesFromDefs } from '../util'; - -const lamiTypes = typesFromDefs(laminarDefinitions); - -export default lamiTypes; diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 6e9d4852bf..f7135202e3 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -4,22 +4,22 @@ "private": true, "version": "0.62.2-21", "dependencies": { - "@babel/core": "^7.11.6", - "@babel/polyfill": "^7.11.5", - "@polkadot/dev": "^0.58.2", + "@babel/core": "^7.12.3", + "@babel/polyfill": "^7.12.1", + "@polkadot/dev": "^0.58.3", "@polkadot/react-components": "0.62.2-21", "electron-log": "^4.2.4", "electron-updater": "^4.3.5" }, "devDependencies": { - "@types/react": "^16.9.50", + "@types/react": "^16.9.53", "@types/react-dom": "^16.9.8", "@types/tmp": "^0.2.0", "babel-loader": "^8.1.0", - "copy-webpack-plugin": "^6.2.0", + "copy-webpack-plugin": "^6.2.1", "html-webpack-plugin": "^4.5.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "^16.14.0", + "react-dom": "^16.14.0", "thread-loader": "^3.0.0", "tmp": "^0.2.1", "webpack": "^4.44.2" diff --git a/packages/apps-routing/package.json b/packages/apps-routing/package.json index 20ea1d0361..2260c0f35a 100644 --- a/packages/apps-routing/package.json +++ b/packages/apps-routing/package.json @@ -11,6 +11,6 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2" + "@babel/runtime": "^7.12.1" } } diff --git a/packages/apps/package.json b/packages/apps/package.json index dae59c003b..c2b763e9ed 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -13,12 +13,12 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/core": "^7.11.6", - "@babel/polyfill": "^7.11.5", - "@babel/runtime": "^7.11.2", + "@babel/core": "^7.12.3", + "@babel/polyfill": "^7.12.1", + "@babel/runtime": "^7.12.1", "@polkadot/apps-config": "0.62.2-21", "@polkadot/apps-routing": "0.62.2-21", - "@polkadot/dev": "^0.58.2", + "@polkadot/dev": "^0.58.3", "@polkadot/react-api": "0.62.2-21", "@polkadot/react-components": "0.62.2-21", "@polkadot/react-hooks": "0.62.2-21", @@ -26,23 +26,23 @@ "@polkadot/react-query": "0.62.2-21", "@polkadot/react-signer": "0.62.2-21", "punycode": "^2.1.1", - "query-string": "^6.13.5" + "query-string": "^6.13.6" }, "devDependencies": { "@types/punycode": "^2.1.0", "babel-loader": "^8.1.0", - "copy-webpack-plugin": "^6.2.0", + "copy-webpack-plugin": "^6.2.1", "css-loader": "^4.3.0", "empty": "^0.10.1", - "file-loader": "^6.1.0", - "html-loader": "^1.3.1", + "file-loader": "^6.1.1", + "html-loader": "^1.3.2", "html-webpack-plugin": "^4.5.0", "markdown-loader": "^6.0.0", "mini-css-extract-plugin": "^0.11.3", - "null-loader": "^4.0.0", + "null-loader": "^4.0.1", "style-loader": "^1.3.0", "thread-loader": "^3.0.0", - "url-loader": "^4.1.0", + "url-loader": "^4.1.1", "webpack": "^4.44.2" } } diff --git a/packages/apps/public/locales/en/app-contracts.json b/packages/apps/public/locales/en/app-contracts.json index 1d10840ad2..05bca5f1c9 100644 --- a/packages/apps/public/locales/en/app-contracts.json +++ b/packages/apps/public/locales/en/app-contracts.json @@ -18,6 +18,7 @@ "No documentation provided": "No documentation provided", "Not on-chain": "Not on-chain", "Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! instructions for updating if you are using an older version.": "Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! instructions for updating if you are using an older version.", + "Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! or solang upgrade instructions if you are using an older version.": "Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! or solang upgrade instructions if you are using an older version.", "Read": "Read", "Remove": "Remove", "Remove ABI": "Remove ABI", @@ -37,6 +38,7 @@ "The maximum amount of gas to use for this contract call. If the call requires more, it will fail.": "The maximum amount of gas to use for this contract call. If the call requires more, it will fail.", "The message to send to this contract. Parameters are adjusted based on the ABI provided.": "The message to send to this contract. Parameters are adjusted based on the ABI provided.", "The value is not in a valid address format": "The value is not in a valid address format", + "This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0 or solang with latest metadata generation.": "This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0 or solang with latest metadata generation.", "This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0-rc1 and newer.": "This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0-rc1 and newer.", "This is the ABI as supplied. Any calls to the contract will use this information for encoding.": "This is the ABI as supplied. Any calls to the contract will use this information for encoding.", "This operation does not impact the associated on-chain code or any of its contracts.": "This operation does not impact the associated on-chain code or any of its contracts.", diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index 337f2e7ab8..95556136f7 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -11,14 +11,14 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2", + "@babel/runtime": "^7.12.1", "@polkadot/react-components": "0.62.2-21", "@polkadot/vanitygen": "^0.22.1", - "detect-browser": "^5.1.1", + "detect-browser": "^5.2.0", "file-saver": "^2.0.2" }, "devDependencies": { - "@testing-library/react": "^11.0.4", - "testcontainers": "^4.3.0" + "@testing-library/react": "^11.1.0", + "testcontainers": "^4.4.0" } } diff --git a/packages/page-addresses/package.json b/packages/page-addresses/package.json index 56cc424e9d..cd29f9dc06 100644 --- a/packages/page-addresses/package.json +++ b/packages/page-addresses/package.json @@ -11,14 +11,14 @@ "contributors": [], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2", + "@babel/runtime": "^7.12.1", "@polkadot/react-components": "0.62.2-21", "@polkadot/vanitygen": "^0.22.1", - "detect-browser": "^5.1.1", + "detect-browser": "^5.2.0", "file-saver": "^2.0.2" }, "devDependencies": { - "@testing-library/react": "^11.0.4", - "testcontainers": "^4.3.0" + "@testing-library/react": "^11.1.0", + "testcontainers": "^4.4.0" } } diff --git a/packages/page-calendar/package.json b/packages/page-calendar/package.json index 618a86ba4e..f08274c472 100644 --- a/packages/page-calendar/package.json +++ b/packages/page-calendar/package.json @@ -11,7 +11,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2", + "@babel/runtime": "^7.12.1", "@polkadot/react-components": "0.62.2-21" } } diff --git a/packages/page-claims/package.json b/packages/page-claims/package.json index 0f71d52df4..a6bad16146 100644 --- a/packages/page-claims/package.json +++ b/packages/page-claims/package.json @@ -12,7 +12,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2", + "@babel/runtime": "^7.12.1", "@polkadot/react-components": "0.62.2-21", "secp256k1": "^3.8.0" } diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 092500cf42..da9dc09321 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -11,7 +11,7 @@ ], "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.11.2", - "@polkadot/api-contract": "^2.2.2-10" + "@babel/runtime": "^7.12.1", + "@polkadot/api-contract": "^2.2.2-11" } } diff --git a/packages/page-contracts/src/Ink3Banner.tsx b/packages/page-contracts/src/Ink3Banner.tsx index bd948521d7..d8ab622749 100644 --- a/packages/page-contracts/src/Ink3Banner.tsx +++ b/packages/page-contracts/src/Ink3Banner.tsx @@ -23,8 +23,8 @@ function Ink3Banner ({ className = '' }: Props): React.ReactElement | nul return (
-

{t('This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0-rc1 and newer.')}

-

{t('Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! instructions for updating if you are using an older version.')}

+

{t('This contracts interface only supports Substrate 2.0 with contracts using Ink! 3.0 or solang with latest metadata generation.')}

+

{t('Older versions of the contracts ABI cannot be used and will display an error indicating an invalid ABI when uploaded. Ensure you follow the Ink! or solang upgrade instructions if you are using an older version.')}

{t("With the ABI updates, there may still be dragons... the new ABI formats are a complete departure and required a lot of under-the-hood changes. So when something doesn't quite work as expected, please let us know via GH issues.")}