fix hbs

embroider-build · Mar 19, 2024 · d7e9625 · d7e9625
1 parent 0b1f6f7
commit d7e9625
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/core/src/virtual-content.ts b/packages/core/src/virtual-content.ts
@@ -1,8 +1,7 @@
 import { dirname, basename, resolve, posix, sep, join } from 'path';
-import { Resolver, AddonPackage, Package, cleanUrl } from '.';
+import type { Resolver, AddonPackage, Package } from '.';
 import { explicitRelative, extensionsPattern } from '.';
 import { compile } from './js-handlebars';
-import { cleanUrl } from '.';
 
 const externalESPrefix = '/@embroider/ext-es/';
 const externalCJSPrefix = '/@embroider/ext-cjs/';
@@ -139,12 +138,11 @@ const pairComponentMarker = '-embroider-pair-component';
 const pairComponentPattern = /^(?<hbsModule>.*)\/(?<jsModule>[^\/]*)-embroider-pair-component$/;
 
 export function virtualPairComponent(hbsModule: string, jsModule: string | undefined): string {
-  let clearHbsModule = cleanUrl(hbsModule);
   let relativeJSModule = '';
   if (jsModule) {
-    relativeJSModule = explicitRelative(clearHbsModule, jsModule);
+    relativeJSModule = explicitRelative(hbsModule, jsModule);
   }
-  return `${clearHbsModule}/${encodeURIComponent(relativeJSModule)}${pairComponentMarker}`;
+  return `${hbsModule}/${encodeURIComponent(relativeJSModule)}${pairComponentMarker}`;
 }
 
 function decodeVirtualPairComponent(

diff --git a/packages/vite/src/hbs.ts b/packages/vite/src/hbs.ts
@@ -99,10 +99,13 @@ async function maybeSynthesizeComponentJS(context: PluginContext, source: string
     return null;
   }
 
-  const pkg = resolverLoader.resolver.packageCache.ownerOfFile(templateResolution.id);
-  const isInComponents = pkg?.isV2App() && templateResolution.id.slice(pkg?.root.length).startsWith('/components');
+  const resolvedId = templateResolution.id.split('?')[0];
+  templateResolution.id = resolvedId;
 
-  if (templateResolution.id.endsWith('/template.hbs' || !isInComponents)) {
+  const pkg = resolverLoader.resolver.packageCache.ownerOfFile(resolvedId);
+  const isInComponents = pkg?.isV2App() && resolvedId.slice(pkg?.root.length).startsWith('/components');
+
+  if (resolvedId.endsWith('/template.hbs' || !isInComponents)) {
     return {
       ...templateResolution,
       meta: {