prebundle 1.1.0-beta.3 → 1.1.0-beta.5

package/README.md

@@ -2,7 +2,7 @@
 
 Prebundle 3rd party dependencies, output a single js file, a package.json file and the dts files.
 
-Based on [ncc](https://github.com/vercel/ncc) and `dts-packer`.
+Based on [ncc](https://github.com/vercel/ncc) and [rollup-plugin-dts](https://www.npmjs.com/package/rollup-plugin-dts).
 
 <p>
   <a href="https://npmjs.com/package/prebundle">

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

@@ -2,20 +2,26 @@ import { dirname, join } from 'node:path';
 import fs from '../compiled/fs-extra/index.js';
 import { cwd, DIST_DIR } from './constant.js';
 import { createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
 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');
-    const config = await import(configPath);
+    const config = await import(pathToFileURL(configPath).href);
     return config.default;
 };
 export function parseTasks(dependencies) {
@@ -25,6 +31,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

@@ -1,4 +1,4 @@
-import { join } from 'node:path';
+import { dirname, join } from 'node:path';
 import ncc from '@vercel/ncc';
 import fastGlob from '../compiled/fast-glob/index.js';
 import fs from '../compiled/fs-extra/index.js';
@@ -26,20 +26,21 @@ async function emitDts(task, externals) {
         outputDefaultDts();
         return;
     }
+    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 = pkgJson.types || pkgJson.typing || pkgJson.typings;
+        const types = getTypes(pkgJson);
         if (types) {
             return join(task.depPath, types);
         }
-        const depTypesPath = findDepPath(`@types/${task.depName}`);
-        const depTypesPkgPath = join(depTypesPath, 'package.json');
-        if (fs.existsSync(depTypesPkgPath)) {
-            const depTypesPkg = fs.readJsonSync(depTypesPkgPath, 'utf-8');
-            return depTypesPkg.types || depTypesPkg.typing || depTypesPkg.typings;
+        const depTypesPath = findDepPath(`@types/${task.depName}/package.json`);
+        if (!depTypesPath) {
+            return null;
         }
-        return null;
+        const depTypesPkg = fs.readJsonSync(depTypesPath, 'utf-8');
+        const depTypes = getTypes(depTypesPkg);
+        return depTypes ? join(dirname(depTypesPath), depTypes) : null;
     };
     const input = getInput();
     if (!input) {

package/package.json

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