feat(deps): update dependency import-meta-resolve to v3 (#498)

christophehurpeau · May 8, 2023 · 626782a · 626782a
1 parent d29d77c
commit 626782a
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 61 deletions.
diff --git a/.yarn/cache/import-meta-resolve-npm-2.1.0-fcf1208127-4554ea5e2d.zip b/.yarn/cache/import-meta-resolve-npm-2.1.0-fcf1208127-4554ea5e2d.zip
diff --git a/.yarn/cache/import-meta-resolve-npm-3.0.0-bc7824116c-d0428cd149.zip b/.yarn/cache/import-meta-resolve-npm-3.0.0-bc7824116c-d0428cd149.zip
diff --git a/dist/definitions/checks/checkDirectDuplicateDependencies.d.ts.map b/dist/definitions/checks/checkDirectDuplicateDependencies.d.ts.map
diff --git a/dist/definitions/utils/createGetDependencyPackageJson.d.ts b/dist/definitions/utils/createGetDependencyPackageJson.d.ts
@@ -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;

diff --git a/dist/definitions/utils/createGetDependencyPackageJson.d.ts.map b/dist/definitions/utils/createGetDependencyPackageJson.d.ts.map
diff --git a/dist/definitions/utils/pkgJsonUtils.d.ts b/dist/definitions/utils/pkgJsonUtils.d.ts
@@ -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
diff --git a/dist/definitions/utils/pkgJsonUtils.d.ts.map b/dist/definitions/utils/pkgJsonUtils.d.ts.map
diff --git a/dist/index-node16.mjs b/dist/index-node16.mjs
@@ -105,23 +105,23 @@ function checkDuplicateDependencies(reportError, pkg, isPkgLibrary, depType, sea
 
 async function checkDirectDuplicateDependencies(pkg, pkgPathName, isPackageALibrary, depType, getDependencyPackageJson, onlyWarnsForCheck, reportErrorNamePrefix = '', customCreateReportError = createReportError) {
   const reportError = customCreateReportError(`${reportErrorNamePrefix}Direct Duplicate Dependencies`, pkgPathName);
-  await Promise.all([{
+  [{
     type: 'devDependencies',
     searchIn: ['devDependencies', 'dependencies']
   }, {
     type: 'dependencies',
     searchIn: ['devDependencies', 'dependencies']
-  }].map(async ({
+  }].forEach(({
     type,
     searchIn
   }) => {
     const dependencies = pkg[type];
     if (!dependencies) return;
     for (const depName of getKeys(dependencies)) {
-      const depPkg = await getDependencyPackageJson(depName);
+      const depPkg = getDependencyPackageJson(depName);
       checkDuplicateDependencies(reportError, pkg, isPackageALibrary, depType, searchIn, depPkg, onlyWarnsForCheck.createFor(depName));
     }
-  }));
+  });
   reportNotWarnedForMapping(reportError, onlyWarnsForCheck);
 }
 
@@ -190,7 +190,7 @@ async function checkDirectPeerDependencies(isLibrary, pkg, pkgPathName, getDepen
           continue;
         }
       }
-      const depPkg = await getDependencyPackageJson(depName);
+      const depPkg = getDependencyPackageJson(depName);
       allDepPkgs.push({
         name: depName,
         type: depType,
@@ -244,7 +244,7 @@ async function checkExactVersions(pkg, pkgPathName, types, {
         if (!shouldOnlyWarn && tryToAutoFix && getDependencyPackageJson) {
           let resolvedDep;
           try {
-            resolvedDep = await getDependencyPackageJson(dependencyName);
+            resolvedDep = getDependencyPackageJson(dependencyName);
           } catch {
             resolvedDep = null;
           }
@@ -475,8 +475,8 @@ function writePkgJson(packagePath, pkg) {
 }
 
 /** @internal */
-async function internalLoadPackageJsonFromNodeModules(pkgDepName, pkgDirname) {
-  const packageUrl = await resolve(`${pkgDepName}/package.json`, `file://${pkgDirname}/package.json`);
+function internalLoadPackageJsonFromNodeModules(pkgDepName, pkgDirname) {
+  const packageUrl = resolve(`${pkgDepName}/package.json`, `file://${pkgDirname}/package.json`);
   return readPkgJson(packageUrl.replace(process.platform === 'win32' ? /^file:\/{3}/ : /^file:\/\//, ''));
 }
 
@@ -486,15 +486,15 @@ function createGetDependencyPackageJson({
   internalCustomLoadPackageJsonFromNodeModules = internalLoadPackageJsonFromNodeModules,
   internalReadPkgJson = readPkgJson
 }) {
-  return async pkgDepName => {
+  return pkgDepName => {
     const existing = nodeModulesPackagePathCache.get(pkgDepName);
     if (existing) return existing;
     let pkg;
     if (pkgDepName.startsWith('.')) {
       pkg = internalReadPkgJson(`${pkgDirname}/${pkgDepName}/package.json`);
     } else {
       try {
-        pkg = await internalCustomLoadPackageJsonFromNodeModules(pkgDepName, pkgDirname);
+        pkg = internalCustomLoadPackageJsonFromNodeModules(pkgDepName, pkgDirname);
       } catch (err) {
         if (!(err instanceof Error)) throw err;
         if (err.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
@@ -769,7 +769,7 @@ function createCheckPackage({
       devDependencies
     }) {
       jobs.push(new Job(this.checkIdenticalVersionsThanDependency.name, async () => {
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         if (resolutions) {
           checkIdenticalVersionsThanDependency(pkg, pkgPathName, 'resolutions', resolutions, depPkg, depPkg.dependencies);
         }
@@ -788,7 +788,7 @@ function createCheckPackage({
       devDependencies
     }) {
       jobs.push(new Job(this.checkSatisfiesVersionsFromDependency.name, async () => {
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         if (resolutions) {
           checkIdenticalVersionsThanDependency(pkg, pkgPathName, 'resolutions', resolutions, depPkg, depPkg.devDependencies);
         }
@@ -813,7 +813,7 @@ function createCheckPackage({
       devDependencies
     }) {
       jobs.push(new Job(this.checkSatisfiesVersionsFromDependency.name, async () => {
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         if (resolutions) {
           checkSatisfiesVersionsFromDependency(pkg, pkgPathName, 'resolutions', resolutions, depPkg, depPkg.dependencies);
         }
@@ -832,7 +832,7 @@ function createCheckPackage({
       devDependencies
     }) {
       jobs.push(new Job(this.checkSatisfiesVersionsInDevDependenciesOfDependency.name, async () => {
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         if (resolutions) {
           checkSatisfiesVersionsFromDependency(pkg, pkgPathName, 'resolutions', resolutions, depPkg, depPkg.devDependencies);
         }
@@ -878,7 +878,7 @@ function createCheckPackage({
     },
     checkSatisfiesVersionsInDependency(depName, dependenciesRanges) {
       jobs.push(new Job(this.checkSatisfiesVersionsInDependency.name, async () => {
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         checkSatisfiesVersionsInDependency(pkgPathName, depPkg, dependenciesRanges);
       }));
       return this;

diff --git a/dist/index-node16.mjs.map b/dist/index-node16.mjs.map
diff --git a/package.json b/package.json
@@ -90,7 +90,7 @@
   "dependencies": {
     "chalk": "^5.2.0",
     "glob": "^10.0.0",
-    "import-meta-resolve": "^2.1.0",
+    "import-meta-resolve": "^3.0.0",
     "semver": "^7.5.0",
     "semver-utils": "^1.1.4",
     "type-fest": "^3.0.0"

diff --git a/src/check-package.ts b/src/check-package.ts
@@ -566,7 +566,7 @@ export function createCheckPackage({
     ) {
       jobs.push(
         new Job(this.checkIdenticalVersionsThanDependency.name, async () => {
-          const depPkg = await getDependencyPackageJson(depName);
+          const depPkg = getDependencyPackageJson(depName);
           if (resolutions) {
             checkIdenticalVersionsThanDependency(
               pkg,
@@ -608,7 +608,7 @@ export function createCheckPackage({
     ) {
       jobs.push(
         new Job(this.checkSatisfiesVersionsFromDependency.name, async () => {
-          const depPkg = await getDependencyPackageJson(depName);
+          const depPkg = getDependencyPackageJson(depName);
           if (resolutions) {
             checkIdenticalVersionsThanDependency(
               pkg,
@@ -664,7 +664,7 @@ export function createCheckPackage({
     ) {
       jobs.push(
         new Job(this.checkSatisfiesVersionsFromDependency.name, async () => {
-          const depPkg = await getDependencyPackageJson(depName);
+          const depPkg = getDependencyPackageJson(depName);
           if (resolutions) {
             checkSatisfiesVersionsFromDependency(
               pkg,
@@ -708,7 +708,7 @@ export function createCheckPackage({
         new Job(
           this.checkSatisfiesVersionsInDevDependenciesOfDependency.name,
           async () => {
-            const depPkg = await getDependencyPackageJson(depName);
+            const depPkg = getDependencyPackageJson(depName);
             if (resolutions) {
               checkSatisfiesVersionsFromDependency(
                 pkg,
@@ -806,7 +806,7 @@ export function createCheckPackage({
     checkSatisfiesVersionsInDependency(depName, dependenciesRanges) {
       jobs.push(
         new Job(this.checkSatisfiesVersionsInDependency.name, async () => {
-          const depPkg = await getDependencyPackageJson(depName);
+          const depPkg = getDependencyPackageJson(depName);
           checkSatisfiesVersionsInDependency(
             pkgPathName,
             depPkg,

diff --git a/src/checks/checkDirectDuplicateDependencies.ts b/src/checks/checkDirectDuplicateDependencies.ts
@@ -34,25 +34,23 @@ export async function checkDirectDuplicateDependencies(
     { type: 'dependencies', searchIn: ['devDependencies', 'dependencies'] },
   ];
 
-  await Promise.all(
-    checks.map(async ({ type, searchIn }) => {
-      const dependencies = pkg[type];
+  checks.forEach(({ type, searchIn }) => {
+    const dependencies = pkg[type];
 
-      if (!dependencies) return;
-      for (const depName of getKeys(dependencies)) {
-        const depPkg = await getDependencyPackageJson(depName);
-        checkDuplicateDependencies(
-          reportError,
-          pkg,
-          isPackageALibrary,
-          depType,
-          searchIn,
-          depPkg,
-          onlyWarnsForCheck.createFor(depName),
-        );
-      }
-    }),
-  );
+    if (!dependencies) return;
+    for (const depName of getKeys(dependencies)) {
+      const depPkg = getDependencyPackageJson(depName);
+      checkDuplicateDependencies(
+        reportError,
+        pkg,
+        isPackageALibrary,
+        depType,
+        searchIn,
+        depPkg,
+        onlyWarnsForCheck.createFor(depName),
+      );
+    }
+  });
 
   reportNotWarnedForMapping(reportError, onlyWarnsForCheck);
 }
diff --git a/src/checks/checkDirectPeerDependencies.ts b/src/checks/checkDirectPeerDependencies.ts
@@ -71,7 +71,7 @@ export async function checkDirectPeerDependencies(
           }
         }
 
-        const depPkg = await getDependencyPackageJson(depName);
+        const depPkg = getDependencyPackageJson(depName);
         allDepPkgs.push({ name: depName, type: depType, pkg: depPkg });
 
         if (depPkg.dependencies && !isLibrary) {

diff --git a/src/checks/checkExactVersions.ts b/src/checks/checkExactVersions.ts
@@ -58,7 +58,7 @@ export async function checkExactVersions(
         if (!shouldOnlyWarn && tryToAutoFix && getDependencyPackageJson) {
           let resolvedDep;
           try {
-            resolvedDep = await getDependencyPackageJson(dependencyName);
+            resolvedDep = getDependencyPackageJson(dependencyName);
           } catch {
             resolvedDep = null;
           }

diff --git a/src/utils/createGetDependencyPackageJson.test.ts b/src/utils/createGetDependencyPackageJson.test.ts
@@ -36,7 +36,7 @@ describe('createGetDependencyPackageJson', () => {
       internalReadPkgJson: readPkgJsonMock as any,
     });
 
-    const res = await getDependencyPackageJson('test1');
+    const res = getDependencyPackageJson('test1');
 
     expect(res).toBe(mockPkg);
     expect(internalLoadPackageJsonFromNodeModulesMock).toBeCalledWith(

diff --git a/src/utils/createGetDependencyPackageJson.ts b/src/utils/createGetDependencyPackageJson.ts
@@ -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>;
 
@@ -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;
@@ -34,7 +32,7 @@ export function createGetDependencyPackageJson({
       pkg = internalReadPkgJson(packagePath);
     } else {
       try {
-        pkg = await internalCustomLoadPackageJsonFromNodeModules(
+        pkg = internalCustomLoadPackageJsonFromNodeModules(
           pkgDepName,
           pkgDirname,
         );

diff --git a/src/utils/pkgJsonUtils.ts b/src/utils/pkgJsonUtils.ts
@@ -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`,
   );

diff --git a/yarn.lock b/yarn.lock
@@ -2531,7 +2531,7 @@ __metadata:
     chalk: ^5.2.0
     eslint: 8.39.0
     glob: ^10.0.0
-    import-meta-resolve: ^2.1.0
+    import-meta-resolve: ^3.0.0
     jest: 29.5.0
     pob-babel: 35.7.0
     semver: 7.5.0
@@ -4069,10 +4069,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-meta-resolve@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "import-meta-resolve@npm:2.1.0"
-  checksum: 4554ea5e2daecbdeb7ebe4df23ced97e6a64ad41ed26889b3c86ed896830dbbe63889c8fad49b7dea76c0f9aad46f7d32412fa727c335e11f3cc79f63a91f8e1
+"import-meta-resolve@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "import-meta-resolve@npm:3.0.0"
+  checksum: d0428cd14915ee0093b995dc5bbc70bd01cc668822f52b62af98f728e5d6a08724f07e6aa9f5fae002d5eecbf6ec2cdcd379bf4869dd1b353bd080693f91e394
   languageName: node
   linkType: hard