From 1d3941599e0a4aba65f2efdd2dfe898bbef1fe8c Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:12:50 +0800 Subject: [PATCH 1/8] fix: project reference --- packages/plugin-infra/tsconfig.json | 7 ++++++- packages/web3-shared/base/{ => src}/env.d.ts | 0 packages/web3-shared/base/{ => src}/hooks/index.ts | 0 packages/web3-shared/base/{ => src}/hooks/useBeat.ts | 0 packages/web3-shared/base/{ => src}/index.ts | 0 packages/web3-shared/base/{ => src}/proxy/index.ts | 0 packages/web3-shared/base/src/tsconfig.json | 10 ++++++++++ packages/web3-shared/base/{ => src}/utils/index.ts | 0 packages/web3-shared/base/{ => src}/utils/number.ts | 0 .../base/{tsconfig.tests.json => tests/tsconfig.json} | 6 +++--- packages/web3-shared/base/tsconfig.json | 10 ---------- packages/web3-shared/evm/tsconfig.json | 2 +- packages/web3-shared/tsconfig.json | 4 ---- 13 files changed, 20 insertions(+), 19 deletions(-) rename packages/web3-shared/base/{ => src}/env.d.ts (100%) rename packages/web3-shared/base/{ => src}/hooks/index.ts (100%) rename packages/web3-shared/base/{ => src}/hooks/useBeat.ts (100%) rename packages/web3-shared/base/{ => src}/index.ts (100%) rename packages/web3-shared/base/{ => src}/proxy/index.ts (100%) create mode 100644 packages/web3-shared/base/src/tsconfig.json rename packages/web3-shared/base/{ => src}/utils/index.ts (100%) rename packages/web3-shared/base/{ => src}/utils/number.ts (100%) rename packages/web3-shared/base/{tsconfig.tests.json => tests/tsconfig.json} (52%) delete mode 100644 packages/web3-shared/base/tsconfig.json delete mode 100644 packages/web3-shared/tsconfig.json diff --git a/packages/plugin-infra/tsconfig.json b/packages/plugin-infra/tsconfig.json index b9877d62ccd3..03b922f3dc76 100644 --- a/packages/plugin-infra/tsconfig.json +++ b/packages/plugin-infra/tsconfig.json @@ -6,7 +6,12 @@ "tsBuildInfoFile": "./dist/.tsbuildinfo" }, "include": ["./src"], - "references": [{ "path": "../shared/" }, { "path": "../shared-base" }, { "path": "../theme" }], + "references": [ + { "path": "../shared/" }, + { "path": "../shared-base" }, + { "path": "../theme" }, + { "path": "../web3-shared/base/src" } + ], "ts-node": { "transpileOnly": true, "compilerOptions": { "module": "CommonJS" } diff --git a/packages/web3-shared/base/env.d.ts b/packages/web3-shared/base/src/env.d.ts similarity index 100% rename from packages/web3-shared/base/env.d.ts rename to packages/web3-shared/base/src/env.d.ts diff --git a/packages/web3-shared/base/hooks/index.ts b/packages/web3-shared/base/src/hooks/index.ts similarity index 100% rename from packages/web3-shared/base/hooks/index.ts rename to packages/web3-shared/base/src/hooks/index.ts diff --git a/packages/web3-shared/base/hooks/useBeat.ts b/packages/web3-shared/base/src/hooks/useBeat.ts similarity index 100% rename from packages/web3-shared/base/hooks/useBeat.ts rename to packages/web3-shared/base/src/hooks/useBeat.ts diff --git a/packages/web3-shared/base/index.ts b/packages/web3-shared/base/src/index.ts similarity index 100% rename from packages/web3-shared/base/index.ts rename to packages/web3-shared/base/src/index.ts diff --git a/packages/web3-shared/base/proxy/index.ts b/packages/web3-shared/base/src/proxy/index.ts similarity index 100% rename from packages/web3-shared/base/proxy/index.ts rename to packages/web3-shared/base/src/proxy/index.ts diff --git a/packages/web3-shared/base/src/tsconfig.json b/packages/web3-shared/base/src/tsconfig.json new file mode 100644 index 000000000000..a84348458401 --- /dev/null +++ b/packages/web3-shared/base/src/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../../tsconfig.json", + "compilerOptions": { + "rootDir": "./", + "outDir": "../dist", + "tsBuildInfoFile": "../dist/.tsbuildinfo" + }, + "include": ["./", "./**/*.json"], + "references": [{ "path": "../../../injected-script/sdk" }] +} diff --git a/packages/web3-shared/base/utils/index.ts b/packages/web3-shared/base/src/utils/index.ts similarity index 100% rename from packages/web3-shared/base/utils/index.ts rename to packages/web3-shared/base/src/utils/index.ts diff --git a/packages/web3-shared/base/utils/number.ts b/packages/web3-shared/base/src/utils/number.ts similarity index 100% rename from packages/web3-shared/base/utils/number.ts rename to packages/web3-shared/base/src/utils/number.ts diff --git a/packages/web3-shared/base/tsconfig.tests.json b/packages/web3-shared/base/tests/tsconfig.json similarity index 52% rename from packages/web3-shared/base/tsconfig.tests.json rename to packages/web3-shared/base/tests/tsconfig.json index 8d45d3236f3d..838976b489bc 100644 --- a/packages/web3-shared/base/tsconfig.tests.json +++ b/packages/web3-shared/base/tests/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../../tsconfig.json", + "extends": "../../../../tsconfig.json", "compilerOptions": { "noEmit": true, "tsBuildInfoFile": "../dist/tests.tsbuildinfo", "types": ["node"] }, - "include": ["./tests"], - "references": [{ "path": "./tsconfig.json" }] + "include": ["./"], + "references": [{ "path": "../src/tsconfig.json" }] } diff --git a/packages/web3-shared/base/tsconfig.json b/packages/web3-shared/base/tsconfig.json deleted file mode 100644 index bec1e5d4644c..000000000000 --- a/packages/web3-shared/base/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "compilerOptions": { - "rootDir": "./", - "outDir": "../dist/base", - "tsBuildInfoFile": "../dist/base.tsbuildinfo" - }, - "include": ["./", "./**/*.json"], - "references": [{ "path": "../../injected-script/sdk" }] -} diff --git a/packages/web3-shared/evm/tsconfig.json b/packages/web3-shared/evm/tsconfig.json index 85d6de3b559a..4c739aecc567 100644 --- a/packages/web3-shared/evm/tsconfig.json +++ b/packages/web3-shared/evm/tsconfig.json @@ -6,5 +6,5 @@ "tsBuildInfoFile": "../dist/evm.tsbuildinfo" }, "include": ["./", "./**/*.json"], - "references": [{ "path": "../../injected-script/sdk" }] + "references": [{ "path": "../../injected-script/sdk" }, { "path": "../base/src" }] } diff --git a/packages/web3-shared/tsconfig.json b/packages/web3-shared/tsconfig.json deleted file mode 100644 index 6ed8fbc79195..000000000000 --- a/packages/web3-shared/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "references": [{ "path": "./base/" }, { "path": "./evm/" }, { "path": "./flow/" }, { "path": "./solana/" }] -} From 0dadf096487126a72740e3429df8baaf4fe704ac Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:18:13 +0800 Subject: [PATCH 2/8] fix: project reference --- packages/mask/utils-pure/tsconfig.json | 2 +- packages/plugin-infra/tsconfig.json | 2 +- packages/web3-shared/base/src/env.d.ts | 1 - packages/web3-shared/base/src/index.ts | 1 + packages/web3-shared/base/src/proxy/index.ts | 2 ++ packages/web3-shared/base/src/tsconfig.json | 10 ---------- packages/web3-shared/base/tests/tsconfig.json | 10 ---------- packages/web3-shared/base/tsconfig.json | 10 ++++++++++ packages/web3-shared/base/tsconfig.tests.json | 9 +++++++++ 9 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 packages/web3-shared/base/src/env.d.ts delete mode 100644 packages/web3-shared/base/src/tsconfig.json delete mode 100644 packages/web3-shared/base/tests/tsconfig.json create mode 100644 packages/web3-shared/base/tsconfig.json create mode 100644 packages/web3-shared/base/tsconfig.tests.json diff --git a/packages/mask/utils-pure/tsconfig.json b/packages/mask/utils-pure/tsconfig.json index 55599407b5af..28492f65e59d 100644 --- a/packages/mask/utils-pure/tsconfig.json +++ b/packages/mask/utils-pure/tsconfig.json @@ -8,5 +8,5 @@ "lib": ["ES2021"] }, "include": ["./"], - "references": [] + "references": [{ "path": "../../shared-base" }] } diff --git a/packages/plugin-infra/tsconfig.json b/packages/plugin-infra/tsconfig.json index 03b922f3dc76..e7f2792a782a 100644 --- a/packages/plugin-infra/tsconfig.json +++ b/packages/plugin-infra/tsconfig.json @@ -10,7 +10,7 @@ { "path": "../shared/" }, { "path": "../shared-base" }, { "path": "../theme" }, - { "path": "../web3-shared/base/src" } + { "path": "../web3-shared/base" } ], "ts-node": { "transpileOnly": true, diff --git a/packages/web3-shared/base/src/env.d.ts b/packages/web3-shared/base/src/env.d.ts deleted file mode 100644 index 868322d5ff30..000000000000 --- a/packages/web3-shared/base/src/env.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/packages/web3-shared/base/src/index.ts b/packages/web3-shared/base/src/index.ts index 043d66c81a42..8b382403328c 100644 --- a/packages/web3-shared/base/src/index.ts +++ b/packages/web3-shared/base/src/index.ts @@ -1,3 +1,4 @@ +/// export * from './hooks' export * from './utils' export * from './proxy' diff --git a/packages/web3-shared/base/src/proxy/index.ts b/packages/web3-shared/base/src/proxy/index.ts index 74b4ded352f8..af7212d67421 100644 --- a/packages/web3-shared/base/src/proxy/index.ts +++ b/packages/web3-shared/base/src/proxy/index.ts @@ -2,6 +2,8 @@ import differenceInSeconds from 'date-fns/differenceInSeconds' import compareAsc from 'date-fns/compareAsc' import ReconnectingWebSocket from 'reconnecting-websocket' +/// + export interface MessageBase { id: string } diff --git a/packages/web3-shared/base/src/tsconfig.json b/packages/web3-shared/base/src/tsconfig.json deleted file mode 100644 index a84348458401..000000000000 --- a/packages/web3-shared/base/src/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../../tsconfig.json", - "compilerOptions": { - "rootDir": "./", - "outDir": "../dist", - "tsBuildInfoFile": "../dist/.tsbuildinfo" - }, - "include": ["./", "./**/*.json"], - "references": [{ "path": "../../../injected-script/sdk" }] -} diff --git a/packages/web3-shared/base/tests/tsconfig.json b/packages/web3-shared/base/tests/tsconfig.json deleted file mode 100644 index 838976b489bc..000000000000 --- a/packages/web3-shared/base/tests/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../../../tsconfig.json", - "compilerOptions": { - "noEmit": true, - "tsBuildInfoFile": "../dist/tests.tsbuildinfo", - "types": ["node"] - }, - "include": ["./"], - "references": [{ "path": "../src/tsconfig.json" }] -} diff --git a/packages/web3-shared/base/tsconfig.json b/packages/web3-shared/base/tsconfig.json new file mode 100644 index 000000000000..0645b741df7c --- /dev/null +++ b/packages/web3-shared/base/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "rootDir": "./src", + "outDir": "./dist", + "tsBuildInfoFile": "./dist/src.tsbuildinfo" + }, + "include": ["./src", "./src/**/*.json"], + "references": [{ "path": "../../injected-script/sdk" }] +} diff --git a/packages/web3-shared/base/tsconfig.tests.json b/packages/web3-shared/base/tsconfig.tests.json new file mode 100644 index 000000000000..8cb160537df2 --- /dev/null +++ b/packages/web3-shared/base/tsconfig.tests.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "noEmit": true, + "types": ["node"] + }, + "include": ["./tests"], + "references": [{ "path": "./tsconfig.json" }] +} From d6f2003e2b89c85a466863a21b5a9e5d33e3380a Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:19:42 +0800 Subject: [PATCH 3/8] fix: project reference --- packages/mask/.webpack/config.ts | 1 + packages/web3-shared/evm/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index c1e13b4775b6..823af482df53 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -72,6 +72,7 @@ export function createConfiguration(rawFlags: BuildFlags): Configuration { '@masknet/icons': join(__dirname, '../../icons/index.ts'), '@masknet/web3-kit': join(__dirname, '../../web3-kit/src/'), '@masknet/web3-providers': join(__dirname, '../../web3-providers/src'), + '@masknet/web3-shared-base': join(__dirname, '../../web3-shared/base/src'), '@masknet/web3-shared-evm': join(__dirname, '../../web3-shared/evm/'), '@masknet/web3-shared-flow': join(__dirname, '../../web3-shared/flow/'), '@masknet/web3-shared-solana': join(__dirname, '../../web3-shared/solana/'), diff --git a/packages/web3-shared/evm/tsconfig.json b/packages/web3-shared/evm/tsconfig.json index 4c739aecc567..31e14ea11894 100644 --- a/packages/web3-shared/evm/tsconfig.json +++ b/packages/web3-shared/evm/tsconfig.json @@ -6,5 +6,5 @@ "tsBuildInfoFile": "../dist/evm.tsbuildinfo" }, "include": ["./", "./**/*.json"], - "references": [{ "path": "../../injected-script/sdk" }, { "path": "../base/src" }] + "references": [{ "path": "../../injected-script/sdk" }, { "path": "../base" }] } From 71e5c3c73720175754ac4d515fdacd6dbe1b6c52 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:21:07 +0800 Subject: [PATCH 4/8] fix: project reference --- packages/web3-shared/base/src/index.ts | 1 - packages/web3-shared/base/src/proxy/index.ts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/web3-shared/base/src/index.ts b/packages/web3-shared/base/src/index.ts index 8b382403328c..043d66c81a42 100644 --- a/packages/web3-shared/base/src/index.ts +++ b/packages/web3-shared/base/src/index.ts @@ -1,4 +1,3 @@ -/// export * from './hooks' export * from './utils' export * from './proxy' diff --git a/packages/web3-shared/base/src/proxy/index.ts b/packages/web3-shared/base/src/proxy/index.ts index af7212d67421..391a95d6b106 100644 --- a/packages/web3-shared/base/src/proxy/index.ts +++ b/packages/web3-shared/base/src/proxy/index.ts @@ -2,8 +2,7 @@ import differenceInSeconds from 'date-fns/differenceInSeconds' import compareAsc from 'date-fns/compareAsc' import ReconnectingWebSocket from 'reconnecting-websocket' -/// - +/// export interface MessageBase { id: string } From 30b339d8001cfbea9668021d3a7b39d8def602b1 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:28:40 +0800 Subject: [PATCH 5/8] fix: project reference --- packages/dashboard/tsconfig.json | 1 + .../mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx | 2 +- packages/mask/src/tsconfig.json | 1 + packages/plugins/Flow/tsconfig.json | 1 + packages/web3-shared/base/src/proxy/index.ts | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/dashboard/tsconfig.json b/packages/dashboard/tsconfig.json index fdd5a8c30d59..06936d8e8719 100644 --- a/packages/dashboard/tsconfig.json +++ b/packages/dashboard/tsconfig.json @@ -10,6 +10,7 @@ { "path": "../public-api" }, { "path": "../theme/" }, { "path": "../mask/src" }, + { "path": "../web3-shared/base/" }, { "path": "../web3-shared/evm/" }, { "path": "../web3-shared/flow/" }, { "path": "../icons/" }, diff --git a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx index d7ecbf427a74..78fdf6601e85 100644 --- a/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx +++ b/packages/mask/src/plugins/Collectible/SNSAdaptor/MakeOfferDialog.tsx @@ -35,7 +35,7 @@ import { PluginTraderMessages } from '../../Trader/messages' import { Trans } from 'react-i18next' import getUnixTime from 'date-fns/getUnixTime' import type { useAsset } from '../../EVM/hooks' -import { rightShift, ZERO } from '@masknet/web3-shared-base/utils/number' +import { rightShift, ZERO } from '@masknet/web3-shared-base' import type { Coin } from '../../Trader/types' import { isWyvernSchemaName } from '../utils' diff --git a/packages/mask/src/tsconfig.json b/packages/mask/src/tsconfig.json index 28176677c278..7bdabfffe9d5 100644 --- a/packages/mask/src/tsconfig.json +++ b/packages/mask/src/tsconfig.json @@ -16,6 +16,7 @@ { "path": "../../public-api" }, { "path": "../../shared" }, { "path": "../../shared-base" }, + { "path": "../../web3-shared/base" }, { "path": "../../web3-shared/evm" }, { "path": "../../web3-shared/flow" }, { "path": "../../web3-providers" }, diff --git a/packages/plugins/Flow/tsconfig.json b/packages/plugins/Flow/tsconfig.json index 6d904dc19c06..6516b1372613 100644 --- a/packages/plugins/Flow/tsconfig.json +++ b/packages/plugins/Flow/tsconfig.json @@ -13,6 +13,7 @@ { "path": "../../shared" }, { "path": "../../shared-base" }, { "path": "../../theme" }, + { "path": "../../web3-shared/base" }, { "path": "../../web3-shared/flow" }, { "path": "../../web3-providers" } ] diff --git a/packages/web3-shared/base/src/proxy/index.ts b/packages/web3-shared/base/src/proxy/index.ts index 391a95d6b106..cdebfa460dce 100644 --- a/packages/web3-shared/base/src/proxy/index.ts +++ b/packages/web3-shared/base/src/proxy/index.ts @@ -160,6 +160,7 @@ export class ProviderProxy { const SOCKET_POINT = // workaround, should create a stage env for QA testing + // @ts-ignore process.env.NODE_ENV === 'production' && process.env.channel === 'stable' ? 'wss://hyper-proxy.r2d2.to' : 'wss://hyper-proxy-development.mask-reverse-proxy.workers.dev' From 26f7045c1f5bd8d2757a8615bfb1a231ed123d2a Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:35:14 +0800 Subject: [PATCH 6/8] fix: project reference --- packages/polyfills/types/webpack.d.ts | 1 + packages/web3-shared/base/src/env.d.ts | 1 + packages/web3-shared/base/src/proxy/index.ts | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 packages/web3-shared/base/src/env.d.ts diff --git a/packages/polyfills/types/webpack.d.ts b/packages/polyfills/types/webpack.d.ts index d940351bb582..8a7de35ad2c1 100644 --- a/packages/polyfills/types/webpack.d.ts +++ b/packages/polyfills/types/webpack.d.ts @@ -6,6 +6,7 @@ */ declare namespace __WebpackModuleApi { + type ModuleId = any interface HotNotifierInfo { type: | 'self-declined' diff --git a/packages/web3-shared/base/src/env.d.ts b/packages/web3-shared/base/src/env.d.ts new file mode 100644 index 000000000000..868322d5ff30 --- /dev/null +++ b/packages/web3-shared/base/src/env.d.ts @@ -0,0 +1 @@ +/// diff --git a/packages/web3-shared/base/src/proxy/index.ts b/packages/web3-shared/base/src/proxy/index.ts index cdebfa460dce..74b4ded352f8 100644 --- a/packages/web3-shared/base/src/proxy/index.ts +++ b/packages/web3-shared/base/src/proxy/index.ts @@ -2,7 +2,6 @@ import differenceInSeconds from 'date-fns/differenceInSeconds' import compareAsc from 'date-fns/compareAsc' import ReconnectingWebSocket from 'reconnecting-websocket' -/// export interface MessageBase { id: string } @@ -160,7 +159,6 @@ export class ProviderProxy { const SOCKET_POINT = // workaround, should create a stage env for QA testing - // @ts-ignore process.env.NODE_ENV === 'production' && process.env.channel === 'stable' ? 'wss://hyper-proxy.r2d2.to' : 'wss://hyper-proxy-development.mask-reverse-proxy.workers.dev' From 9f907c3a0f72a7bd3a9c4a7af8dff26b343b5094 Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:37:34 +0800 Subject: [PATCH 7/8] fix: project reference --- packages/web3-shared/base/src/env.d.ts | 1 + packages/web3-shared/base/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web3-shared/base/src/env.d.ts b/packages/web3-shared/base/src/env.d.ts index 868322d5ff30..64a8c3276ea7 100644 --- a/packages/web3-shared/base/src/env.d.ts +++ b/packages/web3-shared/base/src/env.d.ts @@ -1 +1,2 @@ /// +/// diff --git a/packages/web3-shared/base/tsconfig.json b/packages/web3-shared/base/tsconfig.json index 0645b741df7c..07353b9b0ada 100644 --- a/packages/web3-shared/base/tsconfig.json +++ b/packages/web3-shared/base/tsconfig.json @@ -5,6 +5,6 @@ "outDir": "./dist", "tsBuildInfoFile": "./dist/src.tsbuildinfo" }, - "include": ["./src", "./src/**/*.json"], + "include": ["./src", "./src/env.d.ts", "./src/**/*.json"], "references": [{ "path": "../../injected-script/sdk" }] } From 62dc21f9f32a4458bafb944b4d36ff34654efeaf Mon Sep 17 00:00:00 2001 From: Jack Works Date: Wed, 26 Jan 2022 15:41:40 +0800 Subject: [PATCH 8/8] fix: project reference --- packages/web3-shared/base/tests/proxy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-shared/base/tests/proxy.ts b/packages/web3-shared/base/tests/proxy.ts index 2bad33f2cb34..bfd8e0b31e1f 100644 --- a/packages/web3-shared/base/tests/proxy.ts +++ b/packages/web3-shared/base/tests/proxy.ts @@ -1,5 +1,5 @@ import { describe, test, expect, beforeEach, afterEach, jest, afterAll, beforeAll } from '@jest/globals' -import { SocketPoolItem, ProviderProxy } from '../proxy' +import { SocketPoolItem, ProviderProxy } from '../src/proxy' import * as mockWS from 'jest-websocket-mock' import addSeconds from 'date-fns/addSeconds'