Ensure dependencySatisfies only considers actual dependencies (includes a fix for invalid results within monorepo scenarios)

packages/macros/src/babel/dependency-satisfies.ts

@@ -12,7 +12,7 @@ export default function dependencySatisfies(path: NodePath<t.CallExpression>, st
   if (path.node.arguments.length !== 2) {
     throw error(path, `dependencySatisfies takes exactly two arguments, you passed ${path.node.arguments.length}`);
   }
-  let [packageName, range] = path.node.arguments;
+  const [packageName, range] = path.node.arguments;
   if (packageName.type !== 'StringLiteral') {
     throw error(
       assertArray(path.get('arguments'))[0],
@@ -31,6 +31,13 @@ export default function dependencySatisfies(path: NodePath<t.CallExpression>, st
     if (!us) {
       return false;
     }
+
+    let hasPackage = us.dependencies.find(dep => dep.name === packageName.value);
+
+    if (!hasPackage) {
+      return false;
+    }
+
     let version = packageCache.resolve(packageName.value, us).version;
     return satisfies(version, range.value, {
       includePrerelease: true,

packages/macros/src/glimmer/dependency-satisfies.ts

@@ -30,6 +30,12 @@ export default function dependencySatisfies(
 
   let pkg;
   try {
+    let hasPackage = us.dependencies.find(dep => dep.name === packageName);
+
+    if (!hasPackage) {
+      return false;
+    }
+
     pkg = packageCache.resolve(packageName, us);
   } catch (err) {
     // it's not an error if we can't resolve it, we just don't satisfy it.

packages/macros/tests/babel/dependency-satisfies.test.ts

@@ -123,5 +123,25 @@ describe(`dependencySatisfies`, function () {
       );
       expect(runDefault(code)).toBe(true);
     });
+
+    test('monorepo resolutions resolve correctly', () => {
+      project = new Project('test-app', '1.0.0');
+      project.addDependency('@embroider/util', '*');
+      project.writeSync();
+
+      process.chdir(project.baseDir);
+
+      let code = transform(`
+        import { dependencySatisfies } from '@embroider/macros';
+
+        // specified in dependencies
+        export const util = dependencySatisfies('@embroider/util', '*');
+        // not specified as any kind of dep
+        export const webpack = dependencySatisfies('@embroider/webpack', '*');
+      `);
+
+      expect(code).toMatch(/util = true/);
+      expect(code).toMatch(/webpack = false/);
+    });
   });
 });