thirdweb-dev · jnsdls · Sep 1, 2022 · Sep 1, 2022 · Sep 1, 2022
diff --git a/.changeset/fluffy-ducks-visit.md b/.changeset/fluffy-ducks-visit.md
@@ -0,0 +1,7 @@
+---
+"@thirdweb-dev/react": patch
+"@thirdweb-dev/sdk": patch
+"@thirdweb-dev/storage": patch
+---
+
+switch back to preconstruct for building
diff --git a/packages/react/.babelrc b/packages/react/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    "@babel/preset-typescript",
+    ["@babel/preset-react", { "runtime": "automatic" }],
+    "@babel/preset-env"
+  ]
+}
diff --git a/packages/react/config/api-extractor.json b/packages/react/config/api-extractor.json
@@ -45,7 +45,7 @@
    *
    * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
    */
-  "mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/dist/thirdweb-dev-react.cjs.d.ts",
 
   /**
    * A list of NPM package names whose exports should be treated as part of this package.

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -8,11 +8,12 @@
   },
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "dist/thirdweb-dev-react.cjs.js",
+  "types": "dist/thirdweb-dev-react.cjs.d.ts",
+  "module": "dist/thirdweb-dev-react.esm.js",
   "files": [
-    "dist/**/*"
+    "dist/**/*",
+    "patches/**/*"
   ],
   "private": false,
   "scripts": {
@@ -21,14 +22,12 @@
     "extract-api": "api-extractor run --local",
     "generate:md-docs": "yarn api-documenter markdown -i ./temp -o ./docs",
     "generate-snippets": "node ./scripts/generate-snippets.mjs",
-    "build": "tsup src/index.ts",
+    "build": "tsc && preconstruct build",
     "e2e": "yarn test-ct",
     "test-ct": "playwright test -c playwright-ct.config.ts"
   },
   "sideEffects:": false,
   "devDependencies": {
-    "@zag-js/menu": "^0.1.11",
-    "@zag-js/react": "^0.1.13",
     "@babel/core": "^7.18.10",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-react": "^7.18.6",
@@ -38,6 +37,7 @@
     "@microsoft/tsdoc": "^0.14.1",
     "@playwright/experimental-ct-react": "^1.25.1",
     "@playwright/test": "^1.25.1",
+    "@preconstruct/cli": "^2.2.1",
     "@types/color": "^3.0.3",
     "@types/mime": "^3.0.1",
     "@types/react": "^18.0.5",
@@ -54,7 +54,6 @@
     "prettier": "^2.5.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "tsup": "^6.2.3",
     "typescript": "^4.6.2"
   },
   "dependencies": {
@@ -66,6 +65,8 @@
     "@tanstack/react-query": "^4.0.10",
     "@thirdweb-dev/sdk": "*",
     "@thirdweb-dev/storage": "*",
+    "@zag-js/menu": "^0.1.11",
+    "@zag-js/react": "0.1.16",
     "color": "^4.2.3",
     "copy-to-clipboard": "^3.3.2",
     "detect-browser": "^5.3.0",

diff --git a/packages/sdk/.babelrc b/packages/sdk/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-typescript", "@babel/preset-env"]
+}
diff --git a/packages/sdk/config/api-extractor.json b/packages/sdk/config/api-extractor.json
@@ -45,7 +45,7 @@
    *
    * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
    */
-  "mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/dist/thirdweb-dev-sdk.cjs.d.ts",
 
   /**
    * A list of NPM package names whose exports should be treated as part of this package.

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -8,9 +8,8 @@
     "url": "https://github.com/thirdweb-dev/js.git"
   },
   "license": "Apache-2.0",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "dist/thirdweb-dev-sdk.cjs.js",
+  "module": "dist/thirdweb-dev-sdk.esm.js",
   "files": [
     "dist/**/*"
   ],
@@ -25,19 +24,21 @@
     "generate-md-docs": "yarn api-documenter markdown -i ./temp -o ./docs",
     "generate-docs": "yarn full-build && yarn generate-md-docs",
     "generate-snippets": "node ./scripts/generate-snippets.mjs && node ./scripts/generate-feature-snippets.mjs",
-    "build": "tsup src/index.ts",
+    "build": "tsc && preconstruct build",
     "test:all": "ts-mocha --parallel --paths -t 120000 -r esm -p tsconfig.testing.json './test/**/*.test.ts'",
     "test": "make test",
     "test:single": "ts-mocha --paths -t 120000 -r esm -p tsconfig.testing.json",
     "e2e": "ts-mocha --parallel --paths -t 120000 -r esm -p tsconfig.testing.json './e2e/**/*.test.ts'"
   },
   "devDependencies": {
+    "cbor": "^8.1.0",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "@gmrchk/cli-testing-library": "^0.1.2",
     "@microsoft/api-documenter": "^7.13.53",
     "@microsoft/api-extractor": "^7.18.10",
     "@microsoft/tsdoc": "^0.14.1",
     "@nomiclabs/hardhat-ethers": "2.0.5",
+    "@preconstruct/cli": "^2.2.1",
     "@swc/core": "^1.2.177",
     "@typechain/ethers-v5": "10.0.0",
     "@types/chai": "^4.3.1",
@@ -64,7 +65,6 @@
     "prettier": "^2.4.1",
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.7.0",
-    "tsup": "^6.2.3",
     "typechain": "^8.0.0",
     "typescript": "^4.6.2"
   },

diff --git a/packages/storage/package.json b/packages/storage/package.json
@@ -1,9 +1,8 @@
 {
   "name": "@thirdweb-dev/storage",
   "version": "0.2.2",
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "dist/thirdweb-dev-storage.cjs.js",
+  "module": "dist/thirdweb-dev-storage.esm.js",
   "repository": {
     "directory": "packages/storage",
     "type": "git",
@@ -12,7 +11,7 @@
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "tsup src/index.ts",
+    "build": "tsc && preconstruct build",
     "test": "ts-mocha 'test/**/*.ts' --paths -t 120000 -r esm -p tsconfig.testing.json"
   },
   "files": [
@@ -31,7 +30,7 @@
     "mocha": "^10.0.0",
     "ts-mocha": "^10.0.0",
     "tsc": "^2.0.4",
-    "tsup": "^6.2.3",
+    "@preconstruct/cli": "^2.2.1",
     "typescript": "^4.7.4"
   },
   "dependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -1914,17 +1914,17 @@
     "@ethersproject/properties" "^5.7.0"
     "@ethersproject/strings" "^5.7.0"
 
-"@floating-ui/core@^1.0.0":
+"@floating-ui/core@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8"
   integrity sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==
 
-"@floating-ui/[email protected].0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.0.tgz#66923a56755b6cb7a5958ecf25fe293912672d65"
-  integrity sha512-PMqJvY5Fae8HVQgUqM+lidprS6p9LSvB0AUhCdYKqr3YCaV+WaWCeVNBtXPRY2YIdrgcsL2+vd5F07FxgihHUw==
+"@floating-ui/[email protected].1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.1.tgz#3321d4e799d6ac2503e729131d07ad0e714aabeb"
+  integrity sha512-wBDiLUKWU8QNPNOTAFHiIAkBv1KlHauG2AhqjSeh2H+wR8PX+AArXfz8NkRexH5PgMJMmSOS70YS89AbWYh5dA==
   dependencies:
-    "@floating-ui/core" "^1.0.0"
+    "@floating-ui/core" "^1.0.1"
 
 "@gmrchk/cli-testing-library@^0.1.2":
   version "0.1.2"
@@ -4254,65 +4254,65 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-"@zag-js/[email protected].9":
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/@zag-js/core/-/core-0.1.9.tgz#f56eb19d61af0d6846acc4d6cadbd660aac2fd83"
-  integrity sha512-IX0FA0JiskFVzLiMJAdJHI8rB63FCEoAQ9i6j/MTYAixmnax8w5whC6NqlQ86sD7JzApOpE5xj1QyG9a5zU7lg==
+"@zag-js/[email protected].10":
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/@zag-js/core/-/core-0.1.10.tgz#71ec3366fafd7eed1aba7989ef370b2a105cee3c"
+  integrity sha512-lsJet2ZmTsBlDaMfCJoP0vrhDnn/vqC5NFTuTZ3f+AWwZn/VECXf9yoETGQpB0H74Y2yI2N8etL3NIH0r7kvCA==
   dependencies:
-    "@zag-js/store" "0.1.1"
+    "@zag-js/store" "0.1.2"
     klona "2.0.5"
 
-"@zag-js/[email protected].3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@zag-js/dismissable/-/dismissable-0.1.3.tgz#425a25e2ba9b7f4e2ad4e6ec4b0617713fdd97a0"
-  integrity sha512-FW1pjpul9tbq30VxD62GpHg9CbKsb0Wi5SsZsAgbvvdfoUXNFuXdoPWtMcpwV9Ff/RGZYlkGLNICGBICCuIhMw==
+"@zag-js/[email protected].4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@zag-js/dismissable/-/dismissable-0.1.4.tgz#7021501cdbfed2f170f31032013bdaca8194e885"
+  integrity sha512-1LIela1qG6JEvPpo9PIfzKQ+6inHrdM82T5gU/gY3+sB/LEX084C9+UmfvHmcI629XSmN13QzWoSbRG0ynZ37Q==
   dependencies:
-    "@zag-js/interact-outside" "0.1.3"
+    "@zag-js/interact-outside" "0.1.4"
 
-"@zag-js/[email protected].3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@zag-js/interact-outside/-/interact-outside-0.1.3.tgz#3a80bd906523507d8ecf2a280d165cece1cbdae8"
-  integrity sha512-X8HR/6mr7V8FXcB2FjQOFok2AMEbKIVH9WmzmbmXQhL0GFtekVWFlWrTxoZdwG5hOxO+tSc4oh6u+zLyEGB/OQ==
+"@zag-js/[email protected].4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@zag-js/interact-outside/-/interact-outside-0.1.4.tgz#9ab962abb48494b6821c0508054f2b608e795276"
+  integrity sha512-GeDWrb9WrJ8tQTaPF1KaUUfVbAotM/1ltdHnksa+03uQ+WVOgmDF+6Qmd57EnQgGu7htpA2dNLHsqXAp6aPrrQ==
 
 "@zag-js/menu@^0.1.11":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@zag-js/menu/-/menu-0.1.13.tgz#5042cfb8222420c13c082b532e600d79fa87759e"
-  integrity sha512-0aHE6lu8dkAloR1ZBnJQWGnS78s+t9bnorETzeoMtuDcEUyMc7+dQ89RzXkoVdc0IXBaIXbhS7/vNTGyL6Q1AA==
-  dependencies:
-    "@zag-js/core" "0.1.9"
-    "@zag-js/dismissable" "0.1.3"
-    "@zag-js/popper" "0.1.10"
-    "@zag-js/types" "0.2.4"
-
-"@zag-js/[email protected].10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@zag-js/popper/-/popper-0.1.10.tgz#54aeae5da2152c194b0d04336f73ee6555f1da1c"
-  integrity sha512-ZdxffrZSfrX6azVbIzQ+5GPuWL1DKR9VVMUpZUs8wB69gYYhS3UOGI2b2eCY1pfkitvOOHULoeLuibsHQOhGxQ==
-  dependencies:
-    "@floating-ui/dom" "1.0.0"
-
-"@zag-js/react@^0.1.13":
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/@zag-js/react/-/react-0.1.15.tgz#c27e2848320f4e42321dd73edb86d693ff64fd12"
-  integrity sha512-0xl63vS6E6zGh+Gy2ZnOpWNyzOVjiwpZgI363YupLyFjeh0irg8GGOlxf/4vKd6zLZMTwGSkZggXqAlu+1aN2Q==
-  dependencies:
-    "@zag-js/core" "0.1.9"
-    "@zag-js/store" "0.1.1"
-    "@zag-js/types" "0.2.4"
-    proxy-compare "2.2.0"
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@zag-js/menu/-/menu-0.1.14.tgz#696434a8f3b222fb0fe9f9342ab92bbdac081195"
+  integrity sha512-T/NUHMjiI50IOQS4I9DyMLHL/LUwoXvOLrYoVgNCxyyDWfCtBWSztBYNiVHUhJFCVlPfLkyevcxl6JRIjvQkPA==
+  dependencies:
+    "@zag-js/core" "0.1.10"
+    "@zag-js/dismissable" "0.1.4"
+    "@zag-js/popper" "0.1.11"
+    "@zag-js/types" "0.2.5"
+
+"@zag-js/[email protected].11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@zag-js/popper/-/popper-0.1.11.tgz#df8e9ebcba88519975faa099fa4188f8fda54001"
+  integrity sha512-1jbveJmbyctiGumjsYNv4nWMlRHvBFWt7KmeGSjoOEHiTcx2hEHH3gBu+/ZMwxH3cM4+ZhRM7IxN+5lY7tTKwQ==
+  dependencies:
+    "@floating-ui/dom" "1.0.1"
+
+"@zag-js/[email protected].16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@zag-js/react/-/react-0.1.16.tgz#c77cfbdb730c4dff5d9da1def045e13e1ca8c425"
+  integrity sha512-qK01vagPk9ZXDu0AhLIPelehFJ0UmvgEQUL9bO/lEHppKEIoO0EiJTKKhjGjzOtaRahK4WmJ9bPsRdklv9ta1Q==
+  dependencies:
+    "@zag-js/core" "0.1.10"
+    "@zag-js/store" "0.1.2"
+    "@zag-js/types" "0.2.5"
+    proxy-compare "2.3.0"
     use-sync-external-store "1.2.0"
 
-"@zag-js/[email protected].1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@zag-js/store/-/store-0.1.1.tgz#31572de48fe134bf7cc6409a22d66691abac48b5"
-  integrity sha512-jdJRlXEiP1e7jONsksl7wWwCXbLOgPEofv1OeDIXiLtqkAuF4uMK/oEWiSyJi/O+4UljOR/jKUwKFaLZhlhkOw==
+"@zag-js/[email protected].2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@zag-js/store/-/store-0.1.2.tgz#7c9241d10347d55cb8eeadd723bd0658445471e3"
+  integrity sha512-ya9zb2mpqXaLwCYaIC536sUapIFlLNWEpR5MuIa4h2mvktTVDdG0AQTD4GsQij/6lgAmVE/qvqpMRaeI4zfkRQ==
   dependencies:
-    proxy-compare "2.2.0"
+    proxy-compare "2.3.0"
 
-"@zag-js/[email protected].4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@zag-js/types/-/types-0.2.4.tgz#1e83ede2772ce055437f9873ccdc348050894050"
-  integrity sha512-ZToipRbJQXnM6V/BwJphUf5PiozO1qKxOhJRvJOa2T80avYmVwXJSL6IKbpWbSntmKVzCuUTQOeI5/sTR1jcRg==
+"@zag-js/[email protected].5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@zag-js/types/-/types-0.2.5.tgz#ca78495ee8bf1b8e6c042d3eee0fb4abd8ccfc1c"
+  integrity sha512-T2Vrwm7maw8JtB2OyeDUagc/R87pL79t0aiYSEQBb3UKjnuXDOlcM06ubecPMINxiMIGueKNUbTdsXZ4rWf16Q==
   dependencies:
     csstype "3.1.0"
 
@@ -11291,10 +11291,10 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-compare@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.2.0.tgz#2357330407241b091501644d08a446a4a28e0e15"
-  integrity sha512-hEtMJevUmOByZCTw1NRUVaWWHCGJLO0ogizpey8yX6zMPolDe8YVa+PHgMOTiZuyUkFj+hMKs/1UaM0+ZkuvgA==
+proxy-compare@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/proxy-compare/-/proxy-compare-2.3.0.tgz#ac9633ae52918ff9c9fcc54dfe6316c7a02d20ee"
+  integrity sha512-c3L2CcAi7f7pvlD0D7xsF+2CQIW8C3HaYx2Pfgq8eA4HAl3GAH6/dVYsyBbYF/0XJs2ziGLrzmz5fmzPm6A0pQ==
 
 prr@~1.0.1:
   version "1.0.1"