From 7204a4be157b5bc3b6d15ebf03fde24c3df34af6 Mon Sep 17 00:00:00 2001 From: Jaco Date: Thu, 9 Mar 2023 19:53:03 +0200 Subject: [PATCH] Align tsconfig to allow moduleResolution: nodenext (#1225) * Align tsconfig to allow moduleResolution: nodenext * Remove nodenext node.d.ts reference * Adjust danling imports --- .../src/page/PostMessageProvider.ts | 2 +- packages/extension-base/src/page/index.ts | 2 +- packages/extension-base/src/page/types.ts | 2 +- .../src/Popup/AuthManagement/WebsiteEntry.tsx | 2 +- .../src/Popup/AuthManagement/index.tsx | 2 +- .../src/Popup/Authorize/NoAccount.tsx | 5 ++- .../src/components/Address.spec.tsx | 2 +- tsconfig.base.json | 36 ++++++++++--------- 8 files changed, 28 insertions(+), 25 deletions(-) diff --git a/packages/extension-base/src/page/PostMessageProvider.ts b/packages/extension-base/src/page/PostMessageProvider.ts index 09c0bcd0..4a618414 100644 --- a/packages/extension-base/src/page/PostMessageProvider.ts +++ b/packages/extension-base/src/page/PostMessageProvider.ts @@ -6,7 +6,7 @@ import type { ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkado import type { AnyFunction } from '@polkadot/types/types'; import type { SendRequest } from './types.js'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from 'eventemitter3'; import { isUndefined, logger } from '@polkadot/util'; diff --git a/packages/extension-base/src/page/index.ts b/packages/extension-base/src/page/index.ts index e1647859..51ccd51d 100644 --- a/packages/extension-base/src/page/index.ts +++ b/packages/extension-base/src/page/index.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportRequestMessage, TransportResponseMessage } from '../background/types'; +import type { MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes, TransportRequestMessage, TransportResponseMessage } from '../background/types.js'; import { MESSAGE_ORIGIN_PAGE } from '../defaults.js'; import { getId } from '../utils/getId.js'; diff --git a/packages/extension-base/src/page/types.ts b/packages/extension-base/src/page/types.ts index 4bdf1d6e..39ed3ae1 100644 --- a/packages/extension-base/src/page/types.ts +++ b/packages/extension-base/src/page/types.ts @@ -1,7 +1,7 @@ // Copyright 2019-2023 @polkadot/extension-base authors & contributors // SPDX-License-Identifier: Apache-2.0 -import type { MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes } from '../background/types'; +import type { MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, RequestTypes, ResponseTypes, SubscriptionMessageTypes } from '../background/types.js'; export interface SendRequest { (message: TMessageType): Promise; diff --git a/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx b/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx index d8064462..debc8f7c 100644 --- a/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx +++ b/packages/extension-ui/src/Popup/AuthManagement/WebsiteEntry.tsx @@ -7,9 +7,9 @@ import React, { useCallback } from 'react'; import { Link } from 'react-router-dom'; import { AuthUrlInfo } from '@polkadot/extension-base/background/handlers/State'; -import { RemoveAuth } from '@polkadot/extension-ui/components'; import { useTranslation } from '@polkadot/extension-ui/components/translate'; +import RemoveAuth from '../../components/RemoveAuth.js'; import { styled } from '../../styled.js'; interface Props extends ThemeProps { diff --git a/packages/extension-ui/src/Popup/AuthManagement/index.tsx b/packages/extension-ui/src/Popup/AuthManagement/index.tsx index 0bf6d345..be89e5ec 100644 --- a/packages/extension-ui/src/Popup/AuthManagement/index.tsx +++ b/packages/extension-ui/src/Popup/AuthManagement/index.tsx @@ -6,8 +6,8 @@ import type { ThemeProps } from '../../types.js'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { AuthUrlInfo, AuthUrls } from '@polkadot/extension-base/background/handlers/State'; -import { InputFilter } from '@polkadot/extension-ui/components'; +import InputFilter from '../../components/InputFilter.js'; import useTranslation from '../../hooks/useTranslation.js'; import { getAuthList, removeAuthorization } from '../../messaging.js'; import { Header } from '../../partials/index.js'; diff --git a/packages/extension-ui/src/Popup/Authorize/NoAccount.tsx b/packages/extension-ui/src/Popup/Authorize/NoAccount.tsx index e9e528b8..de852f0d 100644 --- a/packages/extension-ui/src/Popup/Authorize/NoAccount.tsx +++ b/packages/extension-ui/src/Popup/Authorize/NoAccount.tsx @@ -7,9 +7,8 @@ import { t } from 'i18next'; import React, { useCallback } from 'react'; import { Trans } from 'react-i18next'; -import { Button, Warning } from '@polkadot/extension-ui/components'; -import { deleteAuthRequest } from '@polkadot/extension-ui/messaging'; - +import { Button, Warning } from '../../components/index.js'; +import { deleteAuthRequest } from '../../messaging.js'; import { styled } from '../../styled.js'; interface Props extends ThemeProps { diff --git a/packages/extension-ui/src/components/Address.spec.tsx b/packages/extension-ui/src/components/Address.spec.tsx index 6c9ae5e5..df672904 100644 --- a/packages/extension-ui/src/components/Address.spec.tsx +++ b/packages/extension-ui/src/components/Address.spec.tsx @@ -8,7 +8,7 @@ import '@polkadot/extension-mocks/chrome'; import type { ReactWrapper } from 'enzyme'; import type { AccountJson } from '@polkadot/extension-base/background/types'; import type { IconTheme } from '@polkadot/react-identicon/types'; -import type { Props as AddressComponentProps } from './Address'; +import type { Props as AddressComponentProps } from './Address.js'; import Adapter from '@wojtekmaj/enzyme-adapter-react-17'; import enzyme from 'enzyme'; diff --git a/tsconfig.base.json b/tsconfig.base.json index 5771eed0..8b1eb43c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -3,22 +3,26 @@ "compilerOptions": { "composite": true, "paths": { - "@polkadot/extension": ["extension/src"], - "@polkadot/extension/*": ["extension/src/*"], - "@polkadot/extension-base": ["extension-base/src"], - "@polkadot/extension-base/*": ["extension-base/src/*"], - "@polkadot/extension-chains": ["extension-chains/src"], - "@polkadot/extension-chains/*": ["extension-chains/src/*"], - "@polkadot/extension-compat-metamask": ["extension-compat-metamask/src"], - "@polkadot/extension-dapp": ["extension-dapp/src"], - "@polkadot/extension-dapp/*": ["extension-dapp/src/*"], - "@polkadot/extension-inject": ["extension-inject/src"], - "@polkadot/extension-inject/*": ["extension-inject/src/*"], - "@polkadot/extension-mocks/*": ["extension-mocks/src/*"], - "@polkadot/extension-ui": ["extension-ui/src"], - "@polkadot/extension-ui/*": ["extension-ui/src/*"] + "@polkadot/extension": ["extension/src/index.ts"], + "@polkadot/extension/*": ["extension/src/*.ts"], + "@polkadot/extension-base": ["extension-base/src/index.ts"], + "@polkadot/extension-base/background/handlers": ["extension-base/src/background/handlers/index.ts"], + "@polkadot/extension-base/packageInfo": ["extension-base/src/packageInfo.ts"], + "@polkadot/extension-base/page": ["extension-base/src/page/index.ts"], + "@polkadot/extension-base/stores": ["extension-base/src/stores/index.ts"], + "@polkadot/extension-base/utils": ["extension-base/src/utils/index.ts"], + "@polkadot/extension-base/*": ["extension-base/src/*.ts"], + "@polkadot/extension-chains": ["extension-chains/src/index.ts"], + "@polkadot/extension-chains/*": ["extension-chains/src/*.ts"], + "@polkadot/extension-compat-metamask": ["extension-compat-metamask/src/index.ts"], + "@polkadot/extension-dapp": ["extension-dapp/src/index.ts"], + "@polkadot/extension-dapp/*": ["extension-dapp/src/*.ts"], + "@polkadot/extension-inject": ["extension-inject/src/index.ts"], + "@polkadot/extension-inject/*": ["extension-inject/src/*.ts"], + "@polkadot/extension-mocks/*": ["extension-mocks/src/*.ts"], + "@polkadot/extension-ui": ["extension-ui/src/index.ts"], + "@polkadot/extension-ui/*": ["extension-ui/src/*.ts"] }, - "skipLibCheck": true, - "target": "es2020" + "skipLibCheck": true } }