fix(devkit): always read package version from the actual package in e…

…nsurePackage function
nrwl · Jan 25, 2023 · 6623e60 · 6623e60
1 parent bf0aaeb
commit 6623e60
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/packages/devkit/src/utils/package-json.spec.ts b/packages/devkit/src/utils/package-json.spec.ts
@@ -318,20 +318,6 @@ describe('ensurePackage', () => {
     tree = createTree();
   });
 
-  it('should return without error when dependency is satisfied', async () => {
-    writeJson(tree, 'package.json', {
-      devDependencies: {
-        '@nrwl/vite': '15.0.0',
-      },
-    });
-
-    await expect(
-      ensurePackage(tree, '@nrwl/vite', '>=15.0.0', {
-        throwOnMissing: true,
-      })
-    ).resolves.toBeUndefined();
-  });
-
   it('should throw when dependencies are missing', async () => {
     writeJson(tree, 'package.json', {});
 

diff --git a/packages/devkit/src/utils/package-json.ts b/packages/devkit/src/utils/package-json.ts
@@ -5,6 +5,7 @@ import { GeneratorCallback } from 'nx/src/config/misc-interfaces';
 import { clean, coerce, gt, satisfies } from 'semver';
 import { getPackageManagerCommand } from 'nx/src/utils/package-manager';
 import { execSync } from 'child_process';
+import { readModulePackageJson } from 'nx/src/utils/package-json';
 
 const NON_SEMVER_TAGS = {
   '*': 2,
@@ -314,27 +315,20 @@ export async function ensurePackage(
     throwOnMissing?: boolean;
   } = {}
 ): Promise<void> {
-  let version: string;
+  let version: string = null;
 
   // Read package and version from root package.json file.
-  const packageJson = readJson(tree, 'package.json');
   const dev = options.dev ?? true;
   const throwOnMissing = options.throwOnMissing ?? !!process.env.NX_DRY_RUN; // NX_DRY_RUN is set in `packages/nx/src/command-line/generate.ts`
   const pmc = getPackageManagerCommand();
-  const field = dev ? 'devDependencies' : 'dependencies';
 
-  version = packageJson[field]?.[pkg];
-
-  // If package not found, try to resolve it using Node and get its version.
-  if (!version) {
-    try {
-      version = require(`${pkg}/package.json`).version;
-    } catch {
-      // ignore
-    }
+  try {
+    version = readModulePackageJson(`${pkg}/package.json`).packageJson.version;
+  } catch {
+    // ignore
   }
 
-  if (!satisfies(version, requiredVersion)) {
+  if (!version || !satisfies(version, requiredVersion)) {
     const installCmd = `${
       dev ? pmc.addDev : pmc.add
     } ${pkg}@${requiredVersion}`;