Update remote attachment imports

xmtp · Oct 15, 2024 · a23b9c2 · a23b9c2
1 parent 4276763
commit a23b9c2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/content-types/content-type-remote-attachment/package.json b/content-types/content-type-remote-attachment/package.json
@@ -66,10 +66,11 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@xmtp/content-type-primitives": "^1.0.1",
-    "@xmtp/proto": "^3.61.1",
-    "@xmtp/xmtp-js": "^11.6.3"
+    "@xmtp/encryption": "workspace:*",
+    "@xmtp/proto": "^3.61.1"
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.0",
     "@types/node": "^18.19.22",

diff --git a/content-types/content-type-remote-attachment/rollup.config.js b/content-types/content-type-remote-attachment/rollup.config.js
@@ -1,3 +1,4 @@
+import { nodeResolve } from "@rollup/plugin-node-resolve";
 import terser from "@rollup/plugin-terser";
 import typescript from "@rollup/plugin-typescript";
 import { resolveExtensions } from "@xmtp/rollup-plugin-resolve-extensions";
@@ -13,13 +14,15 @@ const plugins = [
   filesize({
     showMinifiedSize: false,
   }),
+  nodeResolve({
+    resolveOnly: ["@xmtp/encryption"],
+  }),
 ];
 
 const external = [
   "@noble/secp256k1",
-  "@xmtp/proto",
   "@xmtp/content-type-primitives",
-  "@xmtp/xmtp-js",
+  "@xmtp/proto",
   "node:crypto",
 ];
 

diff --git a/content-types/content-type-remote-attachment/src/RemoteAttachment.ts b/content-types/content-type-remote-attachment/src/RemoteAttachment.ts
@@ -5,9 +5,8 @@ import {
   type ContentCodec,
   type EncodedContent,
 } from "@xmtp/content-type-primitives";
+import { Ciphertext, crypto, decrypt, encrypt } from "@xmtp/encryption";
 import { content as proto } from "@xmtp/proto";
-import { Ciphertext, decrypt, encrypt } from "@xmtp/xmtp-js";
-import { crypto } from "./encryption";
 
 export const ContentTypeRemoteAttachment = new ContentTypeId({
   authorityId: "xmtp.org",

diff --git a/content-types/content-type-remote-attachment/src/encryption.browser.ts b/content-types/content-type-remote-attachment/src/encryption.browser.ts
diff --git a/content-types/content-type-remote-attachment/src/encryption.ts b/content-types/content-type-remote-attachment/src/encryption.ts
diff --git a/content-types/content-type-remote-attachment/src/utils.ts b/content-types/content-type-remote-attachment/src/utils.ts
diff --git a/yarn.lock b/yarn.lock
@@ -2626,10 +2626,12 @@ __metadata:
   resolution: "@xmtp/content-type-remote-attachment@workspace:content-types/content-type-remote-attachment"
   dependencies:
     "@noble/secp256k1": "npm:^1.7.1"
+    "@rollup/plugin-node-resolve": "npm:^15.3.0"
     "@rollup/plugin-terser": "npm:^0.4.4"
     "@rollup/plugin-typescript": "npm:^12.1.0"
     "@types/node": "npm:^18.19.22"
     "@xmtp/content-type-primitives": "npm:^1.0.1"
+    "@xmtp/encryption": "workspace:*"
     "@xmtp/proto": "npm:^3.61.1"
     "@xmtp/rollup-plugin-resolve-extensions": "npm:^1.0.1"
     "@xmtp/xmtp-js": "npm:^11.6.3"