Modify build to not run postgres.js though tsup

packages/pglite/scripts/bundle-wasm.ts

@@ -36,7 +36,7 @@ async function findAndReplaceInDir(
 async function main() {
   await fs.copyFile("./release/postgres.wasm", "./dist/postgres.wasm");
   await fs.copyFile("./release/postgres.data", "./dist/postgres.data");
-//  await fs.copyFile("./release/postgres.so", "./dist/postgres.so");
+  await fs.copyFile("./release/postgres.js", "./dist/postgres.js");
   await fs.copyFile("./release/vector.tar.gz", "./dist/vector.tar.gz");
   await findAndReplaceInDir(
     "./dist",

packages/pglite/src/extensionUtils.ts

@@ -1,6 +1,6 @@
 import tinyTar from "tinytar";
 import { IN_NODE } from "./utils.js";
-import type { PostgresMod } from "./postgres.js";
+import type { PostgresMod } from "./postgresMod.js";
 
 export async function loadExtensionBundle(
   bundlePath: URL,

packages/pglite/src/fs/idbfs.ts

@@ -1,5 +1,5 @@
 import { FilesystemBase } from "./types.js";
-import type { FS, PostgresMod } from "../postgres.js";
+import type { FS, PostgresMod } from "../postgresMod.js";
 import { PGDATA } from "./index.js";
 import { dumpTar } from "./tarUtils.js";
 

packages/pglite/src/fs/memoryfs.ts

@@ -1,5 +1,5 @@
 import { FilesystemBase } from "./types.js";
-import type { PostgresMod, FS } from "../postgres.js";
+import type { PostgresMod, FS } from "../postgresMod.js";
 import { dumpTar } from "./tarUtils.js";
 
 export class MemoryFS extends FilesystemBase {

packages/pglite/src/fs/nodefs.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { FilesystemBase } from "./types.js";
 import { PGDATA } from "./index.js";
-import type { PostgresMod, FS } from "../postgres.js";
+import type { PostgresMod, FS } from "../postgresMod.js";
 import { dumpTar } from "./tarUtils.js";
 
 export class NodeFS extends FilesystemBase {

packages/pglite/src/fs/tarUtils.ts

@@ -1,5 +1,5 @@
 import { tar, untar, type TarFile, REGTYPE, DIRTYPE } from "tinytar";
-import { FS } from "../postgres.js";
+import { FS } from "../postgresMod.js";
 import { PGDATA } from "./index.js";
 
 export async function dumpTar(FS: FS, dbname?: string): Promise<File | Blob> {

packages/pglite/src/fs/types.ts

@@ -1,4 +1,4 @@
-import type { PostgresMod, FS } from "../postgres.js";
+import type { PostgresMod, FS } from "../postgresMod.js";
 
 export type FsType = "nodefs" | "idbfs" | "memoryfs";
 

packages/pglite/src/pglite.ts

@@ -1,5 +1,5 @@
 import { Mutex } from "async-mutex";
-import PostgresModFactory, { type PostgresMod } from "./postgres.js";
+import PostgresModFactory, { type PostgresMod } from "./postgresMod.js";
 import { type Filesystem, parseDataDir, loadFs } from "./fs/index.js";
 import { makeLocateFile } from "./utils.js";
 import { parseResults } from "./parse.js";

packages/pglite/src/postgres.ts → packages/pglite/src/postgresMod.ts

@@ -1,5 +1,6 @@
 //@ts-ignore
-import PostgresModFactory from "../release/postgres.js";
+// This file in placed in the build from ../release/postgres.js
+import PostgresModFactory from "./postgres.js";
 
 // Uses the types from @types/emscripten
 

packages/pglite/tsup.config.ts

@@ -1,11 +1,13 @@
 import { defineConfig } from "tsup";
 import path from "path";
 import { fileURLToPath } from "url";
+import { Plugin } from 'esbuild'
+import fs from 'fs'
 
 const thisFile = fileURLToPath(new URL(import.meta.url));
 const root = path.dirname(thisFile);
 
-let replaceAssertPlugin = {
+const replaceAssertPlugin = {
   name: "replace-assert",
   setup(build: any) {
     // Resolve `assert` to a blank file
@@ -15,6 +17,25 @@ let replaceAssertPlugin = {
   },
 };
 
+const excludeFromMinificationAndChunkingPlugin: Plugin = {
+  name: 'exclude-from-minification-and-chunking',
+  setup(build) {
+    const filePath = path.resolve(root, 'release', 'postgres.js');
+    build.onResolve({ filter: /release\/postgres\.js$/ }, args => ({
+      path: filePath,
+      namespace: 'exclude-from-minification-and-chunking',
+    }));
+
+    build.onLoad({ filter: /.*/, namespace: 'exclude-from-minification-and-chunking' }, async args => {
+      const contents = await fs.promises.readFile(args.path, 'utf8');
+      return {
+        contents,
+        loader: 'ts',
+      };
+    });
+  }
+}
+
 const entryPoints = [
   "src/index.ts",
   "src/worker/index.ts",
@@ -31,12 +52,16 @@ export default defineConfig({
   },
   clean: true,
   format: ["esm"],
+  external: [
+    './postgres.js',
+    // path.resolve(root, 'release', 'postgres.js'), // Exclude postgres.js from bundling
+  ],
   esbuildOptions(options, context) {
     options.inject = [
       "src/polyfills/buffer.ts",
       "src/polyfills/indirectEval.ts",
     ];
   },
-  esbuildPlugins: [replaceAssertPlugin],
+  esbuildPlugins: [replaceAssertPlugin, excludeFromMinificationAndChunkingPlugin],
   minify: true,
 });