From 8f00bdb100e81de9c7b9bf7837968b03e292aaf3 Mon Sep 17 00:00:00 2001 From: Jaco Date: Mon, 13 Dec 2021 07:32:14 +0100 Subject: [PATCH] Add tsconfig.base (#800) * Add tsconfig.base * Remove unused package * yarn * Adjust paths --- .gitignore | 1 + packages/phishing/src/addrcheck.spec.ts | 3 ++- packages/phishing/src/crosscheck.spec.ts | 4 ++-- packages/phishing/src/index.spec.ts | 13 ++++++++----- packages/unused/.skip-build | 0 packages/unused/.skip-npm | 0 packages/unused/package.json | 19 ------------------- packages/unused/src/dummy.ts | 10 ---------- tsconfig.base.json | 15 +++++++++++++++ tsconfig.json | 14 ++------------ yarn.lock | 6 ------ 11 files changed, 30 insertions(+), 55 deletions(-) delete mode 100644 packages/unused/.skip-build delete mode 100644 packages/unused/.skip-npm delete mode 100644 packages/unused/package.json delete mode 100644 packages/unused/src/dummy.ts create mode 100644 tsconfig.base.json diff --git a/.gitignore b/.gitignore index e85ac0261..3987749fe 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ lerna-debug.log* npm-debug.log* package-lock.json report.*.json +tsconfig.*buildinfo yarn-debug.log* yarn-error.log* NOTES.md diff --git a/packages/phishing/src/addrcheck.spec.ts b/packages/phishing/src/addrcheck.spec.ts index 259163ab8..e4b6344e2 100644 --- a/packages/phishing/src/addrcheck.spec.ts +++ b/packages/phishing/src/addrcheck.spec.ts @@ -5,11 +5,12 @@ import fs from 'fs'; import { decodeAddress } from '@polkadot/util-crypto'; -import ourAddrList from '../../../address.json'; import { fetchWithTimeout } from './fetch'; const TICKS = '```'; +const ourAddrList = JSON.parse(fs.readFileSync('address.json', 'utf-8')) as Record; + function fetch (url: string): Promise { return fetchWithTimeout(url, 5000); } diff --git a/packages/phishing/src/crosscheck.spec.ts b/packages/phishing/src/crosscheck.spec.ts index 95e0ce30e..fcdd7550b 100644 --- a/packages/phishing/src/crosscheck.spec.ts +++ b/packages/phishing/src/crosscheck.spec.ts @@ -6,8 +6,6 @@ import { load as yamlParse } from 'js-yaml'; import { fetch } from '@polkadot/x-fetch'; -import ourSiteList from '../../../all.json'; - interface CryptoScamEntry { addresses: Record; category: string; @@ -24,6 +22,8 @@ interface EthPhishing { const TICKS = '```'; +const ourSiteList = JSON.parse(fs.readFileSync('all.json', 'utf-8')) as { allow: string[]; deny: string[] }; + function assertAndLog (check: boolean, site: string, missing: unknown): void { if (!check) { process.env.CI_LOG && fs.appendFileSync('./.github/crosscheck.md', ` diff --git a/packages/phishing/src/index.spec.ts b/packages/phishing/src/index.spec.ts index f78e1f45c..86009b824 100644 --- a/packages/phishing/src/index.spec.ts +++ b/packages/phishing/src/index.spec.ts @@ -1,12 +1,15 @@ // Copyright 2020-2021 @polkadot/phishing authors & contributors // SPDX-License-Identifier: Apache-2.0 +import fs from 'fs'; + import { decodeAddress } from '@polkadot/util-crypto'; -import addresses from '../../../address.json'; -import allowed from '../../../known.json'; import { checkAddress, checkIfDenied } from '.'; +const addresses = JSON.parse(fs.readFileSync('address.json', 'utf-8')) as Record; +const allowed = JSON.parse(fs.readFileSync('known.json', 'utf-8')) as Record; + describe('checkIfDenied', (): void => { it('returns false when host is not listed', async (): Promise => { expect( @@ -74,7 +77,7 @@ describe('checkAddress', (): void => { describe('check additions', (): void => { it('has no malformed addresses', (): void => { const invalids = Object - .entries(addresses as Record) + .entries(addresses) .map(([url, addrs]): [string, string[]] => { return [url, addrs.filter((a) => { try { @@ -95,10 +98,10 @@ describe('check additions', (): void => { it('has no entries on the known addresses list', (): void => { const added = Object - .values(addresses as Record) + .values(addresses) .reduce((all, addrs) => all.concat(addrs), []); const dupes = Object - .entries(allowed as Record) + .entries(allowed) .reduce<[string, string][]>((all, [site, addrs]) => all.concat(addrs.map((a) => [site, a])), []) .filter(([, a]) => added.includes(a)); diff --git a/packages/unused/.skip-build b/packages/unused/.skip-build deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/unused/.skip-npm b/packages/unused/.skip-npm deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/unused/package.json b/packages/unused/package.json deleted file mode 100644 index 25b130a00..000000000 --- a/packages/unused/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "author": "Jaco Greeff ", - "bugs": "https://github.com/polkadot-js/phishing/issues", - "contributors": [], - "description": "Dummy", - "homepage": "https://github.com/polkadot-js/phishing/tree/master/packages/unused#readme", - "license": "Apache-2.0", - "maintainers": [], - "name": "@polkadot/phishing-unused", - "private": true, - "repository": { - "directory": "packages/unused", - "type": "git", - "url": "https://github.com/polkadot-js/phishing.git" - }, - "sideEffects": false, - "version": "0.6.530", - "main": "index.js" -} diff --git a/packages/unused/src/dummy.ts b/packages/unused/src/dummy.ts deleted file mode 100644 index 1a62a1c43..000000000 --- a/packages/unused/src/dummy.ts +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2020-2021 @polkadot/phishing authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export interface Dummy { - dummy: string; -} - -export default function dummy (): void { - console.error('unused'); -} diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 000000000..8a189d85c --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,15 @@ +{ + "extends": "@polkadot/dev/config/tsconfig.json", + "compilerOptions": { + "composite": true, + "paths": { + "@polkadot/phishing": ["phishing/src"], + "@polkadot/phishing/*": ["phishing/src/*"] + }, + "resolveJsonModule": true, + "skipLibCheck": true, + "typeRoots": [ + "./node_modules/@types" + ] + } + } diff --git a/tsconfig.json b/tsconfig.json index 1172a5488..f8dbc9fff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,20 +1,10 @@ { - "extends": "@polkadot/dev/config/tsconfig.json", + "extends": "./tsconfig.base.json", "exclude": [ "build/**/*", "**/build/**/*" ], "compilerOptions": { - "baseUrl": ".", - "paths": - { - "@polkadot/phishing": ["packages/phishing/src"], - "@polkadot/phishing/*": ["packages/phishing/src/*"] - }, - "resolveJsonModule": true, - "skipLibCheck": true, - "typeRoots": [ - "./node_modules/@types" - ] + "baseUrl": "./packages" } } diff --git a/yarn.lock b/yarn.lock index 0cbb8b45f..cfd296576 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1967,12 +1967,6 @@ __metadata: languageName: node linkType: hard -"@polkadot/phishing-unused@workspace:packages/unused": - version: 0.0.0-use.local - resolution: "@polkadot/phishing-unused@workspace:packages/unused" - languageName: unknown - linkType: soft - "@polkadot/phishing@workspace:packages/phishing": version: 0.0.0-use.local resolution: "@polkadot/phishing@workspace:packages/phishing"