Skip to content

Commit 2b81365

Browse files
Merge branch 'main' into improve-import-compatibility-in-test
2 parents 0234fe6 + 4f410c4 commit 2b81365

File tree

137 files changed

+1058
-390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1058
-390
lines changed

packages/blue-sdk-viem/package.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
"email": "contact@morpho.org"
1212
},
1313
"license": "MIT",
14+
"type": "module",
1415
"main": "src/index.ts",
1516
"files": ["lib"],
1617
"scripts": {
1718
"prepublish": "$npm_execpath build",
1819
"compile": "hardhat compile",
19-
"build": "tsc --noEmit && tsc --build tsconfig.build.json"
20+
"build": "tsc --noEmit && $npm_execpath build:cjs && $npm_execpath build:esm",
21+
"build:cjs": "tsc --build tsconfig.build.cjs.json && echo '{\"type\":\"commonjs\"}' > lib/cjs/package.json",
22+
"build:esm": "tsc --build tsconfig.build.esm.json && echo '{\"type\":\"module\"}' > lib/esm/package.json"
2023
},
2124
"peerDependencies": {
2225
"@morpho-org/blue-sdk": "workspace:^",
@@ -34,7 +37,12 @@
3437
"vitest": "^4.0.15"
3538
},
3639
"publishConfig": {
37-
"main": "lib/index.js",
38-
"types": "lib/index.d.ts"
40+
"exports": {
41+
".": {
42+
"types": "./lib/esm/index.d.ts",
43+
"import": "./lib/esm/index.js",
44+
"require": "./lib/cjs/index.js"
45+
}
46+
}
3947
}
4048
}

packages/blue-sdk-viem/src/MetaMorphoAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { InputMarketParams, MarketId } from "@morpho-org/blue-sdk";
22
import { type Address, type Hex, encodeFunctionData } from "viem";
3-
import { metaMorphoAbi } from "./abis";
3+
import { metaMorphoAbi } from "./abis.js";
44

55
export type MetaMorphoCall = Hex;
66

packages/blue-sdk-viem/src/augment/Holding.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Holding } from "@morpho-org/blue-sdk";
2-
import { fetchHolding } from "../fetch";
2+
import { fetchHolding } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace Holding {

packages/blue-sdk-viem/src/augment/Market.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Market } from "@morpho-org/blue-sdk";
2-
import { fetchMarket } from "../fetch";
2+
import { fetchMarket } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace Market {

packages/blue-sdk-viem/src/augment/MarketParams.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MarketParams } from "@morpho-org/blue-sdk";
2-
import { fetchMarketParams } from "../fetch";
2+
import { fetchMarketParams } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace MarketParams {

packages/blue-sdk-viem/src/augment/Position.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
fetchAccrualPosition,
99
fetchPosition,
1010
fetchPreLiquidationPosition,
11-
} from "../fetch";
11+
} from "../fetch/index.js";
1212

1313
declare module "@morpho-org/blue-sdk" {
1414
namespace Position {

packages/blue-sdk-viem/src/augment/Token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Token } from "@morpho-org/blue-sdk";
2-
import { fetchToken } from "../fetch";
2+
import { fetchToken } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace Token {

packages/blue-sdk-viem/src/augment/User.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { User } from "@morpho-org/blue-sdk";
2-
import { fetchUser } from "../fetch";
2+
import { fetchUser } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace User {

packages/blue-sdk-viem/src/augment/Vault.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AccrualVault, Vault } from "@morpho-org/blue-sdk";
22

3-
import { fetchAccrualVault, fetchVault } from "../fetch";
3+
import { fetchAccrualVault, fetchVault } from "../fetch/index.js";
44

55
declare module "@morpho-org/blue-sdk" {
66
namespace Vault {

packages/blue-sdk-viem/src/augment/VaultConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { VaultConfig } from "@morpho-org/blue-sdk";
2-
import { fetchVaultConfig } from "../fetch";
2+
import { fetchVaultConfig } from "../fetch/index.js";
33

44
declare module "@morpho-org/blue-sdk" {
55
namespace VaultConfig {

0 commit comments

Comments
 (0)