feat(monobundle): drop d.ts gen

innoai-tech · Mar 13, 2024 · c52ac4f · c52ac4f
1 parent 62e5b0f
commit c52ac4f
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 180 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/nodedevpkg/monobundle/package.json b/nodedevpkg/monobundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@innoai-tech/monobundle",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "monobundle": {
     "exports": {
       ".": "./src/index.ts",
@@ -20,8 +20,7 @@
     "globby": "^14.0.1",
     "js-yaml": "^4.1.0",
     "minimatch": "^9.0.3",
-    "rollup": "^4.12.0",
-    "rollup-plugin-dts": "^6.1.0",
+    "rollup": "^4.13.0",
     "yargs": "^17.7.2"
   },
   "peerDependencies": {
@@ -38,14 +37,13 @@
     ".": {
       "bun": "./src/index.ts",
       "import": {
-        "types": "./index.d.ts",
+        "types": "./src/index.ts",
         "default": "./index.mjs"
       }
     }
   },
   "files": [
     "*.mjs",
-    "*.d.ts",
     "src/*",
     "!/**/__tests__"
   ],

diff --git a/nodedevpkg/monobundle/src/bootstrap.ts b/nodedevpkg/monobundle/src/bootstrap.ts
@@ -8,7 +8,7 @@ import type { Project } from "./pm";
 import {
   type MonoBundleOptions,
   entryAlias,
-  writeFormattedJsonFile,
+  writeFormattedJsonFile
 } from "./util";
 
 const imlFromPackageJSON = (rpath: string, pkg: any) => {
@@ -17,7 +17,7 @@ const imlFromPackageJSON = (rpath: string, pkg: any) => {
 
 const patchRootPackage = async (
   project: Project,
-  pkgs: { [k: string]: any },
+  pkgs: { [k: string]: any }
 ) => {
   await writeFile(
     join(project.root, ".idea/modules.xml"),
@@ -26,16 +26,16 @@ const patchRootPackage = async (
   <component name="ProjectModuleManager">
     <modules>
 ${map(pkgs, (pkg, dir) => {
-  const filename = join(
-    "$PROJECT_DIR$",
-    imlFromPackageJSON(relative(project.root, dir), pkg),
-  );
-  return `<module fileurl="file://${filename}" filepath="${filename}" />`;
-}).join("\n")}
+      const filename = join(
+        "$PROJECT_DIR$",
+        imlFromPackageJSON(relative(project.root, dir), pkg)
+      );
+      return `<module fileurl="file://${filename}" filepath="${filename}" />`;
+    }).join("\n")}
     </modules>
   </component>
 </project>
-`,
+`
   );
 };
 
@@ -47,7 +47,7 @@ const orderKeys = <T extends {}>(o: T) => {
     "dependencies",
     "peerDependencies",
     "devDependencies",
-    ...keys(o).sort(),
+    ...keys(o).sort()
   ];
   return pick(o, orderedKeys);
 };
@@ -67,9 +67,9 @@ const getExportsAndBin = (options?: MonoBundleOptions) => {
       // bun must on first
       bun: entryFile,
       import: {
-        types: `./${distName}.d.ts`,
-        default: `./${distName}.mjs`,
-      },
+        types: `${entryFile}`,
+        default: `./${distName}.mjs`
+      }
     });
   });
 
@@ -81,19 +81,19 @@ const patchMonoPackage = async (
   monoRoot: string,
   directory: string,
   pkg: any,
-  rootPkg: any,
+  rootPkg: any
 ) => {
   const defaultScripts = project.pm.defaults().scripts;
 
   const scripts = {
-    ...(pkg.scripts || {}),
+    ...(pkg.scripts || {})
   };
 
   if (get(pkg, ["monobundle"])) {
     scripts.lint = get(
       pkg,
       ["monobundle", "pipeline", "lint"],
-      defaultScripts.lint,
+      defaultScripts.lint
     );
     scripts.build =
       get(pkg, ["monobundle", "pipeline", "build"], defaultScripts.build) ||
@@ -118,17 +118,17 @@ const patchMonoPackage = async (
       license: "MIT",
       repository: rootPkg.repository
         ? {
-            ...rootPkg.repository,
-            directory,
-          }
+          ...rootPkg.repository,
+          directory
+        }
         : undefined,
       publishConfig:
         !pkg.private && rootPkg.publishConfig
           ? {
-              ...rootPkg.publishConfig,
-            }
-          : undefined,
-    }),
+            ...rootPkg.publishConfig
+          }
+          : undefined
+    })
   );
 };
 
@@ -150,17 +150,17 @@ export const addImiFile = async (monoRoot: string, pkg: any) => {
       <excludeFolder url="file://$MODULE_DIR$/.build" />
       <excludeFolder url="file://$MODULE_DIR$/dist" />
       ${
-        isCueMod
-          ? `
+      isCueMod
+        ? `
       <excludeFolder url="file://$MODULE_DIR$/cue.mod/gen" />
       <excludeFolder url="file://$MODULE_DIR$/cue.mod/pkg" />
       `
-          : ""
-      }
+        : ""
+    }
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>`,
+</module>`
   );
 };
 
@@ -174,12 +174,12 @@ export const bootstrap = async (project: Project) => {
   const packageJsonFiles = await globby(
     [
       `${project.root}/package.json`,
-      ...workspaces.map((p) => `${p}/package.json`),
+      ...workspaces.map((p) => `${p}/package.json`)
     ],
     {
       cwd: project.root,
-      absolute: true,
-    },
+      absolute: true
+    }
   );
 
   const packages: { [k: string]: any } = {};
@@ -198,7 +198,7 @@ export const bootstrap = async (project: Project) => {
         monoRoot,
         rpath,
         packageJSON,
-        packages[""],
+        packages[""]
       );
     }