Merge pull request #2648 from embroider-build/fix-macros-in-dummy

Fix dependency-aware macros in dummy apps

Author: ef4

packages/shared-internals/src/package.ts

@@ -1,10 +1,11 @@
 import { Memoize } from 'typescript-memoize';
 import { readFileSync, existsSync } from 'fs-extra';
-import { join, extname } from 'path';
+import { join, extname, resolve } from 'path';
 import get from 'lodash/get';
 import type { AddonMeta, PackageInfo } from './metadata';
 import type PackageCache from './package-cache';
 import flatMap from 'lodash/flatMap';
+import cloneDeep from 'lodash/cloneDeep';
 
 // This is controllable via env var because there are many different contexts
 // (babel/rollup/vite/webpack/handlebars plugins) that can all depend on
@@ -54,9 +55,28 @@ export default class Package {
     return this.packageJSON.version;
   }
 
+  private dummyAppOwnedByAddon: Package | undefined;
+
   @Memoize()
   protected get internalPackageJSON() {
-    return JSON.parse(readFileSync(join(this.root, 'package.json'), 'utf8'));
+    try {
+      return JSON.parse(readFileSync(join(this.root, 'package.json'), 'utf8'));
+    } catch (err) {
+      if (err.code === 'ENOENT' && this.root === this.packageCache.appRoot) {
+        // if the app is missing it's package.json, we could be looking at a
+        // dummy app of a v1 addon.
+        let upPkg = this.packageCache.ownerOfFile(resolve(this.root, '..'));
+        if (upPkg?.isEmberAddon()) {
+          // found containing addon. Synthesize the dummy's app's virtual
+          // package.json
+          this.dummyAppOwnedByAddon = upPkg;
+          let pkg = cloneDeep(upPkg.packageJSON);
+          pkg.name = 'dummy';
+          return pkg;
+        }
+      }
+      throw err;
+    }
   }
 
   @Memoize()
@@ -162,9 +182,10 @@ export default class Package {
 
   @Memoize()
   get nonResolvableDeps(): Map<string, Package> | undefined {
+    let result: Map<string, Package> | undefined;
     let meta = this.internalPackageJSON['ember-addon'];
     if (meta && meta.paths) {
-      return new Map(
+      result = new Map(
         meta.paths
           .map((path: string) => {
             // ember-cli gives a warning if the path specifies an invalid, malformed or missing addon. the logic for invalidating an addon is:
@@ -199,6 +220,14 @@ export default class Package {
           .filter(Boolean)
       );
     }
+    if (this.dummyAppOwnedByAddon) {
+      if (!result) {
+        result = new Map();
+      }
+      // dummy apps magically depend on the containing addon.
+      result.set(this.dummyAppOwnedByAddon.name, this.dummyAppOwnedByAddon);
+    }
+    return result;
   }
 
   get dependencyNames(): string[] {

tests/fixtures/macro-sample-addon/addon/app-ember-satisfies.js

@@ -0,0 +1,8 @@
+import { appEmberSatisfies } from '@embroider/macros';
+
+export default function() {
+  return {
+    aboveTwo: appEmberSatisfies('> 2.0.0'),
+    belowTwo: appEmberSatisfies('< 2.0.0')
+  };
+}

tests/fixtures/macro-sample-addon/ember-cli-build.js

@@ -15,8 +15,5 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return maybeEmbroider(app, {
-    useAddonAppBoot: false,
-    useAddonConfigModule: false,
-  });
+  return app.toTree();
 };

tests/fixtures/macro-sample-addon/tests/unit/app-ember-satisfies-test.js

@@ -0,0 +1,9 @@
+import { module, test } from 'qunit';
+import appEmberSat from 'macro-sample-addon/app-ember-satisfies';
+
+module('Unit | appEmberSatisfies', function() {
+  test('addon code can use appEmberSatisfies', function(assert) {
+    assert.strictEqual(appEmberSat().aboveTwo, true);
+    assert.strictEqual(appEmberSat().belowTwo, false);
+  })
+});

tests/scenarios/macro-test.ts

@@ -201,9 +201,6 @@ function dummyAppScenarioSetup(project: Project) {
   let addonFiles = loadFromFixtureData('macro-sample-addon');
   project.name = 'macro-sample-addon';
   project.linkDependency('@embroider/macros', { baseDir: __dirname });
-  project.linkDependency('@embroider/webpack', { baseDir: __dirname });
-  project.linkDependency('@embroider/compat', { baseDir: __dirname });
-  project.linkDependency('@embroider/core', { baseDir: __dirname });
 
   addonFiles['index.js'] = `
   module.exports = {
@@ -275,7 +272,6 @@ dummyAppScenarios
   });
 
 dummyAppScenarios
-  .skip()
   .map('macro-sample-addon-classic', project => {
     dummyAppScenarioSetup(project);
     project.linkDependency('ember-cli-babel', { baseDir: __dirname, resolveName: 'ember-cli-babel-latest' });
@@ -289,8 +285,8 @@ dummyAppScenarios
         addon = await scenario.prepare();
       });
 
-      test(`pnpm test EMBROIDER_TEST_SETUP_FORCE=classic`, async function (assert) {
-        let result = await addon.execute('cross-env EMBROIDER_TEST_SETUP_FORCE=classic pnpm ember test');
+      test(`pnpm test`, async function (assert) {
+        let result = await addon.execute('pnpm ember test');
         assert.equal(result.exitCode, 0, result.output);
       });
     });