diff --git a/.babelrc.js b/.babelrc.js deleted file mode 100644 index 2b66b4880..000000000 --- a/.babelrc.js +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2020 @polkadot/phishing authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -module.exports = require('./babel.config.js'); diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index d4f653d35..000000000 --- a/.eslintignore +++ /dev/null @@ -1,8 +0,0 @@ -.eslintrc.js -.github/** -.vscode/** -.yarn/** -**/binaryen/* -**/build/* -**/coverage/* -**/node_modules/* diff --git a/.eslintrc.js b/.eslintrc.js index a37721f18..7b1a78efd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -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: [ diff --git a/.github/workflows/crosscheck.yml b/.github/workflows/crosscheck.yml index 06facc17a..c44e2bd5c 100644 --- a/.github/workflows/crosscheck.yml +++ b/.github/workflows/crosscheck.yml @@ -4,10 +4,10 @@ on: - cron: '45 4 * * *' jobs: - ss58: + crosscheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: check env: CI_LOG: 123 diff --git a/.github/workflows/pr-any.yml b/.github/workflows/pr-any.yml index 599248325..aa54c52de 100644 --- a/.github/workflows/pr-any.yml +++ b/.github/workflows/pr-any.yml @@ -9,7 +9,7 @@ jobs: name: ${{ matrix.step }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: ${{ matrix.step }} env: CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }} diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 22b6eb75e..1aca39553 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -13,7 +13,7 @@ jobs: if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && github.repository == 'polkadot-js/phishing'" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: token: ${{ secrets.GH_PAT }} - name: ${{ matrix.step }} diff --git a/jest.config.js b/jest.config.js index c1bc93001..5d4401663 100644 --- a/jest.config.js +++ b/jest.config.js @@ -9,5 +9,5 @@ module.exports = Object.assign({}, config, { modulePathIgnorePatterns: [ '/build' ], - resolver: './jest.resolver.js' + resolver: '@polkadot/dev/config/jest-resolver' }); diff --git a/jest.resolver.js b/jest.resolver.js deleted file mode 100644 index 597454d7f..000000000 --- a/jest.resolver.js +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2020 @polkadot/phishing authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -const path = require('path'); - -module.exports = function resolver (file, config) { - return file.includes('package.json') - ? path.join(config.basedir.replace('/src', '/'), file) - : config.defaultResolver(file, config); -}; diff --git a/package.json b/package.json index b60febaf8..09f964bc2 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@babel/core": "^7.12.3", - "@polkadot/dev": "^0.59.4", + "@polkadot/dev": "^0.59.8", "@types/jest": "^26.0.15" }, "version": "0.1.9" diff --git a/packages/phishing/package.json b/packages/phishing/package.json index f47532b12..ff1887be9 100644 --- a/packages/phishing/package.json +++ b/packages/phishing/package.json @@ -23,7 +23,7 @@ "homepage": "https://github.com/polkadot-js/common/tree/master/packages/phishing#readme", "dependencies": { "@babel/runtime": "^7.12.1", - "@polkadot/x-fetch": "^0.3.4" + "@polkadot/x-fetch": "^0.3.5" }, "devDependencies": { "@types/js-yaml": "^3.12.5", diff --git a/yarn.lock b/yarn.lock index ad27dd719..3c29a2f8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1443,9 +1443,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^0.2.0": - version: 0.2.0 - resolution: "@eslint/eslintrc@npm:0.2.0" +"@eslint/eslintrc@npm:^0.1.3": + version: 0.1.3 + resolution: "@eslint/eslintrc@npm:0.1.3" dependencies: ajv: ^6.12.4 debug: ^4.1.1 @@ -1457,7 +1457,7 @@ __metadata: lodash: ^4.17.19 minimatch: ^3.0.4 strip-json-comments: ^3.1.1 - checksum: bdc8346add0fe57337c09134f19e693fa8a3c03357bf54c05de2270388774b0469b6d6dbd9f368cbd5de53919c4c9e8b644177acc417ea1ff4f99cbf32feefa6 + checksum: e9c5eaa5e706bcedbba6e7e1a2bc85faa7e3a9edbe71375e07240d1b6540fbb88d907bd5e5841b42c2a7a9683dcf031ea052c447c3c9d81ba4d0b74f0dd67e5f languageName: node linkType: hard @@ -1712,9 +1712,9 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev@npm:^0.59.4": - version: 0.59.4 - resolution: "@polkadot/dev@npm:0.59.4" +"@polkadot/dev@npm:^0.59.8": + version: 0.59.8 + resolution: "@polkadot/dev@npm:0.59.8" dependencies: "@babel/cli": ^7.12.1 "@babel/core": ^7.12.3 @@ -1747,7 +1747,7 @@ __metadata: browserslist: ^4.14.5 chalk: ^4.1.0 coveralls: ^3.1.0 - eslint: ^7.11.0 + eslint: 7.11.0 eslint-config-standard: ^15.0.0 eslint-import-resolver-node: ^0.3.4 eslint-plugin-header: ^3.1.0 @@ -1802,7 +1802,7 @@ __metadata: polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.js polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.js polkadot-exec-webpack: scripts/polkadot-exec-webpack.js - checksum: 098a2600dc605a65572eab1494e665200e2758d1936d848648ff16a77cb8383b983726015d955d30c22f0cfbc9e8bfbdc8a5fea42e255731acc575d29eeec94d + checksum: 45b4020becfc171dbe2029781551492d6942d0af1eb0106cc04fa313f00583b6850a93942b013a6f14a246fb36fd705591c6ba29a6083c5e4954bb5d53385587 languageName: node linkType: hard @@ -1811,7 +1811,7 @@ __metadata: resolution: "@polkadot/phishing@workspace:packages/phishing" dependencies: "@babel/runtime": ^7.12.1 - "@polkadot/x-fetch": ^0.3.4 + "@polkadot/x-fetch": ^0.3.5 "@types/js-yaml": ^3.12.5 js-yaml: ^3.14.0 languageName: unknown @@ -1823,14 +1823,14 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/x-fetch@npm:^0.3.4": - version: 0.3.4 - resolution: "@polkadot/x-fetch@npm:0.3.4" +"@polkadot/x-fetch@npm:^0.3.5": + version: 0.3.5 + resolution: "@polkadot/x-fetch@npm:0.3.5" dependencies: "@babel/runtime": ^7.12.1 "@types/node-fetch": ^2.5.7 node-fetch: ^2.6.1 - checksum: e5dcf6708aa7c56e87ee8a3c598dbd6f28f357bfd87f83e84a0fa0f4e319381bd7a8cdfa5c78bc9f4358d1850748ce681ed7b9c5367807badd0acbc27d31a143 + checksum: 538bfa601e9869c8ac8387d88a71332726b9efb5572617cd3fc8ef457f800995cf05f392c20b8ab568bf2a5bce7d5208e1710002ae462fcadc6f407d0c1666ac languageName: node linkType: hard @@ -2001,9 +2001,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 14.14.2 - resolution: "@types/node@npm:14.14.2" - checksum: e6ad786008ec81e010525beb09067f31cc55a3a02120a7e383e21309c1422a0d4a56059c1da46716509e36dbd4d2c607790f3fd715275a09b9f3ffb2cf3b243e + version: 14.14.3 + resolution: "@types/node@npm:14.14.3" + checksum: f77a69dfc0edb74007883f339636f7d79b891219389311ff6d756a966ca1025557c84c68643f738e897385d2e57e9124cc8261fcf080d378398ab60babaffd57 languageName: node linkType: hard @@ -2737,10 +2737,10 @@ __metadata: languageName: node linkType: hard -"ast-module-types@npm:^2.3.1, ast-module-types@npm:^2.3.2, ast-module-types@npm:^2.4.0, ast-module-types@npm:^2.6.0": - version: 2.6.0 - resolution: "ast-module-types@npm:2.6.0" - checksum: c67629212bf558829093d1b06538e51fdc95190ffd7a7db0eeeda4f52b6e3b6c9b2e75d9012dfc466d9baa21a4c2e3bfc6fdeddab0445d9628966653fcc46301 +"ast-module-types@npm:^2.3.2, ast-module-types@npm:^2.4.0, ast-module-types@npm:^2.6.0, ast-module-types@npm:^2.7.0": + version: 2.7.0 + resolution: "ast-module-types@npm:2.7.0" + checksum: 9f7d1071c0f43523c4ea62321fd6e10a2b5568a9465c390813910291def1ab76cc1c3cd5250d0b042de4bc766dccdbdad968bc1474bc717ce68e654c996e972e languageName: node linkType: hard @@ -4148,16 +4148,16 @@ __metadata: linkType: hard "detective-amd@npm:^3.0.0": - version: 3.0.0 - resolution: "detective-amd@npm:3.0.0" + version: 3.0.1 + resolution: "detective-amd@npm:3.0.1" dependencies: - ast-module-types: ^2.3.1 + ast-module-types: ^2.7.0 escodegen: ^1.8.0 get-amd-module-type: ^3.0.0 node-source-walk: ^4.0.0 bin: detective-amd: bin/detective-amd.js - checksum: bb9d1ee828fe6fbc5879ce1db406bda1a3f1a6933d5f8d8942d3f8adc26ef94a94f09b734085206ab24a4bd18357f5c24e8ffb7d3dbfeb384f9c01a7293548ed + checksum: f60a00822a5e9b335f10cb50c451a87812cbc54640054b67a1981a7301866d9fdd5e19b642237b7b03a5d47e1f8fca518292258682fd01ee894639eda275487b languageName: node linkType: hard @@ -4768,12 +4768,12 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^7.11.0": - version: 7.12.0 - resolution: "eslint@npm:7.12.0" +"eslint@npm:7.11.0": + version: 7.11.0 + resolution: "eslint@npm:7.11.0" dependencies: "@babel/code-frame": ^7.0.0 - "@eslint/eslintrc": ^0.2.0 + "@eslint/eslintrc": ^0.1.3 ajv: ^6.10.0 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -4811,7 +4811,7 @@ __metadata: v8-compile-cache: ^2.0.3 bin: eslint: bin/eslint.js - checksum: 22f86c0ebaf75993d197d230a8c35f11ba4ffc7cd0b280aeecb28a04c26446b9e6906eedee264a445311a3b9b31f9bca787ee58546acc087cb2c1056ca89f624 + checksum: 45ef6dc7b31684ca0f383ed9c6224e763197e1d49745542f4440e37286c947973388a6a7ebbf103eeee91ddb4af2652c5d22718f4130bfbbf4bd16a04103f82a languageName: node linkType: hard @@ -9153,11 +9153,11 @@ fsevents@^1.2.7: linkType: hard "pupa@npm:^2.0.1": - version: 2.1.0 - resolution: "pupa@npm:2.1.0" + version: 2.1.1 + resolution: "pupa@npm:2.1.1" dependencies: escape-goat: ^2.0.0 - checksum: 1b4374e7ada1f2e666915d942a98de94819dc018e8dba82aba83e98572954d32b616045e84e28825fcc8b7b485f354c92a8531109ecd62812d8f7f9cff7db227 + checksum: b300d979e1bcc388b0aabe723e9bd7f6598f02a10e66b693b9dde6249f68ad95e93804a1511dbbafd172e404b837d60c49ebdd152e3e94909dc282ca4ba285e8 languageName: node linkType: hard @@ -9742,7 +9742,7 @@ fsevents@^1.2.7: resolution: "root-workspace-0b6124@workspace:." dependencies: "@babel/core": ^7.12.3 - "@polkadot/dev": ^0.59.4 + "@polkadot/dev": ^0.59.8 "@types/jest": ^26.0.15 languageName: unknown linkType: soft @@ -10637,9 +10637,9 @@ fsevents@^1.2.7: linkType: hard "term-size@npm:^2.1.0": - version: 2.2.0 - resolution: "term-size@npm:2.2.0" - checksum: 02307492dfe602234355d55f23f4ce0125ad2dea428a63337e031bc97d2f7832b12c66eb64853f4dc30bdfc05377bc161da8659ecc30303a1ac616a619f284bb + version: 2.2.1 + resolution: "term-size@npm:2.2.1" + checksum: a013f688f6fc1b6410be3b2f7a04c3a9169e97186949b0bc33cc7c1943b0c88d9a943f81e518d9227cb817803e7a18c702f2971eafd6d8659ce4a1df94094246 languageName: node linkType: hard @@ -11045,11 +11045,11 @@ fsevents@^1.2.7: linkType: hard "uglify-js@npm:^3.1.4": - version: 3.11.3 - resolution: "uglify-js@npm:3.11.3" + version: 3.11.4 + resolution: "uglify-js@npm:3.11.4" bin: uglifyjs: bin/uglifyjs - checksum: 893090b962e6f1026c818a5b442e0ff84838560c4d91ab56dea154d51e1a531dfb34ec775e44c603d3ea40a25fe5374e679bd042afaf790372c8fabf3aa84694 + checksum: 654020b5bb2e53ef99b91603396dee47fc24930909a207590f04a93699c1df0f951e85c1c486aec44859b1ca255430681b46f13bd36f81e0113e57c370bf93d0 languageName: node linkType: hard @@ -11705,9 +11705,9 @@ fsevents@^1.2.7: linkType: hard "y18n@npm:^5.0.2": - version: 5.0.4 - resolution: "y18n@npm:5.0.4" - checksum: 362a454e8ae75bcdae0ca46ee5cc24fd915238bb65a0e1fcf014ae1f11056e8ed1ac8fe4a72056c22f80ebe143fa8ccc86a24eb8bd8e71b5ab2cebd91d8fb9cd + version: 5.0.5 + resolution: "y18n@npm:5.0.5" + checksum: a7d41b0cccca1c98ebab270a944df48eb3b5352d3be0affb8afc8369823f6aa97a5fbead2c5b35e59a5650cb786b2b37627b45be5ff31f02a80dd3b881aceb17 languageName: node linkType: hard