vite: fix hbs loading for virtual pair components

packages/vite/src/hbs.ts

@@ -1,14 +1,13 @@
 // TODO: I copied this from @embroider/addon-dev, it needs to be its own package
-// (or be in shared-internals or core)
-import { createFilter } from '@rollup/pluginutils';
 import type { PluginContext, ResolvedId } from 'rollup';
 import type { Plugin } from 'vite';
-import { hbsToJS } from '@embroider/core';
+import { hbsToJS, ResolverLoader } from '@embroider/core';
 import assertNever from 'assert-never';
 import { parse as pathParse } from 'path';
 import makeDebug from 'debug';
 
 const debug = makeDebug('embroider:hbs-plugin');
+const resolverLoader = new ResolverLoader(process.cwd());
 
 export function hbs(): Plugin {
   return {
@@ -99,6 +98,24 @@ async function maybeSynthesizeComponentJS(context: PluginContext, source: string
   if (!templateResolution) {
     return null;
   }
+
+  const resolvedId = templateResolution.id.split('?')[0];
+  templateResolution.id = resolvedId;
+
+  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: {
+        'rollup-hbs-plugin': {
+          type: 'template',
+        },
+      },
+    };
+  }
+
   debug(`emitting template only component: %s`, templateResolution.id);
 
   // we're trying to resolve a JS module but only the corresponding HBS
@@ -113,10 +130,8 @@ async function maybeSynthesizeComponentJS(context: PluginContext, source: string
   };
 }
 
-const hbsFilter = createFilter('**/*.hbs?(\\?)*');
-
 function maybeRewriteHBS(resolution: ResolvedId) {
-  if (!hbsFilter(resolution.id)) {
+  if (!resolution.id.split('?')[0].endsWith('.hbs')) {
     return null;
   }
   debug('emitting hbs rewrite: %s', resolution.id);

tests/vite-app/app/components/old/component.js

@@ -0,0 +1,5 @@
+import Component from '@glimmer/component';
+
+export default class extends Component {
+  message = 'hi';
+}

tests/vite-app/app/components/old/template.hbs

@@ -0,0 +1 @@
+<div>hey {{@message}} <Fancy /></div>

tests/vite-app/app/templates/application.hbs

@@ -1,6 +1,7 @@
 {{page-title "ViteApp"}}
 
 <Example @message={{this.model.message}} />
+<Old @message={{this.model.message}} />
 
 <WelcomePage />
 {{! Feel free to remove this! }}