@embroider/vite 0.2.2-unstable.35f48d4 → 0.2.2-unstable.4070ba7

package/index.mjs

@@ -7,3 +7,5 @@ export * from './src/optimize-deps.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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/vite",
-  "version": "0.2.2-unstable.35f48d4",
+  "version": "0.2.2-unstable.4070ba7",
   "type": "module",
   "exports": {
     ".": {
@@ -10,12 +10,14 @@
   },
   "peerDependencies": {
     "vite": "^5.2.0",
-    "@embroider/core": "^3.4.20-unstable.35f48d4"
+    "@embroider/core": "^3.4.20-unstable.4070ba7"
   },
   "dependencies": {
     "@babel/core": "^7.22.9",
     "@rollup/pluginutils": "^5.1.0",
     "assert-never": "^1.2.1",
+    "browserslist": "*",
+    "browserslist-to-esbuild": "^2.1.1",
     "content-tag": "^2.0.2",
     "debug": "^4.3.2",
     "esbuild": "^0.17.19",
@@ -25,8 +27,8 @@
     "send": "^0.18.0",
     "source-map-url": "^0.4.1",
     "terser": "^5.7.0",
-    "@embroider/macros": "1.16.10-unstable.35f48d4",
-    "@embroider/reverse-exports": "0.1.1-unstable.35f48d4"
+    "@embroider/macros": "1.16.10-unstable.4070ba7",
+    "@embroider/reverse-exports": "0.1.1-unstable.4070ba7"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.1",
@@ -36,7 +38,7 @@
     "@types/send": "^0.17.4",
     "rollup": "^4.18.0",
     "vite": "^5.3.3",
-    "@embroider/core": "^3.4.20-unstable.35f48d4"
+    "@embroider/core": "^3.4.20-unstable.4070ba7"
   },
   "files": [
     "index.mjs",

package/src/build.js

@@ -9,12 +9,12 @@ export function emberBuild(command, mode, resolvableExtensions) {
     }
     if (command === 'build') {
         return new Promise((resolve, reject) => {
-            const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], { env });
+            const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'], { env });
             child.on('exit', code => (code === 0 ? resolve() : reject()));
         });
     }
     return new Promise((resolve, reject) => {
-        const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--watch', '--environment', mode], {
+        const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--watch', '--environment', mode, '-o', 'tmp/compat-prebuild', '--suppress-sizes'], {
             silent: true,
             env,
         });

package/src/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["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('./node_modules/ember-cli/bin/ember', ['build', '--environment', mode], { env });\n      child.on('exit', code => (code === 0 ? resolve() : reject()));\n    });\n  }\n  return new Promise((resolve, reject) => {\n    const child = fork('./node_modules/ember-cli/bin/ember', ['build', '--watch', '--environment', mode], {\n      silent: true,\n      env,\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 = 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"]}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["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 = 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/src/classic-ember-support.d.ts

@@ -0,0 +1,5 @@
+import { type UserConfig } from 'vite';
+export declare function classicEmberSupport(): (import("vite").Plugin<any> | {
+    name: string;
+    config(userConfig: UserConfig): Promise<Record<string, any> | UserConfig>;
+})[];

package/src/classic-ember-support.js

@@ -0,0 +1,37 @@
+import { hbs } from './hbs.js';
+import { scripts } from './scripts.js';
+import { compatPrebuild } from './build.js';
+import { assets } from './assets.js';
+import { contentFor } from './content-for.js';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { mergeConfig } from 'vite';
+import { pathToFileURL } from 'url';
+export function classicEmberSupport() {
+    return [
+        hbs(),
+        scripts(),
+        compatPrebuild(),
+        assets(),
+        contentFor(),
+        {
+            name: 'vite-plugin-ember-browser-targets',
+            async config(userConfig) {
+                const targetsPath = join(process.cwd(), 'config/targets.js');
+                if (existsSync(targetsPath)) {
+                    const targets = await import(pathToFileURL(targetsPath).toString());
+                    if (targets.default.browsers) {
+                        return mergeConfig({
+                            build: {
+                                target: browserslistToEsbuild(targets.browsers),
+                            },
+                        }, userConfig);
+                    }
+                }
+                return userConfig;
+            },
+        },
+    ];
+}
+//# sourceMappingURL=classic-ember-support.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"classic-ember-support.js","sourceRoot":"","sources":["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/src/ember.d.ts

@@ -0,0 +1,6 @@
+import { type UserConfig, type ConfigEnv } from 'vite';
+export declare let extensions: string[];
+export declare function ember(): (import("vite").Plugin<any> | {
+    name: string;
+    config(config: UserConfig, env: ConfigEnv): Promise<Record<string, any>>;
+})[];

package/src/ember.js

@@ -0,0 +1,43 @@
+import { templateTag } from './template-tag.js';
+import { resolver } from './resolver.js';
+import { mergeConfig } from 'vite';
+import { esBuildResolver } from './esbuild-resolver.js';
+export let extensions = ['.mjs', '.gjs', '.js', '.mts', '.gts', '.ts', '.hbs', '.hbs.js', '.json'];
+export function ember() {
+    return [
+        templateTag(),
+        resolver(),
+        {
+            name: 'vite-plugin-ember-config',
+            async config(config, env) {
+                return mergeConfig({
+                    resolve: {
+                        extensions,
+                    },
+                    optimizeDeps: {
+                        exclude: ['@embroider/macros'],
+                        extensions: ['.hbs', '.gjs', '.gts'],
+                        esbuildOptions: {
+                            plugins: [esBuildResolver()],
+                        },
+                    },
+                    build: {
+                        rollupOptions: {
+                            input: {
+                                main: 'index.html',
+                                ...(shouldBuildTests(env.mode) ? { tests: 'tests/index.html' } : undefined),
+                            },
+                        },
+                    },
+                    server: {
+                        port: 4200,
+                    },
+                }, config);
+            },
+        },
+    ];
+}
+function shouldBuildTests(mode) {
+    return mode !== 'production' || process.env.FORCE_BUILD_TESTS;
+}
+//# sourceMappingURL=ember.js.map

package/src/ember.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ember.js","sourceRoot":"","sources":["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/esbuild-request.d.ts

@@ -1,9 +1,5 @@
 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;
@@ -27,7 +23,17 @@ export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<
     } | undefined;
     private constructor();
     get debugType(): string;
+    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/esbuild-request.js

@@ -29,24 +29,23 @@ export class EsBuildRequestAdapter {
     get debugType() {
         return 'esbuild';
     }
+    notFoundResponse(request) {
+        return {
+            type: 'not_found',
+            err: {
+                errors: [{ text: `module not found ${request.specifier}` }],
+            },
+        };
+    }
+    virtualResponse(_request, virtual) {
+        return {
+            type: 'found',
+            filename: virtual.specifier,
+            result: { path: virtual.specifier, namespace: 'embroider-virtual' },
+            virtual,
+        };
+    }
     async resolve(request) {
-        if (request.isVirtual) {
-            return {
-                type: 'found',
-                filename: request.specifier,
-                result: { path: request.specifier, namespace: 'embroider-virtual' },
-                isVirtual: request.isVirtual,
-            };
-        }
-        if (request.isNotFound) {
-            // todo: make sure this looks correct to users
-            return {
-                type: 'not_found',
-                err: {
-                    errors: [{ text: `module not found ${request.specifier}` }],
-                },
-            };
-        }
         requestStatus(request.specifier);
         let result = await this.context.resolve(request.specifier, {
             importer: request.fromFile,
@@ -60,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 +71,12 @@ export class EsBuildRequestAdapter {
                 // and non-strict handlebars (which resolves
                 // 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) {
+                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
+                    // 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).
+                    (result.namespace === 'file' || result.namespace.startsWith('embroider-'))) {
                     let externalizedName = request.specifier;
                     if (!packageName(externalizedName)) {
                         // the request was a relative path. This won't remain valid once
@@ -91,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,
@@ -99,7 +102,22 @@ export class EsBuildRequestAdapter {
                     };
                 }
             }
-            return { type: 'found', filename: result.path, result, isVirtual: request.isVirtual };
+            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,
+            };
         }
     }
 }
@@ -121,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/src/esbuild-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["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 { PackageCache as _PackageCache, Resolution, ModuleRequest, RequestAdapter } from '@embroider/core';\nimport { externalName } from '@embroider/reverse-exports';\n\ntype PublicAPI<T> = { [K in keyof T]: T[K] };\ntype PackageCache = PublicAPI<_PackageCache>;\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  async resolve(\n    request: ModuleRequest<Resolution<OnResolveResult, OnResolveResult>>\n  ): Promise<Resolution<OnResolveResult, OnResolveResult>> {\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        filename: request.specifier,\n        result: { path: request.specifier, namespace: 'embroider-virtual' },\n        isVirtual: request.isVirtual,\n      };\n    }\n    if (request.isNotFound) {\n      // todo: make sure this looks correct to users\n      return {\n        type: 'not_found',\n        err: {\n          errors: [{ text: `module not found ${request.specifier}` }],\n        },\n      };\n    }\n\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 === 'not_found') {\n      return { type: 'not_found', err: result };\n    } else if (result.external) {\n      return { type: 'ignored', 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 (pkg?.root === this.packageCache.appRoot) {\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: 'ignored',\n            result: {\n              path: externalizedName,\n              external: true,\n            },\n          };\n        }\n      }\n      return { type: 'found', filename: result.path, result, isVirtual: request.isVirtual };\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\n    | undefined\n    | Map<string, 'pending' | 'found' | 'not_found'>;\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, 'pending');\n}\n\nexport function writeStatus(id: string, status: 'found' | 'not_found'): void {\n  let channel = sharedGlobalState();\n  if (channel.get(id) === 'pending') {\n    channel.set(id, status);\n  }\n}\n\nfunction readStatus(id: string): 'pending' | 'not_found' | 'found' {\n  let channel = sharedGlobalState();\n  let result = channel.get(id) ?? 'pending';\n  channel.delete(id);\n  return result;\n}\n"]}
+{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["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' },\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/esbuild-resolver.js

@@ -62,7 +62,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;

package/src/esbuild-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["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 } from '@embroider/core';\nconst { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = 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\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\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({ path, namespace }: { path: string; namespace: string }): Promise<OnLoadResult> {\n    let src: string;\n    if (namespace === 'embroider-template-only-component') {\n      src = templateOnlyComponent;\n    } else if (namespace === 'embroider-virtual') {\n      src = virtualContent(path, 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          case 'ignored':\n            return resolution.result;\n          case 'not_found':\n            return resolution.err;\n          default:\n            throw assertNever(resolution);\n        }\n      });\n\n      // template-only-component synthesis\n      build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n        if (pluginData?.embroiderHBSResolving) {\n          // reentrance\n          return null;\n        }\n\n        let result = await build.resolve(path, {\n          namespace,\n          resolveDir,\n          importer,\n          kind,\n          // avoid reentrance\n          pluginData: { ...pluginData, embroiderHBSResolving: true },\n        });\n\n        if (result.errors.length === 0 && !result.external) {\n          let syntheticPath = needsSyntheticComponentJS(path, result.path);\n          if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {\n            return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n          }\n        }\n\n        return result;\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 both embroider resolver and template-only-component\n        // synthesizer, since both expect the ambient system to have extension\n        // 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 one of our three special namespaces:\n      build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\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"]}
+{"version":3,"file":"esbuild-resolver.js","sourceRoot":"","sources":["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 } from '@embroider/core';\nconst { ResolverLoader, virtualContent, needsSyntheticComponentJS, isInComponents } = 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\nconst templateOnlyComponent =\n  `import templateOnly from '@ember/component/template-only';\\n` + `export default templateOnly();\\n`;\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({ path, namespace }: { path: string; namespace: string }): Promise<OnLoadResult> {\n    let src: string;\n    if (namespace === 'embroider-template-only-component') {\n      src = templateOnlyComponent;\n    } else if (namespace === 'embroider-virtual') {\n      src = virtualContent(path, 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      // template-only-component synthesis\n      build.onResolve({ filter: /./ }, async ({ path, importer, namespace, resolveDir, pluginData, kind }) => {\n        if (pluginData?.embroiderHBSResolving) {\n          // reentrance\n          return null;\n        }\n\n        let result = await build.resolve(path, {\n          namespace,\n          resolveDir,\n          importer,\n          kind,\n          // avoid reentrance\n          pluginData: { ...pluginData, embroiderHBSResolving: true },\n        });\n\n        if (result.errors.length === 0 && !result.external) {\n          let syntheticPath = needsSyntheticComponentJS(path, result.path);\n          if (syntheticPath && isInComponents(result.path, resolverLoader.resolver.packageCache)) {\n            return { path: syntheticPath, namespace: 'embroider-template-only-component' };\n          }\n        }\n\n        return result;\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 both embroider resolver and template-only-component\n        // synthesizer, since both expect the ambient system to have extension\n        // 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 one of our three special namespaces:\n      build.onLoad({ namespace: 'embroider-template-only-component', filter: /./ }, onLoad);\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/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,6 +18,8 @@ export declare class RollupRequestAdapter implements RequestAdapter<Resolution<R
     get debugType(): string;
     private specifierWithQueryParams;
     private fromFileWithQueryParams;
+    virtualResponse(request: ModuleRequest<Resolution<ResolveIdResult>>, virtual: VirtualResponse): Resolution<ResolveIdResult>;
+    notFoundResponse(_request: ModuleRequest<Resolution<ResolveIdResult>>): Resolution<ResolveIdResult>;
     resolve(request: ModuleRequest<Resolution<ResolveIdResult>>): Promise<Resolution<ResolveIdResult>>;
 }
 export {};

package/src/request.js

@@ -1,6 +1,5 @@
 import core from '@embroider/core';
 const { cleanUrl, getUrlQueryParams } = core;
-export const virtualPrefix = 'embroider_virtual:';
 export class RollupRequestAdapter {
     constructor(context, queryParams, importerQueryParams) {
         this.context = context;
@@ -16,26 +15,26 @@ export class RollupRequestAdapter {
     fromFileWithQueryParams(fromFile) {
         return `${fromFile}${this.importerQueryParams}`;
     }
-    async resolve(request) {
-        if (request.isVirtual) {
-            let specifier = virtualPrefix + request.specifier;
-            return {
-                type: 'found',
-                filename: specifier,
-                result: {
-                    id: this.specifierWithQueryParams(specifier),
-                    resolvedBy: this.fromFileWithQueryParams(request.fromFile),
+    virtualResponse(request, virtual) {
+        return {
+            type: 'found',
+            filename: virtual.specifier,
+            result: {
+                id: this.specifierWithQueryParams(virtual.specifier),
+                resolvedBy: this.fromFileWithQueryParams(request.fromFile),
+                meta: {
+                    'embroider-resolver': { virtual },
                 },
-                isVirtual: request.isVirtual,
-            };
-        }
-        if (request.isNotFound) {
-            // TODO: we can make sure this looks correct in rollup & vite output when a
-            // user encounters it
-            let err = new Error(`module not found ${this.specifierWithQueryParams}`);
-            err.code = 'MODULE_NOT_FOUND';
-            return { type: 'not_found', err };
-        }
+            },
+            virtual,
+        };
+    }
+    notFoundResponse(_request) {
+        let err = new Error(`module not found ${this.specifierWithQueryParams}`);
+        err.code = 'MODULE_NOT_FOUND';
+        return { type: 'not_found', err };
+    }
+    async resolve(request) {
         let result = await this.context.resolve(this.specifierWithQueryParams(request.specifier), this.fromFileWithQueryParams(request.fromFile), {
             skipSelf: true,
             custom: {
@@ -47,7 +46,7 @@ export class RollupRequestAdapter {
         });
         if (result) {
             let { pathname } = new URL(result.id, 'http://example.com');
-            return { type: 'found', filename: pathname, result, isVirtual: request.isVirtual };
+            return { type: 'found', filename: pathname, result, virtual: false };
         }
         else {
             return { type: 'not_found', err: undefined };
@@ -60,16 +59,9 @@ 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);
         // 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/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution } from '@embroider/core';\nimport core from '@embroider/core';\nconst { cleanUrl, getUrlQueryParams } = core;\nimport type { PluginContext, ResolveIdResult } from 'rollup';\n\nexport const virtualPrefix = 'embroider_virtual:';\n\ninterface Init {\n  context: PluginContext;\n  source: string;\n  importer: string | undefined;\n  custom: Record<string, any> | undefined;\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      let nonVirtual: string;\n      if (importer.startsWith(virtualPrefix)) {\n        nonVirtual = importer.slice(virtualPrefix.length);\n      } else {\n        nonVirtual = importer;\n      }\n\n      // strip query params off the importer\n      let fromFile = cleanUrl(nonVirtual);\n      let importerQueryParams = getUrlQueryParams(nonVirtual);\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  async resolve(request: ModuleRequest<Resolution<ResolveIdResult>>): Promise<Resolution<ResolveIdResult>> {\n    if (request.isVirtual) {\n      let specifier = virtualPrefix + request.specifier;\n      return {\n        type: 'found',\n        filename: specifier,\n        result: {\n          id: this.specifierWithQueryParams(specifier),\n          resolvedBy: this.fromFileWithQueryParams(request.fromFile),\n        },\n        isVirtual: request.isVirtual,\n      };\n    }\n    if (request.isNotFound) {\n      // TODO: we can make sure this looks correct in rollup & vite output when a\n      // user encounters it\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    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, isVirtual: request.isVirtual };\n    } else {\n      return { type: 'not_found', err: undefined };\n    }\n  }\n}\n"]}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;AAc7C,MAAM,OAAO,oBAAoB;IA4B/B,YACU,OAAsB,EACtB,WAAmB,EACnB,mBAA2B;QAF3B,YAAO,GAAP,OAAO,CAAe;QACtB,gBAAW,GAAX,WAAW,CAAQ;QACnB,wBAAmB,GAAnB,mBAAmB,CAAQ;IAClC,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAAC,SAAiB;QAChD,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3C,CAAC;IAEO,uBAAuB,CAAC,QAAgB;QAC9C,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAClD,CAAC;IAED,eAAe,CACb,OAAmD,EACnD,OAAwB;QAExB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,OAAO,CAAC,SAAS;YAC3B,MAAM,EAAE;gBACN,EAAE,EAAE,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,SAAS,CAAC;gBACpD,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC1D,IAAI,EAAE;oBACJ,oBAAoB,EAAE,EAAE,OAAO,EAAyB;iBACzD;aACF;YACD,OAAO;SACR,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,QAAoD;QACnE,IAAI,GAAG,GAAG,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,wBAAwB,EAAE,CAAC,CAAC;QACxE,GAAW,CAAC,IAAI,GAAG,kBAAkB,CAAC;QACvC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAmD;QAC/D,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CACrC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,SAAS,CAAC,EAChD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAC9C;YACE,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE;gBACN,SAAS,EAAE;oBACT,oBAAoB,EAAE,KAAK;oBAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;aACF;SACF,CACF,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAC;YAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;;AAzFM,2BAAM,GAA4D,CAAC,EACxE,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,GACD,EAAE,EAAE;;IACT,IAAI,CAAC,CAAC,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE,CAAC;QACvD,OAAO;IACT,CAAC;IACD,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7C,sCAAsC;QACtC,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,mBAAmB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEtD,2DAA2D;QAC3D,4DAA4D;QAC5D,iCAAiC;QACjC,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAE5C,OAAO;YACL,YAAY,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,IAAI,EAAE;YACjF,OAAO,EAAE,IAAI,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,mBAAmB,CAAC;SAC7E,CAAC;IACJ,CAAC;AACH,CAAC,CAAC","sourcesContent":["import type { ModuleRequest, RequestAdapter, RequestAdapterCreate, Resolution, VirtualResponse } from '@embroider/core';\nimport core from '@embroider/core';\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      // 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        id: 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/resolver.d.ts

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

package/src/resolver.js

@@ -1,9 +1,10 @@
+import { normalizePath } from 'vite';
 import core, { ModuleRequest } from '@embroider/core';
 const { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;
-import { RollupRequestAdapter, virtualPrefix } from './request.js';
+import { RollupRequestAdapter } from './request.js';
 import { assertNever } from 'assert-never';
 import makeDebug from 'debug';
-import { resolve, join } from 'path';
+import { join, resolve } from 'path';
 import { writeStatus } from './esbuild-request.js';
 import { externalName } from '@embroider/reverse-exports';
 import fs from 'fs-extra';
@@ -15,9 +16,61 @@ export function resolver() {
     let server;
     const virtualDeps = new Map();
     const notViteDeps = new Set();
+    const responseMetas = new Map();
+    async function resolveId(context, source, importer, options) {
+        var _a;
+        if ((_a = options.custom) === null || _a === void 0 ? void 0 : _a.depScan) {
+            return await observeDepScan(context, source, importer, options);
+        }
+        let request = ModuleRequest.create(RollupRequestAdapter.create, {
+            context,
+            source,
+            importer,
+            custom: options.custom,
+        });
+        if (!request) {
+            // fallthrough to other rollup plugins
+            return null;
+        }
+        let resolution = await resolverLoader.resolver.resolve(request);
+        switch (resolution.type) {
+            case 'found':
+                if (resolution.virtual) {
+                    return resolution.result;
+                }
+                else {
+                    return await maybeCaptureNewOptimizedDep(context, resolverLoader.resolver, resolution.result, notViteDeps);
+                }
+            case 'not_found':
+                return null;
+            default:
+                throw assertNever(resolution);
+        }
+    }
+    async function ensureResolve(context, specifier) {
+        let result = await resolveId(context, specifier, resolve(resolverLoader.resolver.options.appRoot, 'package.json'), {});
+        if (!result) {
+            throw new Error(`bug: expected to resolve ${specifier}`);
+        }
+        if (typeof result === 'string') {
+            return result;
+        }
+        return result.id;
+    }
+    async function emitVirtualFile(context, fileName) {
+        context.emitFile({
+            type: 'asset',
+            fileName,
+            source: virtualContent(await ensureResolve(context, fileName), resolverLoader.resolver).src,
+        });
+    }
+    let mode = '';
     return {
         name: 'embroider-resolver',
         enforce: 'pre',
+        configResolved(config) {
+            mode = config.mode;
+        },
         configureServer(s) {
             server = s;
             server.watcher.on('all', (_eventName, path) => {
@@ -34,59 +87,48 @@ export function resolver() {
                     }
                 }
             });
+            return () => {
+                server.middlewares.use((req, _res, next) => {
+                    const base = server.config.base || '/';
+                    const originalUrl = req.originalUrl.slice(base.length - 1);
+                    if (originalUrl && originalUrl.length > 1) {
+                        if (originalUrl === null || originalUrl === void 0 ? void 0 : originalUrl.match(/^\/tests($|\?)/)) {
+                            req.originalUrl = `${base}tests/index.html`;
+                            req.url = `${base}tests/index.html`;
+                            return next();
+                        }
+                    }
+                    return next();
+                });
+            };
         },
         async resolveId(source, importer, options) {
             var _a;
-            if ((_a = options.custom) === null || _a === void 0 ? void 0 : _a.depScan) {
-                return await observeDepScan(this, source, importer, options);
-            }
-            let request = ModuleRequest.create(RollupRequestAdapter.create, {
-                context: this,
-                source,
-                importer,
-                custom: options.custom,
-            });
-            if (!request) {
-                // fallthrough to other rollup plugins
-                return null;
+            let resolution = await resolveId(this, source, importer, options);
+            if (typeof resolution === 'string') {
+                return resolution;
             }
-            let resolution = await resolverLoader.resolver.resolve(request);
-            switch (resolution.type) {
-                case 'found':
-                    if (resolution.isVirtual) {
-                        return resolution.result;
-                    }
-                    else {
-                        return await maybeCaptureNewOptimizedDep(this, resolverLoader.resolver, resolution.result, notViteDeps);
-                    }
-                case 'ignored':
-                    return resolution.result;
-                case 'not_found':
-                    return null;
-                default:
-                    throw assertNever(resolution);
+            if (resolution && ((_a = resolution.meta) === null || _a === void 0 ? void 0 : _a['embroider-resolver'])) {
+                responseMetas.set(normalizePath(resolution.id), resolution.meta['embroider-resolver']);
             }
+            return resolution;
         },
         load(id) {
-            if (id.startsWith(virtualPrefix)) {
-                let { pathname } = new URL(id, 'http://example.com');
-                let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);
+            let meta = responseMetas.get(normalizePath(id));
+            if (meta === null || meta === void 0 ? void 0 : meta.virtual) {
+                let { src, watches } = virtualContent(cleanUrl(id), resolverLoader.resolver);
                 virtualDeps.set(id, watches);
                 server === null || server === void 0 ? void 0 : server.watcher.add(watches);
                 return src;
             }
         },
-        buildEnd() {
-            this.emitFile({
-                type: 'asset',
-                fileName: '@embroider/virtual/vendor.js',
-                source: virtualContent(resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-vendor.js'), resolverLoader.resolver).src,
-            });
-            this.emitFile({
-                type: 'asset',
-                fileName: '@embroider/virtual/test-support.js',
-                source: virtualContent(resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'), resolverLoader.resolver).src,
-            });
+        async buildEnd() {
+            emitVirtualFile(this, '@embroider/virtual/vendor.js');
+            emitVirtualFile(this, '@embroider/virtual/vendor.css');
+            if (mode !== 'production') {
+                emitVirtualFile(this, '@embroider/virtual/test-support.js');
+                emitVirtualFile(this, '@embroider/virtual/test-support.css');
+            }
         },
     };
 }
@@ -107,7 +149,7 @@ async function observeDepScan(context, source, importer, options) {
         ...options,
         skipSelf: true,
     });
-    writeStatus(source, result ? 'found' : 'not_found');
+    writeStatus(source, result ? { type: 'found', filename: result.id } : { type: 'not_found' });
     return result;
 }
 function idFromResult(result) {

package/src/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Plugin, ViteDevServer } from 'vite';\nimport core, { ModuleRequest, type Resolver } from '@embroider/core';\nconst { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;\nimport { RollupRequestAdapter, virtualPrefix } from './request.js';\nimport { assertNever } from 'assert-never';\nimport makeDebug from 'debug';\nimport { resolve, join } from 'path';\nimport { writeStatus } from './esbuild-request.js';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\nimport { externalName } from '@embroider/reverse-exports';\nimport fs from 'fs-extra';\nimport { createHash } from 'crypto';\n\nconst { ensureSymlinkSync, outputJSONSync } = fs;\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n  const resolverLoader = new ResolverLoader(process.cwd());\n  let server: ViteDevServer;\n  const virtualDeps: Map<string, string[]> = new Map();\n  const notViteDeps = new Set<string>();\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n\n    configureServer(s) {\n      server = s;\n      server.watcher.on('all', (_eventName, path) => {\n        for (let [id, watches] of virtualDeps) {\n          for (let watch of watches) {\n            if (path.startsWith(watch)) {\n              debug('Invalidate %s because %s', id, path);\n              server.moduleGraph.onFileChange(id);\n              let m = server.moduleGraph.getModuleById(id);\n              if (m) {\n                server.reloadModule(m);\n              }\n            }\n          }\n        }\n      });\n    },\n\n    async resolveId(source, importer, options) {\n      if (options.custom?.depScan) {\n        return await observeDepScan(this, source, importer, options);\n      }\n\n      let request = ModuleRequest.create(RollupRequestAdapter.create, {\n        context: this,\n        source,\n        importer,\n        custom: options.custom,\n      });\n      if (!request) {\n        // fallthrough to other rollup plugins\n        return null;\n      }\n      let resolution = await resolverLoader.resolver.resolve(request);\n      switch (resolution.type) {\n        case 'found':\n          if (resolution.isVirtual) {\n            return resolution.result;\n          } else {\n            return await maybeCaptureNewOptimizedDep(this, resolverLoader.resolver, resolution.result, notViteDeps);\n          }\n        case 'ignored':\n          return resolution.result;\n        case 'not_found':\n          return null;\n        default:\n          throw assertNever(resolution);\n      }\n    },\n    load(id) {\n      if (id.startsWith(virtualPrefix)) {\n        let { pathname } = new URL(id, 'http://example.com');\n        let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n    buildEnd() {\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/virtual/vendor.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-vendor.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n      this.emitFile({\n        type: 'asset',\n        fileName: '@embroider/virtual/test-support.js',\n        source: virtualContent(\n          resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-test-support.js'),\n          resolverLoader.resolver\n        ).src,\n      });\n    },\n  };\n}\n\n// During depscan, we have a wildly different job than during normal\n// usage. Embroider's esbuild resolver plugin replaces this rollup\n// resolver plugin for actually doing resolving, so we don't do any of\n// that. But we are still well-positioned to observe what vite's rollup\n// resolver plugin is doing, and that is important because vite's\n// esbuild depscan plugin will always obscure the results before\n// embroider's esbuild resolver plugin can see them. It obscures the\n// results by marking *both* \"not found\" and \"this is a third-party\n// package\" as \"external: true\". We really care about the difference\n// between the two, since we have fallback behaviors that should apply\n// to \"not found\" that should not apply to successfully discovered\n// third-party packages.\nasync function observeDepScan(context: PluginContext, source: string, importer: string | undefined, options: any) {\n  let result = await context.resolve(source, importer, {\n    ...options,\n    skipSelf: true,\n  });\n  writeStatus(source, result ? 'found' : 'not_found');\n  return result;\n}\n\nfunction idFromResult(result: ResolveIdResult): string | undefined {\n  if (!result) {\n    return undefined;\n  }\n  if (typeof result === 'string') {\n    return cleanUrl(result);\n  }\n  return cleanUrl(result.id);\n}\n\nfunction hashed(path: string): string {\n  let h = createHash('sha1');\n  return h.update(path).digest('hex').slice(0, 8);\n}\n\nasync function maybeCaptureNewOptimizedDep(\n  context: PluginContext,\n  resolver: Resolver,\n  result: ResolveIdResult,\n  notViteDeps: Set<string>\n): Promise<ResolveIdResult> {\n  let foundFile = idFromResult(result);\n  if (!foundFile) {\n    return result;\n  }\n  if (foundFile.startsWith(join(resolver.packageCache.appRoot, 'node_modules', '.vite'))) {\n    debug('maybeCaptureNewOptimizedDep: %s already in vite deps', foundFile);\n    return result;\n  }\n  let pkg = resolver.packageCache.ownerOfFile(foundFile);\n  if (!pkg?.isV2Addon()) {\n    debug('maybeCaptureNewOptimizedDep: %s not in v2 addon', foundFile);\n    return result;\n  }\n  let target = externalName(pkg.packageJSON, explicitRelative(pkg.root, foundFile));\n  if (!target) {\n    debug('maybeCaptureNewOptimizedDep: %s is not exported', foundFile);\n    return result;\n  }\n\n  if (notViteDeps.has(foundFile)) {\n    debug('maybeCaptureNewOptimizedDep: already attmpted %s', foundFile);\n    return result;\n  }\n\n  debug('maybeCaptureNewOptimizedDep: doing re-resolve for %s ', foundFile);\n\n  let jumpRoot = join(tmpdir, 'embroider-vite-jump', hashed(pkg.root));\n  let fromFile = join(jumpRoot, 'package.json');\n  outputJSONSync(fromFile, {\n    name: 'jump-root',\n  });\n  ensureSymlinkSync(pkg.root, join(jumpRoot, 'node_modules', pkg.name));\n  let newResult = await context.resolve(target, fromFile);\n  if (newResult) {\n    if (idFromResult(newResult) === foundFile) {\n      // This case is normal. For example, people could be using\n      // `optimizeDeps.exclude` or they might be working in a monorepo where an\n      // addon is not in node_modules. In both cases vite will decide not to\n      // optimize the file, even though we gave it a chance to.\n      //\n      // We cache that result so we don't keep trying.\n      debug('maybeCaptureNewOptimizedDep: %s did not become an optimized dep', foundFile);\n      notViteDeps.add(foundFile);\n    }\n\n    return newResult;\n  } else {\n    return result;\n  }\n}\n"]}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["resolver.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Plugin, type ViteDevServer, normalizePath } from 'vite';\nimport core, { ModuleRequest, type Resolver } from '@embroider/core';\nconst { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;\nimport { type ResponseMeta, RollupRequestAdapter } from './request.js';\nimport { assertNever } from 'assert-never';\nimport makeDebug from 'debug';\nimport { join, resolve } from 'path';\nimport { writeStatus } from './esbuild-request.js';\nimport type { PluginContext, ResolveIdResult } from 'rollup';\nimport { externalName } from '@embroider/reverse-exports';\nimport fs from 'fs-extra';\nimport { createHash } from 'crypto';\n\nconst { ensureSymlinkSync, outputJSONSync } = fs;\n\nconst debug = makeDebug('embroider:vite');\n\nexport function resolver(): Plugin {\n  const resolverLoader = new ResolverLoader(process.cwd());\n  let server: ViteDevServer;\n  const virtualDeps: Map<string, string[]> = new Map();\n  const notViteDeps = new Set<string>();\n  const responseMetas: Map<string, ResponseMeta> = new Map();\n\n  async function resolveId(\n    context: PluginContext,\n    source: string,\n    importer: string | undefined,\n    options: { custom?: Record<string, unknown> }\n  ) {\n    if (options.custom?.depScan) {\n      return await observeDepScan(context, source, importer, options);\n    }\n\n    let request = ModuleRequest.create(RollupRequestAdapter.create, {\n      context,\n      source,\n      importer,\n      custom: options.custom,\n    });\n    if (!request) {\n      // fallthrough to other rollup plugins\n      return null;\n    }\n    let resolution = await resolverLoader.resolver.resolve(request);\n    switch (resolution.type) {\n      case 'found':\n        if (resolution.virtual) {\n          return resolution.result;\n        } else {\n          return await maybeCaptureNewOptimizedDep(context, resolverLoader.resolver, resolution.result, notViteDeps);\n        }\n      case 'not_found':\n        return null;\n      default:\n        throw assertNever(resolution);\n    }\n  }\n\n  async function ensureResolve(context: PluginContext, specifier: string): Promise<string> {\n    let result = await resolveId(\n      context,\n      specifier,\n      resolve(resolverLoader.resolver.options.appRoot, 'package.json'),\n      {}\n    );\n    if (!result) {\n      throw new Error(`bug: expected to resolve ${specifier}`);\n    }\n    if (typeof result === 'string') {\n      return result;\n    }\n    return result.id;\n  }\n\n  async function emitVirtualFile(context: PluginContext, fileName: string): Promise<void> {\n    context.emitFile({\n      type: 'asset',\n      fileName,\n      source: virtualContent(await ensureResolve(context, fileName), resolverLoader.resolver).src,\n    });\n  }\n\n  let mode = '';\n\n  return {\n    name: 'embroider-resolver',\n    enforce: 'pre',\n\n    configResolved(config) {\n      mode = config.mode;\n    },\n\n    configureServer(s) {\n      server = s;\n      server.watcher.on('all', (_eventName, path) => {\n        for (let [id, watches] of virtualDeps) {\n          for (let watch of watches) {\n            if (path.startsWith(watch)) {\n              debug('Invalidate %s because %s', id, path);\n              server.moduleGraph.onFileChange(id);\n              let m = server.moduleGraph.getModuleById(id);\n              if (m) {\n                server.reloadModule(m);\n              }\n            }\n          }\n        }\n      });\n      return () => {\n        server.middlewares.use((req, _res, next) => {\n          const base = server.config.base || '/';\n          const originalUrl = req.originalUrl!.slice(base.length - 1);\n          if (originalUrl && originalUrl.length > 1) {\n            if (originalUrl?.match(/^\\/tests($|\\?)/)) {\n              req.originalUrl = `${base}tests/index.html`;\n              (req as any).url = `${base}tests/index.html`;\n              return next();\n            }\n          }\n          return next();\n        });\n      };\n    },\n\n    async resolveId(source, importer, options) {\n      let resolution = await resolveId(this, source, importer, options);\n      if (typeof resolution === 'string') {\n        return resolution;\n      }\n      if (resolution && resolution.meta?.['embroider-resolver']) {\n        responseMetas.set(normalizePath(resolution.id), resolution.meta['embroider-resolver'] as ResponseMeta);\n      }\n      return resolution;\n    },\n\n    load(id) {\n      let meta = responseMetas.get(normalizePath(id));\n      if (meta?.virtual) {\n        let { src, watches } = virtualContent(cleanUrl(id), resolverLoader.resolver);\n        virtualDeps.set(id, watches);\n        server?.watcher.add(watches);\n        return src;\n      }\n    },\n    async buildEnd() {\n      emitVirtualFile(this, '@embroider/virtual/vendor.js');\n      emitVirtualFile(this, '@embroider/virtual/vendor.css');\n\n      if (mode !== 'production') {\n        emitVirtualFile(this, '@embroider/virtual/test-support.js');\n        emitVirtualFile(this, '@embroider/virtual/test-support.css');\n      }\n    },\n  };\n}\n\n// During depscan, we have a wildly different job than during normal\n// usage. Embroider's esbuild resolver plugin replaces this rollup\n// resolver plugin for actually doing resolving, so we don't do any of\n// that. But we are still well-positioned to observe what vite's rollup\n// resolver plugin is doing, and that is important because vite's\n// esbuild depscan plugin will always obscure the results before\n// embroider's esbuild resolver plugin can see them. It obscures the\n// results by marking *both* \"not found\" and \"this is a third-party\n// package\" as \"external: true\". We really care about the difference\n// between the two, since we have fallback behaviors that should apply\n// to \"not found\" that should not apply to successfully discovered\n// third-party packages.\nasync function observeDepScan(context: PluginContext, source: string, importer: string | undefined, options: any) {\n  let result = await context.resolve(source, importer, {\n    ...options,\n    skipSelf: true,\n  });\n  writeStatus(source, result ? { type: 'found', filename: result.id } : { type: 'not_found' });\n  return result;\n}\n\nfunction idFromResult(result: ResolveIdResult): string | undefined {\n  if (!result) {\n    return undefined;\n  }\n  if (typeof result === 'string') {\n    return cleanUrl(result);\n  }\n  return cleanUrl(result.id);\n}\n\nfunction hashed(path: string): string {\n  let h = createHash('sha1');\n  return h.update(path).digest('hex').slice(0, 8);\n}\n\nasync function maybeCaptureNewOptimizedDep(\n  context: PluginContext,\n  resolver: Resolver,\n  result: ResolveIdResult,\n  notViteDeps: Set<string>\n): Promise<ResolveIdResult> {\n  let foundFile = idFromResult(result);\n  if (!foundFile) {\n    return result;\n  }\n  if (foundFile.startsWith(join(resolver.packageCache.appRoot, 'node_modules', '.vite'))) {\n    debug('maybeCaptureNewOptimizedDep: %s already in vite deps', foundFile);\n    return result;\n  }\n  let pkg = resolver.packageCache.ownerOfFile(foundFile);\n  if (!pkg?.isV2Addon()) {\n    debug('maybeCaptureNewOptimizedDep: %s not in v2 addon', foundFile);\n    return result;\n  }\n  let target = externalName(pkg.packageJSON, explicitRelative(pkg.root, foundFile));\n  if (!target) {\n    debug('maybeCaptureNewOptimizedDep: %s is not exported', foundFile);\n    return result;\n  }\n\n  if (notViteDeps.has(foundFile)) {\n    debug('maybeCaptureNewOptimizedDep: already attmpted %s', foundFile);\n    return result;\n  }\n\n  debug('maybeCaptureNewOptimizedDep: doing re-resolve for %s ', foundFile);\n\n  let jumpRoot = join(tmpdir, 'embroider-vite-jump', hashed(pkg.root));\n  let fromFile = join(jumpRoot, 'package.json');\n  outputJSONSync(fromFile, {\n    name: 'jump-root',\n  });\n  ensureSymlinkSync(pkg.root, join(jumpRoot, 'node_modules', pkg.name));\n  let newResult = await context.resolve(target, fromFile);\n  if (newResult) {\n    if (idFromResult(newResult) === foundFile) {\n      // This case is normal. For example, people could be using\n      // `optimizeDeps.exclude` or they might be working in a monorepo where an\n      // addon is not in node_modules. In both cases vite will decide not to\n      // optimize the file, even though we gave it a chance to.\n      //\n      // We cache that result so we don't keep trying.\n      debug('maybeCaptureNewOptimizedDep: %s did not become an optimized dep', foundFile);\n      notViteDeps.add(foundFile);\n    }\n\n    return newResult;\n  } else {\n    return result;\n  }\n}\n"]}