fix virtual app file

embroider-build · Sep 14, 2024 · a9a86a7 · a9a86a7
1 parent dcd8752
commit a9a86a7
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/packages/core/src/virtual-content.ts b/packages/core/src/virtual-content.ts
@@ -43,6 +43,15 @@ export function virtualContent(filename: string, resolver: Resolver): VirtualCon
  if (extern) {
  return renderESExternalShim(extern);
  }
+
+ let appjs = decodeAppJsMatch(filename);
+ if (appjs) {
+ if (!appjs.virtual) {
+ return renderAppJs(appjs.filename);
+ }
+ filename = appjs.filename;
+ }
+
  let match = decodeVirtualPairComponent(filename);
  if (match) {
  return pairedComponentShim(match);
@@ -53,11 +62,6 @@ export function virtualContent(filename: string, resolver: Resolver): VirtualCon
  return renderFastbootSwitchTemplate(fb);
  }
 
- let appjs = decodeAppJsMatch(filename);
- if (appjs) {
- return renderAppJs(appjs.filename);
- }
-
  let im = decodeImplicitModules(filename);
  if (im) {
  return renderImplicitModules(im, resolver);
@@ -224,7 +228,12 @@ export function decodeAppJsMatch(filename: string) {
  if (match) {
  let from = match.groups!.from;
  let to = decodeURIComponent(match.groups!.to);
- console.log('from', from, to);
+ if (to.includes(pairComponentMarker)) {
+ return {
+ filename: to,
+ virtual: true,
+ };
+ }
  return {
  filename: require.resolve(to, {
  paths: [resolve(dirname(from), 'node_modules')],