fix(monobundle): support direct bundle

innoai-tech · Mar 13, 2024 · 29c0bec · 29c0bec
1 parent c802a97
commit 29c0bec
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 83 deletions.
diff --git a/nodedevpkg/devconfig/.gitignore b/nodedevpkg/devconfig/.gitignore
@@ -1,3 +1,6 @@
 
+.turbo/
+target/
+dist/
 *.mjs
 *.d.ts
diff --git a/nodedevpkg/monobundle/package.json b/nodedevpkg/monobundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@innoai-tech/monobundle",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "monobundle": {
     "exports": {
       ".": "./src/index.ts",

diff --git a/nodedevpkg/monobundle/src/autoExternal.ts b/nodedevpkg/monobundle/src/autoExternal.ts
@@ -17,51 +17,60 @@ export type Package = {
   peerDependencies?: Record<string, string>;
 };
 
-export const loadWorkspace = async (project: Project, localPkg: Package) => {
+export const collectDeps = async (project: Project, localPkg: Package) => {
   const workspaces = await project.pm.workspaces(project.root);
 
   const m = new Map<string, Set<string>>();
 
-  if (workspaces) {
+  const collectPkgDep = (pkg: Package) => {
+    const dep = new Set<string>();
+
+    if (pkg.name) {
+      dep.add(pkg.name);
+    }
+
+    if (pkg.dependencies) {
+      for (const d in pkg.dependencies) {
+        dep.add(d);
+      }
+    }
+
+    if (pkg.peerDependencies) {
+      for (const d in pkg.peerDependencies) {
+        dep.add(d);
+      }
+    }
+
+    return dep;
+  };
+
+  if (workspaces.length) {
     const packageJSONs = await globby(
       workspaces.map((b) => `${b}/package.json`),
       {
-        cwd: project.root,
-      },
+        cwd: project.root
+      }
     );
 
     for (const f of packageJSONs) {
       let pkg = JSON.parse(
-        String(await readFile(join(`${project.root}`, f))),
+        String(await readFile(join(`${project.root}`, f)))
       ) as Package;
 
       // localPkg may be changed
       if (localPkg.name === pkg.name) {
         pkg = localPkg;
       }
 
-      const dep = new Set<string>();
-
-      if (pkg.name) {
-        dep.add(pkg.name);
-      }
-
-      if (pkg.dependencies) {
-        for (const d in pkg.dependencies) {
-          dep.add(d);
-        }
-      }
-
-      if (pkg.peerDependencies) {
-        for (const d in pkg.peerDependencies) {
-          dep.add(d);
-        }
-      }
-
-      m.set(pkg.name, dep);
+      m.set(pkg.name, collectPkgDep(pkg));
     }
+
+    return m;
   }
 
+  // for non monorepo
+  m.set(localPkg.name, collectPkgDep(localPkg));
+
   return m;
 };
 
@@ -71,7 +80,7 @@ export const createAutoExternal = async (
   opts: {
     logger?: ReturnType<typeof import("./log").createLogger>;
     sideDeps?: string[];
-  },
+  }
 ) => {
   const logger = opts.logger;
   const sideDeps = opts.sideDeps || [];
@@ -81,13 +90,13 @@ export const createAutoExternal = async (
       return false;
     }
     return sideDeps.some(
-      (glob) => pkgName === glob || minimatch(pkgName, glob),
+      (glob) => pkgName === glob || minimatch(pkgName, glob)
     );
   };
 
   const usedPkgs = new Set<string>();
 
-  const w = await loadWorkspace(project, pkg);
+  const w = await collectDeps(project, pkg);
 
   const dep = new Set<string>();
 
@@ -114,7 +123,7 @@ export const createAutoExternal = async (
 
     const unused = {
       deps: {} as { [k: string]: boolean },
-      peerDeps: {} as { [k: string]: boolean },
+      peerDeps: {} as { [k: string]: boolean }
     };
 
     for (const d of dep) {
@@ -143,7 +152,7 @@ export const createAutoExternal = async (
           external(
             id: string,
             importer: string | undefined,
-            isResolved: boolean,
+            isResolved: boolean
           ) {
             if (
               typeof opts.external === "function" &&
@@ -173,7 +182,7 @@ export const createAutoExternal = async (
                   collector.add(id);
 
                   logger?.danger(
-                    `"${id}" is not in dependencies or peerDependencies, and will be bundled.`,
+                    `"${id}" is not in dependencies or peerDependencies, and will be bundled.`
                   );
                 }
               }
@@ -182,9 +191,9 @@ export const createAutoExternal = async (
             }
 
             return false;
-          },
+          }
         };
-      },
+      }
     };
   };
 

diff --git a/nodedevpkg/monobundle/src/bootstrap.ts b/nodedevpkg/monobundle/src/bootstrap.ts
@@ -1,13 +1,10 @@
 import { existsSync } from "fs";
 import { dirname, join, relative } from "path";
-import { get, keys, map, pick } from "@innoai-tech/lodash";
-import { forEach, set, startsWith } from "@innoai-tech/lodash";
+import { get, pick } from "@innoai-tech/lodash";
 import { readFile, writeFile } from "fs/promises";
 import { globby } from "globby";
 import type { Project } from "./pm";
 import {
-  type MonoBundleOptions,
-  entryAlias,
   writeFormattedJsonFile
 } from "./util";
 
@@ -25,7 +22,7 @@ const patchRootPackage = async (
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-${map(pkgs, (pkg, dir) => {
+${Object.entries(pkgs).map(([dir, pkg]) => {
       const filename = join(
         "$PROJECT_DIR$",
         imlFromPackageJSON(relative(project.root, dir), pkg)
@@ -47,33 +44,10 @@ const orderKeys = <T extends {}>(o: T) => {
     "dependencies",
     "peerDependencies",
     "devDependencies",
-    ...keys(o).sort()
+    ...Object.keys(o).sort()
   ];
-  return pick(o, orderedKeys);
-};
-
-const getExportsAndBin = (options?: MonoBundleOptions) => {
-  const pkg = {} as { bin?: {}; exports?: {} };
-
-  forEach(options?.exports, (entryFile, e) => {
-    const distName = entryAlias(e);
-
-    if (startsWith(e, "bin:")) {
-      set(pkg, ["bin", distName], `./${distName}.mjs`);
-      return;
-    }
 
-    set(pkg, ["exports", e], {
-      // bun must on first
-      bun: entryFile,
-      import: {
-        types: `${entryFile}`,
-        default: `./${distName}.mjs`
-      }
-    });
-  });
-
-  return pkg;
+  return pick(o, orderedKeys);
 };
 
 const patchMonoPackage = async (
@@ -106,13 +80,20 @@ const patchMonoPackage = async (
       : undefined;
   }
 
-  const exportsAndBin = getExportsAndBin(get(pkg, ["monobundle"]));
+
+  await writeFile(join(monoRoot, ".gitignore"), `
+.turbo/
+target/
+dist/
+*.mjs
+*.d.ts
+`
+  );
 
   await writeFormattedJsonFile(
     join(monoRoot, "package.json"),
     orderKeys({
       ...pkg,
-      ...exportsAndBin,
       scripts,
       type: "module",
       license: "MIT",

diff --git a/nodedevpkg/monobundle/src/bundle.ts b/nodedevpkg/monobundle/src/bundle.ts
@@ -9,7 +9,7 @@ import {
 } from "@innoai-tech/lodash";
 import commonjs from "@rollup/plugin-commonjs";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
-import { readFile, unlink, writeFile } from "fs/promises";
+import { readFile, unlink } from "fs/promises";
 import { globby } from "globby";
 import { type OutputOptions, rollup } from "rollup";
 import { createAutoExternal } from "./autoExternal";
@@ -24,6 +24,7 @@ import {
   entryAlias,
   writeFormattedJsonFile
 } from "./util";
+import { forEach, set, startsWith } from "@innoai-tech/lodash";
 
 const tsconfigFile = "tsconfig.monobundle.json";
 
@@ -40,7 +41,7 @@ export const bundle = async ({
     throw new Error("must run in some monorepo");
   }
 
-  if (project.root === cwd) {
+  if (cwd === project.root) {
     // monorepo root
     if ((await project.pm.workspaces(project.root)).length) {
       return await bootstrap(project);
@@ -56,17 +57,6 @@ export const bundle = async ({
     return;
   }
 
-  await writeFile(
-    join(cwd, ".gitignore"),
-    `
-.turbo/
-target/
-dist/
-*.mjs
-*.d.ts
-`
-  );
-
   const options: MonoBundleOptions = pkg["monobundle"] || {};
 
   const logger = createLogger(pkg["name"]);
@@ -172,8 +162,10 @@ dist/
     pkg["dependencies"][dep] = undefined;
   }
 
+
   await writeFormattedJsonFile(join(cwd, "package.json"), {
     ...pkg,
+    ...genExportsAndBin(options),
     dependencies: isEmpty(pkg["dependencies"])
       ? undefined
       : (pkg["dependencies"] as { [k: string]: string }),
@@ -185,7 +177,6 @@ dist/
       : (pkg["devDependencies"] as { [k: string]: string }),
     files: ["*.mjs",
       "src/*", "!/**/__tests__"],
-    type: "module",
     // FIXME remote all old entries
     types: undefined,
     main: undefined,
@@ -194,3 +185,30 @@ dist/
 
   return;
 };
+
+
+const genExportsAndBin = (options?: MonoBundleOptions) => {
+  const pkg = {
+    type: "module"
+  } as { bin?: {}; exports?: {} };
+
+  forEach(options?.exports, (entryFile, e) => {
+    const distName = entryAlias(e);
+
+    if (startsWith(e, "bin:")) {
+      set(pkg, ["bin", distName], `./${distName}.mjs`);
+      return;
+    }
+
+    set(pkg, ["exports", e], {
+      // bun must on first
+      bun: entryFile,
+      import: {
+        types: `${entryFile}`,
+        default: `./${distName}.mjs`
+      }
+    });
+  });
+
+  return pkg;
+};
diff --git a/nodedevpkg/purebundle/.gitignore b/nodedevpkg/purebundle/.gitignore
@@ -1,5 +1,6 @@
-/target
-^target/
-target
 
-.swc
+.turbo/
+target/
+dist/
+*.mjs
+*.d.ts
diff --git a/nodepkg/lodash/.gitignore b/nodepkg/lodash/.gitignore
@@ -0,0 +1,6 @@
+
+.turbo/
+target/
+dist/
+*.mjs
+*.d.ts
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
+    .turbo/
+    target/
+    dist/
     *.mjs
     *.d.ts