Skip to content

Commit

Permalink
refactor: resolve is now synchronous
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehurpeau committed May 8, 2023
1 parent b4a455e commit 0551adc
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dist/definitions/utils/createGetDependencyPackageJson.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { PackageJson } from './packageTypes';
import { internalLoadPackageJsonFromNodeModules, readPkgJson } from './pkgJsonUtils';
export type GetDependencyPackageJson = (pkgDepName: string) => Promise<PackageJson>;
export type GetDependencyPackageJson = (pkgDepName: string) => PackageJson;
type NodeModulesPackagePathCache = Map<string, PackageJson>;
interface CreateGetDependencyPackageJsonOptions {
pkgDirname: string;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/definitions/utils/pkgJsonUtils.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ import type { PackageJson } from './packageTypes';
export declare function readPkgJson(packagePath: string): PackageJson;
export declare function writePkgJson(packagePath: string, pkg: PackageJson): void;
/** @internal */
export declare function internalLoadPackageJsonFromNodeModules(pkgDepName: string, pkgDirname: string): Promise<PackageJson>;
export declare function internalLoadPackageJsonFromNodeModules(pkgDepName: string, pkgDirname: string): PackageJson;
//# sourceMappingURL=pkgJsonUtils.d.ts.map
2 changes: 1 addition & 1 deletion dist/definitions/utils/pkgJsonUtils.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions src/utils/createGetDependencyPackageJson.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import {
readPkgJson,
} from './pkgJsonUtils';

export type GetDependencyPackageJson = (
pkgDepName: string,
) => Promise<PackageJson>;
export type GetDependencyPackageJson = (pkgDepName: string) => PackageJson;

type NodeModulesPackagePathCache = Map<string, PackageJson>;

Expand All @@ -25,7 +23,7 @@ export function createGetDependencyPackageJson({
internalCustomLoadPackageJsonFromNodeModules = internalLoadPackageJsonFromNodeModules,
internalReadPkgJson = readPkgJson,
}: CreateGetDependencyPackageJsonOptions): GetDependencyPackageJson {
return async (pkgDepName) => {
return (pkgDepName) => {
const existing = nodeModulesPackagePathCache.get(pkgDepName);
if (existing) return existing;
let pkg: PackageJson;
Expand All @@ -34,7 +32,7 @@ export function createGetDependencyPackageJson({
pkg = internalReadPkgJson(packagePath);
} else {
try {
pkg = await internalCustomLoadPackageJsonFromNodeModules(
pkg = internalCustomLoadPackageJsonFromNodeModules(
pkgDepName,
pkgDirname,
);
Expand Down
6 changes: 3 additions & 3 deletions src/utils/pkgJsonUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ export function writePkgJson(packagePath: string, pkg: PackageJson): void {
}

/** @internal */
export async function internalLoadPackageJsonFromNodeModules(
export function internalLoadPackageJsonFromNodeModules(
pkgDepName: string,
pkgDirname: string,
): Promise<PackageJson> {
const packageUrl = await importResolve(
): PackageJson {
const packageUrl = importResolve(
`${pkgDepName}/package.json`,
`file://${pkgDirname}/package.json`,
);
Expand Down

0 comments on commit 0551adc

Please # to comment.