Skip to content

Commit

Permalink
Bump dev (polkadot-js#2276)
Browse files Browse the repository at this point in the history
* Bump dev

* Update jest config

* Bump dev
  • Loading branch information
jacogr authored Feb 13, 2020
1 parent de3dee4 commit 64edeae
Show file tree
Hide file tree
Showing 12 changed files with 198 additions and 638 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const base = require('@polkadot/dev-react/config/eslint');
const base = require('@polkadot/dev/config/eslint');

// add override for any (a metric ton of them, initial conversion)
module.exports = {
Expand Down
4 changes: 1 addition & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
module.exports = {
extends: '@polkadot/dev-react/config/babel'
};
module.exports = require('@polkadot/dev/config/babel');
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const config = require('@polkadot/dev-react/config/jest');
const config = require('@polkadot/dev/config/jest');
const findPackages = require('./scripts/findPackages');

const internalModules = findPackages().reduce((modules, { dir, name }) => {
Expand Down
29 changes: 18 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^1.2.0-beta.11",
"@polkadot/api-contract": "^1.2.0-beta.11",
"@polkadot/keyring": "^2.3.0-beta.0",
"@polkadot/types": "^1.2.0-beta.11",
"@polkadot/util": "^2.3.0-beta.0",
"@polkadot/util-crypto": "^2.3.0-beta.0",
"@polkadot/api": "^1.2.0-beta.12",
"@polkadot/api-contract": "^1.2.0-beta.12",
"@polkadot/keyring": "^2.3.0-beta.1",
"@polkadot/types": "^1.2.0-beta.12",
"@polkadot/util": "^2.3.0-beta.1",
"@polkadot/util-crypto": "^2.3.0-beta.1",
"babel-core": "^7.0.0-bridge.0",
"typescript": "^3.7.5"
},
Expand All @@ -28,24 +28,31 @@
"docs": "echo \"skipping docs\"",
"clean": "polkadot-dev-clean-build",
"clean:i18n": "rm -rf packages/apps/public/locales/en && mkdir -p packages/apps/public/locales/en",
"lint": "eslint --ext .js,.jsx,.ts,.tsx . && tsc --noEmit --pretty",
"lint": "polkadot-dev-run-lint",
"postinstall": "polkadot-dev-yarn-only",
"test": "jest packages/app-claims/src",
"vanitygen": "node packages/app-accounts/scripts/vanitygen.js",
"start": "cd packages/apps && webpack --config webpack.config.js"
},
"devDependencies": {
"@babel/core": "^7.8.4",
"@babel/register": "^7.7.7",
"@babel/register": "^7.8.3",
"@babel/runtime": "^7.8.4",
"@polkadot/dev-react": "^0.34.2",
"@polkadot/ts": "^0.2.2",
"@polkadot/dev": "^0.40.5",
"@polkadot/ts": "^0.2.3",
"empty": "^0.10.1",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"i18next-scanner": "^2.10.3",
"markdown-loader": "^5.1.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"source-map-explorer": "^2.2.2"
"source-map-explorer": "^2.2.2",
"style-loader": "^1.1.3",
"thread-loader": "^2.1.3",
"url-loader": "^3.0.0",
"webpack": "^4.41.6",
"webpack-cli": "^3.3.11",
"webpack-plugin-serve": "^0.12.1"
}
}
2 changes: 1 addition & 1 deletion packages/app-accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "^0.40.0-beta.29",
"@polkadot/react-qr": "^0.50.0-beta.1",
"@polkadot/react-qr": "^0.50.0-beta.2",
"@types/file-saver": "^2.0.0",
"@types/yargs": "^15.0.2",
"detect-browser": "^4.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/api-contract": "^1.2.0-beta.11"
"@polkadot/api-contract": "^1.2.0-beta.12"
}
}
2 changes: 1 addition & 1 deletion packages/apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "^0.40.0-beta.29",
"@polkadot/react-signer": "^0.40.0-beta.29",
"@polkadot/ui-assets": "^0.50.0-beta.1",
"@polkadot/ui-assets": "^0.50.0-beta.2",
"query-string": "^6.10.1"
}
}
2 changes: 1 addition & 1 deletion packages/apps/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function createWebpack ({ alias = {}, context, name = 'index' }) {
require.resolve('thread-loader'),
{
loader: require.resolve('babel-loader'),
options: require('@polkadot/dev-react/config/babel')
options: require('@polkadot/dev/config/babel')
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions packages/react-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/api": "^1.2.0-beta.11",
"@polkadot/extension-dapp": "^0.22.0-beta.0",
"@polkadot/api": "^1.2.0-beta.12",
"@polkadot/extension-dapp": "^0.22.0-beta.1",
"edgeware-node-types": "^1.1.0",
"rxjs-compat": "^6.5.3"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/react-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/keyring": "^2.3.0-beta.0",
"@polkadot/keyring": "^2.3.0-beta.1",
"@polkadot/react-api": "^0.40.0-beta.29",
"@polkadot/react-identicon": "^0.50.0-beta.1",
"@polkadot/react-identicon": "^0.50.0-beta.2",
"@polkadot/react-query": "^0.40.0-beta.29",
"@polkadot/ui-keyring": "^0.50.0-beta.1",
"@polkadot/ui-settings": "^0.50.0-beta.1",
"@polkadot/ui-keyring": "^0.50.0-beta.2",
"@polkadot/ui-settings": "^0.50.0-beta.2",
"@types/chart.js": "^2.9.11",
"@types/i18next": "^13.0.0",
"@types/react-copy-to-clipboard": "^4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-signer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"dependencies": {
"@babel/runtime": "^7.8.4",
"@polkadot/react-components": "^0.40.0-beta.29",
"@polkadot/react-qr": "^0.50.0-beta.1"
"@polkadot/react-qr": "^0.50.0-beta.2"
}
}
Loading

0 comments on commit 64edeae

Please sign in to comment.