Skip to content

Commit

Permalink
Bump DG actions, cleanu up root, bump deps (polkadot-js#524)
Browse files Browse the repository at this point in the history
  • Loading branch information
jacogr authored Oct 26, 2020
1 parent 02b2273 commit 1cba2f5
Show file tree
Hide file tree
Showing 15 changed files with 228 additions and 236 deletions.
4 changes: 0 additions & 4 deletions .babelrc.js

This file was deleted.

4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

9 changes: 9 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ const base = require('@polkadot/dev/config/eslint');

module.exports = {
...base,
ignorePatterns: [
'.eslintrc.js',
'.github/**',
'.vscode/**',
'.yarn/**',
'**/build/*',
'**/coverage/*',
'**/node_modules/*'
],
parserOptions: {
...base.parserOptions,
project: [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-any.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: ${{ matrix.step }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: ${{ matrix.step }}
run: |
yarn install --immutable | grep -v 'YN0013'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && github.repository == 'polkadot-js/extension'"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
token: ${{ secrets.GH_PAT }}
- name: ${{ matrix.step }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
11 changes: 0 additions & 11 deletions .vscode/settings.json

This file was deleted.

55 changes: 0 additions & 55 deletions .yarn/releases/yarn-2.2.2.cjs

This file was deleted.

55 changes: 55 additions & 0 deletions .yarn/releases/yarn-2.3.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-2.2.2.cjs
yarnPath: .yarn/releases/yarn-2.3.3.cjs
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^2.3.2-12",
"@polkadot/api": "^2.4.1",
"@polkadot/keyring": "^3.6.1",
"@polkadot/networks": "^3.6.1",
"@polkadot/types": "^2.3.2-12",
"@polkadot/types": "^2.4.1",
"@polkadot/util": "^3.6.1",
"@polkadot/util-crypto": "^3.6.1",
"babel-core": "^7.0.0-bridge.0",
Expand All @@ -36,7 +36,7 @@
},
"devDependencies": {
"@babel/core": "^7.12.3",
"@polkadot/dev": "^0.59.3",
"@polkadot/dev": "^0.59.8",
"@types/jest": "^26.0.15",
"babel-loader": "^8.1.0",
"browser-resolve": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.12.1",
"@polkadot/api": "^2.3.2-12",
"@polkadot/api": "^2.4.1",
"@polkadot/extension-inject": "0.35.0-beta.35",
"@polkadot/keyring": "^3.6.1",
"@polkadot/ui-keyring": "^0.61.2-1"
"@polkadot/ui-keyring": "^0.61.2-3"
}
}
6 changes: 3 additions & 3 deletions packages/extension-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"@polkadot/extension-base": "0.35.0-beta.35",
"@polkadot/extension-inject": "0.35.0-beta.35",
"@polkadot/keyring": "^3.6.1",
"@polkadot/react-identicon": "^0.61.2-1",
"@polkadot/react-qr": "^0.61.2-1",
"@polkadot/react-identicon": "^0.61.2-3",
"@polkadot/react-qr": "^0.61.2-3",
"@polkadot/util": "^3.6.1",
"@polkadot/util-crypto": "^3.6.1",
"i18next": "^19.8.2",
"i18next": "^19.8.3",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-dropzone": "^11.2.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"@polkadot/extension-base": "0.35.0-beta.35",
"@polkadot/extension-inject": "0.35.0-beta.35",
"@polkadot/extension-ui": "0.35.0-beta.35",
"@polkadot/phishing": "^0.1.9"
"@polkadot/phishing": "^0.1.10"
},
"devDependencies": {
"@polkadot/dev": "^0.59.3"
"@polkadot/dev": "^0.59.8"
}
}
Loading

0 comments on commit 1cba2f5

Please sign in to comment.