Fix fastboot test

packages/core/src/module-resolver.ts

@@ -190,7 +190,7 @@ export class Resolver {
       return this.external('early require', request, request.specifier);
     }
 
-    request = this.handleFastbootSwitch(request);
+    request = await this.handleFastbootSwitch(request);
     request = await this.handleGlobalsCompat(request);
     request = this.handleImplicitModules(request);
     request = this.handleImplicitTestScripts(request);
@@ -335,7 +335,7 @@ export class Resolver {
     return request;
   }
 
-  private handleFastbootSwitch<R extends ModuleRequest>(request: R): R {
+  private async handleFastbootSwitch<R extends ModuleRequest>(request: R): Promise<R> {
     if (isTerminal(request)) {
       return request;
     }
@@ -369,15 +369,9 @@ export class Resolver {
           } else {
             targetFile = fastbootFile.localFilename;
           }
-          return logTransition(
-            'matched app entry',
-            request,
-            // deliberately not using rehome because we want
-            // generateFastbootSwitch to see that this request is coming *from*
-            // a fastboot switch so it won't cycle back around. Instead we make
-            // the targetFile relative to the fromFile that we already have.
-            request.alias(explicitRelative(dirname(request.fromFile), resolve(pkg.root, targetFile)))
-          );
+
+          let resolution = await request.alias(targetFile).rehome(resolve(pkg.root, 'package.json')).defaultResolve();
+          return logTransition('matched app entry', request, request.resolveTo(resolution));
         }
       }
 

packages/vite/src/resolver.ts

@@ -1,16 +1,19 @@
 import type { Plugin, ViteDevServer } from 'vite';
-import { virtualContent, ResolverLoader } from '@embroider/core';
+import { type PluginItem, transform } from '@babel/core';
+import { locateEmbroiderWorkingDir, virtualContent, ResolverLoader } from '@embroider/core';
 import { RollupModuleRequest, virtualPrefix } from './request';
 import assertNever from 'assert-never';
 import makeDebug from 'debug';
 import { resolve } from 'path';
+import { readJSONSync } from 'fs-extra';
 
 const debug = makeDebug('embroider:vite');
 
 export function resolver(): Plugin {
   let resolverLoader = new ResolverLoader(process.cwd());
   let server: ViteDevServer;
   let virtualDeps: Map<string, string[]> = new Map();
+  let macrosConfig: PluginItem | undefined;
 
   return {
     name: 'embroider-resolver',
@@ -57,7 +60,12 @@ export function resolver(): Plugin {
         let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);
         virtualDeps.set(id, watches);
         server?.watcher.add(watches);
-        return src;
+        if (!macrosConfig) {
+          macrosConfig = readJSONSync(
+            resolve(locateEmbroiderWorkingDir(process.cwd()), 'rewritten-app', 'macros-config.json')
+          ) as PluginItem;
+        }
+        return pathname.endsWith('.css') ? src : runMacros(src, id, macrosConfig);
       }
     },
     buildEnd() {
@@ -80,3 +88,10 @@ export function resolver(): Plugin {
     },
   };
 }
+
+function runMacros(src: string, filename: string, macrosConfig: PluginItem): string {
+  return transform(src, {
+    filename,
+    plugins: [macrosConfig],
+  })!.code!;
+}