Treat getGlobalConfig().fastboot as dynamic as well

embroider-build · Feb 27, 2024 · e55b055 · e55b055
1 parent 183dd97
commit e55b055
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/packages/macros/src/babel/evaluate-json.ts b/packages/macros/src/babel/evaluate-json.ts
@@ -409,25 +409,11 @@ export class Evaluator {
           : assertNever(maybeFastbootMemberExpression);
 
         if (maybeFastbootProperty.isIdentifier() && maybeFastbootProperty.node.name === 'fastboot') {
-          let maybeIsRunningMemberExpression = maybeFastbootMemberExpression.parentPath;
-          if (
-            maybeIsRunningMemberExpression.isMemberExpression() ||
-            maybeIsRunningMemberExpression.isOptionalMemberExpression()
-          ) {
-            let maybeIsRunningProperty = maybeIsRunningMemberExpression.isMemberExpression()
-              ? maybeIsRunningMemberExpression.get('property')
-              : maybeIsRunningMemberExpression.isOptionalMemberExpression()
-              ? maybeIsRunningMemberExpression.get('property')
-              : assertNever(maybeIsRunningMemberExpression);
-
-            if (maybeIsRunningProperty.isIdentifier() && maybeIsRunningProperty.node.name === 'isRunning') {
-              return {
-                confident: true,
-                value: getConfig(path, this.state, 'getGlobalConfig'),
-                hasRuntimeImplementation: true,
-              };
-            }
-          }
+          return {
+            confident: true,
+            value: getConfig(path, this.state, 'getGlobalConfig'),
+            hasRuntimeImplementation: true,
+          };
         }
       }
 

diff --git a/packages/macros/tests/babel/eval.test.ts b/packages/macros/tests/babel/eval.test.ts
@@ -200,7 +200,7 @@ describe('hasRuntimeImplementation', function () {
         let code = transform(`
         import { getGlobalConfig } from '@embroider/macros';
         const result = getGlobalConfig().fastboot`);
-        expect(code).toMatch(`result = false`);
+        expect(code).toMatch(`result = true`);
       });
 
       // fastboot.isRunning relies on dynamic evaluation at runtime. For backwards compatibility we keep it working. See https://github.com/embroider-build/embroider/issues/1804