@embroider/core 3.4.20-unstable.aaeb674 → 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/options.d.ts

@@ -8,8 +8,5 @@ export default interface Options {
         resolve: string[];
         useMethod?: string;
     }[];
-    amdCompatibility?: false | 'cjs' | {
-        es: [string, string[]][];
-    };
 }
 export declare function optionsWithDefaults(options?: Options): Required<Options>;

package/src/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;AAsHA,kDAcC;AAdD,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,IAAI,QAAQ,GAAG;QACb,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,KAAK;QACvB,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;QAClB,WAAW,EAAE,EAAE;QACf,gBAAgB,EAAE,KAAc;KACjC,CAAC;IACF,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["export default interface Options {\n  // When true, we statically resolve all template helpers at build time. This\n  // causes unused helpers to be left out of the build (\"tree shaking\" of\n  // helpers).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticHelpers?: boolean;\n\n  // When true, we statically resolve all modifiers at build time. This\n  // causes unused modifiers to be left out of the build (\"tree shaking\" of\n  // modifiers).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticModifiers?: boolean;\n\n  // When true, we statically resolve all components at build time. This causes\n  // unused components to be left out of the build (\"tree shaking\" of\n  // components).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticComponents?: boolean;\n\n  // Enables per-route code splitting. Any route names that match these patterns\n  // will be split out of the initial app payload. If you use this, you must\n  // also add @embroider/router to your app. See [@embroider/router's\n  // README](https://github.com/embroider-build/embroider/blob/main/packages/router/README.md)\n  splitAtRoutes?: (RegExp | string)[];\n\n  // Every file within your application's `app` directory is categorized as a\n  // component, helper, modifier, route, route template, controller, or \"other\".\n  //\n  // This option lets you decide which \"other\" files should be loaded\n  // statically. By default, all \"other\" files will be included in the build and\n  // registered with Ember's runtime loader, because we can't know if somebody\n  // is going to try to access them dynamically via Ember's resolver or AMD\n  // runtime `require`.\n  //\n  // If you know that your files are only ever imported, you can list them here\n  // and then they will only be included exactly where they're needed.\n  //\n  // Provide a list of directories or files relative to `/app`. For example\n  //\n  //     staticAppPaths: ['lib']\n  //\n  // means that everything under your-project/app/lib will be loaded statically.\n  //\n  // This option has no effect on components (which are governed by\n  // staticComponents), helpers (which are governed by staticHelpers), modifiers\n  // (which are governed by staticModifiers) or the route-specific files (routes,\n  // route templates, and controllers which are governed by splitAtRoutes).\n  staticAppPaths?: string[];\n\n  // This is a performance optimization that can help you avoid the \"Your build\n  // is slower because some babel plugins are non-serializable\" penalty. If you\n  // provide the locations of known non-serializable objects, we can discover\n  // them and make them serializable.\n  //\n  // resolve is a list of paths to resolve, in a chain. This lets you resolve\n  // your dependencies' dependencies, like: resolve: ['your-dependency',\n  // 'inner-dependency/lib/transform']\n  //\n  // useMethod optionally lets you pick which property within the module to use.\n  // If not provided, we use the module.exports itself.\n  pluginHints?: { resolve: string[]; useMethod?: string }[];\n\n  // Ember classically used a runtime AMD module loader.\n  //\n  // Embroider *can* locate the vast majority of modules statically, but when an\n  // addon is doing something highly dynamic (like injecting AMD `define()`\n  // statements directly into a <script>), we still may not be able to locate\n  // them. So Embroider can emit a placeholder shim for the missing module that\n  // attempts to locate it at runtime in the classic AMD loader.\n  //\n  // This shim can be generated as commonJS (cjs) or an ES module (es). The\n  // default is cjs.\n  //\n  // CJS is useful when you're building in an environment that is tolerant of\n  // mixed CJS and ES modules (like Webpack), because the set of exported names\n  // from the module doesn't need to be known in advance. For this reason, CJS\n  // shims are generated on-demand and are fully-automatic. This is the default\n  // for maximum backward-compatibility.\n  //\n  // ES is useful when you're building in a strict ES module environment (like\n  // Vite). It's fully spec-defined and doesn't suffer interoperability\n  // complexities. The downside is, we can only emit a correct shim for a module\n  // if you tell embroider what set of names it exports. Example:\n\n  // emberExternals: {\n  //   es: [\n  //     // import { first, second  } from \"my-library\";\n  //     ['my-library', ['first', 'second']],\n  //     // import Example from \"my-library/components/example\";\n  //     ['my-library/components/example', ['default']]\n  //   ];\n  // }\n\n  // It is not recommended to use `es` mode without also using\n  // staticEmberSource, because without staticEmberSource ember itself needs\n  // many external shims.\n  //\n  // false means we don't do any external shimming.\n  amdCompatibility?:\n    | false\n    | 'cjs'\n    | {\n        es: [string, string[]][];\n      };\n}\n\nexport function optionsWithDefaults(options?: Options): Required<Options> {\n  let defaults = {\n    staticHelpers: false,\n    staticModifiers: false,\n    staticComponents: false,\n    splitAtRoutes: [],\n    staticAppPaths: [],\n    pluginHints: [],\n    amdCompatibility: 'cjs' as const,\n  };\n  if (options) {\n    return Object.assign(defaults, options);\n  }\n  return defaults;\n}\n"]}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;AA2EA,kDAcC;AAdD,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,IAAI,QAAQ,GAAG;QACb,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,KAAK;QACvB,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;QAClB,WAAW,EAAE,EAAE;QACf,gBAAgB,EAAE,KAAc;KACjC,CAAC;IACF,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC","sourcesContent":["export default interface Options {\n  // When true, we statically resolve all template helpers at build time. This\n  // causes unused helpers to be left out of the build (\"tree shaking\" of\n  // helpers).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticHelpers?: boolean;\n\n  // When true, we statically resolve all modifiers at build time. This\n  // causes unused modifiers to be left out of the build (\"tree shaking\" of\n  // modifiers).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticModifiers?: boolean;\n\n  // When true, we statically resolve all components at build time. This causes\n  // unused components to be left out of the build (\"tree shaking\" of\n  // components).\n  //\n  // Defaults to false, which gives you greater compatibility with classic Ember\n  // apps at the cost of bigger builds.\n  //\n  // Enabling this is a prerequisite for route splitting.\n  staticComponents?: boolean;\n\n  // Enables per-route code splitting. Any route names that match these patterns\n  // will be split out of the initial app payload. If you use this, you must\n  // also add @embroider/router to your app. See [@embroider/router's\n  // README](https://github.com/embroider-build/embroider/blob/main/packages/router/README.md)\n  splitAtRoutes?: (RegExp | string)[];\n\n  // Every file within your application's `app` directory is categorized as a\n  // component, helper, modifier, route, route template, controller, or \"other\".\n  //\n  // This option lets you decide which \"other\" files should be loaded\n  // statically. By default, all \"other\" files will be included in the build and\n  // registered with Ember's runtime loader, because we can't know if somebody\n  // is going to try to access them dynamically via Ember's resolver or AMD\n  // runtime `require`.\n  //\n  // If you know that your files are only ever imported, you can list them here\n  // and then they will only be included exactly where they're needed.\n  //\n  // Provide a list of directories or files relative to `/app`. For example\n  //\n  //     staticAppPaths: ['lib']\n  //\n  // means that everything under your-project/app/lib will be loaded statically.\n  //\n  // This option has no effect on components (which are governed by\n  // staticComponents), helpers (which are governed by staticHelpers), modifiers\n  // (which are governed by staticModifiers) or the route-specific files (routes,\n  // route templates, and controllers which are governed by splitAtRoutes).\n  staticAppPaths?: string[];\n\n  // This is a performance optimization that can help you avoid the \"Your build\n  // is slower because some babel plugins are non-serializable\" penalty. If you\n  // provide the locations of known non-serializable objects, we can discover\n  // them and make them serializable.\n  //\n  // resolve is a list of paths to resolve, in a chain. This lets you resolve\n  // your dependencies' dependencies, like: resolve: ['your-dependency',\n  // 'inner-dependency/lib/transform']\n  //\n  // useMethod optionally lets you pick which property within the module to use.\n  // If not provided, we use the module.exports itself.\n  pluginHints?: { resolve: string[]; useMethod?: string }[];\n}\n\nexport function optionsWithDefaults(options?: Options): Required<Options> {\n  let defaults = {\n    staticHelpers: false,\n    staticModifiers: false,\n    staticComponents: false,\n    splitAtRoutes: [],\n    staticAppPaths: [],\n    pluginHints: [],\n    amdCompatibility: 'cjs' as const,\n  };\n  if (options) {\n    return Object.assign(defaults, options);\n  }\n  return defaults;\n}\n"]}

package/src/virtual-content.d.ts

@@ -1,19 +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 virtualExternalESModule(specifier: string, exports: string[] | undefined): string;
-export declare function virtualExternalCJSModule(specifier: string): string;
-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,12 +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.virtualExternalESModule = virtualExternalESModule;
-exports.virtualExternalCJSModule = virtualExternalCJSModule;
-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");
@@ -16,85 +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 externalESPrefix = '/@embroider/ext-es/';
-const externalCJSPrefix = '/@embroider/ext-cjs/';
+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 cjsExtern = decodeVirtualExternalCJSModule(filename);
-    if (cjsExtern) {
-        return renderCJSExternalShim(cjsExtern);
+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 entrypoint = (0, virtual_entrypoint_1.decodeEntrypoint)(filename);
-    if (entrypoint) {
-        return (0, virtual_entrypoint_1.renderEntrypoint)(resolver, entrypoint);
-    }
-    let routeEntrypoint = (0, virtual_route_entrypoint_1.decodeRouteEntrypoint)(filename);
-    if (routeEntrypoint) {
-        return (0, virtual_route_entrypoint_1.renderRouteEntrypoint)(resolver, routeEntrypoint);
-    }
-    let extern = decodeVirtualExternalESModule(filename);
-    if (extern) {
-        return renderESExternalShim(extern);
-    }
-    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}`);
-}
-const externalESShim = (0, js_handlebars_1.compile)(`
-{{#if (eq moduleName "require")}}
-const m = window.requirejs;
-export default m;
-const has = m.has;
-export { has }
-{{else}}
-const m = window.require("{{{js-string-escape moduleName}}}");
-{{#if default}}
-export default m.default;
-{{/if}}
-{{#if names}}
-const { {{#each names as |name|}}{{name}}, {{/each}} } = m;
-export { {{#each names as |name|}}{{name}}, {{/each}} }
-{{/if}}
-{{/if}}
-`);
-function renderESExternalShim({ moduleName, exports, }) {
-    return {
-        src: externalESShim({
-            moduleName,
-            default: exports.includes('default'),
-            names: exports.filter(n => n !== 'default'),
-        }),
-        watches: [],
-    };
 }
 function pairedComponentShim(params) {
     return {
@@ -104,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";
 
 
@@ -121,99 +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}}
 `);
-function virtualExternalESModule(specifier, exports) {
-    if (exports) {
-        return externalESPrefix + specifier + `/exports=${exports.join(',')}`;
-    }
-    else {
-        return externalESPrefix + specifier;
-    }
-}
-function virtualExternalCJSModule(specifier) {
-    return externalCJSPrefix + specifier;
-}
-function decodeVirtualExternalESModule(filename) {
-    if (filename.startsWith(externalESPrefix)) {
-        let exports = [];
-        let components = filename.split('/exports=');
-        let nameString = components[1];
-        if (nameString) {
-            exports = nameString.split(',');
-        }
-        let moduleName = components[0].slice(externalESPrefix.length);
-        return { moduleName, exports };
-    }
-}
-function decodeVirtualExternalCJSModule(filename) {
-    if (filename.startsWith(externalCJSPrefix)) {
-        return { moduleName: filename.slice(externalCJSPrefix.length) };
-    }
-}
-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: [],
     };
 }
@@ -232,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())) {
@@ -346,41 +200,4 @@ function orderAddons(depA, depB) {
     }
     return depAIdx - depBIdx;
 }
-function renderCJSExternalShim(params) {
-    return {
-        src: renderCJSExternalShimTemplate(params),
-        watches: [],
-    };
-}
-const renderCJSExternalShimTemplate = (0, js_handlebars_1.compile)(`
-module.exports = new Proxy({}, {
-  get(target, prop) {
-
-    {{!- our proxy always presents as ES module so that we can intercept "get('default')" -}}
-    if (prop === '__esModule') {
-      return true;
-    }
-
-    {{#if (eq moduleName "require")}}
-      const m = window.requirejs;
-    {{else}}
-      const m = window.require("{{{js-string-escape moduleName}}}");
-    {{/if}}
-
-    {{!-
-      There are plenty of hand-written AMD defines floating around
-      that lack an __esModule declaration.
-
-      As far as I can tell, Ember's loader was already treating the Boolean(m.default)===true
-      case as a module, so in theory we aren't breaking anything by
-      treating it as such when other packagers come looking.
-    -}}
-    if (prop === 'default' && !m.__esModule && !m.default) {
-      return m;
-    }
-
-    return m[prop];
-  }
-});
-`);
 //# sourceMappingURL=virtual-content.js.map