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

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

Hide file tree

Showing 2 changed files with 10 additions and 23 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
@@ -317,21 +317,22 @@ export async function ensurePackage(
   let version: string;
 
   // 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];
+  // Try to resolve the actual version from resolved module.
+  try {
+    version = require(`${pkg}/package.json`).version;
+  } catch {
+    // ignore
+  }
 
-  // If package not found, try to resolve it using Node and get its version.
+  // Otherwise try to read in from package.json. This is needed for E2E tests to pass.
   if (!version) {
-    try {
-      version = require(`${pkg}/package.json`).version;
-    } catch {
-      // ignore
-    }
+    const packageJson = readJson(tree, 'package.json');
+    const field = dev ? 'devDependencies' : 'dependencies';
+    version = packageJson[field]?.[pkg];
   }
 
   if (!satisfies(version, requiredVersion)) {