@embroider/core 3.4.20-unstable.947c6d2 → 3.4.20-unstable.b470496

package/src/node-resolve.js

@@ -3,70 +3,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeModuleRequest = void 0;
+exports.NodeRequestAdapter = void 0;
 exports.nodeResolve = nodeResolve;
 const virtual_content_1 = require("./virtual-content");
 const path_1 = require("path");
 const shared_internals_1 = require("@embroider/shared-internals");
 const assert_never_1 = __importDefault(require("assert-never"));
-class NodeModuleRequest {
-    constructor(resolver, specifier, fromFile, isVirtual, meta, isNotFound, resolvedTo) {
+// these would be circular, but they're type-only so it's fine
+const module_request_1 = require("./module-request");
+class NodeRequestAdapter {
+    constructor(resolver) {
         this.resolver = resolver;
-        this.specifier = specifier;
-        this.fromFile = fromFile;
-        this.isVirtual = isVirtual;
-        this.meta = meta;
-        this.isNotFound = isNotFound;
-        this.resolvedTo = resolvedTo;
     }
     get debugType() {
         return 'node';
     }
-    alias(specifier) {
-        return new NodeModuleRequest(this.resolver, specifier, this.fromFile, false, this.meta, false, undefined);
+    notFoundResponse(request) {
+        let err = new Error(`module not found ${request.specifier}`);
+        err.code = 'MODULE_NOT_FOUND';
+        return {
+            type: 'not_found',
+            err,
+        };
     }
-    rehome(fromFile) {
-        if (this.fromFile === fromFile) {
-            return this;
-        }
-        else {
-            return new NodeModuleRequest(this.resolver, this.specifier, fromFile, false, this.meta, false, undefined);
-        }
-    }
-    virtualize(filename) {
-        return new NodeModuleRequest(this.resolver, filename, this.fromFile, true, this.meta, false, undefined);
-    }
-    withMeta(meta) {
-        return new NodeModuleRequest(this.resolver, this.specifier, this.fromFile, this.isVirtual, meta, this.isNotFound, this.resolvedTo);
-    }
-    notFound() {
-        return new NodeModuleRequest(this.resolver, this.specifier, this.fromFile, this.isVirtual, this.meta, true, undefined);
+    virtualResponse(_request, virtual) {
+        return {
+            type: 'found',
+            filename: virtual.specifier,
+            virtual,
+            result: {
+                type: 'virtual',
+                content: (0, virtual_content_1.virtualContent)(virtual, this.resolver).src,
+                filename: virtual.specifier,
+            },
+        };
     }
-    resolveTo(resolution) {
-        return new NodeModuleRequest(this.resolver, this.specifier, this.fromFile, this.isVirtual, this.meta, this.isNotFound, resolution);
-    }
-    async defaultResolve() {
-        const request = this;
-        if (request.isVirtual) {
-            return {
-                type: 'found',
-                filename: request.specifier,
-                isVirtual: true,
-                result: {
-                    type: 'virtual',
-                    content: (0, virtual_content_1.virtualContent)(request.specifier, this.resolver).src,
-                    filename: request.specifier,
-                },
-            };
-        }
-        if (request.isNotFound) {
-            let err = new Error(`module not found ${request.specifier}`);
-            err.code = 'MODULE_NOT_FOUND';
-            return {
-                type: 'not_found',
-                err,
-            };
-        }
+    async resolve(request) {
         // require.resolve does not like when we resolve from virtual paths.
         // That is, a request like "../thing.js" from
         // "/a/real/path/VIRTUAL_SUBDIR/virtual.js" has an unambiguous target of
@@ -102,12 +74,22 @@ class NodeModuleRequest {
                 }
                 continue;
             }
-            return { type: 'found', filename, result: { type: 'real', filename }, isVirtual: false };
+            return { type: 'found', filename, result: { type: 'real', filename }, virtual: false };
         }
         return { type: 'not_found', err: initialError };
     }
 }
-exports.NodeModuleRequest = NodeModuleRequest;
+exports.NodeRequestAdapter = NodeRequestAdapter;
+NodeRequestAdapter.create = ({ resolver, specifier, fromFile }) => {
+    return {
+        initialState: {
+            specifier,
+            fromFile,
+            meta: undefined,
+        },
+        adapter: new NodeRequestAdapter(resolver),
+    };
+};
 function* candidates(specifier) {
     yield specifier;
     const extensions = ['.hbs.js', '.hbs'];
@@ -116,14 +98,13 @@ function* candidates(specifier) {
     }
 }
 async function nodeResolve(resolver, specifier, fromFile) {
-    let resolution = await resolver.resolve(new NodeModuleRequest(resolver, specifier, fromFile, false, undefined, false, undefined));
+    let request = module_request_1.ModuleRequest.create(NodeRequestAdapter.create, { resolver, fromFile, specifier });
+    let resolution = await resolver.resolve(request);
     switch (resolution.type) {
         case 'not_found':
             return resolution;
         case 'found':
             return resolution.result;
-        case 'ignored':
-            throw new Error(`bug: this is supposed to be impossible because NodeModuleRequest.prototype.defaultResove does not use "ignored"`);
         default:
             throw (0, assert_never_1.default)(resolution);
     }

package/src/node-resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-resolve.js","sourceRoot":"","sources":["node-resolve.ts"],"names":[],"mappings":"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","sourcesContent":["import { virtualContent } from './virtual-content';\nimport { dirname, resolve, isAbsolute } from 'path';\nimport { explicitRelative } from '@embroider/shared-internals';\nimport assertNever from 'assert-never';\n\n// these would be circular, but they're type-only so it's fine\nimport type { ModuleRequest, Resolution, Resolver } from './module-resolver';\n\nexport class NodeModuleRequest implements ModuleRequest {\n  constructor(\n    private resolver: Resolver,\n    readonly specifier: string,\n    readonly fromFile: string,\n    readonly isVirtual: boolean,\n    readonly meta: Record<string, any> | undefined,\n    readonly isNotFound: boolean,\n    readonly resolvedTo: Resolution<NodeResolution, Error> | undefined\n  ) {}\n\n  get debugType() {\n    return 'node';\n  }\n\n  alias(specifier: string): this {\n    return new NodeModuleRequest(this.resolver, specifier, this.fromFile, false, this.meta, false, undefined) as this;\n  }\n  rehome(fromFile: string): this {\n    if (this.fromFile === fromFile) {\n      return this;\n    } else {\n      return new NodeModuleRequest(this.resolver, this.specifier, fromFile, false, this.meta, false, undefined) as this;\n    }\n  }\n  virtualize(filename: string): this {\n    return new NodeModuleRequest(this.resolver, filename, this.fromFile, true, this.meta, false, undefined) as this;\n  }\n  withMeta(meta: Record<string, any> | undefined): this {\n    return new NodeModuleRequest(\n      this.resolver,\n      this.specifier,\n      this.fromFile,\n      this.isVirtual,\n      meta,\n      this.isNotFound,\n      this.resolvedTo\n    ) as this;\n  }\n  notFound(): this {\n    return new NodeModuleRequest(\n      this.resolver,\n      this.specifier,\n      this.fromFile,\n      this.isVirtual,\n      this.meta,\n      true,\n      undefined\n    ) as this;\n  }\n\n  resolveTo(resolution: Resolution<NodeResolution, Error>): this {\n    return new NodeModuleRequest(\n      this.resolver,\n      this.specifier,\n      this.fromFile,\n      this.isVirtual,\n      this.meta,\n      this.isNotFound,\n      resolution\n    ) as this;\n  }\n\n  async defaultResolve(): Promise<Resolution<NodeResolution, Error>> {\n    const request = this;\n    if (request.isVirtual) {\n      return {\n        type: 'found',\n        filename: request.specifier,\n        isVirtual: true,\n        result: {\n          type: 'virtual' as 'virtual',\n          content: virtualContent(request.specifier, this.resolver).src,\n          filename: request.specifier,\n        },\n      };\n    }\n    if (request.isNotFound) {\n      let err = new Error(`module not found ${request.specifier}`);\n      (err as any).code = 'MODULE_NOT_FOUND';\n      return {\n        type: 'not_found',\n        err,\n      };\n    }\n\n    // require.resolve does not like when we resolve from virtual paths.\n    // That is, a request like \"../thing.js\" from\n    // \"/a/real/path/VIRTUAL_SUBDIR/virtual.js\" has an unambiguous target of\n    // \"/a/real/path/thing.js\", but require.resolve won't do that path\n    // adjustment until after checking whether VIRTUAL_SUBDIR actually\n    // exists.\n    //\n    // We can do the path adjustments before doing require.resolve.\n    let { specifier } = request;\n    let fromDir = dirname(request.fromFile);\n    if (!isAbsolute(specifier) && specifier.startsWith('.')) {\n      let targetPath = resolve(fromDir, specifier);\n      let newFromDir = dirname(targetPath);\n      if (fromDir !== newFromDir) {\n        specifier = explicitRelative(newFromDir, targetPath);\n        fromDir = newFromDir;\n      }\n    }\n\n    let initialError;\n\n    for (let candidate of candidates(specifier)) {\n      let filename;\n      try {\n        filename = require.resolve(candidate, {\n          paths: [fromDir],\n        });\n      } catch (err) {\n        if (err.code !== 'MODULE_NOT_FOUND') {\n          throw err;\n        }\n\n        if (!initialError) {\n          initialError = err;\n        }\n\n        continue;\n      }\n      return { type: 'found', filename, result: { type: 'real' as 'real', filename }, isVirtual: false };\n    }\n\n    return { type: 'not_found', err: initialError };\n  }\n}\n\nfunction* candidates(specifier: string) {\n  yield specifier;\n\n  const extensions = ['.hbs.js', '.hbs'];\n\n  for (let ext of extensions) {\n    yield `${specifier}${ext}`;\n  }\n}\n\ntype NodeResolution = { type: 'virtual'; filename: string; content: string } | { type: 'real'; filename: string };\n\ntype NodeResolutionError = { type: 'not_found'; err: Error };\n\nexport async function nodeResolve(\n  resolver: Resolver,\n  specifier: string,\n  fromFile: string\n): Promise<NodeResolution | NodeResolutionError> {\n  let resolution = await resolver.resolve(\n    new NodeModuleRequest(resolver, specifier, fromFile, false, undefined, false, undefined)\n  );\n  switch (resolution.type) {\n    case 'not_found':\n      return resolution;\n    case 'found':\n      return resolution.result;\n    case 'ignored':\n      throw new Error(\n        `bug: this is supposed to be impossible because NodeModuleRequest.prototype.defaultResove does not use \"ignored\"`\n      );\n    default:\n      throw assertNever(resolution);\n  }\n}\n"]}
+{"version":3,"file":"node-resolve.js","sourceRoot":"","sources":["node-resolve.ts"],"names":[],"mappings":"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","sourcesContent":["import { virtualContent, type VirtualResponse } from './virtual-content';\nimport { dirname, resolve, isAbsolute } from 'path';\nimport { explicitRelative } from '@embroider/shared-internals';\nimport assertNever from 'assert-never';\n\n// these would be circular, but they're type-only so it's fine\nimport { ModuleRequest, type RequestAdapter, type RequestAdapterCreate, type Resolution } from './module-request';\nimport type { Resolver } from './module-resolver';\n\nexport class NodeRequestAdapter implements RequestAdapter<Resolution<NodeResolution, Error>> {\n  static create: RequestAdapterCreate<\n    { resolver: Resolver; specifier: string; fromFile: string },\n    Resolution<NodeResolution, Error>\n  > = ({ resolver, specifier, fromFile }) => {\n    return {\n      initialState: {\n        specifier,\n        fromFile,\n        meta: undefined,\n      },\n      adapter: new NodeRequestAdapter(resolver),\n    };\n  };\n\n  private constructor(private resolver: Resolver) {}\n\n  get debugType() {\n    return 'node';\n  }\n\n  notFoundResponse(request: ModuleRequest<Resolution<NodeResolution, Error>>): Resolution<NodeResolution, Error> {\n    let err = new Error(`module not found ${request.specifier}`);\n    (err as any).code = 'MODULE_NOT_FOUND';\n    return {\n      type: 'not_found',\n      err,\n    };\n  }\n\n  virtualResponse(\n    _request: ModuleRequest<Resolution<NodeResolution, Error>>,\n    virtual: VirtualResponse\n  ): Resolution<NodeResolution, Error> {\n    return {\n      type: 'found',\n      filename: virtual.specifier,\n      virtual,\n      result: {\n        type: 'virtual' as const,\n        content: virtualContent(virtual, this.resolver).src,\n        filename: virtual.specifier,\n      },\n    };\n  }\n\n  async resolve(request: ModuleRequest<Resolution<NodeResolution, Error>>): Promise<Resolution<NodeResolution, Error>> {\n    // require.resolve does not like when we resolve from virtual paths.\n    // That is, a request like \"../thing.js\" from\n    // \"/a/real/path/VIRTUAL_SUBDIR/virtual.js\" has an unambiguous target of\n    // \"/a/real/path/thing.js\", but require.resolve won't do that path\n    // adjustment until after checking whether VIRTUAL_SUBDIR actually\n    // exists.\n    //\n    // We can do the path adjustments before doing require.resolve.\n    let { specifier } = request;\n    let fromDir = dirname(request.fromFile);\n    if (!isAbsolute(specifier) && specifier.startsWith('.')) {\n      let targetPath = resolve(fromDir, specifier);\n      let newFromDir = dirname(targetPath);\n      if (fromDir !== newFromDir) {\n        specifier = explicitRelative(newFromDir, targetPath);\n        fromDir = newFromDir;\n      }\n    }\n\n    let initialError;\n\n    for (let candidate of candidates(specifier)) {\n      let filename;\n      try {\n        filename = require.resolve(candidate, {\n          paths: [fromDir],\n        });\n      } catch (err) {\n        if (err.code !== 'MODULE_NOT_FOUND') {\n          throw err;\n        }\n\n        if (!initialError) {\n          initialError = err;\n        }\n\n        continue;\n      }\n      return { type: 'found', filename, result: { type: 'real' as 'real', filename }, virtual: false };\n    }\n\n    return { type: 'not_found', err: initialError };\n  }\n}\n\nfunction* candidates(specifier: string) {\n  yield specifier;\n\n  const extensions = ['.hbs.js', '.hbs'];\n\n  for (let ext of extensions) {\n    yield `${specifier}${ext}`;\n  }\n}\n\ntype NodeResolution = { type: 'virtual'; filename: string; content: string } | { type: 'real'; filename: string };\n\ntype NodeResolutionError = { type: 'not_found'; err: Error };\n\nexport async function nodeResolve(\n  resolver: Resolver,\n  specifier: string,\n  fromFile: string\n): Promise<NodeResolution | NodeResolutionError> {\n  let request = ModuleRequest.create(NodeRequestAdapter.create, { resolver, fromFile, specifier });\n  let resolution = await resolver.resolve(request!);\n  switch (resolution.type) {\n    case 'not_found':\n      return resolution;\n    case 'found':\n      return resolution.result;\n    default:\n      throw assertNever(resolution);\n  }\n}\n"]}

package/src/virtual-content.d.ts

@@ -1,17 +1,31 @@
 import type { Resolver } from '.';
+import { type TestSupportResponse } from './virtual-test-support';
+import { type TestSupportStylesResponse } from './virtual-test-support-styles';
+import { type VirtualVendorResponse } from './virtual-vendor';
+import { type VirtualVendorStylesResponse } from './virtual-vendor-styles';
+import { type EntrypointResponse } from './virtual-entrypoint';
+import { type RouteEntrypointResponse } from './virtual-route-entrypoint';
+export type VirtualResponse = {
+    specifier: string;
+} & (FastbootSwitchResponse | ImplicitModulesResponse | EntrypointResponse | RouteEntrypointResponse | TestSupportResponse | TestSupportStylesResponse | VirtualVendorResponse | VirtualVendorStylesResponse | VirtualPairResponse);
 export interface VirtualContentResult {
     src: string;
     watches: string[];
 }
-export declare function virtualContent(filename: string, resolver: Resolver): VirtualContentResult;
-export declare function virtualPairComponent(hbsModule: string, jsModule: string | undefined): string;
-export declare function fastbootSwitch(specifier: string, fromFile: string, names: Set<string>): string;
-export declare function decodeFastbootSwitch(filename: string): {
-    names: string[];
-    hasDefaultExport: boolean;
-    filename: string;
-} | undefined;
-export declare function decodeImplicitModules(filename: string): {
+export declare function virtualContent(response: VirtualResponse, resolver: Resolver): VirtualContentResult;
+export interface VirtualPairResponse {
+    type: 'component-pair';
+    specifier: string;
+    hbsModule: string;
+    jsModule: string | null;
+    debugName: string;
+}
+interface FastbootSwitchResponse {
+    type: 'fastboot-switch';
+    names: Set<string>;
+}
+export interface ImplicitModulesResponse {
     type: 'implicit-modules' | 'implicit-test-modules';
     fromFile: string;
-} | undefined;
+}
+export {};

package/src/virtual-content.js

@@ -1,10 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.virtualContent = virtualContent;
-exports.virtualPairComponent = virtualPairComponent;
-exports.fastbootSwitch = fastbootSwitch;
-exports.decodeFastbootSwitch = decodeFastbootSwitch;
-exports.decodeImplicitModules = decodeImplicitModules;
 const path_1 = require("path");
 const _1 = require(".");
 const js_handlebars_1 = require("./js-handlebars");
@@ -14,48 +13,35 @@ const virtual_vendor_1 = require("./virtual-vendor");
 const virtual_vendor_styles_1 = require("./virtual-vendor-styles");
 const virtual_entrypoint_1 = require("./virtual-entrypoint");
 const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
+const assert_never_1 = __importDefault(require("assert-never"));
 // Given a filename that was passed to your ModuleRequest's `virtualize()`,
 // this produces the corresponding contents. It's a static, stateless function
 // because we recognize that that process that did resolution might not be the
 // same one that loads the content.
-function virtualContent(filename, resolver) {
-    let entrypoint = (0, virtual_entrypoint_1.decodeEntrypoint)(filename);
-    if (entrypoint) {
-        return (0, virtual_entrypoint_1.renderEntrypoint)(resolver, entrypoint);
+function virtualContent(response, resolver) {
+    switch (response.type) {
+        case 'entrypoint':
+            return (0, virtual_entrypoint_1.renderEntrypoint)(resolver, response);
+        case 'vendor-js':
+            return (0, virtual_vendor_1.renderVendor)(response, resolver);
+        case 'vendor-css':
+            return (0, virtual_vendor_styles_1.renderVendorStyles)(response, resolver);
+        case 'test-support-css':
+            return (0, virtual_test_support_styles_1.renderTestSupportStyles)(response, resolver);
+        case 'test-support-js':
+            return (0, virtual_test_support_1.renderImplicitTestScripts)(response, resolver);
+        case 'component-pair':
+            return pairedComponentShim(response);
+        case 'implicit-modules':
+        case 'implicit-test-modules':
+            return renderImplicitModules(response, resolver);
+        case 'route-entrypoint':
+            return (0, virtual_route_entrypoint_1.renderRouteEntrypoint)(response, resolver);
+        case 'fastboot-switch':
+            return renderFastbootSwitchTemplate(response);
+        default:
+            throw (0, assert_never_1.default)(response);
     }
-    let routeEntrypoint = (0, virtual_route_entrypoint_1.decodeRouteEntrypoint)(filename);
-    if (routeEntrypoint) {
-        return (0, virtual_route_entrypoint_1.renderRouteEntrypoint)(resolver, routeEntrypoint);
-    }
-    let match = decodeVirtualPairComponent(filename);
-    if (match) {
-        return pairedComponentShim(match);
-    }
-    let fb = decodeFastbootSwitch(filename);
-    if (fb) {
-        return renderFastbootSwitchTemplate(fb);
-    }
-    let im = decodeImplicitModules(filename);
-    if (im) {
-        return renderImplicitModules(im, resolver);
-    }
-    let isVendor = (0, virtual_vendor_1.decodeVirtualVendor)(filename);
-    if (isVendor) {
-        return (0, virtual_vendor_1.renderVendor)(filename, resolver);
-    }
-    let isImplicitTestScripts = (0, virtual_test_support_1.decodeImplicitTestScripts)(filename);
-    if (isImplicitTestScripts) {
-        return (0, virtual_test_support_1.renderImplicitTestScripts)(filename, resolver);
-    }
-    let isVendorStyles = (0, virtual_vendor_styles_1.decodeVirtualVendorStyles)(filename);
-    if (isVendorStyles) {
-        return (0, virtual_vendor_styles_1.renderVendorStyles)(filename, resolver);
-    }
-    let isTestSupportStyles = (0, virtual_test_support_styles_1.decodeTestSupportStyles)(filename);
-    if (isTestSupportStyles) {
-        return (0, virtual_test_support_styles_1.renderTestSupportStyles)(filename, resolver);
-    }
-    throw new Error(`not an @embroider/core virtual file: ${filename}`);
 }
 function pairedComponentShim(params) {
     return {
@@ -65,7 +51,7 @@ function pairedComponentShim(params) {
 }
 const pairedComponentShimTemplate = (0, js_handlebars_1.compile)(`
 import { setComponentTemplate } from "@ember/component";
-import template from "{{{js-string-escape relativeHBSModule}}}";
+import template from "{{{js-string-escape hbsModule}}}";
 import { deprecate } from "@ember/debug";
 
 
@@ -82,71 +68,20 @@ deprecate("Components with separately resolved templates are deprecated. Migrate
   }
 );
 
-{{#if relativeJSModule}}
-import component from "{{{js-string-escape relativeJSModule}}}";
+{{#if jsModule}}
+import component from "{{{js-string-escape jsModule}}}";
 export default setComponentTemplate(template, component);
 {{else}}
 import templateOnlyComponent from "@ember/component/template-only";
 export default setComponentTemplate(template, templateOnlyComponent(undefined, "{{{js-string-escape debugName}}}"));
 {{/if}}
 `);
-const pairComponentMarker = '-embroider-pair-component';
-const pairComponentPattern = /^(?<hbsModule>.*)__vpc__(?<jsModule>[^\/]*)-embroider-pair-component$/;
-function virtualPairComponent(hbsModule, jsModule) {
-    let relativeJSModule = '';
-    if (jsModule) {
-        relativeJSModule = (0, _1.explicitRelative)((0, path_1.dirname)(hbsModule), jsModule);
-    }
-    return `${hbsModule}__vpc__${encodeURIComponent(relativeJSModule)}${pairComponentMarker}`;
-}
-function decodeVirtualPairComponent(filename) {
-    // Performance: avoid paying regex exec cost unless needed
-    if (!filename.includes(pairComponentMarker)) {
-        return null;
-    }
-    let match = pairComponentPattern.exec(filename);
-    if (!match) {
-        return null;
-    }
-    let { hbsModule, jsModule } = match.groups;
-    // target our real hbs module from our virtual module
-    let relativeHBSModule = (0, _1.explicitRelative)((0, path_1.dirname)(filename), hbsModule);
-    return {
-        relativeHBSModule,
-        relativeJSModule: decodeURIComponent(jsModule) || null,
-        debugName: (0, path_1.basename)(relativeHBSModule).replace(/\.(js|hbs)$/, ''),
-    };
-}
-const fastbootSwitchSuffix = '/embroider_fastboot_switch';
-const fastbootSwitchPattern = /(?<original>.+)\/embroider_fastboot_switch(?:\?names=(?<names>.+))?$/;
-function fastbootSwitch(specifier, fromFile, names) {
-    let filename = `${(0, path_1.resolve)((0, path_1.dirname)(fromFile), specifier)}${fastbootSwitchSuffix}`;
-    if (names.size > 0) {
-        return `${filename}?names=${[...names].join(',')}`;
-    }
-    else {
-        return filename;
-    }
-}
-function decodeFastbootSwitch(filename) {
-    var _a, _b, _c;
-    // Performance: avoid paying regex exec cost unless needed
-    if (!filename.includes(fastbootSwitchSuffix)) {
-        return;
-    }
-    let match = fastbootSwitchPattern.exec(filename);
-    if (match) {
-        let names = (_c = (_b = (_a = match.groups) === null || _a === void 0 ? void 0 : _a.names) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
-        return {
-            names: names.filter(name => name !== 'default'),
-            hasDefaultExport: names.includes('default'),
-            filename: match.groups.original,
-        };
-    }
-}
 function renderFastbootSwitchTemplate(params) {
     return {
-        src: fastbootSwitchTemplate(params),
+        src: fastbootSwitchTemplate({
+            names: [...params.names].filter(name => name !== 'default'),
+            hasDefaultExport: params.names.has('default'),
+        }),
         watches: [],
     };
 }
@@ -165,21 +100,7 @@ export default mod.default;
 export const {{name}} = mod.{{name}};
 {{/each}}
 `);
-const implicitModulesPattern = /(?<filename>.*)[\\/]-embroider-implicit-(?<test>test-)?modules\.js$/;
-function decodeImplicitModules(filename) {
-    // Performance: avoid paying regex exec cost unless needed
-    if (!filename.includes('-embroider-implicit-')) {
-        return;
-    }
-    let m = implicitModulesPattern.exec(filename);
-    if (m) {
-        return {
-            type: m.groups.test ? 'implicit-test-modules' : 'implicit-modules',
-            fromFile: m.groups.filename,
-        };
-    }
-}
-function renderImplicitModules({ type, fromFile, }, resolver) {
+function renderImplicitModules({ type, fromFile }, resolver) {
     let resolvableExtensionsPattern = (0, _1.extensionsPattern)(resolver.options.resolvableExtensions);
     const pkg = resolver.packageCache.ownerOfFile(fromFile);
     if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {

package/src/virtual-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-content.js","sourceRoot":"","sources":["virtual-content.ts"],"names":[],"mappings":"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","sourcesContent":["import { dirname, basename, resolve, posix, sep, join } from 'path';\nimport type { Resolver, AddonPackage, Package } from '.';\nimport { explicitRelative, extensionsPattern } from '.';\nimport { compile } from './js-handlebars';\nimport { decodeImplicitTestScripts, renderImplicitTestScripts } from './virtual-test-support';\nimport { decodeTestSupportStyles, renderTestSupportStyles } from './virtual-test-support-styles';\nimport { decodeVirtualVendor, renderVendor } from './virtual-vendor';\nimport { decodeVirtualVendorStyles, renderVendorStyles } from './virtual-vendor-styles';\n\nimport { decodeEntrypoint, renderEntrypoint } from './virtual-entrypoint';\nimport { decodeRouteEntrypoint, renderRouteEntrypoint } from './virtual-route-entrypoint';\n\nexport interface VirtualContentResult {\n  src: string;\n  watches: string[];\n}\n\n// Given a filename that was passed to your ModuleRequest's `virtualize()`,\n// this produces the corresponding contents. It's a static, stateless function\n// because we recognize that that process that did resolution might not be the\n// same one that loads the content.\nexport function virtualContent(filename: string, resolver: Resolver): VirtualContentResult {\n  let entrypoint = decodeEntrypoint(filename);\n  if (entrypoint) {\n    return renderEntrypoint(resolver, entrypoint);\n  }\n\n  let routeEntrypoint = decodeRouteEntrypoint(filename);\n  if (routeEntrypoint) {\n    return renderRouteEntrypoint(resolver, routeEntrypoint);\n  }\n\n  let match = decodeVirtualPairComponent(filename);\n  if (match) {\n    return pairedComponentShim(match);\n  }\n\n  let fb = decodeFastbootSwitch(filename);\n  if (fb) {\n    return renderFastbootSwitchTemplate(fb);\n  }\n\n  let im = decodeImplicitModules(filename);\n  if (im) {\n    return renderImplicitModules(im, resolver);\n  }\n\n  let isVendor = decodeVirtualVendor(filename);\n  if (isVendor) {\n    return renderVendor(filename, resolver);\n  }\n\n  let isImplicitTestScripts = decodeImplicitTestScripts(filename);\n  if (isImplicitTestScripts) {\n    return renderImplicitTestScripts(filename, resolver);\n  }\n\n  let isVendorStyles = decodeVirtualVendorStyles(filename);\n  if (isVendorStyles) {\n    return renderVendorStyles(filename, resolver);\n  }\n\n  let isTestSupportStyles = decodeTestSupportStyles(filename);\n  if (isTestSupportStyles) {\n    return renderTestSupportStyles(filename, resolver);\n  }\n\n  throw new Error(`not an @embroider/core virtual file: ${filename}`);\n}\n\ninterface PairedComponentShimParams {\n  relativeHBSModule: string;\n  relativeJSModule: string | null;\n  debugName: string;\n}\n\nfunction pairedComponentShim(params: PairedComponentShimParams): VirtualContentResult {\n  return {\n    src: pairedComponentShimTemplate(params),\n    watches: [],\n  };\n}\n\nconst pairedComponentShimTemplate = compile(`\nimport { setComponentTemplate } from \"@ember/component\";\nimport template from \"{{{js-string-escape relativeHBSModule}}}\";\nimport { deprecate } from \"@ember/debug\";\n\n\ndeprecate(\"Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts. Tried to lookup '{{debugName}}'.\",\n  false, {\n    id: 'component-template-resolving',\n    url: 'https://deprecations.emberjs.com/id/component-template-resolving',\n    until: '6.0.0',\n    for: 'ember-source',\n    since: {\n      available: '5.10.0',\n      enabled: '5.10.0',\n    },\n  }\n);\n\n{{#if relativeJSModule}}\nimport component from \"{{{js-string-escape relativeJSModule}}}\";\nexport default setComponentTemplate(template, component);\n{{else}}\nimport templateOnlyComponent from \"@ember/component/template-only\";\nexport default setComponentTemplate(template, templateOnlyComponent(undefined, \"{{{js-string-escape debugName}}}\"));\n{{/if}}\n`) as (params: PairedComponentShimParams) => string;\n\nconst pairComponentMarker = '-embroider-pair-component';\nconst pairComponentPattern = /^(?<hbsModule>.*)__vpc__(?<jsModule>[^\\/]*)-embroider-pair-component$/;\n\nexport function virtualPairComponent(hbsModule: string, jsModule: string | undefined): string {\n  let relativeJSModule = '';\n  if (jsModule) {\n    relativeJSModule = explicitRelative(dirname(hbsModule), jsModule);\n  }\n  return `${hbsModule}__vpc__${encodeURIComponent(relativeJSModule)}${pairComponentMarker}`;\n}\n\nfunction decodeVirtualPairComponent(\n  filename: string\n): { relativeHBSModule: string; relativeJSModule: string | null; debugName: string } | null {\n  // Performance: avoid paying regex exec cost unless needed\n  if (!filename.includes(pairComponentMarker)) {\n    return null;\n  }\n  let match = pairComponentPattern.exec(filename);\n  if (!match) {\n    return null;\n  }\n  let { hbsModule, jsModule } = match.groups! as { hbsModule: string; jsModule: string };\n  // target our real hbs module from our virtual module\n  let relativeHBSModule = explicitRelative(dirname(filename), hbsModule);\n  return {\n    relativeHBSModule,\n    relativeJSModule: decodeURIComponent(jsModule) || null,\n    debugName: basename(relativeHBSModule).replace(/\\.(js|hbs)$/, ''),\n  };\n}\n\nconst fastbootSwitchSuffix = '/embroider_fastboot_switch';\nconst fastbootSwitchPattern = /(?<original>.+)\\/embroider_fastboot_switch(?:\\?names=(?<names>.+))?$/;\nexport function fastbootSwitch(specifier: string, fromFile: string, names: Set<string>): string {\n  let filename = `${resolve(dirname(fromFile), specifier)}${fastbootSwitchSuffix}`;\n  if (names.size > 0) {\n    return `${filename}?names=${[...names].join(',')}`;\n  } else {\n    return filename;\n  }\n}\n\nexport function decodeFastbootSwitch(filename: string) {\n  // Performance: avoid paying regex exec cost unless needed\n  if (!filename.includes(fastbootSwitchSuffix)) {\n    return;\n  }\n  let match = fastbootSwitchPattern.exec(filename);\n  if (match) {\n    let names = match.groups?.names?.split(',') ?? [];\n    return {\n      names: names.filter(name => name !== 'default'),\n      hasDefaultExport: names.includes('default'),\n      filename: match.groups!.original,\n    };\n  }\n}\n\ninterface FastbootSwitchParams {\n  names: string[];\n  hasDefaultExport: boolean;\n}\n\nfunction renderFastbootSwitchTemplate(params: FastbootSwitchParams): VirtualContentResult {\n  return {\n    src: fastbootSwitchTemplate(params),\n    watches: [],\n  };\n}\n\nconst fastbootSwitchTemplate = compile(`\nimport { macroCondition, getGlobalConfig, importSync } from '@embroider/macros';\nlet mod;\nif (macroCondition(getGlobalConfig().fastboot?.isRunning)){\n  mod = importSync('./fastboot');\n} else {\n  mod = importSync('./browser');\n}\n{{#if hasDefaultExport}}\nexport default mod.default;\n{{/if}}\n{{#each names as |name|}}\nexport const {{name}} = mod.{{name}};\n{{/each}}\n`) as (params: FastbootSwitchParams) => string;\n\nconst implicitModulesPattern = /(?<filename>.*)[\\\\/]-embroider-implicit-(?<test>test-)?modules\\.js$/;\n\nexport function decodeImplicitModules(\n  filename: string\n): { type: 'implicit-modules' | 'implicit-test-modules'; fromFile: string } | undefined {\n  // Performance: avoid paying regex exec cost unless needed\n  if (!filename.includes('-embroider-implicit-')) {\n    return;\n  }\n  let m = implicitModulesPattern.exec(filename);\n  if (m) {\n    return {\n      type: m.groups!.test ? 'implicit-test-modules' : 'implicit-modules',\n      fromFile: m.groups!.filename,\n    };\n  }\n}\n\nfunction renderImplicitModules(\n  {\n    type,\n    fromFile,\n  }: {\n    type: 'implicit-modules' | 'implicit-test-modules';\n    fromFile: string;\n  },\n  resolver: Resolver\n): VirtualContentResult {\n  let resolvableExtensionsPattern = extensionsPattern(resolver.options.resolvableExtensions);\n\n  const pkg = resolver.packageCache.ownerOfFile(fromFile);\n  if (!pkg?.isV2Ember()) {\n    throw new Error(`bug: saw special implicit modules import in non-ember package at ${fromFile}`);\n  }\n\n  let ownModules: { runtime: string; buildtime: string }[] = [];\n  let dependencyModules: string[] = [];\n\n  let deps = pkg.dependencies.sort(orderAddons);\n\n  for (let dep of deps) {\n    // anything that isn't a v2 ember package by this point is not an active\n    // addon.\n    if (!dep.isV2Addon()) {\n      continue;\n    }\n\n    // we ignore peerDependencies here because classic ember-cli ignores\n    // peerDependencies here, and we're implementing the implicit-modules\n    // backward-comptibility feature.\n    if (pkg.categorizeDependency(dep.name) === 'peerDependencies') {\n      continue;\n    }\n\n    let implicitModules = dep.meta[type];\n    if (implicitModules) {\n      let renamedModules = inverseRenamedModules(dep.meta, resolvableExtensionsPattern);\n      for (let name of implicitModules) {\n        let packageName = dep.name;\n\n        let renamedMeta = dep.meta['renamed-packages'];\n        if (renamedMeta) {\n          Object.entries(renamedMeta).forEach(([key, value]) => {\n            if (value === dep.name) {\n              packageName = key;\n            }\n          });\n        }\n\n        let runtime = join(packageName, name).replace(resolvableExtensionsPattern, '');\n        let runtimeRenameLookup = runtime.split('\\\\').join('/');\n        if (renamedModules && renamedModules[runtimeRenameLookup]) {\n          runtime = renamedModules[runtimeRenameLookup];\n        }\n        runtime = runtime.split(sep).join('/');\n        ownModules.push({\n          runtime,\n          buildtime: posix.join(packageName, name),\n        });\n      }\n    }\n    // we don't recurse across an engine boundary. Engines import their own\n    // implicit-modules.\n    if (!dep.isEngine()) {\n      dependencyModules.push(posix.join(dep.name, `-embroider-${type}.js`));\n    }\n  }\n  return { src: implicitModulesTemplate({ ownModules, dependencyModules }), watches: [] };\n}\n\nconst implicitModulesTemplate = compile(`\n\n\n{{#each dependencyModules as |module index|}}\n  import dep{{index}} from \"{{js-string-escape module}}\";\n{{/each}}\n\n{{#each ownModules as |module index|}}\n  import * as own{{index}} from \"{{js-string-escape module.buildtime}}\";\n{{/each}}\n\nexport default Object.assign({},\n  {{#each dependencyModules as |module index|}}\n    dep{{index}},\n  {{/each}}\n  {\n    {{#each ownModules as |module index|}}\n      \"{{js-string-escape module.runtime}}\": own{{index}},\n    {{/each}}\n  }\n);\n`) as (params: { dependencyModules: string[]; ownModules: { runtime: string; buildtime: string }[] }) => string;\n\n// meta['renamed-modules'] has mapping from classic filename to real filename.\n// This takes that and converts it to the inverst mapping from real import path\n// to classic import path.\nfunction inverseRenamedModules(meta: AddonPackage['meta'], extensions: RegExp) {\n  let renamed = meta['renamed-modules'];\n  if (renamed) {\n    let inverted = {} as { [name: string]: string };\n    for (let [classic, real] of Object.entries(renamed)) {\n      inverted[real.replace(extensions, '')] = classic.replace(extensions, '');\n    }\n    return inverted;\n  }\n}\n\nfunction orderAddons(depA: Package, depB: Package): number {\n  let depAIdx = 0;\n  let depBIdx = 0;\n\n  if (depA && depA.meta && depA.isV2Addon()) {\n    depAIdx = depA.meta['order-index'] || 0;\n  }\n  if (depB && depB.meta && depB.isV2Addon()) {\n    depBIdx = depB.meta['order-index'] || 0;\n  }\n\n  return depAIdx - depBIdx;\n}\n"]}
+{"version":3,"file":"virtual-content.js","sourceRoot":"","sources":["virtual-content.ts"],"names":[],"mappings":"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","sourcesContent":["import { posix, sep, join } from 'path';\nimport type { Resolver, AddonPackage, Package } from '.';\nimport { extensionsPattern } from '.';\nimport { compile } from './js-handlebars';\nimport { renderImplicitTestScripts, type TestSupportResponse } from './virtual-test-support';\nimport { renderTestSupportStyles, type TestSupportStylesResponse } from './virtual-test-support-styles';\nimport { renderVendor, type VirtualVendorResponse } from './virtual-vendor';\nimport { renderVendorStyles, type VirtualVendorStylesResponse } from './virtual-vendor-styles';\n\nimport { type EntrypointResponse, renderEntrypoint } from './virtual-entrypoint';\nimport { renderRouteEntrypoint, type RouteEntrypointResponse } from './virtual-route-entrypoint';\nimport assertNever from 'assert-never';\n\nexport type VirtualResponse = { specifier: string } & (\n  | FastbootSwitchResponse\n  | ImplicitModulesResponse\n  | EntrypointResponse\n  | RouteEntrypointResponse\n  | TestSupportResponse\n  | TestSupportStylesResponse\n  | VirtualVendorResponse\n  | VirtualVendorStylesResponse\n  | VirtualPairResponse\n);\n\nexport interface VirtualContentResult {\n  src: string;\n  watches: string[];\n}\n\n// Given a filename that was passed to your ModuleRequest's `virtualize()`,\n// this produces the corresponding contents. It's a static, stateless function\n// because we recognize that that process that did resolution might not be the\n// same one that loads the content.\nexport function virtualContent(response: VirtualResponse, resolver: Resolver): VirtualContentResult {\n  switch (response.type) {\n    case 'entrypoint':\n      return renderEntrypoint(resolver, response);\n    case 'vendor-js':\n      return renderVendor(response, resolver);\n    case 'vendor-css':\n      return renderVendorStyles(response, resolver);\n    case 'test-support-css':\n      return renderTestSupportStyles(response, resolver);\n    case 'test-support-js':\n      return renderImplicitTestScripts(response, resolver);\n    case 'component-pair':\n      return pairedComponentShim(response);\n    case 'implicit-modules':\n    case 'implicit-test-modules':\n      return renderImplicitModules(response, resolver);\n    case 'route-entrypoint':\n      return renderRouteEntrypoint(response, resolver);\n    case 'fastboot-switch':\n      return renderFastbootSwitchTemplate(response);\n    default:\n      throw assertNever(response);\n  }\n}\n\ninterface PairedComponentShimParams {\n  hbsModule: string;\n  jsModule: string | null;\n  debugName: string;\n}\n\nfunction pairedComponentShim(params: PairedComponentShimParams): VirtualContentResult {\n  return {\n    src: pairedComponentShimTemplate(params),\n    watches: [],\n  };\n}\n\nconst pairedComponentShimTemplate = compile(`\nimport { setComponentTemplate } from \"@ember/component\";\nimport template from \"{{{js-string-escape hbsModule}}}\";\nimport { deprecate } from \"@ember/debug\";\n\n\ndeprecate(\"Components with separately resolved templates are deprecated. Migrate to either co-located js/ts + hbs files or to gjs/gts. Tried to lookup '{{debugName}}'.\",\n  false, {\n    id: 'component-template-resolving',\n    url: 'https://deprecations.emberjs.com/id/component-template-resolving',\n    until: '6.0.0',\n    for: 'ember-source',\n    since: {\n      available: '5.10.0',\n      enabled: '5.10.0',\n    },\n  }\n);\n\n{{#if jsModule}}\nimport component from \"{{{js-string-escape jsModule}}}\";\nexport default setComponentTemplate(template, component);\n{{else}}\nimport templateOnlyComponent from \"@ember/component/template-only\";\nexport default setComponentTemplate(template, templateOnlyComponent(undefined, \"{{{js-string-escape debugName}}}\"));\n{{/if}}\n`) as (params: PairedComponentShimParams) => string;\n\nexport interface VirtualPairResponse {\n  type: 'component-pair';\n  specifier: string;\n  hbsModule: string;\n  jsModule: string | null;\n  debugName: string;\n}\n\ninterface FastbootSwitchResponse {\n  type: 'fastboot-switch';\n  names: Set<string>;\n}\n\nfunction renderFastbootSwitchTemplate(params: FastbootSwitchResponse): VirtualContentResult {\n  return {\n    src: fastbootSwitchTemplate({\n      names: [...params.names].filter(name => name !== 'default'),\n      hasDefaultExport: params.names.has('default'),\n    }),\n    watches: [],\n  };\n}\n\nconst fastbootSwitchTemplate = compile(`\nimport { macroCondition, getGlobalConfig, importSync } from '@embroider/macros';\nlet mod;\nif (macroCondition(getGlobalConfig().fastboot?.isRunning)){\n  mod = importSync('./fastboot');\n} else {\n  mod = importSync('./browser');\n}\n{{#if hasDefaultExport}}\nexport default mod.default;\n{{/if}}\n{{#each names as |name|}}\nexport const {{name}} = mod.{{name}};\n{{/each}}\n`) as (params: { names: string[]; hasDefaultExport: boolean }) => string;\n\nexport interface ImplicitModulesResponse {\n  type: 'implicit-modules' | 'implicit-test-modules';\n  fromFile: string;\n}\n\nfunction renderImplicitModules({ type, fromFile }: ImplicitModulesResponse, resolver: Resolver): VirtualContentResult {\n  let resolvableExtensionsPattern = extensionsPattern(resolver.options.resolvableExtensions);\n\n  const pkg = resolver.packageCache.ownerOfFile(fromFile);\n  if (!pkg?.isV2Ember()) {\n    throw new Error(`bug: saw special implicit modules import in non-ember package at ${fromFile}`);\n  }\n\n  let ownModules: { runtime: string; buildtime: string }[] = [];\n  let dependencyModules: string[] = [];\n\n  let deps = pkg.dependencies.sort(orderAddons);\n\n  for (let dep of deps) {\n    // anything that isn't a v2 ember package by this point is not an active\n    // addon.\n    if (!dep.isV2Addon()) {\n      continue;\n    }\n\n    // we ignore peerDependencies here because classic ember-cli ignores\n    // peerDependencies here, and we're implementing the implicit-modules\n    // backward-comptibility feature.\n    if (pkg.categorizeDependency(dep.name) === 'peerDependencies') {\n      continue;\n    }\n\n    let implicitModules = dep.meta[type];\n    if (implicitModules) {\n      let renamedModules = inverseRenamedModules(dep.meta, resolvableExtensionsPattern);\n      for (let name of implicitModules) {\n        let packageName = dep.name;\n\n        let renamedMeta = dep.meta['renamed-packages'];\n        if (renamedMeta) {\n          Object.entries(renamedMeta).forEach(([key, value]) => {\n            if (value === dep.name) {\n              packageName = key;\n            }\n          });\n        }\n\n        let runtime = join(packageName, name).replace(resolvableExtensionsPattern, '');\n        let runtimeRenameLookup = runtime.split('\\\\').join('/');\n        if (renamedModules && renamedModules[runtimeRenameLookup]) {\n          runtime = renamedModules[runtimeRenameLookup];\n        }\n        runtime = runtime.split(sep).join('/');\n        ownModules.push({\n          runtime,\n          buildtime: posix.join(packageName, name),\n        });\n      }\n    }\n    // we don't recurse across an engine boundary. Engines import their own\n    // implicit-modules.\n    if (!dep.isEngine()) {\n      dependencyModules.push(posix.join(dep.name, `-embroider-${type}.js`));\n    }\n  }\n  return { src: implicitModulesTemplate({ ownModules, dependencyModules }), watches: [] };\n}\n\nconst implicitModulesTemplate = compile(`\n\n\n{{#each dependencyModules as |module index|}}\n  import dep{{index}} from \"{{js-string-escape module}}\";\n{{/each}}\n\n{{#each ownModules as |module index|}}\n  import * as own{{index}} from \"{{js-string-escape module.buildtime}}\";\n{{/each}}\n\nexport default Object.assign({},\n  {{#each dependencyModules as |module index|}}\n    dep{{index}},\n  {{/each}}\n  {\n    {{#each ownModules as |module index|}}\n      \"{{js-string-escape module.runtime}}\": own{{index}},\n    {{/each}}\n  }\n);\n`) as (params: { dependencyModules: string[]; ownModules: { runtime: string; buildtime: string }[] }) => string;\n\n// meta['renamed-modules'] has mapping from classic filename to real filename.\n// This takes that and converts it to the inverst mapping from real import path\n// to classic import path.\nfunction inverseRenamedModules(meta: AddonPackage['meta'], extensions: RegExp) {\n  let renamed = meta['renamed-modules'];\n  if (renamed) {\n    let inverted = {} as { [name: string]: string };\n    for (let [classic, real] of Object.entries(renamed)) {\n      inverted[real.replace(extensions, '')] = classic.replace(extensions, '');\n    }\n    return inverted;\n  }\n}\n\nfunction orderAddons(depA: Package, depB: Package): number {\n  let depAIdx = 0;\n  let depBIdx = 0;\n\n  if (depA && depA.meta && depA.isV2Addon()) {\n    depAIdx = depA.meta['order-index'] || 0;\n  }\n  if (depB && depB.meta && depB.isV2Addon()) {\n    depBIdx = depB.meta['order-index'] || 0;\n  }\n\n  return depAIdx - depBIdx;\n}\n"]}

package/src/virtual-entrypoint.d.ts

@@ -1,8 +1,10 @@
 import { AppFiles, type RouteFiles } from './app-files';
 import type { Resolver } from './module-resolver';
-export declare function decodeEntrypoint(filename: string): {
+export interface EntrypointResponse {
+    type: 'entrypoint';
     fromDir: string;
-} | undefined;
+    specifier: string;
+}
 export declare function staticAppPathsPattern(staticAppPaths: string[] | undefined): RegExp | undefined;
 export declare function renderEntrypoint(resolver: Resolver, { fromDir }: {
     fromDir: string;

package/src/virtual-entrypoint.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeEntrypoint = decodeEntrypoint;
 exports.staticAppPathsPattern = staticAppPathsPattern;
 exports.renderEntrypoint = renderEntrypoint;
 exports.importPaths = importPaths;
@@ -16,22 +15,8 @@ const lodash_1 = require("lodash");
 const path_1 = require("path");
 const shared_internals_1 = require("@embroider/shared-internals");
 const walk_sync_1 = __importDefault(require("walk-sync"));
-const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
 const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 const options_1 = require("./options");
-const entrypointPattern = /(?<filename>.*)[\\/]-embroider-entrypoint.js/;
-function decodeEntrypoint(filename) {
-    // Performance: avoid paying regex exec cost unless needed
-    if (!filename.includes('-embroider-entrypoint')) {
-        return;
-    }
-    let m = entrypointPattern.exec(filename);
-    if (m) {
-        return {
-            fromDir: m.groups.filename,
-        };
-    }
-}
 function staticAppPathsPattern(staticAppPaths) {
     if (staticAppPaths && staticAppPaths.length > 0) {
         return new RegExp('^(?:' + staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
@@ -39,7 +24,6 @@ function staticAppPathsPattern(staticAppPaths) {
 }
 function renderEntrypoint(resolver, { fromDir }) {
     var _a;
-    // this is new
     const owner = resolver.packageCache.ownerOfFile(fromDir);
     let eagerModules = [];
     if (!owner) {
@@ -98,10 +82,10 @@ function renderEntrypoint(resolver, { fromDir }) {
     for (let [routeName, routeFiles] of appFiles.routeFiles.children) {
         splitRoute(routeName, routeFiles, resolver.options.splitAtRoutes, (_, filename) => {
             requiredAppFiles.push([filename]);
-        }, (routeNames, _files) => {
+        }, (routeNames) => {
             lazyRoutes.push({
                 names: routeNames,
-                path: (0, virtual_route_entrypoint_1.encodePublicRouteEntrypoint)(routeNames, _files),
+                path: `@embroider/core/route/${encodeURIComponent(routeNames[0])}`,
             });
         });
     }