@embroider/vite 0.2.2-unstable.7afa1cc → 0.2.2-unstable.89cc372

package/{index.mjs → dist/index.d.ts}

@@ -9,3 +9,4 @@ export * from './src/assets.js';
 export * from './src/content-for.js';
 export * from './src/classic-ember-support.js';
 export * from './src/ember.js';
+export * from './src/build-once.js';

package/{index.d.ts → dist/index.js}

@@ -4,6 +4,10 @@ export * from './src/hbs.js';
 export * from './src/scripts.js';
 export * from './src/template-tag.js';
 export * from './src/optimize-deps.js';
-export * from './src/assets.js';
 export * from './src/build.js';
+export * from './src/assets.js';
 export * from './src/content-for.js';
+export * from './src/classic-ember-support.js';
+export * from './src/ember.js';
+export * from './src/build-once.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC","sourcesContent":["export * from './src/resolver.js';\nexport * from './src/esbuild-resolver.js';\nexport * from './src/hbs.js';\nexport * from './src/scripts.js';\nexport * from './src/template-tag.js';\nexport * from './src/optimize-deps.js';\nexport * from './src/build.js';\nexport * from './src/assets.js';\nexport * from './src/content-for.js';\nexport * from './src/classic-ember-support.js';\nexport * from './src/ember.js';\nexport * from './src/build-once.js';\n"]}

package/{src → dist/src}/assets.js

@@ -37,8 +37,12 @@ export function assets() {
         configureServer(server) {
             return () => {
                 server.middlewares.use((req, res, next) => {
-                    if (req.originalUrl && req.originalUrl.length > 1) {
-                        const assetUrl = findPublicAsset(req.originalUrl.split('?')[0], resolverLoader.resolver);
+                    let originalUrl = req.originalUrl;
+                    if (originalUrl === null || originalUrl === void 0 ? void 0 : originalUrl.startsWith(server.config.base)) {
+                        originalUrl = req.originalUrl.slice((server.config.base.length || 1) - 1);
+                    }
+                    if (originalUrl && originalUrl.length > 1) {
+                        const assetUrl = findPublicAsset(originalUrl.split('?')[0], resolverLoader.resolver);
                         if (assetUrl) {
                             return send(req, assetUrl).pipe(res);
                         }

package/dist/src/assets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/assets.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Resolver } from '@embroider/core';\nimport core from '@embroider/core';\nconst { ResolverLoader } = core;\nimport type { Plugin } from 'vite';\nimport * as process from 'process';\nimport { join, posix } from 'path';\nimport fs from 'fs-extra';\nconst { existsSync, readFileSync, lstatSync } = fs;\nimport send from 'send';\n\nfunction findPublicAsset(relativePath: string, resolver: Resolver) {\n  const packageCache = resolver.packageCache;\n  let pkg = packageCache.ownerOfFile(relativePath);\n\n  for (const engine of resolver.options.engines) {\n    for (const addon of engine.activeAddons) {\n      pkg = packageCache.ownerOfFile(addon.root);\n      if (pkg && pkg.meta && pkg.isV2Addon() && pkg.meta['public-assets']) {\n        const asset = Object.entries(pkg.meta['public-assets']).find(\n          ([_key, a]) => posix.resolve('/', a) === relativePath\n        )?.[0];\n        let local = asset ? join(addon.root, asset) : null;\n        if (local && existsSync(local)) {\n          return local;\n        }\n      }\n    }\n  }\n}\n\nexport function assets(): Plugin {\n  const cwd = process.cwd();\n  const resolverLoader = new ResolverLoader(cwd);\n  let mode: 'build' | 'serve' = 'build';\n  let publicDir = 'public';\n  return {\n    name: 'assets',\n    enforce: 'post',\n    configResolved(options) {\n      mode = options.command;\n      publicDir = options.publicDir;\n    },\n    configureServer(server) {\n      return () => {\n        server.middlewares.use((req, res, next) => {\n          let originalUrl = req.originalUrl;\n          if (originalUrl?.startsWith(server.config.base)) {\n            originalUrl = req.originalUrl!.slice((server.config.base.length || 1) - 1);\n          }\n          if (originalUrl && originalUrl.length > 1) {\n            const assetUrl = findPublicAsset(originalUrl.split('?')[0], resolverLoader.resolver);\n            if (assetUrl) {\n              return send(req, assetUrl).pipe(res as unknown as NodeJS.WritableStream);\n            }\n          }\n          return next();\n        });\n      };\n    },\n    buildStart: {\n      // we need to wait for the compatBuild plugin's buildStart hook to finish\n      // so that the resolver config exists before we try to read it.\n      sequential: true,\n      order: 'post',\n      async handler() {\n        if (mode !== 'build') return;\n        const engines = resolverLoader.resolver.options.engines;\n        for (const engine of engines) {\n          const packages = engine.activeAddons.map(a => resolverLoader.resolver.packageCache.ownerOfFile(a.root));\n          packages.forEach(pkg => {\n            if (!pkg || !pkg.isV2Addon()) return;\n            const assets = pkg.meta['public-assets'] || {};\n            Object.entries(assets).forEach(([path, dest]) => {\n              // do not override app public assets\n              if (existsSync(join(publicDir, dest))) {\n                return;\n              }\n\n              const filePath = join(pkg.root, path);\n              if (!lstatSync(filePath).isFile()) {\n                console.log(`Invalid package definition, ${pkg.name} has defined a file \"${path}\" that is not a file`);\n                return;\n              }\n\n              this.emitFile({\n                type: 'asset',\n                source: readFileSync(filePath),\n                fileName: posix.resolve('/', dest).slice(1),\n              });\n            });\n          });\n        }\n      },\n    },\n  };\n}\n"]}

package/dist/src/build-once.d.ts

@@ -0,0 +1 @@
+export declare function buildOnce(outputPath: string, emberEnv: 'development' | 'test' | 'production'): Promise<void>;

package/dist/src/build-once.js

@@ -0,0 +1,13 @@
+import { spawn } from 'child_process';
+export function buildOnce(outputPath, emberEnv) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(`npx vite build --outDir ${outputPath} --mode ${emberEnv === 'production' ? 'production' : 'development'}`, {
+            cwd: process.cwd(),
+            shell: true,
+            stdio: 'inherit',
+            env: { ...process.env },
+        });
+        child.on('exit', code => (code === 0 ? resolve() : reject(new Error('vite build failed'))));
+    });
+}
+//# sourceMappingURL=build-once.js.map

package/dist/src/build-once.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-once.js","sourceRoot":"","sources":["../../src/build-once.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,MAAM,UAAU,SAAS,CAAC,UAAkB,EAAE,QAA+C;IAC3F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,KAAK,CACjB,2BAA2B,UAAU,WAAW,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,EAAE,EAC1G;YACE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,KAAK,EAAE,IAAI;YACX,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE;SACxB,CACF,CAAC;QACF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { spawn } from 'child_process';\n\nexport function buildOnce(outputPath: string, emberEnv: 'development' | 'test' | 'production'): Promise<void> {\n  return new Promise((resolve, reject) => {\n    const child = spawn(\n      `npx vite build --outDir ${outputPath} --mode ${emberEnv === 'production' ? 'production' : 'development'}`,\n      {\n        cwd: process.cwd(),\n        shell: true,\n        stdio: 'inherit',\n        env: { ...process.env },\n      }\n    );\n    child.on('exit', code => (code === 0 ? resolve() : reject(new Error('vite build failed'))));\n  });\n}\n"]}

package/{src → dist/src}/build.js

@@ -41,10 +41,10 @@ export function compatPrebuild() {
         name: 'embroider-builder',
         enforce: 'pre',
         config(config, { mode, command }) {
-            var _a;
-            viteCommand = command;
+            var _a, _b;
+            viteCommand = (_a = process.env.EMBROIDER_VITE_COMMAND) !== null && _a !== void 0 ? _a : command;
             viteMode = mode;
-            resolvableExtensions = (_a = config.resolve) === null || _a === void 0 ? void 0 : _a.extensions;
+            resolvableExtensions = (_b = config.resolve) === null || _b === void 0 ? void 0 : _b.extensions;
         },
         async buildStart() {
             if (!viteCommand) {

package/dist/src/build.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/build.ts"],"names":[],"mappings":"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","sourcesContent":["import { fork } from 'child_process';\nimport type { Plugin } from 'vite';\n\nexport function emberBuild(command: string, mode: string, resolvableExtensions: string[] | undefined): Promise<void> {\n  let env: Record<string, string> = {\n    ...process.env,\n    EMBROIDER_PREBUILD: 'true',\n  };\n\n  if (resolvableExtensions) {\n    env['EMBROIDER_RESOLVABLE_EXTENSIONS'] = resolvableExtensions?.join(',');\n  }\n\n  if (command === 'build') {\n    return new Promise((resolve, reject) => {\n      const child = fork(\n        './node_modules/ember-cli/bin/ember',\n        ['build', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'],\n        { env }\n      );\n      child.on('exit', code => (code === 0 ? resolve() : reject()));\n    });\n  }\n  return new Promise((resolve, reject) => {\n    const child = fork(\n      './node_modules/ember-cli/bin/ember',\n      ['build', '--watch', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'],\n      {\n        silent: true,\n        env,\n      }\n    );\n    child.on('exit', code => (code === 0 ? resolve() : reject(new Error('ember build --watch failed'))));\n    child.on('spawn', () => {\n      child.stderr?.on('data', data => {\n        console.error(data.toString());\n      });\n      child.stdout!.on('data', data => {\n        console.log(data.toString());\n        if (data.toString().includes('Build successful')) {\n          resolve();\n        }\n      });\n    });\n  });\n}\n\nexport function compatPrebuild(): Plugin {\n  let viteCommand: string | undefined;\n  let viteMode: string | undefined;\n  let resolvableExtensions: string[] | undefined;\n\n  return {\n    name: 'embroider-builder',\n    enforce: 'pre',\n    config(config, { mode, command }) {\n      viteCommand = process.env.EMBROIDER_VITE_COMMAND ?? command;\n      viteMode = mode;\n      resolvableExtensions = config.resolve?.extensions;\n    },\n    async buildStart() {\n      if (!viteCommand) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's command`);\n      }\n      if (!viteMode) {\n        throw new Error(`bug: embroider compatPrebuild did not detect Vite's mode`);\n      }\n      await emberBuild(viteCommand, viteMode, resolvableExtensions);\n    },\n  };\n}\n"]}

package/dist/src/classic-ember-support.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"classic-ember-support.js","sourceRoot":"","sources":["../../src/classic-ember-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAmB,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,GAAG,EAAE;QACL,OAAO,EAAE;QACT,cAAc,EAAE;QAChB,MAAM,EAAE;QACR,UAAU,EAAE;QACZ;YACE,IAAI,EAAE,mCAAmC;YACzC,KAAK,CAAC,MAAM,CAAC,UAAsB;gBACjC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;gBAC7D,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACpE,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;wBAC7B,OAAO,WAAW,CAChB;4BACE,KAAK,EAAE;gCACL,MAAM,EAAE,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC;6BAChD;yBACF,EACD,UAAU,CACX,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,OAAO,UAAU,CAAC;YACpB,CAAC;SACF;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { hbs } from './hbs.js';\nimport { scripts } from './scripts.js';\nimport { compatPrebuild } from './build.js';\nimport { assets } from './assets.js';\nimport { contentFor } from './content-for.js';\nimport browserslistToEsbuild from 'browserslist-to-esbuild';\nimport { existsSync } from 'fs';\nimport { join } from 'path';\nimport { mergeConfig, type UserConfig } from 'vite';\nimport { pathToFileURL } from 'url';\n\nexport function classicEmberSupport() {\n  return [\n    hbs(),\n    scripts(),\n    compatPrebuild(),\n    assets(),\n    contentFor(),\n    {\n      name: 'vite-plugin-ember-browser-targets',\n      async config(userConfig: UserConfig) {\n        const targetsPath = join(process.cwd(), 'config/targets.js');\n        if (existsSync(targetsPath)) {\n          const targets = await import(pathToFileURL(targetsPath).toString());\n          if (targets.default.browsers) {\n            return mergeConfig(\n              {\n                build: {\n                  target: browserslistToEsbuild(targets.browsers),\n                },\n              },\n              userConfig\n            );\n          }\n        }\n        return userConfig;\n      },\n    },\n  ];\n}\n"]}

package/dist/src/content-for.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"content-for.js","sourceRoot":"","sources":["../../src/content-for.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,MAAM,EAAE,yBAAyB,EAAE,GAAG,IAAI,CAAC;AAE3C,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,IAAI,EAAE,uBAAuB;QAE7B,kBAAkB,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE;YAC/B,IAAI,MAAM,GAAQ,YAAY,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC;YACnG,IAAI,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YACrC,KAAK,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;gBAC3E,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,WAAW,KAAK,EAAE,GAAG,WAAW,EAAE,CAAC,CAAC;YAC5E,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { Plugin } from 'vite';\nimport fs from 'fs-extra';\nconst { readJSONSync } = fs;\nimport { join } from 'path';\nimport core from '@embroider/core';\nconst { locateEmbroiderWorkingDir } = core;\n\nexport function contentFor(): Plugin {\n  return {\n    name: 'embroider-content-for',\n\n    transformIndexHtml(html, { path }) {\n      let config: any = readJSONSync(join(locateEmbroiderWorkingDir(process.cwd()), 'content-for.json'));\n      let contentsForConfig = config[path];\n      for (const [contentType, htmlContent] of Object.entries(contentsForConfig)) {\n        html = html.replace(`{{content-for \"${contentType}\"}}`, `${htmlContent}`);\n      }\n      return html;\n    },\n  };\n}\n"]}

package/dist/src/ember.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember.js","sourceRoot":"","sources":["../../src/ember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAmC,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,IAAI,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAEnG,MAAM,UAAU,KAAK;IACnB,OAAO;QACL,WAAW,EAAE;QACb,QAAQ,EAAE;QACV;YACE,IAAI,EAAE,0BAA0B;YAChC,KAAK,CAAC,MAAM,CAAC,MAAkB,EAAE,GAAc;gBAC7C,OAAO,WAAW,CAChB;oBACE,OAAO,EAAE;wBACP,UAAU;qBACX;oBAED,YAAY,EAAE;wBACZ,OAAO,EAAE,CAAC,mBAAmB,CAAC;wBAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;wBACpC,cAAc,EAAE;4BACd,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;yBAC7B;qBACF;oBAED,KAAK,EAAE;wBACL,aAAa,EAAE;4BACb,KAAK,EAAE;gCACL,IAAI,EAAE,YAAY;gCAClB,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;6BAC5E;yBACF;qBACF;oBACD,MAAM,EAAE;wBACN,IAAI,EAAE,IAAI;qBACX;iBACF,EACD,MAAM,CACP,CAAC;YACJ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;AAChE,CAAC","sourcesContent":["import { templateTag } from './template-tag.js';\nimport { resolver } from './resolver.js';\nimport { mergeConfig, type UserConfig, type ConfigEnv } from 'vite';\nimport { esBuildResolver } from './esbuild-resolver.js';\n\nexport let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];\n\nexport function ember() {\n  return [\n    templateTag(),\n    resolver(),\n    {\n      name: 'vite-plugin-ember-config',\n      async config(config: UserConfig, env: ConfigEnv) {\n        return mergeConfig(\n          {\n            resolve: {\n              extensions,\n            },\n\n            optimizeDeps: {\n              exclude: ['@embroider/macros'],\n              extensions: ['.hbs', '.gjs', '.gts'],\n              esbuildOptions: {\n                plugins: [esBuildResolver()],\n              },\n            },\n\n            build: {\n              rollupOptions: {\n                input: {\n                  main: 'index.html',\n                  ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),\n                },\n              },\n            },\n            server: {\n              port: 4200,\n            },\n          },\n          config\n        );\n      },\n    },\n  ];\n}\n\nfunction shouldBuildTests(mode: string) {\n  return mode !== 'production' || process.env.FORCE_BUILD_TESTS;\n}\n"]}

package/{src → dist/src}/esbuild-request.d.ts

@@ -1,10 +1,5 @@
-import core from '@embroider/core';
 import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
-import type { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';
-type PublicAPI<T> = {
-    [K in keyof T]: T[K];
-};
-type PackageCache = PublicAPI<_PackageCache>;
+import type { PackageCachePublicAPI as PackageCache, Resolution, ModuleRequest, RequestAdapter, VirtualResponse } from '@embroider/core';
 export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {
     private packageCache;
     private phase;
@@ -28,9 +23,17 @@ export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<
     } | undefined;
     private constructor();
     get debugType(): string;
-    notFoundResponse(request: core.ModuleRequest<core.Resolution<OnResolveResult, OnResolveResult>>): core.Resolution<OnResolveResult, OnResolveResult>;
-    virtualResponse(_request: core.ModuleRequest<core.Resolution<OnResolveResult, OnResolveResult>>, virtualFileName: string): core.Resolution<OnResolveResult, OnResolveResult>;
+    notFoundResponse(request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>): Resolution<OnResolveResult, OnResolveResult>;
+    virtualResponse(_request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>, virtual: VirtualResponse): Resolution<OnResolveResult, OnResolveResult>;
     resolve(request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>): Promise<Resolution<OnResolveResult, OnResolveResult>>;
 }
-export declare function writeStatus(id: string, status: 'found' | 'not_found'): void;
+export declare function writeStatus(id: string, status: InternalStatus): void;
+type InternalStatus = {
+    type: 'pending';
+} | {
+    type: 'not_found';
+} | {
+    type: 'found';
+    filename: string;
+};
 export {};

package/{src → dist/src}/esbuild-request.js

@@ -37,12 +37,12 @@ export class EsBuildRequestAdapter {
             },
         };
     }
-    virtualResponse(_request, virtualFileName) {
+    virtualResponse(_request, virtual) {
         return {
             type: 'found',
-            filename: virtualFileName,
-            result: { path: virtualFileName, namespace: 'embroider-virtual' },
-            isVirtual: true,
+            filename: virtual.specifier,
+            result: { path: virtual.specifier, namespace: 'embroider-virtual', pluginData: { virtual } },
+            virtual,
         };
     }
     async resolve(request) {
@@ -59,12 +59,9 @@ export class EsBuildRequestAdapter {
             },
         });
         let status = readStatus(request.specifier);
-        if (result.errors.length > 0 || status === 'not_found') {
+        if (result.errors.length > 0 || status.type === 'not_found') {
             return { type: 'not_found', err: result };
         }
-        else if (result.external) {
-            return { type: 'ignored', result };
-        }
         else {
             if (this.phase === 'bundling') {
                 // we need to ensure that we don't traverse back into the app while
@@ -75,7 +72,7 @@ export class EsBuildRequestAdapter {
                 // components/helpers/modifiers against the app's global pool).
                 let pkg = this.packageCache.ownerOfFile(result.path);
                 if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) === this.packageCache.appRoot &&
-                    // vite provides node built-in polyfills under a custom namespace and we dont 
+                    // vite provides node built-in polyfills under a custom namespace and we dont
                     // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,
                     // rather than getting deferred to the app build (which also works, but means they didn't
                     // get pre-optimized).
@@ -95,7 +92,9 @@ export class EsBuildRequestAdapter {
                         externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;
                     }
                     return {
-                        type: 'ignored',
+                        type: 'found',
+                        filename: externalizedName,
+                        virtual: false,
                         result: {
                             path: externalizedName,
                             external: true,
@@ -103,7 +102,22 @@ export class EsBuildRequestAdapter {
                     };
                 }
             }
-            return { type: 'found', filename: result.path, result, isVirtual: false };
+            let filename;
+            if (status.type === 'found' && result.external) {
+                // when we know that the file was really found, but vite has
+                // externalized it, report the true filename that was found, not the
+                // externalized request path.
+                filename = status.filename;
+            }
+            else {
+                filename = result.path;
+            }
+            return {
+                type: 'found',
+                filename,
+                result,
+                virtual: false,
+            };
         }
     }
 }
@@ -125,18 +139,19 @@ function sharedGlobalState() {
     return channel;
 }
 function requestStatus(id) {
-    sharedGlobalState().set(id, 'pending');
+    sharedGlobalState().set(id, { type: 'pending' });
 }
 export function writeStatus(id, status) {
+    var _a;
     let channel = sharedGlobalState();
-    if (channel.get(id) === 'pending') {
+    if (((_a = channel.get(id)) === null || _a === void 0 ? void 0 : _a.type) === 'pending') {
         channel.set(id, status);
     }
 }
 function readStatus(id) {
     var _a;
     let channel = sharedGlobalState();
-    let result = (_a = channel.get(id)) !== null && _a !== void 0 ? _a : 'pending';
+    let result = (_a = channel.get(id)) !== null && _a !== void 0 ? _a : { type: 'pending' };
     channel.delete(id);
     return result;
 }

package/dist/src/esbuild-request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["../../src/esbuild-request.ts"],"names":[],"mappings":"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","sourcesContent":["import core from '@embroider/core';\nconst { cleanUrl, packageName } = core;\nimport type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';\nimport { dirname } from 'path';\n\nimport type {\n  PackageCachePublicAPI as PackageCache,\n  Resolution,\n  ModuleRequest,\n  RequestAdapter,\n  VirtualResponse,\n} from '@embroider/core';\nimport { externalName } from '@embroider/reverse-exports';\n\nexport class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {\n  static create({\n    packageCache,\n    phase,\n    build,\n    kind,\n    path,\n    importer,\n    pluginData,\n  }: {\n    packageCache: PackageCache;\n    phase: 'bundling' | 'other';\n    build: PluginBuild;\n    kind: ImportKind;\n    path: string;\n    importer: string | undefined;\n    pluginData: Record<string, any> | undefined;\n  }) {\n    if (!(pluginData?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n\n    if (path && importer && path[0] !== '\\0' && !path.startsWith('virtual-module:')) {\n      let fromFile = cleanUrl(importer);\n      return {\n        initialState: {\n          specifier: path,\n          fromFile,\n          meta: pluginData?.embroider?.meta,\n        },\n        adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),\n      };\n    }\n  }\n\n  private constructor(\n    private packageCache: PackageCache,\n    private phase: 'bundling' | 'other',\n    private context: PluginBuild,\n    private kind: ImportKind\n  ) {}\n\n  get debugType() {\n    return 'esbuild';\n  }\n\n  notFoundResponse(\n    request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n  ): Resolution<OnResolveResult, OnResolveResult> {\n    return {\n      type: 'not_found',\n      err: {\n        errors: [{ text: `module not found ${request.specifier}` }],\n      },\n    };\n  }\n\n  virtualResponse(\n    _request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>,\n    virtual: VirtualResponse\n  ): Resolution<OnResolveResult, OnResolveResult> {\n    return {\n      type: 'found',\n      filename: virtual.specifier,\n      result: { path: virtual.specifier, namespace: 'embroider-virtual', pluginData: { virtual } },\n      virtual,\n    };\n  }\n\n  async resolve(\n    request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n  ): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n    requestStatus(request.specifier);\n\n    let result = await this.context.resolve(request.specifier, {\n      importer: request.fromFile,\n      resolveDir: dirname(request.fromFile),\n      kind: this.kind,\n      pluginData: {\n        embroider: {\n          enableCustomResolver: false,\n          meta: request.meta,\n        },\n      },\n    });\n\n    let status = readStatus(request.specifier);\n\n    if (result.errors.length > 0 || status.type === 'not_found') {\n      return { type: 'not_found', err: result };\n    } else {\n      if (this.phase === 'bundling') {\n        // we need to ensure that we don't traverse back into the app while\n        // doing dependency pre-bundling. There are multiple ways an addon can\n        // resolve things from the app, due to the existince of both app-js\n        // (modules in addons that are logically part of the app's namespace)\n        // and non-strict handlebars (which resolves\n        // components/helpers/modifiers against the app's global pool).\n        let pkg = this.packageCache.ownerOfFile(result.path);\n        if (\n          pkg?.root === this.packageCache.appRoot &&\n          // vite provides node built-in polyfills under a custom namespace and we dont\n          // want to interrupt that. We'd prefer they get bundled in the dep optimizer normally,\n          // rather than getting deferred to the app build (which also works, but means they didn't\n          // get pre-optimized).\n          (result.namespace === 'file' || result.namespace.startsWith('embroider-'))\n        ) {\n          let externalizedName = request.specifier;\n          if (!packageName(externalizedName)) {\n            // the request was a relative path. This won't remain valid once\n            // it has been bundled into vite/deps. But we know it targets the\n            // app, so we can always convert it into a non-relative import\n            // from the app's namespace\n            //\n            // IMPORTANT: whenever an addon resolves a relative path to the\n            // app, it does so because our code in the core resolver has\n            // rewritten the request to be relative to the app's root. So here\n            // we will only ever encounter relative paths that are already\n            // relative to the app's root directory.\n            externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;\n          }\n          return {\n            type: 'found',\n            filename: externalizedName,\n            virtual: false,\n            result: {\n              path: externalizedName,\n              external: true,\n            },\n          };\n        }\n      }\n\n      let filename: string;\n      if (status.type === 'found' && result.external) {\n        // when we know that the file was really found, but vite has\n        // externalized it, report the true filename that was found, not the\n        // externalized request path.\n        filename = status.filename;\n      } else {\n        filename = result.path;\n      }\n\n      return {\n        type: 'found',\n        filename,\n        result,\n        virtual: false,\n      };\n    }\n  }\n}\n\n/*\n  This is an unfortunate necessity. During depscan, vite deliberately hides\n  information from esbuild. Specifically, it treats \"not found\" and \"this is an\n  external dependency\" as both \"external: true\". But we really care about the\n  difference, since we have fallback behaviors for the \"not found\" case. Using\n  this global state, our rollup resolver plugin can observe what vite is\n  actually doing and communicate that knowledge outward to our esbuild resolver\n  plugin.\n */\nfunction sharedGlobalState() {\n  let channel = (globalThis as any).__embroider_vite_resolver_channel__ as undefined | Map<string, InternalStatus>;\n  if (!channel) {\n    channel = new Map();\n    (globalThis as any).__embroider_vite_resolver_channel__ = channel;\n  }\n  return channel;\n}\n\nfunction requestStatus(id: string): void {\n  sharedGlobalState().set(id, { type: 'pending' });\n}\n\nexport function writeStatus(id: string, status: InternalStatus): void {\n  let channel = sharedGlobalState();\n  if (channel.get(id)?.type === 'pending') {\n    channel.set(id, status);\n  }\n}\n\nfunction readStatus(id: string): InternalStatus {\n  let channel = sharedGlobalState();\n  let result = channel.get(id) ?? { type: 'pending' };\n  channel.delete(id);\n  return result;\n}\n\ntype InternalStatus = { type: 'pending' } | { type: 'not_found' } | { type: 'found'; filename: string };\n"]}

package/{src → dist/src}/esbuild-resolver.js

@@ -1,6 +1,6 @@
 import { transformAsync } from '@babel/core';
 import core, { ModuleRequest } from '@embroider/core';
-const { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = core;
+const { ResolverLoader, virtualContent } = core;
 import fs from 'fs-extra';
 const { readFileSync } = fs;
 import { EsBuildRequestAdapter } from './esbuild-request.js';
@@ -8,7 +8,6 @@ import { assertNever } from 'assert-never';
 import { hbsToJS } from '@embroider/core';
 import { Preprocessor } from 'content-tag';
 import { extname } from 'path';
-const templateOnlyComponent = `import templateOnly from '@ember/component/template-only';\n` + `export default templateOnly();\n`;
 export function esBuildResolver() {
     let resolverLoader = new ResolverLoader(process.cwd());
     let preprocessor = new Preprocessor();
@@ -19,13 +18,12 @@ export function esBuildResolver() {
         }
         return result.code;
     }
-    async function onLoad({ path, namespace }) {
+    async function onLoad({ path, namespace, pluginData, }) {
         let src;
-        if (namespace === 'embroider-template-only-component') {
-            src = templateOnlyComponent;
-        }
-        else if (namespace === 'embroider-virtual') {
-            src = virtualContent(path, resolverLoader.resolver).src;
+        if (namespace === 'embroider-virtual') {
+            // castin because response in our namespace are supposed to always have
+            // this pluginData.
+            src = virtualContent(pluginData.virtual, resolverLoader.resolver).src;
         }
         else {
             src = readFileSync(path, 'utf8');
@@ -62,7 +60,6 @@ export function esBuildResolver() {
                 let resolution = await resolverLoader.resolver.resolve(request);
                 switch (resolution.type) {
                     case 'found':
-                    case 'ignored':
                         return resolution.result;
                     case 'not_found':
                         return resolution.err;
@@ -70,34 +67,11 @@ export function esBuildResolver() {
                         throw assertNever(resolution);
                 }
             });
-            // template-only-component synthesis
-            build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
-                if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderHBSResolving) {
-                    // reentrance
-                    return null;
-                }
-                let result = await build.resolve(path, {
-                    namespace,
-                    resolveDir,
-                    importer,
-                    kind,
-                    // avoid reentrance
-                    pluginData: { ...pluginData, embroiderHBSResolving: true },
-                });
-                if (result.errors.length === 0 && !result.external) {
-                    let syntheticPath = needsSyntheticComponentJS(path, result.path);
-                    if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {
-                        return { path: syntheticPath, namespace: 'embroider-template-only-component' };
-                    }
-                }
-                return result;
-            });
             if (phase === 'bundling') {
                 // during bundling phase, we need to provide our own extension
                 // searching. We do it here in its own resolve plugin so that it's
-                // sitting beneath both embroider resolver and template-only-component
-                // synthesizer, since both expect the ambient system to have extension
-                // search.
+                // sitting beneath the embroider resolver since it expects the ambient
+                // system to have extension search.
                 build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {
                     if (pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroiderExtensionResolving) {
                         // reentrance
@@ -125,8 +99,7 @@ export function esBuildResolver() {
                     return firstResult;
                 });
             }
-            // we need to handle everything from one of our three special namespaces:
-            build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);
+            // we need to handle everything from our special namespaces
             build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);
             build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);
             // we need to handle all hbs

package/dist/src/esbuild-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["../../src/esbuild-resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin as EsBuildPlugin, OnLoadResult, PluginBuild, ResolveResult } from 'esbuild';\nimport { transformAsync } from '@babel/core';\nimport core, { ModuleRequest, type VirtualResponse } from '@embroider/core';\nconst { ResolverLoader, virtualContent } = core;\nimport fs from 'fs-extra';\nconst { readFileSync } = fs;\nimport { EsBuildRequestAdapter } from './esbuild-request.js';\nimport { assertNever } from 'assert-never';\nimport { hbsToJS } from '@embroider/core';\nimport { Preprocessor } from 'content-tag';\nimport { extname } from 'path';\n\nexport function esBuildResolver(): EsBuildPlugin {\n  let resolverLoader = new ResolverLoader(process.cwd());\n  let preprocessor = new Preprocessor();\n\n  async function transformAndAssert(src: string, filename: string): Promise<string> {\n    const result = await transformAsync(src, { filename });\n    if (!result || result.code == null) {\n      throw new Error(`Failed to load file ${filename} in esbuild-hbs-loader`);\n    }\n    return result.code!;\n  }\n\n  async function onLoad({\n    path,\n    namespace,\n    pluginData,\n  }: {\n    path: string;\n    namespace: string;\n    pluginData?: { virtual: VirtualResponse };\n  }): Promise<OnLoadResult> {\n    let src: string;\n    if (namespace === 'embroider-virtual') {\n      // castin because response in our namespace are supposed to always have\n      // this pluginData.\n      src = virtualContent(pluginData!.virtual, resolverLoader.resolver).src;\n    } else {\n      src = readFileSync(path, 'utf8');\n    }\n    if (path.endsWith('.hbs')) {\n      src = hbsToJS(src);\n    } else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {\n      src = preprocessor.process(src, { filename: path });\n    }\n    if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {\n      src = await transformAndAssert(src, path);\n    }\n    return { contents: src };\n  }\n\n  return {\n    name: 'embroider-esbuild-resolver',\n    setup(build) {\n      const phase = detectPhase(build);\n\n      // Embroider Resolver\n      build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {\n        let request = ModuleRequest.create(EsBuildRequestAdapter.create, {\n          packageCache: resolverLoader.resolver.packageCache,\n          phase,\n          build,\n          kind,\n          path,\n          importer,\n          pluginData,\n        });\n        if (!request) {\n          return null;\n        }\n        let resolution = await resolverLoader.resolver.resolve(request);\n        switch (resolution.type) {\n          case 'found':\n            return resolution.result;\n          case 'not_found':\n            return resolution.err;\n          default:\n            throw assertNever(resolution);\n        }\n      });\n\n      if (phase === 'bundling') {\n        // during bundling phase, we need to provide our own extension\n        // searching. We do it here in its own resolve plugin so that it's\n        // sitting beneath the embroider resolver since it expects the ambient\n        // system to have extension search.\n        build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n          if (pluginData?.embroiderExtensionResolving) {\n            // reentrance\n            return null;\n          }\n\n          let firstResult: ResolveResult | undefined;\n\n          for (let requestName of extensionSearch(path, resolverLoader.resolver.options.resolvableExtensions)) {\n            let result = await build.resolve(requestName, {\n              namespace,\n              resolveDir,\n              importer,\n              kind,\n              // avoid reentrance\n              pluginData: { ...pluginData, embroiderExtensionResolving: true },\n            });\n\n            if (result.errors.length > 0) {\n              // if extension search fails, we want to let the first failure be the\n              // one that propagates, so that the error message makes sense.\n              firstResult = result;\n            } else {\n              return result;\n            }\n          }\n\n          return firstResult;\n        });\n      }\n\n      // we need to handle everything from our special namespaces\n      build.onLoad({ namespace: 'embroider-virtual', filter: /./ }, onLoad);\n      build.onLoad({ namespace: 'embroider-template-tag', filter: /./ }, onLoad);\n\n      // we need to handle all hbs\n      build.onLoad({ filter: /\\.hbs$/ }, onLoad);\n\n      // we need to handle all GJS (to preprocess) and JS (to run macros)\n      build.onLoad({ filter: /\\.g?[jt]s$/ }, onLoad);\n    },\n  };\n}\n\nfunction detectPhase(build: PluginBuild): 'bundling' | 'other' {\n  let plugins = (build.initialOptions.plugins ?? []).map(p => p.name);\n  if (plugins.includes('vite:dep-pre-bundle')) {\n    return 'bundling';\n  } else {\n    return 'other';\n  }\n}\n\nfunction* extensionSearch(specifier: string, extensions: string[]): Generator<string> {\n  yield specifier;\n  // when there's no explicit extension, we may do extension search\n  if (extname(specifier) === '') {\n    for (let ext of extensions) {\n      yield specifier + ext;\n    }\n  }\n}\n"]}

package/dist/src/hbs.js

@@ -0,0 +1,34 @@
+import { createFilter } from '@rollup/pluginutils';
+import { hbsToJS, templateOnlyComponentSource } from '@embroider/core';
+const hbsFilter = createFilter('**/*.hbs?([?]*)');
+export function hbs() {
+    return {
+        name: 'rollup-hbs-plugin',
+        enforce: 'pre',
+        load(id) {
+            var _a;
+            if (((_a = getMeta(this, id)) === null || _a === void 0 ? void 0 : _a.type) === 'template-only-component-js') {
+                return {
+                    code: templateOnlyComponentSource(),
+                };
+            }
+        },
+        transform(code, id) {
+            if (!hbsFilter(id)) {
+                return null;
+            }
+            return hbsToJS(code);
+        },
+    };
+}
+function getMeta(context, id) {
+    var _a, _b;
+    const meta = (_b = (_a = context.getModuleInfo(id)) === null || _a === void 0 ? void 0 : _a.meta) === null || _b === void 0 ? void 0 : _b['rollup-hbs-plugin'];
+    if (meta) {
+        return meta;
+    }
+    else {
+        return null;
+    }
+}
+//# sourceMappingURL=hbs.js.map

package/dist/src/hbs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hbs.js","sourceRoot":"","sources":["../../src/hbs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAEvE,MAAM,SAAS,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAC;AAElD,MAAM,UAAU,GAAG;IACjB,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,KAAK;QAEd,IAAI,CAAC,EAAU;;YACb,IAAI,CAAA,MAAA,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,0CAAE,IAAI,MAAK,4BAA4B,EAAE,CAAC;gBAC7D,OAAO;oBACL,IAAI,EAAE,2BAA2B,EAAE;iBACpC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,SAAS,OAAO,CAAC,OAAsB,EAAE,EAAU;;IACjD,MAAM,IAAI,GAAG,MAAA,MAAA,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,0CAAE,IAAI,0CAAG,mBAAmB,CAAC,CAAC;IACpE,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,IAAY,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC","sourcesContent":["import { createFilter } from '@rollup/pluginutils';\nimport type { PluginContext } from 'rollup';\nimport type { Plugin } from 'vite';\nimport { hbsToJS, templateOnlyComponentSource } from '@embroider/core';\n\nconst hbsFilter = createFilter('**/*.hbs?([?]*)');\n\nexport function hbs(): Plugin {\n  return {\n    name: 'rollup-hbs-plugin',\n    enforce: 'pre',\n\n    load(id: string) {\n      if (getMeta(this, id)?.type === 'template-only-component-js') {\n        return {\n          code: templateOnlyComponentSource(),\n        };\n      }\n    },\n\n    transform(code: string, id: string) {\n      if (!hbsFilter(id)) {\n        return null;\n      }\n      return hbsToJS(code);\n    },\n  };\n}\n\ntype Meta = {\n  type: 'template-only-component-js';\n};\n\nfunction getMeta(context: PluginContext, id: string): Meta | null {\n  const meta = context.getModuleInfo(id)?.meta?.['rollup-hbs-plugin'];\n  if (meta) {\n    return meta as Meta;\n  } else {\n    return null;\n  }\n}\n"]}

package/dist/src/optimize-deps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"optimize-deps.js","sourceRoot":"","sources":["../../src/optimize-deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOxD,MAAM,UAAU,YAAY;IAC1B,OAAO;QACL,OAAO,EAAE,CAAC,mBAAmB,CAAC;QAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QACpC,cAAc,EAAE;YACd,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;SAC7B;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { esBuildResolver } from './esbuild-resolver.js';\n\nexport interface OptimizeDeps {\n  exclude?: string[];\n  [key: string]: unknown;\n}\n\nexport function optimizeDeps(): OptimizeDeps {\n  return {\n    exclude: ['@embroider/macros'],\n    extensions: ['.hbs', '.gjs', '.gts'],\n    esbuildOptions: {\n      plugins: [esBuildResolver()],\n    },\n  };\n}\n"]}

package/{src → dist/src}/request.d.ts

@@ -1,12 +1,14 @@
-import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution } from '@embroider/core';
+import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution, VirtualResponse } from '@embroider/core';
 import type { PluginContext, ResolveIdResult } from 'rollup';
-export declare const virtualPrefix = "embroider_virtual:";
 interface Init {
     context: PluginContext;
     source: string;
     importer: string | undefined;
     custom: Record<string, any> | undefined;
 }
+export interface ResponseMeta {
+    virtual: VirtualResponse;
+}
 export declare class RollupRequestAdapter implements RequestAdapter<Resolution<ResolveIdResult>> {
     private context;
     private queryParams;
@@ -16,7 +18,7 @@ export declare class RollupRequestAdapter implements RequestAdapter<Resolution<R
     get debugType(): string;
     private specifierWithQueryParams;
     private fromFileWithQueryParams;
-    virtualResponse(request: ModuleRequest<Resolution<ResolveIdResult>>, virtualFileName: string): Resolution<ResolveIdResult>;
+    virtualResponse(request: ModuleRequest<Resolution<ResolveIdResult>>, virtual: VirtualResponse): Resolution<ResolveIdResult>;
     notFoundResponse(_request: ModuleRequest<Resolution<ResolveIdResult>>): Resolution<ResolveIdResult>;
     resolve(request: ModuleRequest<Resolution<ResolveIdResult>>): Promise<Resolution<ResolveIdResult>>;
 }

package/{src → dist/src}/request.js

@@ -1,6 +1,6 @@
 import core from '@embroider/core';
+import { resolve } from 'path';
 const { cleanUrl, getUrlQueryParams } = core;
-export const virtualPrefix = 'embroider_virtual:';
 export class RollupRequestAdapter {
     constructor(context, queryParams, importerQueryParams) {
         this.context = context;
@@ -16,16 +16,21 @@ export class RollupRequestAdapter {
     fromFileWithQueryParams(fromFile) {
         return `${fromFile}${this.importerQueryParams}`;
     }
-    virtualResponse(request, virtualFileName) {
-        let specifier = virtualPrefix + virtualFileName;
+    virtualResponse(request, virtual) {
         return {
             type: 'found',
-            filename: specifier,
+            filename: virtual.specifier,
             result: {
-                id: this.specifierWithQueryParams(specifier),
+                // The `resolve` here is necessary on windows, where we might have
+                // unix-like specifiers but Vite needs to see a real windows path in the
+                // result.
+                id: resolve(this.specifierWithQueryParams(virtual.specifier)),
                 resolvedBy: this.fromFileWithQueryParams(request.fromFile),
+                meta: {
+                    'embroider-resolver': { virtual },
+                },
             },
-            isVirtual: true,
+            virtual,
         };
     }
     notFoundResponse(_request) {
@@ -45,7 +50,7 @@ export class RollupRequestAdapter {
         });
         if (result) {
             let { pathname } = new URL(result.id, 'http://example.com');
-            return { type: 'found', filename: pathname, result, isVirtual: false };
+            return { type: 'found', filename: pathname, result, virtual: false };
         }
         else {
             return { type: 'not_found', err: undefined };
@@ -58,16 +63,14 @@ RollupRequestAdapter.create = ({ context, source, importer, custom, }) => {
         return;
     }
     if (source && importer && source[0] !== '\0') {
-        let nonVirtual;
-        if (importer.startsWith(virtualPrefix)) {
-            nonVirtual = importer.slice(virtualPrefix.length);
-        }
-        else {
-            nonVirtual = importer;
-        }
         // strip query params off the importer
-        let fromFile = cleanUrl(nonVirtual);
-        let importerQueryParams = getUrlQueryParams(nonVirtual);
+        let fromFile = cleanUrl(importer);
+        let importerQueryParams = getUrlQueryParams(importer);
+        if (source.startsWith('/@embroider/virtual/')) {
+            // when our virtual paths are used in HTML they come into here with a /
+            // prefix. We still want them to resolve like packages.
+            source = source.slice(1);
+        }
         // strip query params off the source but keep track of them
         // we use regexp-based methods over a URL object because the
         // source can be a relative path.

package/dist/src/request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution, VirtualResponse } from '@embroider/core';\nimport core from '@embroider/core';\nimport { resolve } from 'path';\n\nconst { cleanUrl, getUrlQueryParams } = core;\nimport type { PluginContext, ResolveIdResult } from 'rollup';\n\ninterface Init {\n  context: PluginContext;\n  source: string;\n  importer: string | undefined;\n  custom: Record<string, any> | undefined;\n}\n\nexport interface ResponseMeta {\n  virtual: VirtualResponse;\n}\n\nexport class RollupRequestAdapter implements RequestAdapter<Resolution<ResolveIdResult>> {\n  static create: RequestAdapterCreate<Init, Resolution<ResolveIdResult>> = ({\n    context,\n    source,\n    importer,\n    custom,\n  }: Init) => {\n    if (!(custom?.embroider?.enableCustomResolver ?? true)) {\n      return;\n    }\n    if (source && importer && source[0] !== '\\0') {\n      // strip query params off the importer\n      let fromFile = cleanUrl(importer);\n      let importerQueryParams = getUrlQueryParams(importer);\n\n      if (source.startsWith('/@embroider/virtual/')) {\n        // when our virtual paths are used in HTML they come into here with a /\n        // prefix. We still want them to resolve like packages.\n        source = source.slice(1);\n      }\n\n      // strip query params off the source but keep track of them\n      // we use regexp-based methods over a URL object because the\n      // source can be a relative path.\n      let cleanSource = cleanUrl(source);\n      let queryParams = getUrlQueryParams(source);\n\n      return {\n        initialState: { specifier: cleanSource, fromFile, meta: custom?.embroider?.meta },\n        adapter: new RollupRequestAdapter(context, queryParams, importerQueryParams),\n      };\n    }\n  };\n\n  private constructor(\n    private context: PluginContext,\n    private queryParams: string,\n    private importerQueryParams: string\n  ) {}\n\n  get debugType() {\n    return 'rollup';\n  }\n\n  private specifierWithQueryParams(specifier: string): string {\n    return `${specifier}${this.queryParams}`;\n  }\n\n  private fromFileWithQueryParams(fromFile: string): string {\n    return `${fromFile}${this.importerQueryParams}`;\n  }\n\n  virtualResponse(\n    request: ModuleRequest<Resolution<ResolveIdResult>>,\n    virtual: VirtualResponse\n  ): Resolution<ResolveIdResult> {\n    return {\n      type: 'found',\n      filename: virtual.specifier,\n      result: {\n        // The `resolve` here is necessary on windows, where we might have\n        // unix-like specifiers but Vite needs to see a real windows path in the\n        // result.\n        id: resolve(this.specifierWithQueryParams(virtual.specifier)),\n        resolvedBy: this.fromFileWithQueryParams(request.fromFile),\n        meta: {\n          'embroider-resolver': { virtual } satisfies ResponseMeta,\n        },\n      },\n      virtual,\n    };\n  }\n\n  notFoundResponse(_request: ModuleRequest<Resolution<ResolveIdResult>>): Resolution<ResolveIdResult> {\n    let err = new Error(`module not found ${this.specifierWithQueryParams}`);\n    (err as any).code = 'MODULE_NOT_FOUND';\n    return { type: 'not_found', err };\n  }\n\n  async resolve(request: ModuleRequest<Resolution<ResolveIdResult>>): Promise<Resolution<ResolveIdResult>> {\n    let result = await this.context.resolve(\n      this.specifierWithQueryParams(request.specifier),\n      this.fromFileWithQueryParams(request.fromFile),\n      {\n        skipSelf: true,\n        custom: {\n          embroider: {\n            enableCustomResolver: false,\n            meta: request.meta,\n          },\n        },\n      }\n    );\n    if (result) {\n      let { pathname } = new URL(result.id, 'http://example.com');\n      return { type: 'found', filename: pathname, result, virtual: false };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  }\n}\n"]}

package/{src → dist/src}/resolver.d.ts

@@ -1,2 +1,2 @@
-import type { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 export declare function resolver(): Plugin;