Skip to content

Commit c4941d1

Browse files
committed
feat(uniswapx): add esm build
1 parent ff2be9a commit c4941d1

14 files changed

+80
-26
lines changed

sdks/uniswapx-sdk/.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parser": "@typescript-eslint/parser",
33
"parserOptions": {
4-
"project": "./tsconfig.json"
4+
"project": "./tsconfig.base.json"
55
},
66
"env": {
77
"es6": true
@@ -60,4 +60,4 @@
6060
"always-multiline"
6161
]
6262
}
63-
}
63+
}

sdks/uniswapx-sdk/integration/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
"chai": "^4.3.6",
2525
"hardhat": "^2.22.15",
2626
"husky": "^8.0.3",
27-
"ts-node": "^10.9.1",
28-
"tsdx": "^0.14.1"
27+
"ts-node": "^10.9.1"
2928
},
3029
"dependencies": {
3130
"@ethersproject/bytes": "^5.7.0",
3231
"@typechain/ethers-v5": "^10.1.0",
3332
"@typechain/hardhat": "^6.1.2",
3433
"@uniswap/sdk-core": "^5.0.0",
34+
"@uniswap/uniswapx-sdk": "file:../",
3535
"dotenv": "^16.0.3",
3636
"ethers": "^5.7.0",
3737
"typechain": "^8.1.0"

sdks/uniswapx-sdk/integration/test/PriorityOrder.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Permit2Abi from "../../abis/Permit2.json";
1010
import MockERC20Abi from "../../abis/MockERC20.json";
1111

1212
import { Permit2, PriorityOrderReactor, MockERC20 } from "../../src/contracts";
13-
import { PriorityOrderBuilder, PriorityCosignerData } from "../../dist/src";
13+
import { PriorityOrderBuilder, PriorityCosignerData } from "@uniswap/uniswapx-sdk";
1414

1515
describe("PriorityOrder", () => {
1616
const FEE_RECIPIENT = "0x1111111111111111111111111111111111111111";

sdks/uniswapx-sdk/integration/test/PriorityOrderValidator.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
OrderValidation,
2020
PriorityCosignerData,
2121
CosignedPriorityOrder,
22-
} from "../../dist/src";
22+
} from "@uniswap/uniswapx-sdk";
2323
import { StaticJsonRpcProvider } from "@ethersproject/providers";
2424
import { REACTOR_ADDRESS_MAPPING, UNISWAPX_ORDER_QUOTER_MAPPING } from "../../src/constants";
2525
import { parseEther } from "ethers/lib/utils";

sdks/uniswapx-sdk/integration/test/RelayOrderValidator.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
RelayOrderBuilder,
1818
RelayOrderValidator,
1919
RelayOrder,
20-
} from "../../dist/src";
20+
} from "@uniswap/uniswapx-sdk";
2121
import { deployAndReturnPermit2 } from "./utils/permit2";
2222
import { deployMulticall3 } from "./utils/multicall";
2323

sdks/uniswapx-sdk/integration/test/V3DutchOrder.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Permit2Abi from "../../abis/Permit2.json"
44
import V3DutchOrderReactorAbi from "../../abis/V3DutchOrderReactor.json"
55
import MockERC20Abi from "../../abis/MockERC20.json"
66
import { Permit2, V3DutchOrderReactor } from "../../src/contracts"
7-
import { MockERC20 } from "../../dist/src/contracts";
7+
import { MockERC20 } from "../../src/contracts";
88
import { BlockchainTime } from "./utils/time";
99
import { V3DutchOrderBuilder } from "../../src/builder/V3DutchOrderBuilder"
1010
import { expect } from "chai";
@@ -830,4 +830,4 @@ const getCosignerData = async (
830830
outputOverrides: [BigNumber.from(0)],
831831
};
832832
return Object.assign(defaultData, overrides);
833-
};
833+
};

sdks/uniswapx-sdk/jest.config.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
module.exports = {
33
preset: 'ts-jest',
44
testEnvironment: 'node',
5-
};
5+
globals: {
6+
'ts-jest': {
7+
tsconfig: 'tsconfig.base.json'
8+
}
9+
}
10+
};

sdks/uniswapx-sdk/package.json

+17-5
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,21 @@
77
"ethereum"
88
],
99
"license": "MIT",
10-
"main": "dist/src/index.js",
11-
"typings": "dist/src/index.d.ts",
12-
"module": "dist/uniswapx-sdk.esm.js",
10+
"main": "./dist/cjs/src/index.js",
11+
"typings": "./dist/types/src/index.d.ts",
12+
"module": "./dist/esm/src/index.js",
1313
"files": [
1414
"dist"
1515
],
1616
"engines": {
1717
"node": ">=10"
1818
},
1919
"scripts": {
20-
"build": "yarn run typechain && tsc -p tsconfig.json",
20+
"clean": "rm -rf dist",
21+
"build": "yarn clean && yarn run typechain && yarn build:cjs && yarn build:esm && yarn build:types",
22+
"build:cjs": "tsc -p tsconfig.cjs.json",
23+
"build:esm": "tsc -p tsconfig.esm.json",
24+
"build:types": "tsc -p tsconfig.types.json",
2125
"lint": "eslint src --ext .ts",
2226
"lint:fix": "eslint src --ext .ts --fix",
2327
"prettier": "prettier \"src/**/*.ts\" --list-different",
@@ -96,5 +100,13 @@
96100
}
97101
]
98102
]
99-
}
103+
},
104+
"exports": {
105+
".": {
106+
"types": "./dist/types/src/index.d.ts",
107+
"import": "./dist/esm/src/index.js",
108+
"require": "./dist/cjs/src/index.js"
109+
}
110+
},
111+
"sideEffects": false
100112
}

sdks/uniswapx-sdk/tsconfig.json sdks/uniswapx-sdk/tsconfig.base.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
2-
"include": [
3-
"src"
4-
],
2+
"include": ["src", "abis"],
53
"compilerOptions": {
6-
"outDir": "dist",
4+
"rootDir": ".",
5+
"baseUrl": ".",
76
"target": "es6",
8-
"module": "commonjs",
97
"importHelpers": true,
108
"declaration": true,
119
"sourceMap": true,
@@ -23,6 +21,7 @@
2321
"moduleResolution": "node",
2422
"resolveJsonModule": true,
2523
"esModuleInterop": true,
26-
"skipLibCheck": true
27-
},
28-
}
24+
"skipLibCheck": true,
25+
"isolatedModules": true
26+
}
27+
}

sdks/uniswapx-sdk/tsconfig.cjs.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig.base.json",
3+
"compilerOptions": {
4+
"module": "commonjs",
5+
"outDir": "dist/cjs"
6+
}
7+
}

sdks/uniswapx-sdk/tsconfig.esm.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig.base.json",
3+
"compilerOptions": {
4+
"module": "esnext",
5+
"outDir": "dist/esm"
6+
}
7+
}

sdks/uniswapx-sdk/tsconfig.types.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"extends": "./tsconfig.base.json",
3+
"compilerOptions": {
4+
"declaration": true,
5+
"emitDeclarationOnly": true,
6+
"outDir": "dist/types"
7+
}
8+
}

turbo.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
"sdks/*/src/**.ts",
1414
"sdks/*/src/**.tsx"
1515
],
16-
"outputs": []
16+
"outputs": [
17+
"dist/**",
18+
"sdks/*/dist/**"
19+
]
1720
},
1821
"test": {
1922
"dependsOn": [
@@ -27,4 +30,4 @@
2730
"dependsOn": []
2831
}
2932
}
30-
}
33+
}

yarn.lock

+14-1
Original file line numberDiff line numberDiff line change
@@ -4606,6 +4606,19 @@ __metadata:
46064606
languageName: node
46074607
linkType: hard
46084608

4609+
"@uniswap/uniswapx-sdk@file:../::locator=uniswapx-integration%40workspace%3Asdks%2Funiswapx-sdk%2Fintegration":
4610+
version: 0.0.0
4611+
resolution: "@uniswap/uniswapx-sdk@file:../#../::hash=b4c3f3&locator=uniswapx-integration%40workspace%3Asdks%2Funiswapx-sdk%2Fintegration"
4612+
dependencies:
4613+
"@ethersproject/bytes": ^5.7.0
4614+
"@ethersproject/providers": ^5.7.0
4615+
"@uniswap/permit2-sdk": ^1.2.1
4616+
"@uniswap/sdk-core": ^5.0.0
4617+
ethers: ^5.7.0
4618+
checksum: 3f533bdf0998e542a5f795206cdb2a28e7003f84050eac369efdfc5a65da287a05c817f2997fc249a7f1930d3c6f05d0a32cc01152df3c067ae29feffd792a43
4619+
languageName: node
4620+
linkType: hard
4621+
46094622
"@uniswap/uniswapx-sdk@workspace:sdks/uniswapx-sdk":
46104623
version: 0.0.0-use.local
46114624
resolution: "@uniswap/uniswapx-sdk@workspace:sdks/uniswapx-sdk"
@@ -17610,13 +17623,13 @@ __metadata:
1761017623
"@types/mocha": ^9.1.1
1761117624
"@types/node": ^18.7.16
1761217625
"@uniswap/sdk-core": ^5.0.0
17626+
"@uniswap/uniswapx-sdk": "file:../"
1761317627
chai: ^4.3.6
1761417628
dotenv: ^16.0.3
1761517629
ethers: ^5.7.0
1761617630
hardhat: ^2.22.15
1761717631
husky: ^8.0.3
1761817632
ts-node: ^10.9.1
17619-
tsdx: ^0.14.1
1762017633
typechain: ^8.1.0
1762117634
languageName: unknown
1762217635
linkType: soft

0 commit comments

Comments
 (0)