@esmx/rspack 3.0.0-rc.52 → 3.0.0-rc.53

package/dist/rspack/pack.d.ts

@@ -1,2 +1,9 @@
-import type { Esmx } from '@esmx/core';
+import type { Esmx, ManifestJson } from '@esmx/core';
 export declare function pack(esmx: Esmx): Promise<boolean>;
+export interface GenerateExportsOptions {
+    client: ManifestJson['exports'];
+    server: ManifestJson['exports'];
+    base?: Record<string, unknown>;
+}
+export declare function generateExports(options: GenerateExportsOptions): Record<string, unknown>;
+export declare function contentHash(buffer: Buffer, algorithm?: string): string;

package/dist/rspack/pack.mjs

@@ -28,6 +28,27 @@ export async function pack(esmx) {
   await packConfig.onAfter(esmx, pkgJson, data);
   return true;
 }
+export function generateExports(options) {
+  const { client, server, base = {} } = options;
+  const exports = { ...base };
+  const set = /* @__PURE__ */ new Set([...Object.keys(client), ...Object.keys(server)]);
+  set.forEach((name) => {
+    const clientExport = client[name];
+    const serverExport = server[name];
+    const exportName = name === "index" ? "." : `./${name}`;
+    if (clientExport && serverExport) {
+      exports[exportName] = {
+        default: `./server/${serverExport.file}`,
+        browser: `./client/${clientExport.file}`
+      };
+    } else if (clientExport) {
+      exports[exportName] = `./client/${clientExport.file}`;
+    } else if (serverExport) {
+      exports[exportName] = `./server/${serverExport.file}`;
+    }
+  });
+  return exports;
+}
 async function buildPackageJson(esmx) {
   const [clientJson, serverJson, curJson] = await Promise.all([
     esmx.readJson(
@@ -38,27 +59,10 @@ async function buildPackageJson(esmx) {
     ),
     esmx.readJson(esmx.resolvePath("package.json"))
   ]);
-  const exports = {
-    ...curJson?.exports
-  };
-  const set = /* @__PURE__ */ new Set([
-    ...Object.keys(clientJson.exports),
-    ...Object.keys(serverJson.exports)
-  ]);
-  set.forEach((name) => {
-    const client = clientJson.exports[name];
-    const server = serverJson.exports[name];
-    const exportName = `./${name}`;
-    if (client && server) {
-      exports[exportName] = {
-        default: `./server/${server.file}`,
-        browser: `./client/${client.file}`
-      };
-    } else if (client) {
-      exports[exportName] = `./client/${client.file}`;
-    } else if (server) {
-      exports[exportName] = `./server/${server.file}`;
-    }
+  const exports = generateExports({
+    client: clientJson.exports,
+    server: serverJson.exports,
+    base: curJson?.exports
   });
   const buildJson = {
     ...curJson,
@@ -66,8 +70,8 @@ async function buildPackageJson(esmx) {
   };
   return buildJson;
 }
-function contentHash(buffer, algorithm = "sha256") {
-  const hash = crypto.createHash("sha256");
+export function contentHash(buffer, algorithm = "sha256") {
+  const hash = crypto.createHash(algorithm);
   hash.update(buffer);
   return `${algorithm}-${hash.digest("hex")}`;
 }

package/dist/rspack/pack.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/rspack/pack.test.mjs

@@ -0,0 +1,180 @@
+import { describe, expect, it } from "vitest";
+import { contentHash, generateExports } from "./pack.mjs";
+describe("generateExports", () => {
+  it("should generate exports with both client and server files", () => {
+    const clientExports = {
+      "src/entry.client": {
+        file: "exports/src/entry.client.95f6085b.final.mjs",
+        name: "src/entry.client",
+        rewrite: true,
+        identifier: "ssr-vue2-remote/src/entry.client"
+      },
+      "src/components/index": {
+        file: "exports/src/components/index.a73d6772.final.mjs",
+        name: "src/components/index",
+        rewrite: true,
+        identifier: "ssr-vue2-remote/src/components/index"
+      }
+    };
+    const serverExports = {
+      "src/entry.server": {
+        file: "exports/src/entry.server.b85ed2ff.final.mjs",
+        name: "src/entry.server",
+        rewrite: true,
+        identifier: "ssr-vue2-remote/src/entry.server"
+      },
+      "src/components/index": {
+        file: "exports/src/components/index.12b57db5.final.mjs",
+        name: "src/components/index",
+        rewrite: true,
+        identifier: "ssr-vue2-remote/src/components/index"
+      }
+    };
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports
+    });
+    expect(result).toEqual({
+      "./src/entry.client": "./client/exports/src/entry.client.95f6085b.final.mjs",
+      "./src/entry.server": "./server/exports/src/entry.server.b85ed2ff.final.mjs",
+      "./src/components/index": {
+        default: "./server/exports/src/components/index.12b57db5.final.mjs",
+        browser: "./client/exports/src/components/index.a73d6772.final.mjs"
+      }
+    });
+  });
+  it("should merge with existing exports", () => {
+    const clientExports = {
+      index: {
+        file: "index.js",
+        name: "index",
+        rewrite: true,
+        identifier: "index"
+      }
+    };
+    const serverExports = {
+      index: {
+        file: "index.js",
+        name: "index",
+        rewrite: true,
+        identifier: "index"
+      }
+    };
+    const existingExports = {
+      "./custom": "./custom.js"
+    };
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports,
+      base: existingExports
+    });
+    expect(result).toEqual({
+      "./custom": "./custom.js",
+      ".": {
+        default: "./server/index.js",
+        browser: "./client/index.js"
+      }
+    });
+  });
+  it("should handle empty exports", () => {
+    const clientExports = {};
+    const serverExports = {};
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports
+    });
+    expect(result).toEqual({});
+  });
+  it("should handle only client exports", () => {
+    const clientExports = {
+      utils: {
+        file: "utils.js",
+        name: "utils",
+        rewrite: true,
+        identifier: "utils"
+      }
+    };
+    const serverExports = {};
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports
+    });
+    expect(result).toEqual({
+      "./utils": "./client/utils.js"
+    });
+  });
+  it("should handle only server exports", () => {
+    const clientExports = {};
+    const serverExports = {
+      api: {
+        file: "api.js",
+        name: "api",
+        rewrite: true,
+        identifier: "api"
+      }
+    };
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports
+    });
+    expect(result).toEqual({
+      "./api": "./server/api.js"
+    });
+  });
+  it("should handle index export correctly", () => {
+    const clientExports = {
+      index: {
+        file: "index.js",
+        name: "index",
+        rewrite: true,
+        identifier: "index"
+      }
+    };
+    const serverExports = {
+      index: {
+        file: "index.js",
+        name: "index",
+        rewrite: true,
+        identifier: "index"
+      }
+    };
+    const result = generateExports({
+      client: clientExports,
+      server: serverExports
+    });
+    expect(result).toEqual({
+      ".": {
+        default: "./server/index.js",
+        browser: "./client/index.js"
+      }
+    });
+  });
+});
+describe("contentHash", () => {
+  it("should generate SHA256 hash for buffer", () => {
+    const buffer = Buffer.from("test content");
+    const result = contentHash(buffer);
+    expect(result).toMatch(/^sha256-[a-f0-9]{64}$/);
+    expect(result).toBe(
+      "sha256-6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72"
+    );
+  });
+  it("should use custom algorithm when provided", () => {
+    const buffer = Buffer.from("test content");
+    const result = contentHash(buffer, "md5");
+    expect(result).toMatch(/^md5-[a-f0-9]{32}$/);
+    expect(result).toBe("md5-9473fdd0d880a43c21b7778d34872157");
+  });
+  it("should handle empty buffer", () => {
+    const buffer = Buffer.from("");
+    const result = contentHash(buffer);
+    expect(result).toBe(
+      "sha256-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    );
+  });
+  it("should handle binary data", () => {
+    const buffer = Buffer.from([0, 1, 2, 3, 255]);
+    const result = contentHash(buffer);
+    expect(result).toMatch(/^sha256-[a-f0-9]{64}$/);
+  });
+});

package/package.json

@@ -63,8 +63,8 @@
         }
     },
     "dependencies": {
-        "@esmx/import": "3.0.0-rc.52",
-        "@esmx/rspack-module-link-plugin": "3.0.0-rc.52",
+        "@esmx/import": "3.0.0-rc.53",
+        "@esmx/rspack-module-link-plugin": "3.0.0-rc.53",
         "@npmcli/arborist": "^9.0.1",
         "@rspack/core": "1.4.8",
         "css-loader": "^7.1.2",
@@ -80,7 +80,7 @@
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/core": "3.0.0-rc.52",
+        "@esmx/core": "3.0.0-rc.53",
         "@types/node": "^24.0.0",
         "@types/npmcli__arborist": "^6.3.1",
         "@types/pacote": "^11.1.8",
@@ -91,7 +91,7 @@
         "unbuild": "3.5.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.52",
+    "version": "3.0.0-rc.53",
     "type": "module",
     "private": false,
     "exports": {
@@ -110,5 +110,5 @@
         "template",
         "public"
     ],
-    "gitHead": "6cb46d99223f82c65b7913514950497ce34860ae"
+    "gitHead": "e76fe45c0af262d52944c038f04e62b3b0fca3f7"
 }

package/src/rspack/pack.test.ts

@@ -0,0 +1,217 @@
+import type { ManifestJsonExports } from '@esmx/core';
+import { describe, expect, it } from 'vitest';
+import { contentHash, generateExports } from './pack';
+
+describe('generateExports', () => {
+    it('should generate exports with both client and server files', () => {
+        const clientExports: ManifestJsonExports = {
+            'src/entry.client': {
+                file: 'exports/src/entry.client.95f6085b.final.mjs',
+                name: 'src/entry.client',
+                rewrite: true,
+                identifier: 'ssr-vue2-remote/src/entry.client'
+            },
+            'src/components/index': {
+                file: 'exports/src/components/index.a73d6772.final.mjs',
+                name: 'src/components/index',
+                rewrite: true,
+                identifier: 'ssr-vue2-remote/src/components/index'
+            }
+        };
+
+        const serverExports: ManifestJsonExports = {
+            'src/entry.server': {
+                file: 'exports/src/entry.server.b85ed2ff.final.mjs',
+                name: 'src/entry.server',
+                rewrite: true,
+                identifier: 'ssr-vue2-remote/src/entry.server'
+            },
+            'src/components/index': {
+                file: 'exports/src/components/index.12b57db5.final.mjs',
+                name: 'src/components/index',
+                rewrite: true,
+                identifier: 'ssr-vue2-remote/src/components/index'
+            }
+        };
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports
+        });
+
+        expect(result).toEqual({
+            './src/entry.client':
+                './client/exports/src/entry.client.95f6085b.final.mjs',
+            './src/entry.server':
+                './server/exports/src/entry.server.b85ed2ff.final.mjs',
+            './src/components/index': {
+                default:
+                    './server/exports/src/components/index.12b57db5.final.mjs',
+                browser:
+                    './client/exports/src/components/index.a73d6772.final.mjs'
+            }
+        });
+    });
+
+    it('should merge with existing exports', () => {
+        const clientExports: ManifestJsonExports = {
+            index: {
+                file: 'index.js',
+                name: 'index',
+                rewrite: true,
+                identifier: 'index'
+            }
+        };
+
+        const serverExports: ManifestJsonExports = {
+            index: {
+                file: 'index.js',
+                name: 'index',
+                rewrite: true,
+                identifier: 'index'
+            }
+        };
+
+        const existingExports = {
+            './custom': './custom.js'
+        };
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports,
+            base: existingExports
+        });
+
+        expect(result).toEqual({
+            './custom': './custom.js',
+            '.': {
+                default: './server/index.js',
+                browser: './client/index.js'
+            }
+        });
+    });
+
+    it('should handle empty exports', () => {
+        const clientExports: ManifestJsonExports = {};
+        const serverExports: ManifestJsonExports = {};
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports
+        });
+
+        expect(result).toEqual({});
+    });
+
+    it('should handle only client exports', () => {
+        const clientExports: ManifestJsonExports = {
+            utils: {
+                file: 'utils.js',
+                name: 'utils',
+                rewrite: true,
+                identifier: 'utils'
+            }
+        };
+
+        const serverExports: ManifestJsonExports = {};
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports
+        });
+
+        expect(result).toEqual({
+            './utils': './client/utils.js'
+        });
+    });
+
+    it('should handle only server exports', () => {
+        const clientExports: ManifestJsonExports = {};
+
+        const serverExports: ManifestJsonExports = {
+            api: {
+                file: 'api.js',
+                name: 'api',
+                rewrite: true,
+                identifier: 'api'
+            }
+        };
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports
+        });
+
+        expect(result).toEqual({
+            './api': './server/api.js'
+        });
+    });
+
+    it('should handle index export correctly', () => {
+        const clientExports: ManifestJsonExports = {
+            index: {
+                file: 'index.js',
+                name: 'index',
+                rewrite: true,
+                identifier: 'index'
+            }
+        };
+
+        const serverExports: ManifestJsonExports = {
+            index: {
+                file: 'index.js',
+                name: 'index',
+                rewrite: true,
+                identifier: 'index'
+            }
+        };
+
+        const result = generateExports({
+            client: clientExports,
+            server: serverExports
+        });
+
+        expect(result).toEqual({
+            '.': {
+                default: './server/index.js',
+                browser: './client/index.js'
+            }
+        });
+    });
+});
+
+describe('contentHash', () => {
+    it('should generate SHA256 hash for buffer', () => {
+        const buffer = Buffer.from('test content');
+        const result = contentHash(buffer);
+
+        expect(result).toMatch(/^sha256-[a-f0-9]{64}$/);
+        expect(result).toBe(
+            'sha256-6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72'
+        );
+    });
+
+    it('should use custom algorithm when provided', () => {
+        const buffer = Buffer.from('test content');
+        const result = contentHash(buffer, 'md5');
+
+        expect(result).toMatch(/^md5-[a-f0-9]{32}$/);
+        expect(result).toBe('md5-9473fdd0d880a43c21b7778d34872157');
+    });
+
+    it('should handle empty buffer', () => {
+        const buffer = Buffer.from('');
+        const result = contentHash(buffer);
+
+        expect(result).toBe(
+            'sha256-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+        );
+    });
+
+    it('should handle binary data', () => {
+        const buffer = Buffer.from([0x00, 0x01, 0x02, 0x03, 0xff]);
+        const result = contentHash(buffer);
+
+        expect(result).toMatch(/^sha256-[a-f0-9]{64}$/);
+    });
+});

package/src/rspack/pack.ts

@@ -36,6 +36,40 @@ export async function pack(esmx: Esmx): Promise<boolean> {
     return true;
 }
 
+export interface GenerateExportsOptions {
+    client: ManifestJson['exports'];
+    server: ManifestJson['exports'];
+    base?: Record<string, unknown>;
+}
+
+export function generateExports(
+    options: GenerateExportsOptions
+): Record<string, unknown> {
+    const { client, server, base = {} } = options;
+    const exports: Record<string, unknown> = { ...base };
+
+    const set = new Set([...Object.keys(client), ...Object.keys(server)]);
+
+    set.forEach((name) => {
+        const clientExport = client[name];
+        const serverExport = server[name];
+        const exportName = name === 'index' ? '.' : `./${name}`;
+
+        if (clientExport && serverExport) {
+            exports[exportName] = {
+                default: `./server/${serverExport.file}`,
+                browser: `./client/${clientExport.file}`
+            };
+        } else if (clientExport) {
+            exports[exportName] = `./client/${clientExport.file}`;
+        } else if (serverExport) {
+            exports[exportName] = `./server/${serverExport.file}`;
+        }
+    });
+
+    return exports;
+}
+
 async function buildPackageJson(esmx: Esmx): Promise<Record<string, any>> {
     const [clientJson, serverJson, curJson] = await Promise.all([
         esmx.readJson<ManifestJson>(
@@ -46,27 +80,11 @@ async function buildPackageJson(esmx: Esmx): Promise<Record<string, any>> {
         ),
         esmx.readJson(esmx.resolvePath('package.json'))
     ]);
-    const exports: Record<string, any> = {
-        ...curJson?.exports
-    };
-    const set = new Set([
-        ...Object.keys(clientJson.exports),
-        ...Object.keys(serverJson.exports)
-    ]);
-    set.forEach((name) => {
-        const client = clientJson.exports[name];
-        const server = serverJson.exports[name];
-        const exportName = `./${name}`;
-        if (client && server) {
-            exports[exportName] = {
-                default: `./server/${server.file}`,
-                browser: `./client/${client.file}`
-            };
-        } else if (client) {
-            exports[exportName] = `./client/${client.file}`;
-        } else if (server) {
-            exports[exportName] = `./server/${server.file}`;
-        }
+
+    const exports = generateExports({
+        client: clientJson.exports,
+        server: serverJson.exports,
+        base: curJson?.exports
     });
 
     const buildJson: Record<string, any> = {
@@ -76,8 +94,8 @@ async function buildPackageJson(esmx: Esmx): Promise<Record<string, any>> {
     return buildJson;
 }
 
-function contentHash(buffer: Buffer, algorithm = 'sha256') {
-    const hash = crypto.createHash('sha256');
+export function contentHash(buffer: Buffer, algorithm = 'sha256') {
+    const hash = crypto.createHash(algorithm);
     hash.update(buffer);
     return `${algorithm}-${hash.digest('hex')}`;
 }