Merge pull request #523 from xmtp/rygine/use-rollup-plugin

Use published rollup plugin for builds
xmtp · Jan 23, 2024 · c5fe2d2 · c5fe2d2
2 parents 779e5c1 + e406668
commit c5fe2d2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 120 deletions.
diff --git a/build/rollup-plugin-resolve-extensions/index.ts b/build/rollup-plugin-resolve-extensions/index.ts
diff --git a/build/utils.ts b/build/utils.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,11 +39,9 @@
   "scripts": {
     "prebench": "npm run build:bench",
     "bench": "node dist/bench/index.cjs",
-    "build": "npm run clean:dist && npm run build:plugin && npm run build:rollup",
+    "build": "npm run clean:dist && rollup -c",
     "build:bench": "rollup -c rollup.config.bench.js",
     "build:docs": "rimraf docs && mkdir -p tmp && cp README.md tmp/ && sed -i.bak '/badge.svg/d' tmp/README.md && typedoc --excludePrivate --readme tmp/README.md src/index.ts",
-    "build:rollup": "rollup -c",
-    "build:plugin": "rollup -c rollup.config.build.js",
     "clean": "npm run clean:dist",
     "clean:dist": "rimraf dist",
     "package": "npm pack",
@@ -129,6 +127,7 @@
     "@types/node": "^18.14.0",
     "@typescript-eslint/eslint-plugin": "^6.7.2",
     "@typescript-eslint/parser": "^6.7.2",
+    "@xmtp/rollup-plugin-resolve-extensions": "^1.0.0",
     "benny": "^3.7.1",
     "dd-trace": "^2.12.2",
     "eslint": "^8.50.0",

diff --git a/rollup.config.build.js b/rollup.config.build.js
diff --git a/rollup.config.js b/rollup.config.js
@@ -4,7 +4,7 @@ import { dts } from 'rollup-plugin-dts'
 import filesize from 'rollup-plugin-filesize'
 import json from '@rollup/plugin-json'
 import terser from '@rollup/plugin-terser'
-import { resolveExtensions } from './build/rollup-plugin-resolve-extensions/index.js'
+import { resolveExtensions } from '@xmtp/rollup-plugin-resolve-extensions'
 
 const external = [
   '@noble/secp256k1',
@@ -69,7 +69,11 @@ export default defineConfig([
       format: 'es',
       sourcemap: true,
     },
-    plugins: [resolveExtensions(['.browser']), terser(), ...plugins],
+    plugins: [
+      resolveExtensions({ extensions: ['.browser'] }),
+      terser(),
+      ...plugins,
+    ],
     external,
   },
   {
@@ -80,7 +84,7 @@ export default defineConfig([
       sourcemap: true,
     },
     plugins: [
-      resolveExtensions(['.bundler', '.browser']),
+      resolveExtensions({ extensions: ['.bundler', '.browser'] }),
       terser(),
       ...plugins,
     ],