* Bumps

* Update webpack-merge usage

* Electron merge
This commit is contained in:
Jaco Greeff 2020-07-31 16:41:48 +02:00 committed by GitHub
parent 1fd1acbc6e
commit b251a6253d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 1155 additions and 989 deletions

View File

@ -33,12 +33,12 @@
"afterSign": "electron-builder-notarize"
},
"resolutions": {
"@polkadot/api": "^1.27.0-beta.2",
"@polkadot/api-contract": "^1.27.0-beta.2",
"@polkadot/keyring": "^3.1.0-beta.0",
"@polkadot/types": "^1.27.0-beta.2",
"@polkadot/util": "^3.1.0-beta.0",
"@polkadot/util-crypto": "^3.1.0-beta.0",
"@polkadot/api": "^1.27.0-beta.3",
"@polkadot/api-contract": "^1.27.0-beta.3",
"@polkadot/keyring": "^3.1.0-beta.1",
"@polkadot/types": "^1.27.0-beta.3",
"@polkadot/util": "^3.1.0-beta.1",
"@polkadot/util-crypto": "^3.1.0-beta.1",
"@polkadot/wasm-crypto": "^1.2.1",
"babel-core": "^7.0.0-bridge.0"
},
@ -77,17 +77,17 @@
"start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'"
},
"devDependencies": {
"@babel/core": "^7.10.5",
"@babel/core": "^7.11.0",
"@babel/register": "^7.10.5",
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@pinata/sdk": "^1.1.10",
"@polkadot/dev": "^0.55.29",
"@polkadot/ts": "^0.3.30",
"@polkadot/dev": "^0.55.30",
"@polkadot/ts": "^0.3.31",
"@types/bn.js": "^4.11.6",
"@types/chart.js": "^2.9.23",
"@types/file-saver": "^2.0.1",
"@types/i18next": "^13.0.0",
"@types/jest": "^26.0.7",
"@types/jest": "^26.0.8",
"@types/react-beautiful-dnd": "^13.0.0",
"@types/react-copy-to-clipboard": "^4.3.0",
"@types/react-dom": "^16.9.8",
@ -98,9 +98,9 @@
"@types/styled-theming": "^2.2.4",
"concurrently": "^5.2.0",
"devtron": "^1.4.0",
"dnslink-cloudflare": "^2.0.4",
"electron": "^9.1.1",
"electron-builder": "^22.8.0",
"dnslink-cloudflare": "^3.0.0",
"electron": "^9.1.2",
"electron-builder": "^22.8.1",
"electron-builder-notarize": "^1.2.0",
"i18next-scanner": "^2.11.0",
"react": "^16.13.1",
@ -109,10 +109,10 @@
"stylelint": "^13.6.1",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-styled-components": "^0.1.1",
"terser-webpack-plugin": "^3.0.7",
"webpack": "^4.44.0",
"terser-webpack-plugin": "^3.0.8",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-merge": "^4.2.2",
"webpack-merge": "^5.0.9",
"webpack-plugin-serve": "^1.0.1"
}
}

View File

@ -12,7 +12,7 @@
"license": "Apache-2.0",
"dependencies": {
"@acala-network/type-definitions": "0.3.1",
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"edgeware-node-types": "^2.3.4"
}
}

View File

@ -4,12 +4,12 @@
"private": true,
"version": "0.52.0-beta.18",
"dependencies": {
"@babel/core": "^7.10.5",
"@babel/core": "^7.11.0",
"@babel/polyfill": "^7.10.4",
"@polkadot/dev": "^0.55.29",
"@polkadot/dev": "^0.55.30",
"@polkadot/react-components": "0.52.0-beta.18",
"electron-log": "^4.2.2",
"electron-updater": "^4.3.4"
"electron-updater": "^4.3.5"
},
"devDependencies": {
"@types/react": "^16.9.43",
@ -22,6 +22,6 @@
"react-dom": "^16.13.1",
"thread-loader": "^2.1.3",
"tmp": "^0.2.1",
"webpack": "^4.44.0"
"webpack": "^4.44.1"
}
}

View File

@ -4,11 +4,12 @@
/* eslint-disable camelcase */
const path = require('path');
const merge = require('webpack-merge');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const baseConfig = require('@polkadot/apps/webpack.base.config');
const path = require('path');
const { merge } = require('webpack-merge');
const baseConfig = require('../apps/webpack.base.config');
const ENV = process.env.NODE_ENV || 'production';
const isProd = ENV === 'production';

View File

@ -11,6 +11,6 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5"
"@babel/runtime": "^7.11.0"
}
}

View File

@ -13,10 +13,10 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/core": "^7.10.5",
"@babel/core": "^7.11.0",
"@babel/polyfill": "^7.10.4",
"@babel/runtime": "^7.10.5",
"@polkadot/dev": "^0.55.29",
"@babel/runtime": "^7.11.0",
"@polkadot/dev": "^0.55.30",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-signer": "0.52.0-beta.18",
"punycode": "^2.1.1",
@ -26,7 +26,7 @@
"@types/punycode": "^2.1.0",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^6.0.3",
"css-loader": "^3.6.0",
"css-loader": "^4.1.1",
"empty": "^0.10.1",
"file-loader": "^6.0.0",
"html-loader": "^1.1.0",
@ -37,6 +37,6 @@
"style-loader": "^1.2.1",
"thread-loader": "^2.1.3",
"url-loader": "^4.1.0",
"webpack": "^4.44.0"
"webpack": "^4.44.1"
}
}

View File

@ -2,13 +2,12 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
/* eslint-disable camelcase */
const fs = require('fs');
const path = require('path');
const merge = require('webpack-merge');
const baseConfig = require('./webpack.base.config');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const path = require('path');
const { merge } = require('webpack-merge');
const baseConfig = require('./webpack.base.config');
const ENV = process.env.NODE_ENV || 'development';
const context = __dirname;

View File

@ -11,9 +11,9 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/vanitygen": "^0.18.1",
"@polkadot/vanitygen": "^0.19.0-beta.0",
"detect-browser": "^5.1.1",
"file-saver": "^2.0.2"
}

View File

@ -12,7 +12,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"secp256k1": "^3.8.0"
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@polkadot/api-contract": "^1.27.0-beta.2"
"@babel/runtime": "^7.11.0",
"@polkadot/api-contract": "^1.27.0-beta.3"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/apps-routing": "0.52.0-beta.18",
"@polkadot/react-components": "0.52.0-beta.18"
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"
}

View File

@ -11,7 +11,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-params": "0.52.0-beta.18",
"@polkadot/react-signer": "0.52.0-beta.18"

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/apps-config": "0.52.0-beta.18",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18",

View File

@ -8,7 +8,7 @@
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/app-explorer": "0.52.0-beta.18",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"

View File

@ -11,7 +11,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-params": "0.52.0-beta.18"
}

View File

@ -12,7 +12,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -11,7 +11,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"
}

View File

@ -11,7 +11,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -12,7 +12,7 @@
],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18",
"@polkadot/react-query": "0.52.0-beta.18"
}

View File

@ -30,9 +30,9 @@
},
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@polkadot/api": "^1.27.0-beta.2",
"@polkadot/extension-dapp": "^0.32.1",
"rxjs-compat": "^6.6.0"
"@babel/runtime": "^7.11.0",
"@polkadot/api": "^1.27.0-beta.3",
"@polkadot/extension-dapp": "^0.33.0-beta.0",
"rxjs-compat": "^6.6.2"
}
}

View File

@ -10,23 +10,23 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/react-fontawesome": "^0.1.11",
"@polkadot/keyring": "^3.1.0-beta.0",
"@polkadot/keyring": "^3.1.0-beta.1",
"@polkadot/react-api": "0.52.0-beta.18",
"@polkadot/react-identicon": "^0.58.0-beta.1",
"@polkadot/react-qr": "^0.58.0-beta.1",
"@polkadot/react-identicon": "^0.58.0-beta.2",
"@polkadot/react-qr": "^0.58.0-beta.2",
"@polkadot/react-query": "0.52.0-beta.18",
"@polkadot/ui-keyring": "^0.58.0-beta.1",
"@polkadot/ui-settings": "^0.58.0-beta.1",
"@polkadot/util": "^3.1.0-beta.0",
"@polkadot/util-crypto": "^3.1.0-beta.0",
"@polkadot/ui-keyring": "^0.58.0-beta.2",
"@polkadot/ui-settings": "^0.58.0-beta.2",
"@polkadot/util": "^3.1.0-beta.1",
"@polkadot/util-crypto": "^3.1.0-beta.1",
"chart.js": "^2.9.3",
"codeflask": "^1.4.1",
"i18next": "^19.6.3",
"i18next-browser-languagedetector": "^4.3.1",
"i18next-browser-languagedetector": "^5.0.0",
"react": "^16.13.1",
"react-beautiful-dnd": "^13.0.0",
"react-chartjs-2": "^2.9.0",

View File

@ -30,7 +30,7 @@
},
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"memoizee": "^0.4.14"
},
"devDependencies": {

View File

@ -10,7 +10,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

View File

@ -30,6 +30,6 @@
},
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.10.5"
"@babel/runtime": "^7.11.0"
}
}

View File

@ -10,7 +10,7 @@
"contributors": [],
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.10.5",
"@babel/runtime": "^7.11.0",
"@polkadot/react-components": "0.52.0-beta.18"
}
}

1994
yarn.lock

File diff suppressed because it is too large Load Diff