prebundle 1.1.0-beta.2 → 1.1.0-beta.4

package/dist/helper.d.ts

@@ -1,5 +1,5 @@
 import type { Config, DependencyConfig, ParsedTask } from './types.js';
-export declare function findDepPath(name: string): string;
+export declare function findDepPath(name: string): string | null;
 export declare const resolveConfig: () => Promise<Config>;
 export declare function parseTasks(dependencies: Array<string | DependencyConfig>): ParsedTask[];
 export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U>): Pick<T, U>;

package/dist/helper.js

@@ -4,14 +4,19 @@ import { cwd, DIST_DIR } from './constant.js';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 export function findDepPath(name) {
-    let entry = dirname(require.resolve(join(name), { paths: [cwd] }));
-    while (!dirname(entry).endsWith('node_modules')) {
-        entry = dirname(entry);
+    try {
+        let entry = dirname(require.resolve(join(name), { paths: [cwd] }));
+        while (!dirname(entry).endsWith('node_modules')) {
+            entry = dirname(entry);
+        }
+        if (name.includes('/')) {
+            return join(dirname(entry), name);
+        }
+        return entry;
     }
-    if (name.includes('/')) {
-        return join(dirname(entry), name);
+    catch (err) {
+        return null;
     }
-    return entry;
 }
 export const resolveConfig = async () => {
     const configPath = join(cwd, 'prebundle.config.mjs');
@@ -25,6 +30,9 @@ export function parseTasks(dependencies) {
         const importPath = join(cwd, DIST_DIR, depName);
         const distPath = join(cwd, DIST_DIR, depName);
         const depPath = findDepPath(depName);
+        if (!depPath) {
+            throw new Error(`Failed to resolve dependency: ${depName}`);
+        }
         const depEntry = require.resolve(depName, { paths: [cwd] });
         const info = {
             depName,

package/dist/prebundle.js

@@ -4,7 +4,7 @@ import fastGlob from '../compiled/fast-glob/index.js';
 import fs from '../compiled/fs-extra/index.js';
 import rslog from '../compiled/rslog/index.js';
 import { DEFAULT_EXTERNALS } from './constant.js';
-import { pick, replaceFileContent } from './helper.js';
+import { findDepPath, pick } from './helper.js';
 import { dts } from 'rollup-plugin-dts';
 import { rollup } from 'rollup';
 const { logger } = rslog;
@@ -18,16 +18,6 @@ function emitIndex(code, distPath) {
     const distIndex = join(distPath, 'index.js');
     fs.outputFileSync(distIndex, code);
 }
-function fixTypeExternalPath(file, task, externals) {
-    const filepath = join(task.distPath, file);
-    replaceFileContent(filepath, (content) => {
-        let newContent = content;
-        for (const name of Object.keys(externals)) {
-            newContent = newContent.replace(new RegExp(`../../${name}`, 'g'), externals[name]);
-        }
-        return newContent;
-    });
-}
 async function emitDts(task, externals) {
     const outputDefaultDts = () => {
         fs.writeFileSync(join(task.distPath, 'index.d.ts'), 'export = any;\n');
@@ -36,16 +26,33 @@ async function emitDts(task, externals) {
         outputDefaultDts();
         return;
     }
-    const pkgPath = join(task.depPath, 'package.json');
-    const pkgJson = fs.readJsonSync(pkgPath, 'utf-8');
-    const types = pkgJson.types || pkgJson.typing || pkgJson.typings;
-    if (!types) {
+    const getTypes = (json) => json.types || json.typing || json.typings || null;
+    const getInput = () => {
+        const pkgPath = join(task.depPath, 'package.json');
+        const pkgJson = fs.readJsonSync(pkgPath, 'utf-8');
+        const types = getTypes(pkgJson);
+        if (types) {
+            return join(task.depPath, types);
+        }
+        const depTypesPath = findDepPath(`@types/${task.depName}`);
+        if (!depTypesPath) {
+            return null;
+        }
+        const depTypesPkgPath = join(depTypesPath, 'package.json');
+        if (fs.existsSync(depTypesPkgPath)) {
+            const depTypesPkg = fs.readJsonSync(depTypesPkgPath, 'utf-8');
+            return getTypes(depTypesPkg);
+        }
+        return null;
+    };
+    const input = getInput();
+    if (!input) {
         outputDefaultDts();
         return;
     }
     try {
         const inputConfig = {
-            input: join(task.depPath, types),
+            input,
             external: Object.keys(externals),
             plugins: [
                 dts({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebundle",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.4",
   "main": "./dist/index.js",
   "type": "module",
   "repository": {