Merge pull request #724 from xmtp/rygine/fixes

Fix example Vite config, misc cleanup
xmtp · Nov 19, 2024 · d30b40c · d30b40c
2 parents 3eed1fe + 931ce82
commit d30b40c
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 87 deletions.
diff --git a/content-types/content-type-group-updated/package.json b/content-types/content-type-group-updated/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-primitives/package.json b/content-types/content-type-primitives/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-reaction/package.json b/content-types/content-type-reaction/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-read-receipt/package.json b/content-types/content-type-read-receipt/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-remote-attachment/package.json b/content-types/content-type-remote-attachment/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-reply/package.json b/content-types/content-type-reply/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-text/package.json b/content-types/content-type-text/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/content-types/content-type-transaction-reference/package.json b/content-types/content-type-transaction-reference/package.json
@@ -31,14 +31,17 @@
       "browser": "./dist/browser/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "browser": "dist/browser/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/examples/react-vite-browser-sdk/vite.config.ts b/examples/react-vite-browser-sdk/vite.config.ts
@@ -5,7 +5,8 @@ import { defineConfig } from "vite";
 export default defineConfig({
   plugins: [react()],
   optimizeDeps: {
-    exclude: ["@xmtp/wasm-bindings"],
+    exclude: ["@xmtp/browser-sdk"],
+    include: ["@xmtp/proto"],
   },
   server: {
     headers: {

diff --git a/packages/consent-proof-signature/package.json b/packages/consent-proof-signature/package.json
@@ -29,7 +29,8 @@
       "types": "./dist/index.d.ts",
       "require": "./dist/index.cjs",
       "import": "./dist/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -38,8 +39,7 @@
   "files": [
     "dist",
     "src",
-    "!src/**/*.test.*",
-    "tsconfig.json"
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/packages/frames-client/package.json b/packages/frames-client/package.json
@@ -28,16 +28,16 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "module": "dist/index.js",
   "browser": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
     "src",
-    "!src/**/*.test.*",
-    "tsconfig.json"
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/packages/frames-validator/package.json b/packages/frames-validator/package.json
@@ -14,13 +14,16 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "src",
+    "!src/**/*.test.*"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/sdks/browser-sdk/README.md b/sdks/browser-sdk/README.md
@@ -68,7 +68,7 @@ export default nextConfig;
 
 ### Bundlers
 
-This SDK uses a WebAssembly (WASM) module and some bundlers must be configured properly to handle it.
+This SDK and some of its dependencies use `import.meta.url`. Some bundlers must be configured to account for this during development.
 
 #### Vite
 
@@ -79,7 +79,8 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
   optimizeDeps: {
-    exclude: ["@xmtp/wasm-bindings"],
+    exclude: ["@xmtp/browser-sdk"],
+    include: ["@xmtp/proto"],
   },
 });
 ```

diff --git a/sdks/browser-sdk/package.json b/sdks/browser-sdk/package.json
@@ -29,15 +29,15 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "module": "dist/index.js",
   "browser": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "tsconfig.json"
+    "src"
   ],
   "scripts": {
     "build": "yarn clean:dist && yarn rollup -c",

diff --git a/sdks/js-sdk/package.json b/sdks/js-sdk/package.json
@@ -59,8 +59,7 @@
   "types": "dist/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "tsconfig.json"
+    "src"
   ],
   "scripts": {
     "bench": "yarn build:bench && node dist/bench/index.cjs",

diff --git a/sdks/node-sdk/package.json b/sdks/node-sdk/package.json
@@ -28,7 +28,8 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "dist/index.cjs",
   "module": "dist/index.js",

diff --git a/sdks/node-sdk/src/Conversations.ts b/sdks/node-sdk/src/Conversations.ts
@@ -47,10 +47,7 @@ export class Conversations {
     }
   }
 
-  async newConversation(
-    accountAddresses: string[],
-    options?: CreateGroupOptions,
-  ) {
+  async newGroup(accountAddresses: string[], options?: CreateGroupOptions) {
     const group = await this.#conversations.createGroup(
       accountAddresses,
       options,

diff --git a/sdks/node-sdk/test/Client.test.ts b/sdks/node-sdk/test/Client.test.ts
@@ -164,9 +164,7 @@ describe("Client", () => {
     const user2 = createUser();
     const client1 = await createRegisteredClient(user1);
     const client2 = await createRegisteredClient(user2);
-    const group = await client1.conversations.newConversation([
-      user2.account.address,
-    ]);
+    const group = await client1.conversations.newGroup([user2.account.address]);
 
     await client2.conversations.sync();
     const group2 = client2.conversations.getConversationById(group.id);