From c351b61f55bc826e21589e75e7a03b272ee14f1a Mon Sep 17 00:00:00 2001 From: joepegler Date: Mon, 11 Mar 2024 13:26:41 +0000 Subject: [PATCH] chore: remove monorepo setup (#17) * chore: remove monorepo setup --- .size-limit.json | 12 ++--- bun.lockb | Bin 228648 -> 228023 bytes package.json | 50 ++++++++++++++---- packages/core/package.json | 31 ----------- .../account/actions/getAccountAddress.ts | 0 .../account/actions/sendTransaction.ts | 0 .../account/createSmartAccount.ts | 0 {packages/core => src}/account/index.ts | 0 {packages/core => src}/account/utils/abis.ts | 0 .../core => src}/account/utils/constants.ts | 0 .../core => src}/account/utils/errors.ts | 0 .../core => src}/account/utils/helpers.ts | 0 {packages/core => src}/account/utils/types.ts | 0 .../core => src}/bundler/actions/chainId.ts | 0 .../core => src}/bundler/actions/index.ts | 0 .../bundler/createBundlerClient.ts | 0 src/bundler/index.ts | 4 ++ .../core => src}/bundler/utils/helpers.ts | 0 {packages/core => src}/index.ts | 0 .../createECDSAOwnershipModule.ts | 0 {packages/core => src}/modules/index.ts | 0 .../createSessionKeyManagerModule.ts | 0 {packages/core => src}/modules/utils/types.ts | 0 .../paymaster/actions/sponsorUserOp.ts | 0 .../paymaster/createPaymasterClient.ts | 0 tests/account.test.ts | 10 ++-- tests/bundler.test.ts | 6 +-- tests/modules/ecdsaOwnershipModule.test.ts | 8 +-- tests/tsconfig.json | 10 ---- tests/vitest.config.ts | 4 -- tsconfig/tsconfig.base.json | 10 ++-- tsconfig/tsconfig.cjs.json | 3 +- tsconfig/tsconfig.esm.json | 3 +- tsconfig/tsconfig.json | 10 ++-- tsconfig/tsconfig.types.json | 7 +-- typedoc.json | 6 +-- 36 files changed, 83 insertions(+), 91 deletions(-) delete mode 100644 packages/core/package.json rename {packages/core => src}/account/actions/getAccountAddress.ts (100%) rename {packages/core => src}/account/actions/sendTransaction.ts (100%) rename {packages/core => src}/account/createSmartAccount.ts (100%) rename {packages/core => src}/account/index.ts (100%) rename {packages/core => src}/account/utils/abis.ts (100%) rename {packages/core => src}/account/utils/constants.ts (100%) rename {packages/core => src}/account/utils/errors.ts (100%) rename {packages/core => src}/account/utils/helpers.ts (100%) rename {packages/core => src}/account/utils/types.ts (100%) rename {packages/core => src}/bundler/actions/chainId.ts (100%) rename {packages/core => src}/bundler/actions/index.ts (100%) rename {packages/core => src}/bundler/createBundlerClient.ts (100%) create mode 100644 src/bundler/index.ts rename {packages/core => src}/bundler/utils/helpers.ts (100%) rename {packages/core => src}/index.ts (100%) rename {packages/core => src}/modules/ecdsaOwnershipValidationModule/createECDSAOwnershipModule.ts (100%) rename {packages/core => src}/modules/index.ts (100%) rename {packages/core => src}/modules/sessionKeyManagerModule/createSessionKeyManagerModule.ts (100%) rename {packages/core => src}/modules/utils/types.ts (100%) rename {packages/core => src}/paymaster/actions/sponsorUserOp.ts (100%) rename {packages/core => src}/paymaster/createPaymasterClient.ts (100%) delete mode 100644 tests/tsconfig.json diff --git a/.size-limit.json b/.size-limit.json index 0706a568..b15afc33 100644 --- a/.size-limit.json +++ b/.size-limit.json @@ -1,19 +1,19 @@ [ { "name": "core (esm)", - "path": "./packages/core/_esm/index.js", - "limit": "100 kB", + "path": "./dist/_esm/index.js", + "limit": "5 kB", "import": "*" }, { "name": "core (cjs)", - "path": "./packages/core/_cjs/index.js", - "limit": "200 kB" + "path": "./dist/_cjs/index.js", + "limit": "10 kB" }, { "name": "core (tree-shaking)", - "path": "./packages/core/_esm/index.js", - "limit": "100 kB", + "path": "./dist/_esm/index.js", + "limit": "5 kB", "import": "{ createSmartAccount }" } ] diff --git a/bun.lockb b/bun.lockb index 364d1b08b2f71c3af80e2f3a283340d1846b67ed..74579e7ad9b6c56d5ebbff320e020ab6342c153f 100755 GIT binary patch delta 32585 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 MNRwF9hvLHj4-${lNB{r; delta 32770 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

%88`Bj_lh*vL$Q$ ziCh!^C~12XjpJRRYY7wDv2jP?du`aJqv+1Jj(D;~G4ncxnMi;6SDF9z4hO&fbFewC zTw>;eIrZ0r**s()y9Rx;vN9%;O*#hm(cdR_{h7~*UmKd?rwMw}@oXCuq>tEXFbDm8 zWHIwXCU1_o+ECYHJ(FZ-{7d&6%1nQi*ro$R?o8^u0(Wg_14{K+&h8vXX2mS(ORy4_ z{3Y&{IzYCuA>NMlCoYyXO6li^FuQyU!h)vR?ytt$hZWZc44I+q+=A zSEqJWaQ6f&XufmUk(=|bd9+N-(OzF__^LzD-WOd59EvLBljVt7pT9iPGkV=1$aK%= zTJGf38VTW-lOfwdUOQsI?4+)t&O=Y}Dn(B)qna_-ld_vrR$TlDdbe>ayw*E0WLRo^ zW=3ZEI87=EIVnGqSi#q_GaG7eX2F~t%o3~8|22AKWF{nfrn6Gn%%x<|Y572X$(uRd zmZPnPrDn9s&B;m39?c3|5V`cWJibNAG6%DVO(gGL^Ec4Lay7WPhxgXYGy`Iecyjeil3R< twrkZfWTIvyLzv+In*u9JoG ./packages/core/_cjs/package.json '{\"type\":\"commonjs\"}'", - "build:esm": "tsc --project ./tsconfig/tsconfig.esm.json && tsc-alias -p ./tsconfig/tsconfig.esm.json && echo > ./packages/core/_esm/package.json '{\"type\": \"module\",\"sideEffects\":false}'", + "build:cjs": "tsc --project ./tsconfig/tsconfig.cjs.json && tsc-alias -p ./tsconfig/tsconfig.cjs.json && echo > ./dist/_cjs/package.json '{\"type\":\"commonjs\"}'", + "build:esm": "tsc --project ./tsconfig/tsconfig.esm.json && tsc-alias -p ./tsconfig/tsconfig.esm.json && echo > ./dist/_esm/package.json '{\"type\": \"module\",\"sideEffects\":false}'", "build:types": "tsc --project ./tsconfig/tsconfig.types.json && tsc-alias -p ./tsconfig/tsconfig.types.json", - "clean": "rimraf ./packages/core/_esm ./packages/core/_cjs ./packages/core/_types ./packages/core/tsconfig", + "clean": "rimraf ./src/_esm ./src/_cjs ./src/_types ./src/tsconfig", "test": "vitest dev -c ./tests/vitest.config.ts", "test:ci": "CI=true vitest -c ./tests/vitest.config.ts --coverage", "size": "size-limit", @@ -51,7 +82,8 @@ "vitest": "^1.3.1" }, "peerDependencies": { - "typescript": "^5.0.0" + "typescript": "^5", + "viem": "^2" }, "commitlint": { "extends": ["@commitlint/config-conventional"] diff --git a/packages/core/package.json b/packages/core/package.json deleted file mode 100644 index eb8510c5..00000000 --- a/packages/core/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@biconomy/core", - "version": "0.0.1", - "author": "Biconomy", - "homepage": "https://biconomy.io", - "repository": "github:bcnmy/sdk", - "main": "./_cjs/index.js", - "module": "./_esm/index.js", - "types": "./_types/index.d.ts", - "typings": "./_types/index.d.ts", - "type": "module", - "sideEffects": false, - "description": "A utility library for working with erc-7579", - "keywords": ["erc-7579", "smart account"], - "license": "MIT", - "exports": { - ".": { - "types": "./_types/index.d.ts", - "import": "./_esm/index.js", - "default": "./_cjs/index.js" - }, - "./core": { - "types": "./_types/core/index.d.ts", - "import": "./_esm/core/index.js", - "default": "./_cjs/core/index.js" - } - }, - "peerDependencies": { - "viem": "^2" - } -} diff --git a/packages/core/account/actions/getAccountAddress.ts b/src/account/actions/getAccountAddress.ts similarity index 100% rename from packages/core/account/actions/getAccountAddress.ts rename to src/account/actions/getAccountAddress.ts diff --git a/packages/core/account/actions/sendTransaction.ts b/src/account/actions/sendTransaction.ts similarity index 100% rename from packages/core/account/actions/sendTransaction.ts rename to src/account/actions/sendTransaction.ts diff --git a/packages/core/account/createSmartAccount.ts b/src/account/createSmartAccount.ts similarity index 100% rename from packages/core/account/createSmartAccount.ts rename to src/account/createSmartAccount.ts diff --git a/packages/core/account/index.ts b/src/account/index.ts similarity index 100% rename from packages/core/account/index.ts rename to src/account/index.ts diff --git a/packages/core/account/utils/abis.ts b/src/account/utils/abis.ts similarity index 100% rename from packages/core/account/utils/abis.ts rename to src/account/utils/abis.ts diff --git a/packages/core/account/utils/constants.ts b/src/account/utils/constants.ts similarity index 100% rename from packages/core/account/utils/constants.ts rename to src/account/utils/constants.ts diff --git a/packages/core/account/utils/errors.ts b/src/account/utils/errors.ts similarity index 100% rename from packages/core/account/utils/errors.ts rename to src/account/utils/errors.ts diff --git a/packages/core/account/utils/helpers.ts b/src/account/utils/helpers.ts similarity index 100% rename from packages/core/account/utils/helpers.ts rename to src/account/utils/helpers.ts diff --git a/packages/core/account/utils/types.ts b/src/account/utils/types.ts similarity index 100% rename from packages/core/account/utils/types.ts rename to src/account/utils/types.ts diff --git a/packages/core/bundler/actions/chainId.ts b/src/bundler/actions/chainId.ts similarity index 100% rename from packages/core/bundler/actions/chainId.ts rename to src/bundler/actions/chainId.ts diff --git a/packages/core/bundler/actions/index.ts b/src/bundler/actions/index.ts similarity index 100% rename from packages/core/bundler/actions/index.ts rename to src/bundler/actions/index.ts diff --git a/packages/core/bundler/createBundlerClient.ts b/src/bundler/createBundlerClient.ts similarity index 100% rename from packages/core/bundler/createBundlerClient.ts rename to src/bundler/createBundlerClient.ts diff --git a/src/bundler/index.ts b/src/bundler/index.ts new file mode 100644 index 00000000..6d0ca3a9 --- /dev/null +++ b/src/bundler/index.ts @@ -0,0 +1,4 @@ +export type { BundlerRpcSchema, BundlerActions } from "./actions/index.js" +export { bundlerActions } from "./actions/index.js" +export { extractChainIdFromBundlerUrl } from "./utils/helpers.js" +export { createBundlerClient } from "./createBundlerClient.js" diff --git a/packages/core/bundler/utils/helpers.ts b/src/bundler/utils/helpers.ts similarity index 100% rename from packages/core/bundler/utils/helpers.ts rename to src/bundler/utils/helpers.ts diff --git a/packages/core/index.ts b/src/index.ts similarity index 100% rename from packages/core/index.ts rename to src/index.ts diff --git a/packages/core/modules/ecdsaOwnershipValidationModule/createECDSAOwnershipModule.ts b/src/modules/ecdsaOwnershipValidationModule/createECDSAOwnershipModule.ts similarity index 100% rename from packages/core/modules/ecdsaOwnershipValidationModule/createECDSAOwnershipModule.ts rename to src/modules/ecdsaOwnershipValidationModule/createECDSAOwnershipModule.ts diff --git a/packages/core/modules/index.ts b/src/modules/index.ts similarity index 100% rename from packages/core/modules/index.ts rename to src/modules/index.ts diff --git a/packages/core/modules/sessionKeyManagerModule/createSessionKeyManagerModule.ts b/src/modules/sessionKeyManagerModule/createSessionKeyManagerModule.ts similarity index 100% rename from packages/core/modules/sessionKeyManagerModule/createSessionKeyManagerModule.ts rename to src/modules/sessionKeyManagerModule/createSessionKeyManagerModule.ts diff --git a/packages/core/modules/utils/types.ts b/src/modules/utils/types.ts similarity index 100% rename from packages/core/modules/utils/types.ts rename to src/modules/utils/types.ts diff --git a/packages/core/paymaster/actions/sponsorUserOp.ts b/src/paymaster/actions/sponsorUserOp.ts similarity index 100% rename from packages/core/paymaster/actions/sponsorUserOp.ts rename to src/paymaster/actions/sponsorUserOp.ts diff --git a/packages/core/paymaster/createPaymasterClient.ts b/src/paymaster/createPaymasterClient.ts similarity index 100% rename from packages/core/paymaster/createPaymasterClient.ts rename to src/paymaster/createPaymasterClient.ts diff --git a/tests/account.test.ts b/tests/account.test.ts index 070b30cd..152750d3 100644 --- a/tests/account.test.ts +++ b/tests/account.test.ts @@ -14,11 +14,11 @@ import { type UserOperationStruct, createSmartAccount, walletClientToSmartAccountSigner -} from "../packages/core/account/index.js" -import { DEFAULT_ECDSA_OWNERSHIP_MODULE } from "../packages/core/account/utils/constants.js" -import { SignTransactionNotSupportedBySmartAccount } from "../packages/core/account/utils/errors.js" -import { getChain } from "../packages/core/account/utils/helpers.js" -import { extractChainIdFromBundlerUrl } from "../packages/core/bundler/utils/helpers.js" +} from "../src/account/index.js" +import { DEFAULT_ECDSA_OWNERSHIP_MODULE } from "../src/account/utils/constants.js" +import { SignTransactionNotSupportedBySmartAccount } from "../src/account/utils/errors.js" +import { getChain } from "../src/account/utils/helpers.js" +import { extractChainIdFromBundlerUrl } from "../src/bundler/utils/helpers.js" describe("Biconomy Smart Account core tests", () => { let smartAccount: Awaited> diff --git a/tests/bundler.test.ts b/tests/bundler.test.ts index 2ec95693..31af074b 100644 --- a/tests/bundler.test.ts +++ b/tests/bundler.test.ts @@ -2,9 +2,9 @@ import { http } from "viem" import { describe, expect, it } from "vitest" import { privateKeyToAccount } from "viem/accounts" -import { getChain } from "../packages/core/account/utils/helpers.js" -import { createBundlerClient } from "../packages/core/bundler/createBundlerClient.js" -import { extractChainIdFromBundlerUrl } from "../packages/core/bundler/utils/helpers.js" +import { getChain } from "../src/account/utils/helpers.js" +import { createBundlerClient } from "../src/bundler/createBundlerClient.js" +import { extractChainIdFromBundlerUrl } from "../src/bundler/utils/helpers.js" describe("Bundler tests", () => { const bundlerUrl = process.env.BUNDLER_URL ?? "" diff --git a/tests/modules/ecdsaOwnershipModule.test.ts b/tests/modules/ecdsaOwnershipModule.test.ts index a68c1d18..170a70d9 100644 --- a/tests/modules/ecdsaOwnershipModule.test.ts +++ b/tests/modules/ecdsaOwnershipModule.test.ts @@ -11,10 +11,10 @@ import { privateKeyToAccount } from "viem/accounts" import { createSmartAccount, walletClientToSmartAccountSigner -} from "../../packages/core/account/index.js" -import { DEFAULT_ECDSA_OWNERSHIP_MODULE } from "../../packages/core/account/utils/constants.js" -import { getChain } from "../../packages/core/account/utils/helpers.js" -import { extractChainIdFromBundlerUrl } from "../../packages/core/bundler/utils/helpers.js" +} from "../../src/account/index.js" +import { DEFAULT_ECDSA_OWNERSHIP_MODULE } from "../../src/account/utils/constants.js" +import { getChain } from "../../src/account/utils/helpers.js" +import { extractChainIdFromBundlerUrl } from "../../src/bundler/utils/helpers.js" describe("Biconomy Smart Account core tests", () => { let smartAccount: Awaited> diff --git a/tests/tsconfig.json b/tests/tsconfig.json deleted file mode 100644 index 29f3c4fc..00000000 --- a/tests/tsconfig.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../tsconfig/tsconfig.json", - "compilerOptions": { - "module": "NodeNext", - "moduleResolution": "NodeNext", - "target": "ESNext", - "types": ["bun-types"], - "baseUrl": ".", - } -} \ No newline at end of file diff --git a/tests/vitest.config.ts b/tests/vitest.config.ts index 70ad0ce6..5c7c1e71 100644 --- a/tests/vitest.config.ts +++ b/tests/vitest.config.ts @@ -3,10 +3,6 @@ import { defineConfig } from "vitest/config" export default defineConfig({ test: { - alias: { - "../packages": join(__dirname, "../packages"), - "~tests": join(__dirname, ".") - }, coverage: { all: false, provider: "v8", diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 3b1c0e93..67111566 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -2,7 +2,6 @@ "include": [], "compilerOptions": { "incremental": false, - "strict": true, "useDefineForClassFields": true, "noFallthroughCasesInSwitch": true, "noImplicitReturns": true, @@ -20,12 +19,11 @@ "moduleResolution": "NodeNext", "module": "NodeNext", "target": "ES2021", - "lib": [ - "ES2022", - "DOM" - ], + "lib": ["ES2022"], "skipLibCheck": true, - "noErrorTruncation": true + "noErrorTruncation": true, + "noEmit": true, + "strict": true }, "tsc-alias": { "resolveFullPaths": true, diff --git a/tsconfig/tsconfig.cjs.json b/tsconfig/tsconfig.cjs.json index 81cc7615..d5607ac1 100644 --- a/tsconfig/tsconfig.cjs.json +++ b/tsconfig/tsconfig.cjs.json @@ -2,8 +2,9 @@ "extends": "./tsconfig.json", "compilerOptions": { "module": "commonjs", - "outDir": "../packages/core/_cjs", + "outDir": "../dist/_cjs", "removeComments": true, "verbatimModuleSyntax": false, + "noEmit": false } } diff --git a/tsconfig/tsconfig.esm.json b/tsconfig/tsconfig.esm.json index be0716ed..136a81fc 100644 --- a/tsconfig/tsconfig.esm.json +++ b/tsconfig/tsconfig.esm.json @@ -2,6 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "module": "es2015", - "outDir": "../packages/core/_esm" + "outDir": "../dist/_esm", + "noEmit": false } } diff --git a/tsconfig/tsconfig.json b/tsconfig/tsconfig.json index 1620dd2e..2c9c1e63 100644 --- a/tsconfig/tsconfig.json +++ b/tsconfig/tsconfig.json @@ -1,16 +1,16 @@ { "extends": "./tsconfig.base.json", "include": [ - "../packages/" + "../src/" ], "exclude": [ - "../packages/**/*.test.ts", - "../packages/**/*.test-d.ts", - "../packages/**/*.bench.ts" + "../src/**/*.test.ts", + "../src/**/*.test-d.ts", + "../src/**/*.bench.ts" ], "compilerOptions": { "moduleResolution": "node", "sourceMap": true, - "rootDir": "../packages/core" + "rootDir": "../src" } } \ No newline at end of file diff --git a/tsconfig/tsconfig.types.json b/tsconfig/tsconfig.types.json index 86759c16..bb70b996 100644 --- a/tsconfig/tsconfig.types.json +++ b/tsconfig/tsconfig.types.json @@ -2,10 +2,11 @@ "extends": "./tsconfig.json", "compilerOptions": { "module": "esnext", - "outDir": "../packages/core/_esm", - "declarationDir": "../packages/core/_types", + "outDir": "../dist/_esm", + "declarationDir": "../dist/_types", "emitDeclarationOnly": true, "declaration": true, - "declarationMap": true + "declarationMap": true, + "noEmit": false } } diff --git a/typedoc.json b/typedoc.json index 550cc42c..6a717b22 100644 --- a/typedoc.json +++ b/typedoc.json @@ -1,8 +1,8 @@ { "$schema": "https://typedoc.org/schema.json", - "entryPoints": ["packages/core/index.ts"], - "basePath": "packages", - "includes": "packages", + "entryPoints": ["src/index.ts"], + "basePath": "src", + "includes": "src", "out": "docs", "gitRevision": "main" }