js: resolve bundling issues

Bonfida · Sep 4, 2024 · 89707ae · 89707ae
1 parent 10445f1
commit 89707ae
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 3 deletions.
diff --git a/js/package-lock.json b/js/package-lock.json
diff --git a/js/package.json b/js/package.json
@@ -38,6 +38,7 @@
     "@pythnetwork/client": "^2.19.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.5",

diff --git a/js/rollup.config.mjs b/js/rollup.config.mjs
@@ -7,6 +7,7 @@ import replace from "@rollup/plugin-replace";
 import babel from "@rollup/plugin-babel";
 import { visualizer } from "rollup-plugin-visualizer";
 import multiInput from "rollup-plugin-multi-input";
+import inject from "@rollup/plugin-inject";
 
 /**
  * @type {import('rollup').RollupOptions}
@@ -43,15 +44,29 @@ export default {
       preserveModulesRoot: "src",
     },
   ],
-  external: ["@solana/web3.js"],
+  external: [
+    "@solana/web3.js",
+    "@solana/buffer-layout-utils",
+    "@solana/buffer-layout",
+  ],
   plugins: [
     multiInput.default(),
     nodeResolve({
       browser: true,
       preferBuiltins: false,
-      dedupe: ["borsh", "@solana/spl-token", "bn.js", "buffer"],
+      dedupe: [
+        "borsh",
+        "@solana/spl-token",
+        "bn.js",
+        "buffer",
+        "@solana/buffer-layout-utils",
+        "@solana/buffer-layout",
+      ],
     }),
     commonjs(),
+    inject({
+      Buffer: ["buffer", "Buffer"],
+    }),
     typescript({
       tsconfig: "./tsconfig.json",
       declaration: false,

diff --git a/js/src/record_v2/serializeRecordV2Content.ts b/js/src/record_v2/serializeRecordV2Content.ts
@@ -11,7 +11,7 @@ import {
   InvalidInjectiveAddressError,
   InvalidRecordInputError,
 } from "../error";
-
+import { Buffer } from "buffer";
 import { UTF8_ENCODED, EVM_RECORDS } from "./const";
 
 /**