fix vite build

embroider-build · Feb 14, 2024 · 106b7e1 · 106b7e1
1 parent 43da932
commit 106b7e1
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 100 deletions.
diff --git a/packages/vite/src/hbs.ts b/packages/vite/src/hbs.ts
@@ -14,7 +14,10 @@ export function hbs(): Plugin {
   return {
     name: 'rollup-hbs-plugin',
     enforce: 'pre',
-    async resolveId(source: string, importer: string | undefined) {
+    async resolveId(source: string, importer: string | undefined, options) {
+      if (options.custom?.embroider?.isExtensionSearch) {
+        return null;
+      }
       let resolution = await this.resolve(source, importer, {
         skipSelf: true,
       });
@@ -89,6 +92,7 @@ async function maybeSynthesizeComponentJS(context: PluginContext, source: string
         // Currently this guard is only actually exercised in rollup, not in
         // vite, due to https://github.com/vitejs/vite/issues/13852
         enableCustomResolver: false,
+        isExtensionSearch: true,
       },
     },
   });

diff --git a/packages/vite/src/resolver.ts b/packages/vite/src/resolver.ts
@@ -55,7 +55,7 @@ export function resolver(): Plugin {
       if (id.startsWith(virtualPrefix)) {
         let { src, watches } = virtualContent(id.slice(virtualPrefix.length), resolverLoader.resolver);
         virtualDeps.set(id, watches);
-        server.watcher.add(watches);
+        server?.watcher.add(watches);
         return src;
       }
     },

diff --git a/packages/vite/src/template-tag.ts b/packages/vite/src/template-tag.ts
@@ -15,7 +15,10 @@ export function templateTag({ inline_source_map } = { inline_source_map: false }
     name: 'embroider-template-tag',
     enforce: 'pre',
 
-    async resolveId(id: string, importer: string | undefined) {
+    async resolveId(id: string, importer: string | undefined, options) {
+      if (options.custom?.embroider?.isExtensionSearch) {
+        return null;
+      }
       let resolution = await this.resolve(id, importer, {
         skipSelf: true,
       });
@@ -27,6 +30,7 @@ export function templateTag({ inline_source_map } = { inline_source_map: false }
           skipSelf: true,
           custom: {
             embroider: {
+              isExtensionSearch: true,
               enableCustomResolver: false,
             },
           },