fix vite build

packages/vite/src/hbs.ts

@@ -14,9 +14,15 @@ 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?.onlyResolver) {
+        return null;
+      }
       let resolution = await this.resolve(source, importer, {
         skipSelf: true,
+        custom: {
+          onlyResolver: true,
+        },
       });
 
       if (!resolution) {

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;
       }
     },

packages/vite/src/template-tag.ts

@@ -15,9 +15,15 @@ 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?.onlyResolver) {
+        return null;
+      }
       let resolution = await this.resolve(id, importer, {
         skipSelf: true,
+        custom: {
+          onlyResolver: true,
+        },
       });
       if (resolution) {
         return resolution;
@@ -26,6 +32,7 @@ export function templateTag({ inline_source_map } = { inline_source_map: false }
         resolution = await this.resolve(candidate, importer, {
           skipSelf: true,
           custom: {
+            onlyResolver: true,
             embroider: {
               enableCustomResolver: false,
             },

tests/scenarios/vite-app-test.ts

@@ -112,5 +112,16 @@ viteAppScenarios
         const depCache = readdirSync(join(app.dir, 'node_modules', '.vite', 'deps'));
         assert.ok(depCache.length > 0, 'should have created cached deps');
       });
+
+      test(`pnpm build`, async function (assert) {
+        let result = await app.execute('pnpm build');
+        assert.equal(result.exitCode, 0, result.output);
+        const distFiles = readdirSync(join(app.dir, 'dist'));
+        assert.ok(distFiles.length > 1, 'should have created dist folder');
+        assert.ok(distFiles.includes('assets'), 'should have created assets folder');
+
+        const assetFiles = readdirSync(join(app.dir, 'dist', 'assets'));
+        assert.ok(assetFiles.length > 1, 'should have created asset files');
+      });
     });
   });

tests/vite-app/package.json

@@ -38,6 +38,7 @@
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.0",
     "ember-auto-import": "^2.6.3",

tests/vite-app/vite.config.mjs

@@ -8,6 +8,7 @@ import {
   compatPrebuild,
 } from "@embroider/vite";
 import { resolve } from "path";
+import rollupResolve from "@rollup/plugin-node-resolve";
 import { babel } from "@rollup/plugin-babel";
 
 const root = "node_modules/.embroider/rewritten-app";
@@ -42,7 +43,13 @@ export default defineConfig({
     },
   },
   build: {
+    outDir: resolve(process.cwd(), "dist"),
     rollupOptions: {
+      plugins: [
+        rollupResolve({
+          extensions: [".gjs", ".js", ".hbs", ".ts", ".gts"],
+        }),
+      ],
       input: {
         main: resolve(root, "index.html"),
         tests: resolve(root, "tests/index.html"),