@embroider/vite 1.0.0-alpha.8 → 1.0.0

package/dist/src/backchannel.d.ts

@@ -0,0 +1,17 @@
+export declare class BackChannel {
+    #private;
+    constructor();
+    requestStatus(specifier: string, fromFile: string): void;
+    writeStatus(specifier: string, fromFile: string, status: FinalStatus): void;
+    readStatus(specifier: string, fromFile: string): Status;
+}
+export declare function writeStatus(specifier: string, fromFile: string, status: FinalStatus): void;
+export type FinalStatus = {
+    type: 'not_found';
+} | {
+    type: 'found';
+    filename: string;
+};
+export type Status = FinalStatus | {
+    type: 'indeterminate';
+};

package/dist/src/backchannel.js

@@ -0,0 +1,65 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _BackChannel_state;
+import makeDebug from 'debug';
+const debug = makeDebug('embroider:vite-esbuild-backchannel');
+export class BackChannel {
+    constructor() {
+        _BackChannel_state.set(this, new Map());
+        /*
+          This is an unfortunate necessity. During depscan, vite deliberately hides
+          information from esbuild. Specifically, it treats "not found" and "this is an
+          external dependency" as both "external: true". But we really care about the
+          difference, since we have fallback behaviors for the "not found" case. Using
+          this global state, our rollup resolver plugin can observe what vite is
+          actually doing and communicate that knowledge outward to our esbuild resolver
+          plugin.
+       */
+        globalThis.__embroider_vite_resolver_channel__ = this;
+    }
+    requestStatus(specifier, fromFile) {
+        let id = stateKey(specifier, fromFile);
+        if (!__classPrivateFieldGet(this, _BackChannel_state, "f").has(id)) {
+            debug('requestStatus(%s, %s) pending', specifier, fromFile);
+            __classPrivateFieldGet(this, _BackChannel_state, "f").set(stateKey(specifier, fromFile), { type: 'pending' });
+        }
+        else {
+            debug('requestStatus(%s, %s) exists', specifier, fromFile);
+        }
+    }
+    writeStatus(specifier, fromFile, status) {
+        var _a;
+        let id = stateKey(specifier, fromFile);
+        if (((_a = __classPrivateFieldGet(this, _BackChannel_state, "f").get(id)) === null || _a === void 0 ? void 0 : _a.type) === 'pending') {
+            debug('writeStatus(%s, %s) = %s', specifier, fromFile, status.type);
+            __classPrivateFieldGet(this, _BackChannel_state, "f").set(id, status);
+        }
+        else {
+            debug('writeStatus(%s, %s) not pending', specifier, fromFile, status.type);
+        }
+    }
+    readStatus(specifier, fromFile) {
+        let id = stateKey(specifier, fromFile);
+        let found = __classPrivateFieldGet(this, _BackChannel_state, "f").get(id);
+        debug('readStatus(%s, %s) = %s', specifier, fromFile, found === null || found === void 0 ? void 0 : found.type);
+        if (!found) {
+            throw new Error(`bug in BackChannel: readStatus before requestStatus`);
+        }
+        if (found.type === 'pending') {
+            return { type: 'indeterminate' };
+        }
+        return found;
+    }
+}
+_BackChannel_state = new WeakMap();
+export function writeStatus(specifier, fromFile, status) {
+    let channel = globalThis.__embroider_vite_resolver_channel__;
+    channel === null || channel === void 0 ? void 0 : channel.writeStatus(specifier, fromFile, status);
+}
+function stateKey(specifier, fromFile) {
+    return `${specifier}\0${fromFile}`;
+}
+//# sourceMappingURL=backchannel.js.map

package/dist/src/backchannel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backchannel.js","sourceRoot":"","sources":["../../src/backchannel.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,SAAS,MAAM,OAAO,CAAC;AAE9B,MAAM,KAAK,GAAG,SAAS,CAAC,oCAAoC,CAAC,CAAC;AAE9D,MAAM,OAAO,WAAW;IAGtB;QAFA,6BAAS,IAAI,GAAG,EAA0B,EAAC;QAGzC;;;;;;;;SAQC;QACA,UAAkB,CAAC,mCAAmC,GAAG,IAAI,CAAC;IACjE,CAAC;IAED,aAAa,CAAC,SAAiB,EAAE,QAAgB;QAC/C,IAAI,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,uBAAA,IAAI,0BAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,KAAK,CAAC,+BAA+B,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC5D,uBAAA,IAAI,0BAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,8BAA8B,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,WAAW,CAAC,SAAiB,EAAE,QAAgB,EAAE,MAAmB;;QAClE,IAAI,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAA,MAAA,uBAAA,IAAI,0BAAO,CAAC,GAAG,CAAC,EAAE,CAAC,0CAAE,IAAI,MAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,CAAC,0BAA0B,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACpE,uBAAA,IAAI,0BAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,iCAAiC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,UAAU,CAAC,SAAiB,EAAE,QAAgB;QAC5C,IAAI,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,uBAAA,IAAI,0BAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChC,KAAK,CAAC,yBAAyB,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;QACnC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;;AAED,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,QAAgB,EAAE,MAAmB;IAClF,IAAI,OAAO,GAAI,UAAkB,CAAC,mCAA8D,CAAC;IACjG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,QAAQ,CAAC,SAAiB,EAAE,QAAgB;IACnD,OAAO,GAAG,SAAS,KAAK,QAAQ,EAAE,CAAC;AACrC,CAAC","sourcesContent":["import makeDebug from 'debug';\n\nconst debug = makeDebug('embroider:vite-esbuild-backchannel');\n\nexport class BackChannel {\n  #state = new Map<string, InternalStatus>();\n\n  constructor() {\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   */\n    (globalThis as any).__embroider_vite_resolver_channel__ = this;\n  }\n\n  requestStatus(specifier: string, fromFile: string): void {\n    let id = stateKey(specifier, fromFile);\n    if (!this.#state.has(id)) {\n      debug('requestStatus(%s, %s) pending', specifier, fromFile);\n      this.#state.set(stateKey(specifier, fromFile), { type: 'pending' });\n    } else {\n      debug('requestStatus(%s, %s) exists', specifier, fromFile);\n    }\n  }\n\n  writeStatus(specifier: string, fromFile: string, status: FinalStatus): void {\n    let id = stateKey(specifier, fromFile);\n    if (this.#state.get(id)?.type === 'pending') {\n      debug('writeStatus(%s, %s) = %s', specifier, fromFile, status.type);\n      this.#state.set(id, status);\n    } else {\n      debug('writeStatus(%s, %s) not pending', specifier, fromFile, status.type);\n    }\n  }\n\n  readStatus(specifier: string, fromFile: string): Status {\n    let id = stateKey(specifier, fromFile);\n    let found = this.#state.get(id);\n    debug('readStatus(%s, %s) = %s', specifier, fromFile, found?.type);\n    if (!found) {\n      throw new Error(`bug in BackChannel: readStatus before requestStatus`);\n    }\n    if (found.type === 'pending') {\n      return { type: 'indeterminate' };\n    }\n    return found;\n  }\n}\n\nexport function writeStatus(specifier: string, fromFile: string, status: FinalStatus): void {\n  let channel = (globalThis as any).__embroider_vite_resolver_channel__ as BackChannel | undefined;\n  channel?.writeStatus(specifier, fromFile, status);\n}\n\nfunction stateKey(specifier: string, fromFile: string): string {\n  return `${specifier}\\0${fromFile}`;\n}\n\nexport type FinalStatus = { type: 'not_found' } | { type: 'found'; filename: string };\nexport type Status = FinalStatus | { type: 'indeterminate' };\ntype InternalStatus = { type: 'pending' } | FinalStatus;\n"]}

package/dist/src/esbuild-request.d.ts

@@ -1,18 +1,21 @@
 import type { ImportKind, OnResolveResult, PluginBuild } from 'esbuild';
 import type { PackageCachePublicAPI as PackageCache, Resolution, ModuleRequest, RequestAdapter, VirtualResponse } from '@embroider/core';
+import type { BackChannel } from './backchannel.js';
 export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<OnResolveResult, OnResolveResult>> {
     private packageCache;
     private phase;
     private context;
     private kind;
-    static create({ packageCache, phase, build, kind, path, importer, pluginData, }: {
+    private backChannel;
+    static create({ packageCache, phase, build, kind, path, importer, pluginData, backChannel, }: {
         packageCache: PackageCache;
-        phase: 'bundling' | 'other';
+        phase: 'bundling' | 'scanning' | 'other';
         build: PluginBuild;
         kind: ImportKind;
         path: string;
         importer: string | undefined;
         pluginData: Record<string, any> | undefined;
+        backChannel: BackChannel | undefined;
     }): {
         initialState: {
             specifier: string;
@@ -27,13 +30,3 @@ export declare class EsBuildRequestAdapter implements RequestAdapter<Resolution<
     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: InternalStatus): void;
-type InternalStatus = {
-    type: 'pending';
-} | {
-    type: 'not_found';
-} | {
-    type: 'found';
-    filename: string;
-};
-export {};

package/dist/src/esbuild-request.js

@@ -2,29 +2,35 @@ import core from '@embroider/core';
 const { cleanUrl, packageName } = core;
 import { dirname } from 'path';
 import { externalName } from '@embroider/reverse-exports';
+import { assertNever } from 'assert-never';
 export class EsBuildRequestAdapter {
-    static create({ packageCache, phase, build, kind, path, importer, pluginData, }) {
+    static create({ packageCache, phase, build, kind, path, importer, pluginData, backChannel, }) {
         var _a, _b, _c;
         if (!((_b = (_a = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _a === void 0 ? void 0 : _a.enableCustomResolver) !== null && _b !== void 0 ? _b : true)) {
             return;
         }
         if (path && importer && path[0] !== '\0' && !path.startsWith('virtual-module:')) {
             let fromFile = cleanUrl(importer);
+            if (process.platform === 'win32') {
+                // embroider uses real OS paths for filenames. Vite and Esbuild don't do so consistently.
+                fromFile = fromFile.replace(/\//g, '\\');
+            }
             return {
                 initialState: {
                     specifier: path,
                     fromFile,
                     meta: (_c = pluginData === null || pluginData === void 0 ? void 0 : pluginData.embroider) === null || _c === void 0 ? void 0 : _c.meta,
                 },
-                adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind),
+                adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind, backChannel),
             };
         }
     }
-    constructor(packageCache, phase, context, kind) {
+    constructor(packageCache, phase, context, kind, backChannel) {
         this.packageCache = packageCache;
         this.phase = phase;
         this.context = context;
         this.kind = kind;
+        this.backChannel = backChannel;
     }
     get debugType() {
         return 'esbuild';
@@ -46,7 +52,9 @@ export class EsBuildRequestAdapter {
         };
     }
     async resolve(request) {
-        requestStatus(request.specifier);
+        if (this.backChannel) {
+            this.backChannel.requestStatus(request.specifier, request.fromFile);
+        }
         let result = await this.context.resolve(request.specifier, {
             importer: request.fromFile,
             resolveDir: dirname(request.fromFile),
@@ -58,101 +66,74 @@ export class EsBuildRequestAdapter {
                 },
             },
         });
-        let status = readStatus(request.specifier);
-        if (result.errors.length > 0 || status.type === 'not_found') {
+        if (result.errors.length > 0) {
             return { type: 'not_found', err: result };
         }
-        else {
-            if (this.phase === 'bundling') {
-                // we need to ensure that we don't traverse back into the app while
-                // doing dependency pre-bundling. There are multiple ways an addon can
-                // resolve things from the app, due to the existince of both app-js
-                // (modules in addons that are logically part of the app's namespace)
-                // 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 &&
-                    // 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
-                        // it has been bundled into vite/deps. But we know it targets the
-                        // app, so we can always convert it into a non-relative import
-                        // from the app's namespace
-                        //
-                        // IMPORTANT: whenever an addon resolves a relative path to the
-                        // app, it does so because our code in the core resolver has
-                        // rewritten the request to be relative to the app's root. So here
-                        // we will only ever encounter relative paths that are already
-                        // relative to the app's root directory.
-                        externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;
+        let filename = result.path;
+        if (this.backChannel) {
+            let status = this.backChannel.readStatus(request.specifier, request.fromFile);
+            switch (status.type) {
+                case 'not_found':
+                    return { type: 'not_found', err: result };
+                case 'found':
+                    if (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;
                     }
-                    return {
-                        type: 'found',
-                        filename: externalizedName,
-                        virtual: false,
-                        result: {
-                            path: externalizedName,
-                            external: true,
-                        },
-                    };
-                }
+                    break;
+                case 'indeterminate':
+                    break;
+                default:
+                    throw assertNever(status);
             }
-            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;
+        }
+        if (this.phase === 'bundling') {
+            // we need to ensure that we don't traverse back into the app while
+            // doing dependency pre-bundling. There are multiple ways an addon can
+            // resolve things from the app, due to the existince of both app-js
+            // (modules in addons that are logically part of the app's namespace)
+            // 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 &&
+                // 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
+                    // it has been bundled into vite/deps. But we know it targets the
+                    // app, so we can always convert it into a non-relative import
+                    // from the app's namespace
+                    //
+                    // IMPORTANT: whenever an addon resolves a relative path to the
+                    // app, it does so because our code in the core resolver has
+                    // rewritten the request to be relative to the app's root. So here
+                    // we will only ever encounter relative paths that are already
+                    // relative to the app's root directory.
+                    externalizedName = externalName(pkg.packageJSON, externalizedName) || externalizedName;
+                }
+                return {
+                    type: 'found',
+                    filename: externalizedName,
+                    virtual: false,
+                    result: {
+                        path: externalizedName,
+                        external: true,
+                    },
+                };
             }
-            return {
-                type: 'found',
-                filename,
-                result,
-                virtual: false,
-            };
         }
+        return {
+            type: 'found',
+            filename,
+            result,
+            virtual: false,
+        };
     }
 }
-/*
-  This is an unfortunate necessity. During depscan, vite deliberately hides
-  information from esbuild. Specifically, it treats "not found" and "this is an
-  external dependency" as both "external: true". But we really care about the
-  difference, since we have fallback behaviors for the "not found" case. Using
-  this global state, our rollup resolver plugin can observe what vite is
-  actually doing and communicate that knowledge outward to our esbuild resolver
-  plugin.
- */
-function sharedGlobalState() {
-    let channel = globalThis.__embroider_vite_resolver_channel__;
-    if (!channel) {
-        channel = new Map();
-        globalThis.__embroider_vite_resolver_channel__ = channel;
-    }
-    return channel;
-}
-function requestStatus(id) {
-    sharedGlobalState().set(id, { type: 'pending' });
-}
-export function writeStatus(id, status) {
-    var _a;
-    let channel = sharedGlobalState();
-    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 : { type: 'pending' };
-    channel.delete(id);
-    return result;
-}
 //# sourceMappingURL=esbuild-request.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"esbuild-request.js","sourceRoot":"","sources":["../../src/esbuild-request.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAS/B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,OAAO,qBAAqB;IAChC,MAAM,CAAC,MAAM,CAAC,EACZ,YAAY,EACZ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,UAAU,GASX;;QACC,IAAI,CAAC,CAAC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,oBAAoB,mCAAI,IAAI,CAAC,EAAE,CAAC;YAC3D,OAAO;QACT,CAAC;QAED,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAChF,IAAI,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAClC,OAAO;gBACL,YAAY,EAAE;oBACZ,SAAS,EAAE,IAAI;oBACf,QAAQ;oBACR,IAAI,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,0CAAE,IAAI;iBAClC;gBACD,OAAO,EAAE,IAAI,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;aACrE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,YACU,YAA0B,EAC1B,KAA2B,EAC3B,OAAoB,EACpB,IAAgB;QAHhB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,UAAK,GAAL,KAAK,CAAsB;QAC3B,YAAO,GAAP,OAAO,CAAa;QACpB,SAAI,GAAJ,IAAI,CAAY;IACvB,CAAC;IAEJ,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,gBAAgB,CACd,OAAoE;QAEpE,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE;gBACH,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;aAC5D;SACF,CAAC;IACJ,CAAC;IAED,eAAe,CACb,QAAqE,EACrE,OAAwB;QAExB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,OAAO,CAAC,SAAS;YAC3B,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE;YAC5F,OAAO;SACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CACX,OAAoE;QAEpE,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEjC,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;YACzD,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;YACrC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE;gBACV,SAAS,EAAE;oBACT,oBAAoB,EAAE,KAAK;oBAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE3C,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAC5D,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;gBAC9B,mEAAmE;gBACnE,sEAAsE;gBACtE,mEAAmE;gBACnE,qEAAqE;gBACrE,4CAA4C;gBAC5C,+DAA+D;gBAC/D,IAAI,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrD,IACE,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,IAAI,CAAC,YAAY,CAAC,OAAO;oBACvC,6EAA6E;oBAC7E,sFAAsF;oBACtF,yFAAyF;oBACzF,sBAAsB;oBACtB,CAAC,MAAM,CAAC,SAAS,KAAK,MAAM,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EAC1E,CAAC;oBACD,IAAI,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;oBACzC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;wBACnC,gEAAgE;wBAChE,iEAAiE;wBACjE,8DAA8D;wBAC9D,2BAA2B;wBAC3B,EAAE;wBACF,+DAA+D;wBAC/D,4DAA4D;wBAC5D,kEAAkE;wBAClE,8DAA8D;wBAC9D,wCAAwC;wBACxC,gBAAgB,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,IAAI,gBAAgB,CAAC;oBACzF,CAAC;oBACD,OAAO;wBACL,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,gBAAgB;wBAC1B,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE;4BACN,IAAI,EAAE,gBAAgB;4BACtB,QAAQ,EAAE,IAAI;yBACf;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,QAAgB,CAAC;YACrB,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC/C,4DAA4D;gBAC5D,oEAAoE;gBACpE,6BAA6B;gBAC7B,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;YACzB,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,QAAQ;gBACR,MAAM;gBACN,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,SAAS,iBAAiB;IACxB,IAAI,OAAO,GAAI,UAAkB,CAAC,mCAA8E,CAAC;IACjH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACnB,UAAkB,CAAC,mCAAmC,GAAG,OAAO,CAAC;IACpE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,aAAa,CAAC,EAAU;IAC/B,iBAAiB,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,EAAU,EAAE,MAAsB;;IAC5D,IAAI,OAAO,GAAG,iBAAiB,EAAE,CAAC;IAClC,IAAI,CAAA,MAAA,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,0CAAE,IAAI,MAAK,SAAS,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,EAAU;;IAC5B,IAAI,OAAO,GAAG,iBAAiB,EAAE,CAAC;IAClC,IAAI,MAAM,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,mCAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACpD,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC;AAChB,CAAC","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"]}
+{"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';\nimport type { BackChannel } from './backchannel.js';\nimport { assertNever } from 'assert-never';\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    backChannel,\n  }: {\n    packageCache: PackageCache;\n    phase: 'bundling' | 'scanning' | 'other';\n    build: PluginBuild;\n    kind: ImportKind;\n    path: string;\n    importer: string | undefined;\n    pluginData: Record<string, any> | undefined;\n    backChannel: BackChannel | 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      if (process.platform === 'win32') {\n        // embroider uses real OS paths for filenames. Vite and Esbuild don't do so consistently.\n        fromFile = fromFile.replace(/\\//g, '\\\\');\n      }\n      return {\n        initialState: {\n          specifier: path,\n          fromFile,\n          meta: pluginData?.embroider?.meta,\n        },\n        adapter: new EsBuildRequestAdapter(packageCache, phase, build, kind, backChannel),\n      };\n    }\n  }\n\n  private constructor(\n    private packageCache: PackageCache,\n    private phase: 'bundling' | 'scanning' | 'other',\n    private context: PluginBuild,\n    private kind: ImportKind,\n    private backChannel: BackChannel | undefined\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    if (this.backChannel) {\n      this.backChannel.requestStatus(request.specifier, request.fromFile);\n    }\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    if (result.errors.length > 0) {\n      return { type: 'not_found', err: result };\n    }\n\n    let filename = result.path;\n\n    if (this.backChannel) {\n      let status = this.backChannel.readStatus(request.specifier, request.fromFile);\n      switch (status.type) {\n        case 'not_found':\n          return { type: 'not_found', err: result };\n        case 'found':\n          if (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          }\n          break;\n        case 'indeterminate':\n          break;\n        default:\n          throw assertNever(status);\n      }\n    }\n\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    return {\n      type: 'found',\n      filename,\n      result,\n      virtual: false,\n    };\n  }\n}\n"]}

package/dist/src/esbuild-resolver.js

@@ -8,6 +8,7 @@ import { assertNever } from 'assert-never';
 import { hbsToJS } from '@embroider/core';
 import { Preprocessor } from 'content-tag';
 import { extname } from 'path';
+import { BackChannel } from './backchannel.js';
 export function esBuildResolver() {
     let resolverLoader = new ResolverLoader(process.cwd());
     let preprocessor = new Preprocessor();
@@ -32,7 +33,8 @@ export function esBuildResolver() {
             src = hbsToJS(src);
         }
         else if (['.gjs', '.gts'].some(ext => path.endsWith(ext))) {
-            src = preprocessor.process(src, { filename: path });
+            let { code /*,  map */ } = preprocessor.process(src, { filename: path, inline_source_map: true });
+            src = code;
         }
         if (['.hbs', '.gjs', '.gts', '.js', '.ts'].some(ext => path.endsWith(ext))) {
             src = await transformAndAssert(src, path);
@@ -43,6 +45,15 @@ export function esBuildResolver() {
         name: 'embroider-esbuild-resolver',
         setup(build) {
             const phase = detectPhase(build);
+            let backChannel;
+            if (phase === 'scanning') {
+                // this is created here because of the lifetime it should have. When we
+                // catch vite lying to esbuild about missing deps actually being
+                // "external", we need to remember that fact for the remainder of the
+                // depscan, because if esbuild asks again it will hit a cache and we
+                // won't get to observe it again.
+                backChannel = new BackChannel();
+            }
             // Embroider Resolver
             build.onResolve({ filter: /./ }, async ({ path, importer, pluginData, kind }) => {
                 let request = ModuleRequest.create(EsBuildRequestAdapter.create, {
@@ -53,6 +64,7 @@ export function esBuildResolver() {
                     path,
                     importer,
                     pluginData,
+                    backChannel,
                 });
                 if (!request) {
                     return null;
@@ -115,6 +127,9 @@ function detectPhase(build) {
     if (plugins.includes('vite:dep-pre-bundle')) {
         return 'bundling';
     }
+    else if (plugins.includes('vite:dep-scan')) {
+        return 'scanning';
+    }
     else {
         return 'other';
     }

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

@@ -1 +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"]}
+{"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';\nimport { BackChannel } from './backchannel.js';\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      let { code /*,  map */ } = preprocessor.process(src, { filename: path, inline_source_map: true });\n      src = code;\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      let backChannel: BackChannel | undefined;\n      if (phase === 'scanning') {\n        // this is created here because of the lifetime it should have. When we\n        // catch vite lying to esbuild about missing deps actually being\n        // \"external\", we need to remember that fact for the remainder of the\n        // depscan, because if esbuild asks again it will hit a cache and we\n        // won't get to observe it again.\n        backChannel = new BackChannel();\n      }\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          backChannel,\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' | 'scanning' | 'other' {\n  let plugins = (build.initialOptions.plugins ?? []).map(p => p.name);\n  if (plugins.includes('vite:dep-pre-bundle')) {\n    return 'bundling';\n  } else if (plugins.includes('vite:dep-scan')) {\n    return 'scanning';\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/request.js

@@ -65,6 +65,10 @@ RollupRequestAdapter.create = ({ context, source, importer, custom, }) => {
     if (source && importer && source[0] !== '\0') {
         // strip query params off the importer
         let fromFile = cleanUrl(importer);
+        if (process.platform === 'win32') {
+            // embroider uses real OS paths for filenames. Vite and Esbuild don't do so consistently.
+            fromFile = fromFile.replace(/\//g, '\\');
+        }
         let importerQueryParams = getUrlQueryParams(importer);
         if (source.startsWith('/@embroider/virtual/')) {
             // when our virtual paths are used in HTML they come into here with a /

package/dist/src/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;AAc7C,MAAM,OAAO,oBAAoB;IAkC/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,kEAAkE;gBAClE,wEAAwE;gBACxE,UAAU;gBACV,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC7D,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;;AAlGM,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,IAAI,MAAM,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,uEAAuE;YACvE,uDAAuD;YACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,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';\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"]}
+{"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      if (process.platform === 'win32') {\n        // embroider uses real OS paths for filenames. Vite and Esbuild don't do so consistently.\n        fromFile = fromFile.replace(/\\//g, '\\\\');\n      }\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/dist/src/resolver.js

@@ -5,7 +5,7 @@ import { RollupRequestAdapter } from './request.js';
 import { assertNever } from 'assert-never';
 import makeDebug from 'debug';
 import { join, resolve } from 'path';
-import { writeStatus } from './esbuild-request.js';
+import { writeStatus } from './backchannel.js';
 import { externalName } from '@embroider/reverse-exports';
 import fs from 'fs-extra';
 import { createHash } from 'crypto';
@@ -157,7 +157,7 @@ async function observeDepScan(context, source, importer, options) {
         ...options,
         skipSelf: true,
     });
-    writeStatus(source, result ? { type: 'found', filename: result.id } : { type: 'not_found' });
+    writeStatus(source, importer !== null && importer !== void 0 ? importer : '', result ? { type: 'found', filename: result.id } : { type: 'not_found' });
     return result;
 }
 function idFromResult(result) {