diff --git a/packages/caip/package.json b/packages/caip/package.json index e77f58c3fb2..87df58b3b60 100644 --- a/packages/caip/package.json +++ b/packages/caip/package.json @@ -10,9 +10,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/chain-adapters/package.json b/packages/chain-adapters/package.json index b77373aeb1a..57e34668e4f 100644 --- a/packages/chain-adapters/package.json +++ b/packages/chain-adapters/package.json @@ -9,9 +9,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/contracts/package.json b/packages/contracts/package.json index f9c2b67790a..111a9d50f9d 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -10,9 +10,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/errors/package.json b/packages/errors/package.json index ac54f9311ff..6dadb39b856 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -9,9 +9,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-coinbase/package.json b/packages/hdwallet-coinbase/package.json index 5054362058f..df48513afe6 100644 --- a/packages/hdwallet-coinbase/package.json +++ b/packages/hdwallet-coinbase/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-core/package.json b/packages/hdwallet-core/package.json index 15a06de1762..07a7501f3cf 100644 --- a/packages/hdwallet-core/package.json +++ b/packages/hdwallet-core/package.json @@ -8,21 +8,21 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" }, "./wallet": { - "import": "./dist/esm/wallet.js", - "types": "./dist/esm/wallet.d.ts" + "types": "./dist/esm/wallet.d.ts", + "import": "./dist/esm/wallet.js" }, "./keyring": { - "import": "./dist/esm/keyring.js", - "types": "./dist/esm/keyring.d.ts" + "types": "./dist/esm/keyring.d.ts", + "import": "./dist/esm/keyring.js" }, "./event": { - "import": "./dist/esm/event.js", - "types": "./dist/esm/event.d.ts" + "types": "./dist/esm/event.d.ts", + "import": "./dist/esm/event.js" } }, "files": [ diff --git a/packages/hdwallet-gridplus/package.json b/packages/hdwallet-gridplus/package.json index 8e0da06d650..3bda9759dc4 100644 --- a/packages/hdwallet-gridplus/package.json +++ b/packages/hdwallet-gridplus/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey-electron/package.json b/packages/hdwallet-keepkey-electron/package.json index ac3f869ad9e..2555e11a988 100644 --- a/packages/hdwallet-keepkey-electron/package.json +++ b/packages/hdwallet-keepkey-electron/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey-nodehid/package.json b/packages/hdwallet-keepkey-nodehid/package.json index 4965e108c2d..2c5287fa7bd 100644 --- a/packages/hdwallet-keepkey-nodehid/package.json +++ b/packages/hdwallet-keepkey-nodehid/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey-nodewebusb/package.json b/packages/hdwallet-keepkey-nodewebusb/package.json index 5d3959049b8..bd19022d5d1 100644 --- a/packages/hdwallet-keepkey-nodewebusb/package.json +++ b/packages/hdwallet-keepkey-nodewebusb/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey-tcp/package.json b/packages/hdwallet-keepkey-tcp/package.json index 59e39a656fc..56478e67352 100644 --- a/packages/hdwallet-keepkey-tcp/package.json +++ b/packages/hdwallet-keepkey-tcp/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey-webusb/package.json b/packages/hdwallet-keepkey-webusb/package.json index c4b4eb40a84..0829b918c4b 100644 --- a/packages/hdwallet-keepkey-webusb/package.json +++ b/packages/hdwallet-keepkey-webusb/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keepkey/package.json b/packages/hdwallet-keepkey/package.json index 3d9b3193c68..aaf413875cb 100644 --- a/packages/hdwallet-keepkey/package.json +++ b/packages/hdwallet-keepkey/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-keplr/package.json b/packages/hdwallet-keplr/package.json index 803f0e88d5f..6e620cc96ee 100644 --- a/packages/hdwallet-keplr/package.json +++ b/packages/hdwallet-keplr/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-ledger-webhid/package.json b/packages/hdwallet-ledger-webhid/package.json index c8976339bd5..6026a96f0c0 100644 --- a/packages/hdwallet-ledger-webhid/package.json +++ b/packages/hdwallet-ledger-webhid/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-ledger-webusb/package.json b/packages/hdwallet-ledger-webusb/package.json index fbef30e6f76..061a51cf5cb 100644 --- a/packages/hdwallet-ledger-webusb/package.json +++ b/packages/hdwallet-ledger-webusb/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-ledger/package.json b/packages/hdwallet-ledger/package.json index 5fc824c3387..8d9835b0117 100644 --- a/packages/hdwallet-ledger/package.json +++ b/packages/hdwallet-ledger/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-metamask-multichain/package.json b/packages/hdwallet-metamask-multichain/package.json index c8867b98c27..c93c7ff2119 100644 --- a/packages/hdwallet-metamask-multichain/package.json +++ b/packages/hdwallet-metamask-multichain/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-native-vault/package.json b/packages/hdwallet-native-vault/package.json index 58fc9d12c3a..a2bbc6f72d4 100644 --- a/packages/hdwallet-native-vault/package.json +++ b/packages/hdwallet-native-vault/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-native/package.json b/packages/hdwallet-native/package.json index 233a24281a4..0fcc7f5e3bc 100644 --- a/packages/hdwallet-native/package.json +++ b/packages/hdwallet-native/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" }, "./nativeEvents": { "import": "./dist/esm/nativeEvents.js", diff --git a/packages/hdwallet-phantom/package.json b/packages/hdwallet-phantom/package.json index 6505181ec9f..f780831bbbb 100644 --- a/packages/hdwallet-phantom/package.json +++ b/packages/hdwallet-phantom/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-trezor-connect/package.json b/packages/hdwallet-trezor-connect/package.json index 9fc90f1ebe9..f60bad4e26f 100644 --- a/packages/hdwallet-trezor-connect/package.json +++ b/packages/hdwallet-trezor-connect/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-trezor/package.json b/packages/hdwallet-trezor/package.json index 46515716c7a..f9102f3fd67 100644 --- a/packages/hdwallet-trezor/package.json +++ b/packages/hdwallet-trezor/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-vultisig/package.json b/packages/hdwallet-vultisig/package.json index ea755e1ce44..94828dac16d 100644 --- a/packages/hdwallet-vultisig/package.json +++ b/packages/hdwallet-vultisig/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/hdwallet-walletconnectv2/package.json b/packages/hdwallet-walletconnectv2/package.json index 87522ba991b..0725fc7e9aa 100644 --- a/packages/hdwallet-walletconnectv2/package.json +++ b/packages/hdwallet-walletconnectv2/package.json @@ -8,9 +8,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/public-api/Dockerfile b/packages/public-api/Dockerfile index 2814f6d748d..d8b200df79a 100644 --- a/packages/public-api/Dockerfile +++ b/packages/public-api/Dockerfile @@ -12,17 +12,40 @@ RUN apk add --no-cache python3 make g++ openjdk17-jre COPY package.json yarn.lock .yarnrc.yml ./ COPY .yarn ./.yarn -# Copy ALL package.json files for workspace resolution (yarn requires all workspaces to be present) -COPY packages/public-api/package.json ./packages/public-api/ +# Copy all workspace package.json files for resolution (yarn requires all workspaces present) COPY packages/caip/package.json ./packages/caip/ -COPY packages/types/package.json ./packages/types/ -COPY packages/utils/package.json ./packages/utils/ -COPY packages/swapper/package.json ./packages/swapper/ COPY packages/chain-adapters/package.json ./packages/chain-adapters/ -COPY packages/unchained-client/package.json ./packages/unchained-client/ COPY packages/contracts/package.json ./packages/contracts/ COPY packages/errors/package.json ./packages/errors/ +COPY packages/hdwallet-coinbase/package.json ./packages/hdwallet-coinbase/ +COPY packages/hdwallet-core/package.json ./packages/hdwallet-core/ +COPY packages/hdwallet-gridplus/package.json ./packages/hdwallet-gridplus/ +COPY packages/hdwallet-integration/package.json ./packages/hdwallet-integration/ +COPY packages/hdwallet-keepkey/package.json ./packages/hdwallet-keepkey/ +COPY packages/hdwallet-keepkey-electron/package.json ./packages/hdwallet-keepkey-electron/ +COPY packages/hdwallet-keepkey-nodehid/package.json ./packages/hdwallet-keepkey-nodehid/ +COPY packages/hdwallet-keepkey-nodewebusb/package.json ./packages/hdwallet-keepkey-nodewebusb/ +COPY packages/hdwallet-keepkey-tcp/package.json ./packages/hdwallet-keepkey-tcp/ +COPY packages/hdwallet-keepkey-webusb/package.json ./packages/hdwallet-keepkey-webusb/ +COPY packages/hdwallet-keplr/package.json ./packages/hdwallet-keplr/ +COPY packages/hdwallet-ledger/package.json ./packages/hdwallet-ledger/ +COPY packages/hdwallet-ledger-webhid/package.json ./packages/hdwallet-ledger-webhid/ +COPY packages/hdwallet-ledger-webusb/package.json ./packages/hdwallet-ledger-webusb/ +COPY packages/hdwallet-metamask-multichain/package.json ./packages/hdwallet-metamask-multichain/ +COPY packages/hdwallet-native/package.json ./packages/hdwallet-native/ +COPY packages/hdwallet-native-vault/package.json ./packages/hdwallet-native-vault/ +COPY packages/hdwallet-phantom/package.json ./packages/hdwallet-phantom/ +COPY packages/hdwallet-sandbox/package.json ./packages/hdwallet-sandbox/ +COPY packages/hdwallet-trezor/package.json ./packages/hdwallet-trezor/ +COPY packages/hdwallet-trezor-connect/package.json ./packages/hdwallet-trezor-connect/ +COPY packages/hdwallet-vultisig/package.json ./packages/hdwallet-vultisig/ +COPY packages/hdwallet-walletconnectv2/package.json ./packages/hdwallet-walletconnectv2/ +COPY packages/public-api/package.json ./packages/public-api/ +COPY packages/swapper/package.json ./packages/swapper/ COPY packages/swap-widget/package.json ./packages/swap-widget/ +COPY packages/types/package.json ./packages/types/ +COPY packages/unchained-client/package.json ./packages/unchained-client/ +COPY packages/utils/package.json ./packages/utils/ # Install dependencies with Railway cache mount (skip build/postinstall scripts that require git/cypress/etc) RUN --mount=type=cache,id=s/5fa4b228-de48-4bb3-90d6-807d0c6e7f1c-/root/.yarn/berry/cache,target=/root/.yarn/berry/cache \ @@ -43,8 +66,7 @@ COPY public/generated/generatedAssetData.json ./public/generated/ COPY tsconfig.json tsconfig.packages.json ./ # Build all packages using parallel tsc with project references -RUN yarn run -T tsc --build tsconfig.packages.json && \ - yarn workspaces foreach -ptiv --include '@shapeshiftoss/{errors,types,contracts,caip,utils,unchained-client,chain-adapters,swapper,public-api}' run postbuild +RUN yarn run -T tsc --build tsconfig.packages.json && yarn postbuild:packages # Build the public-api bundle WORKDIR /app/packages/public-api @@ -66,13 +88,5 @@ COPY --from=builder /app/public/generated/generatedAssetData.json ./public/gener # Set environment ENV NODE_ENV=production ENV ASSET_DATA_PATH=/app/public/generated/generatedAssetData.json -ENV PORT=3001 -ENV HOST=0.0.0.0 - -EXPOSE 3001 - -# Health check -HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://localhost:3001/health || exit 1 CMD ["node", "server.cjs"] diff --git a/packages/public-api/Dockerfile.dockerignore b/packages/public-api/Dockerfile.dockerignore index 9614c140cf7..8a5824384f6 100644 --- a/packages/public-api/Dockerfile.dockerignore +++ b/packages/public-api/Dockerfile.dockerignore @@ -27,4 +27,5 @@ cypress/ **/*.spec.ts # Other large/unnecessary directories +src/ .playwright-mcp/ diff --git a/packages/public-api/esbuild.config.mjs b/packages/public-api/esbuild.config.mjs index 368664106aa..8504e30aebd 100644 --- a/packages/public-api/esbuild.config.mjs +++ b/packages/public-api/esbuild.config.mjs @@ -1,5 +1,17 @@ import * as esbuild from 'esbuild' +const ethersCompatPlugin = { + name: 'ethers-compat', + setup(build) { + build.onResolve({ filter: /^ethers\/lib\/utils$/ }, args => { + // hdwallet packages have their own ethers v5 where ethers/lib/utils exists natively + if (args.resolveDir.includes('hdwallet-')) return undefined + // Other packages (e.g. @cowprotocol/app-data) use ethers v6 which re-exports utils at the top level + return build.resolve('ethers', { resolveDir: args.resolveDir, kind: args.kind }) + }) + }, +} + const result = await esbuild.build({ entryPoints: ['src/index.ts'], bundle: true, @@ -12,10 +24,7 @@ const result = await esbuild.build({ // Keep native modules external 'fsevents', ], - alias: { - // Alias ethers/lib/utils to ethers which has the utils re-exported - 'ethers/lib/utils': 'ethers', - }, + plugins: [ethersCompatPlugin], define: { 'process.env.NODE_ENV': '"production"', }, diff --git a/packages/public-api/railway.json b/packages/public-api/railway.json new file mode 100644 index 00000000000..e9f27936549 --- /dev/null +++ b/packages/public-api/railway.json @@ -0,0 +1,27 @@ +{ + "$schema": "https://railway.com/railway.schema.json", + "build": { + "builder": "DOCKERFILE", + "dockerfilePath": "packages/public-api/Dockerfile", + "watchPatterns": [ + "packages/public-api/**", + "packages/swapper/**", + "packages/caip/**", + "packages/types/**", + "packages/utils/**", + "packages/unchained-client/**", + "packages/chain-adapters/**", + "packages/contracts/**", + "packages/errors/**", + "packages/hdwallet-core/**", + "packages/hdwallet-ledger/**", + "public/generated/generatedAssetData.json", + "yarn.lock" + ] + }, + "deploy": { + "healthcheckPath": "/health", + "healthcheckTimeout": 30, + "restartPolicyType": "ALWAYS" + } +} diff --git a/packages/public-api/railway.toml b/packages/public-api/railway.toml deleted file mode 100644 index 4badc5a3e70..00000000000 --- a/packages/public-api/railway.toml +++ /dev/null @@ -1,21 +0,0 @@ -[build] -builder = "dockerfile" -dockerfilePath = "packages/public-api/Dockerfile" -watchPatterns = [ - "packages/public-api/**", - "packages/swapper/**", - "packages/caip/**", - "packages/types/**", - "packages/utils/**", - "packages/unchained-client/**", - "packages/chain-adapters/**", - "packages/contracts/**", - "packages/errors/**", - "public/generated/generatedAssetData.json" -] - -[deploy] -healthcheckPath = "/health" -healthcheckTimeout = 30 -restartPolicyType = "on_failure" -restartPolicyMaxRetries = 5 diff --git a/packages/swapper/package.json b/packages/swapper/package.json index 6a30a533569..9d1e0f39565 100644 --- a/packages/swapper/package.json +++ b/packages/swapper/package.json @@ -10,9 +10,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/types/package.json b/packages/types/package.json index 256c2a5f9f0..6ba062e4bbe 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -10,9 +10,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/unchained-client/package.json b/packages/unchained-client/package.json index aa1eda3216c..2be15e0f620 100644 --- a/packages/unchained-client/package.json +++ b/packages/unchained-client/package.json @@ -9,9 +9,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index 5c059fc57b3..7675887e957 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -10,9 +10,9 @@ "types": "dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "import": "./dist/esm/index.js", - "require": "./dist/cjs/index.js", - "types": "./dist/esm/index.d.ts" + "require": "./dist/cjs/index.js" } }, "files": [