vite-plugin-rebundle 1.8.0 → 1.10.0

package/dist/rebundle.d.ts

@@ -9,18 +9,19 @@ type RolldownOptions = {
     input?: InputOptions;
     output?: OutputOptions;
 };
-type Options = {
+type BundleOptions = {
     [bundleName: string]: RolldownOptions;
 };
 declare class Rebundle extends Unit {
-    private options;
+    private generalOptions;
+    private bundleOptions;
     private config;
     private originalFiles;
     private rebundledFiles;
     private hasError;
     private port;
     private ws;
-    constructor(options: Options);
+    constructor(generalOptions: RolldownOptions | null, bundleOptions?: BundleOptions);
     get vite(): Plugin;
     private onConfig;
     private onConfigResolved;
@@ -37,7 +38,8 @@ declare class Rebundle extends Unit {
     private removeFromDist;
     private ensureWs;
     private removeDirectoryIfEmpty;
+    private merge;
 }
-declare function rebundle(options?: Options): Plugin<any>;
+declare function rebundle(generalOptions: RolldownOptions | null, bundleOptions?: BundleOptions): Plugin<any>;
 
-export { type Options, Rebundle, type RolldownOptions, _code_, _sourcemap_, rebundle as default, rebundle };
+export { type BundleOptions, Rebundle, type RolldownOptions, _code_, _sourcemap_, rebundle as default, rebundle };

package/dist/rebundle.js

@@ -1,5 +1,5 @@
 // src/rebundle.ts
-import { safe, Unit } from "@eposlabs/utils";
+import { safe, Unit, is } from "@eposlabs/utils";
 import chalk from "chalk";
 import { filesize } from "filesize";
 import { readdir, readFile, rmdir, stat, unlink } from "fs/promises";
@@ -10,16 +10,18 @@ import { WebSocketServer } from "ws";
 var _code_ = Symbol("rebundle:code");
 var _sourcemap_ = Symbol("rebundle:sourcemap");
 var Rebundle = class extends Unit {
-  options;
+  generalOptions;
+  bundleOptions;
   config = null;
   originalFiles = {};
   rebundledFiles = {};
   hasError = false;
   port = null;
   ws = null;
-  constructor(options) {
+  constructor(generalOptions, bundleOptions) {
     super();
-    this.options = options;
+    this.generalOptions = generalOptions ?? {};
+    this.bundleOptions = bundleOptions ?? {};
   }
   get vite() {
     return {
@@ -78,8 +80,6 @@ var Rebundle = class extends Unit {
       if (chunk.isEntry) continue;
       await this.removeFromDist(chunk.fileName);
       delete bundle[chunk.fileName];
-      const dir = dirname(join(this.dist, chunk.fileName));
-      await this.removeDirectoryIfEmpty(dir);
     }
     if (this.config.build.watch && modifiedChunkNames.length > 0) {
       const ws = await this.ensureWs();
@@ -100,12 +100,18 @@ var Rebundle = class extends Unit {
       await this.removeFromDist(chunk.fileName);
       return false;
     }
-    const options = this.options[chunk.name] ?? {};
     const [result] = await safe(async () => {
       const inputPath = join(this.dist, chunk.fileName);
       const outputPath = join(this.dist, this.unprefixed(chunk.fileName));
-      const build = await rolldown({ ...options.input, input: inputPath });
-      const result2 = await build.write({ ...options.output, sourcemap: false, file: outputPath });
+      const build = await rolldown({
+        ...this.merge(this.generalOptions.input ?? {}, this.bundleOptions[chunk.name]?.input ?? {}),
+        input: inputPath
+      });
+      const result2 = await build.write({
+        ...this.merge(this.generalOptions.output ?? {}, this.bundleOptions[chunk.name]?.output ?? {}),
+        sourcemap: false,
+        file: outputPath
+      });
       return result2;
     });
     if (!result) return;
@@ -153,7 +159,10 @@ var Rebundle = class extends Unit {
     return content;
   }
   async removeFromDist(path) {
-    await safe(unlink(join(this.dist, path)));
+    path = join(this.dist, path);
+    const dir = dirname(path);
+    await safe(unlink(path));
+    await this.removeDirectoryIfEmpty(dir);
   }
   async ensureWs() {
     if (this.ws) return this.ws;
@@ -167,9 +176,20 @@ var Rebundle = class extends Unit {
     await rmdir(dir);
     await this.removeDirectoryIfEmpty(dirname(dir));
   }
+  merge(obj1, obj2) {
+    const result = { ...obj1 };
+    for (const key in obj2) {
+      if (is.object(obj1[key]) && is.object(obj2[key])) {
+        result[key] = this.merge(obj1[key], obj2[key]);
+      } else {
+        result[key] = obj2[key];
+      }
+    }
+    return result;
+  }
 };
-function rebundle(options = {}) {
-  return new Rebundle(options).vite;
+function rebundle(generalOptions, bundleOptions) {
+  return new Rebundle(generalOptions, bundleOptions).vite;
 }
 var rebundle_default = rebundle;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-rebundle",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -27,14 +27,14 @@
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.8.0",
+    "@eposlabs/utils": "^1.9.0",
     "@types/ws": "^8.18.1",
     "chalk": "^5.6.2",
     "filesize": "^11.0.13",
     "portfinder": "^1.0.38",
     "rolldown": "^1.0.0-beta.41",
-    "rollup": "^4.52.3",
-    "vite": "^7.1.7",
+    "rollup": "^4.52.4",
+    "vite": "^7.1.9",
     "ws": "^8.18.3"
   }
 }

package/src/rebundle.ts

@@ -1,4 +1,4 @@
-import { safe, Unit } from '@eposlabs/utils'
+import { safe, Unit, is } from '@eposlabs/utils'
 import chalk from 'chalk'
 import { filesize } from 'filesize'
 import { readdir, readFile, rmdir, stat, unlink } from 'node:fs/promises'
@@ -17,12 +17,13 @@ export type RolldownOptions = {
   output?: OutputOptions
 }
 
-export type Options = {
+export type BundleOptions = {
   [bundleName: string]: RolldownOptions
 }
 
 export class Rebundle extends Unit {
-  private options: Options
+  private generalOptions: RolldownOptions
+  private bundleOptions: BundleOptions
   private config: ResolvedConfig | null = null
   private originalFiles: Record<string, string> = {}
   private rebundledFiles: Record<string, string> = {}
@@ -30,9 +31,10 @@ export class Rebundle extends Unit {
   private port: number | null = null
   private ws: WebSocketServer | null = null
 
-  constructor(options: Options) {
+  constructor(generalOptions: RolldownOptions | null, bundleOptions?: BundleOptions) {
     super()
-    this.options = options
+    this.generalOptions = generalOptions ?? {}
+    this.bundleOptions = bundleOptions ?? {}
   }
 
   get vite(): Plugin {
@@ -110,10 +112,6 @@ export class Rebundle extends Unit {
       // Remove from dist and bundle
       await this.removeFromDist(chunk.fileName)
       delete bundle[chunk.fileName]
-
-      // Recursively remove containing directory if empty
-      const dir = dirname(join(this.dist, chunk.fileName))
-      await this.removeDirectoryIfEmpty(dir)
     }
 
     // Notify about modified chunks
@@ -150,12 +148,21 @@ export class Rebundle extends Unit {
     }
 
     // Build with rolldown
-    const options = this.options[chunk.name] ?? {}
     const [result] = await safe(async () => {
       const inputPath = join(this.dist, chunk.fileName)
       const outputPath = join(this.dist, this.unprefixed(chunk.fileName))
-      const build = await rolldown({ ...options.input, input: inputPath })
-      const result = await build.write({ ...options.output, sourcemap: false, file: outputPath })
+
+      const build = await rolldown({
+        ...this.merge(this.generalOptions.input ?? {}, this.bundleOptions[chunk.name]?.input ?? {}),
+        input: inputPath,
+      })
+
+      const result = await build.write({
+        ...this.merge(this.generalOptions.output ?? {}, this.bundleOptions[chunk.name]?.output ?? {}),
+        sourcemap: false,
+        file: outputPath,
+      })
+
       return result
     })
     if (!result) return
@@ -221,7 +228,10 @@ export class Rebundle extends Unit {
   }
 
   private async removeFromDist(path: string) {
-    await safe(unlink(join(this.dist, path)))
+    path = join(this.dist, path)
+    const dir = dirname(path)
+    await safe(unlink(path))
+    await this.removeDirectoryIfEmpty(dir)
   }
 
   private async ensureWs() {
@@ -237,10 +247,23 @@ export class Rebundle extends Unit {
     await rmdir(dir)
     await this.removeDirectoryIfEmpty(dirname(dir))
   }
+
+  private merge(obj1: Record<string, any>, obj2: Record<string, any>) {
+    const result: Record<string, any> = { ...obj1 }
+    for (const key in obj2) {
+      if (is.object(obj1[key]) && is.object(obj2[key])) {
+        result[key] = this.merge(obj1[key], obj2[key])
+      } else {
+        result[key] = obj2[key]
+      }
+    }
+
+    return result
+  }
 }
 
-export function rebundle(options: Options = {}) {
-  return new Rebundle(options).vite
+export function rebundle(generalOptions: RolldownOptions | null, bundleOptions?: BundleOptions) {
+  return new Rebundle(generalOptions, bundleOptions).vite
 }
 
 export default rebundle