Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@ const config = createConfig([
files: [
'packages/account-tree-controller/**',
'packages/accounts-controller/**',
'packages/address-book-controller/**',
'packages/approval-controller/**',
'packages/authenticated-user-storage/**',
'packages/base-controller/**',
'packages/base-data-service/**',
Expand All @@ -392,17 +394,22 @@ const config = createConfig([
'packages/controller-utils/**',
'packages/eip-5792-middleware/**',
'packages/eip1193-permission-middleware/**',
'packages/ens-controller/**',
'packages/eth-block-tracker/**',
'packages/eth-json-rpc-middleware/**',
'packages/eth-json-rpc-provider/**',
'packages/gas-fee-controller/**',
'packages/json-rpc-engine/**',
'packages/json-rpc-middleware-stream/**',
'packages/logging-controller/**',
'packages/message-manager/**',
'packages/messenger/**',
'packages/messenger-cli/**',
'packages/money-account-controller/**',
'packages/multichain-account-service/**',
'packages/multichain-api-middleware/**',
'packages/multichain-transactions-controller/**',
'packages/name-controller/**',
'packages/network-connection-banner-controller/**',
'packages/permission-controller/**',
'packages/permission-log-controller/**',
Expand All @@ -415,8 +422,12 @@ const config = createConfig([
'packages/react-data-query/**',
'packages/sample-controllers/**',
'packages/selected-network-controller/**',
'packages/signature-controller/**',
'packages/smart-transactions-controller/**',
'packages/snap-account-service/**',
'packages/transaction-controller/**',
'packages/transaction-pay-controller/**',
'packages/user-operation-controller/**',
'packages/wallet/**',
'packages/wallet-cli/**',
'packages/wallet-framework-docs/**',
Expand Down
4 changes: 2 additions & 2 deletions packages/address-book-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/address-book-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Do not edit manually.
*/

import type { AddressBookController } from './AddressBookController';
import type { AddressBookController } from './AddressBookController.js';

/**
* Returns all address book entries as an array.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import type { Hex } from '@metamask/utils';
import type {
AddressBookControllerContactDeletedEvent,
AddressBookControllerMessenger,
} from './AddressBookController';
} from './AddressBookController.js';
import {
AddressBookController,
AddressType,
controllerName,
} from './AddressBookController';
} from './AddressBookController.js';

type AllActions = MessengerActions<AddressBookControllerMessenger>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import type { Messenger } from '@metamask/messenger';
import type { Hex } from '@metamask/utils';

import type { AddressBookControllerMethodActions } from './AddressBookController-method-action-types';
import type { AddressBookControllerMethodActions } from './AddressBookController-method-action-types.js';

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do we gain by this distinction?

Regardless of what format we compile our packages to, surely it can support either import format to avoid this chore refactor?


/**
* ContactEntry representation
Expand Down
6 changes: 3 additions & 3 deletions packages/address-book-controller/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ export type {
AddressBookControllerEvents,
AddressBookControllerMessenger,
ContactEntry,
} from './AddressBookController';
} from './AddressBookController.js';
export {
getDefaultAddressBookControllerState,
AddressBookController,
} from './AddressBookController';
} from './AddressBookController.js';

export type {
AddressBookControllerListAction,
AddressBookControllerSetAction,
AddressBookControllerDeleteAction,
AddressBookControllerClearAction,
} from './AddressBookController-method-action-types';
} from './AddressBookController-method-action-types.js';
4 changes: 2 additions & 2 deletions packages/approval-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/approval-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Do not edit manually.
*/

import type { ApprovalController } from './ApprovalController';
import type { ApprovalController } from './ApprovalController.js';

/**
* Adds an approval request per the given arguments, optionally showing
Expand Down
8 changes: 4 additions & 4 deletions packages/approval-controller/src/ApprovalController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type {
import { errorCodes, JsonRpcError } from '@metamask/rpc-errors';
import { nanoid } from 'nanoid';

import { flushPromises } from '../../../tests/helpers';
import { flushPromises } from '../../../tests/helpers.js';
import type {
AddApprovalOptions,
ApprovalControllerActions,
Expand All @@ -19,19 +19,19 @@ import type {
ErrorOptions,
StartFlowOptions,
SuccessOptions,
} from './ApprovalController';
} from './ApprovalController.js';
import {
APPROVAL_TYPE_RESULT_ERROR,
APPROVAL_TYPE_RESULT_SUCCESS,
ApprovalController,
ORIGIN_METAMASK,
} from './ApprovalController';
} from './ApprovalController.js';
import {
ApprovalRequestNoResultSupportError,
EndInvalidFlowError,
MissingApprovalFlowError,
NoApprovalFlowsError,
} from './errors';
} from './errors.js';

jest.mock('nanoid');

Expand Down
4 changes: 2 additions & 2 deletions packages/approval-controller/src/ApprovalController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import { rpcErrors } from '@metamask/rpc-errors';
import type { Json, OptionalField } from '@metamask/utils';
import { nanoid } from 'nanoid';

import type { ApprovalControllerMethodActions } from './ApprovalController-method-action-types';
import type { ApprovalControllerMethodActions } from './ApprovalController-method-action-types.js';
import {
ApprovalRequestNotFoundError,
ApprovalRequestNoResultSupportError,
EndInvalidFlowError,
NoApprovalFlowsError,
MissingApprovalFlowError,
} from './errors';
} from './errors.js';

// Constants

Expand Down
6 changes: 3 additions & 3 deletions packages/approval-controller/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './ApprovalController';
export * from './ApprovalController.js';
export type {
ApprovalControllerAddRequestAction,
ApprovalControllerAddAndShowApprovalRequestAction,
Expand All @@ -16,5 +16,5 @@ export type {
ApprovalControllerSetFlowLoadingTextAction,
ApprovalControllerShowSuccessAction,
ApprovalControllerShowErrorAction,
} from './ApprovalController-method-action-types';
export * from './errors';
} from './ApprovalController-method-action-types.js';
export * from './errors.js';
4 changes: 2 additions & 2 deletions packages/ens-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/ens-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Do not edit manually.
*/

import type { EnsController } from './EnsController';
import type { EnsController } from './EnsController.js';

/**
* Clears ensResolutionsByAddress state property.
Expand Down
6 changes: 3 additions & 3 deletions packages/ens-controller/src/EnsController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import type {
import {
buildMockGetNetworkClientById,
buildCustomNetworkClientConfiguration,
} from '../../network-controller/tests/helpers';
import { EnsController, DEFAULT_ENS_NETWORK_MAP } from './EnsController';
} from '../../network-controller/tests/helpers.js';
import { EnsController, DEFAULT_ENS_NETWORK_MAP } from './EnsController.js';
import type {
EnsControllerState,
EnsControllerMessenger,
} from './EnsController';
} from './EnsController.js';

const defaultState: EnsControllerState = {
ensEntries: {},
Expand Down
2 changes: 1 addition & 1 deletion packages/ens-controller/src/EnsController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import type { Hex } from '@metamask/utils';
import { createProjectLogger } from '@metamask/utils';
import { toASCII } from 'punycode/punycode.js';

import type { EnsControllerMethodActions } from './EnsController-method-action-types';
import type { EnsControllerMethodActions } from './EnsController-method-action-types.js';

const log = createProjectLogger('ens-controller');

Expand Down
4 changes: 2 additions & 2 deletions packages/ens-controller/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export * from './EnsController';
export * from './EnsController.js';
export type {
EnsControllerResetStateAction,
EnsControllerClearAction,
EnsControllerDeleteAction,
EnsControllerGetAction,
EnsControllerSetAction,
EnsControllerReverseResolveAddressAction,
} from './EnsController-method-action-types';
} from './EnsController-method-action-types.js';
4 changes: 2 additions & 2 deletions packages/gas-fee-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/gas-fee-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Do not edit manually.
*/

import type { GasFeeController } from './GasFeeController';
import type { GasFeeController } from './GasFeeController.js';

/**
* Resets the polling interval by stopping and restarting polling
Expand Down
12 changes: 6 additions & 6 deletions packages/gas-fee-controller/src/GasFeeController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@ import type {
import type { Hex } from '@metamask/utils';
import nock from 'nock';

import { flushPromises } from '../../../tests/helpers';
import { flushPromises } from '../../../tests/helpers.js';
import {
buildCustomNetworkConfiguration,
buildCustomRpcEndpoint,
} from '../../network-controller/tests/helpers';
import determineGasFeeCalculations from './determineGasFeeCalculations';
} from '../../network-controller/tests/helpers.js';
import determineGasFeeCalculations from './determineGasFeeCalculations.js';
import {
fetchGasEstimates,
fetchLegacyGasPriceEstimates,
fetchEthGasPriceEstimate,
calculateTimeEstimate,
} from './gas-util';
import { GAS_ESTIMATE_TYPES, GasFeeController } from './GasFeeController';
} from './gas-util.js';
import { GAS_ESTIMATE_TYPES, GasFeeController } from './GasFeeController.js';
import type {
GasFeeMessenger,
GasFeeState,
GasFeeStateEthGasPrice,
GasFeeStateFeeMarket,
GasFeeStateLegacy,
} from './GasFeeController';
} from './GasFeeController.js';

jest.mock('./determineGasFeeCalculations');

Expand Down
6 changes: 3 additions & 3 deletions packages/gas-fee-controller/src/GasFeeController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import { StaticIntervalPollingController } from '@metamask/polling-controller';
import type { Hex } from '@metamask/utils';
import { v1 as random } from 'uuid';

import determineGasFeeCalculations from './determineGasFeeCalculations';
import determineGasFeeCalculations from './determineGasFeeCalculations.js';
import {
fetchGasEstimates,
fetchLegacyGasPriceEstimates,
fetchEthGasPriceEstimate,
calculateTimeEstimate,
} from './gas-util';
import type { GasFeeControllerMethodActions } from './GasFeeController-method-action-types';
} from './gas-util.js';
import type { GasFeeControllerMethodActions } from './GasFeeController-method-action-types.js';

export const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import determineGasFeeCalculations from './determineGasFeeCalculations';
import determineGasFeeCalculations from './determineGasFeeCalculations.js';
import {
fetchGasEstimates,
fetchLegacyGasPriceEstimates,
fetchEthGasPriceEstimate,
calculateTimeEstimate,
} from './gas-util';
} from './gas-util.js';
import type {
unknownString,
GasFeeEstimates,
LegacyGasPriceEstimate,
EthGasPriceEstimate,
EstimatedGasFeeTimeBounds,
} from './GasFeeController';
} from './GasFeeController.js';

jest.mock('./gas-util');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type {
GasFeeEstimates,
GasFeeState as GasFeeCalculations,
LegacyGasPriceEstimate,
} from './GasFeeController';
import { GAS_ESTIMATE_TYPES } from './GasFeeController';
} from './GasFeeController.js';
import { GAS_ESTIMATE_TYPES } from './GasFeeController.js';

type DetermineGasFeeCalculationsRequest = {
isEIP1559Compatible: boolean;
Expand Down
4 changes: 2 additions & 2 deletions packages/gas-fee-controller/src/gas-util.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
normalizeGWEIDecimalNumbers,
fetchGasEstimates,
calculateTimeEstimate,
} from './gas-util';
import type { GasFeeEstimates } from './GasFeeController';
} from './gas-util.js';
import type { GasFeeEstimates } from './GasFeeController.js';

const mockEIP1559ApiResponses: GasFeeEstimates[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/gas-fee-controller/src/gas-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type {
EstimatedGasFeeTimeBounds,
unknownString,
LegacyGasPriceEstimate,
} from './GasFeeController';
} from './GasFeeController.js';

const makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });

Expand Down
4 changes: 2 additions & 2 deletions packages/gas-fee-controller/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './GasFeeController';
export * from './GasFeeController.js';
export type {
GasFeeControllerResetPollingAction,
GasFeeControllerFetchGasFeeEstimatesAction,
Expand All @@ -8,4 +8,4 @@ export type {
GasFeeControllerGetTimeEstimateAction,
GasFeeControllerEnableNonRPCGasFeeApisAction,
GasFeeControllerDisableNonRPCGasFeeApisAction,
} from './GasFeeController-method-action-types';
} from './GasFeeController-method-action-types.js';
4 changes: 2 additions & 2 deletions packages/logging-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/logging-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Loading