@embroider/core 3.5.0 → 3.5.1-unstable.1c0f616

package/src/node-resolve.js.map

@@ -0,0 +1 @@
+{"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; extensions: string[] },\n    Resolution<NodeResolution, Error>\n  > = ({ resolver, specifier, fromFile, extensions }) => {\n    return {\n      initialState: {\n        specifier,\n        fromFile,\n        meta: undefined,\n      },\n      adapter: new NodeRequestAdapter(resolver, extensions),\n    };\n  };\n\n  private constructor(private resolver: Resolver, private extensions: string[]) {}\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, this.extensions)) {\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      if (filename.endsWith('.hbs') && !candidate.endsWith('.hbs')) {\n        // Evaluating the `handlebars` NPM package installs a Node extension\n        // that puts `*.hbs` in the automatic search path. But we can't control\n        // its priority, and it's really important to us that `.hbs` cannot\n        // shadow other extensions with higher priority. For example, when both\n        // `.ts` and `.hbs` exist, resolving is supposed to find the `.ts`.\n        //\n        // This covers the case where we found an hbs \"by accident\", when we\n        // weren't actually expecting it.\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\nconst defaultExtensions = ['.hbs.js', '.hbs'];\n\nfunction* candidates(specifier: string, extensions: string[]) {\n  yield specifier;\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 interface NodeResolveOpts {\n  extensions?: string[];\n}\n\nexport async function nodeResolve(\n  resolver: Resolver,\n  specifier: string,\n  fromFile: string,\n  opts?: NodeResolveOpts\n): Promise<NodeResolution | NodeResolutionError> {\n  let request = ModuleRequest.create(NodeRequestAdapter.create, {\n    resolver,\n    fromFile,\n    specifier,\n    extensions: opts?.extensions ?? defaultExtensions,\n  });\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

@@ -55,17 +55,10 @@ export default interface Options {
     staticInvokables?: boolean;
     splitAtRoutes?: (RegExp | string)[];
     staticAppPaths?: string[];
-    skipBabel?: {
-        package: string;
-        semverRange?: string;
-    }[];
     pluginHints?: {
         resolve: string[];
         useMethod?: string;
     }[];
-    amdCompatibility?: false | 'cjs' | {
-        es: [string, string[]][];
-    };
 }
 export type CoreOptionsType = Required<Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>> & Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;
 export declare function optionsWithDefaults(options?: Options): CoreOptionsType;

package/src/options.js

@@ -5,7 +5,6 @@ function optionsWithDefaults(options) {
     let defaults = {
         splitAtRoutes: [],
         staticAppPaths: [],
-        skipBabel: [],
         pluginHints: [],
         amdCompatibility: 'cjs',
     };

package/src/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";;AA+JA,kDAYC;AAZD,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,IAAI,QAAQ,GAAG;QACb,aAAa,EAAE,EAAE;QACjB,cAAc,EAAE,EAAE;QAClB,SAAS,EAAE,EAAE;QACb,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  /**\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticHelpers?: boolean;\n\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticModifiers?: boolean;\n\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticComponents?: boolean;\n\n  /**\n   * When true, we statically resolve all components, modifiers, and helpers (collectively\n   * knows as Invokables) at build time. This causes any unused Invokables to be left out\n   * of the build if they are unused i.e. \"tree shaking\".\n   *\n   * Defaults to false which gives you greater compatibility with classic Ember apps at the\n   * cost of bigger builds.\n   *\n   * This setting takes over from `staticHelpers`, `staticModifiers`, and `staticComponents`\n   * because the Developer Experience was less than ideal if any of these settings did not\n   * agree i.e. they all needed to be true or they all needed to be false.\n   *\n   * Enabling this is a prerequisite for route splitting.\n   */\n  staticInvokables?: 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  // By default, all modules that get imported into the app go through Babel, so\n  // that all code will conform with your Babel targets. This option allows you\n  // to turn Babel off for a particular package. You might need this to work\n  // around a transpiler bug or you might use this as a build-performance\n  // optimization if you've manually verified that a particular package doesn't\n  // need transpilation to be safe in your target browsers.\n  skipBabel?: { package: string; semverRange?: 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 type CoreOptionsType = Required<\n  Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>\n> &\n  Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;\n\nexport function optionsWithDefaults(options?: Options): CoreOptionsType {\n  let defaults = {\n    splitAtRoutes: [],\n    staticAppPaths: [],\n    skipBabel: [],\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":";;AA4GA,kDAWC;AAXD,SAAgB,mBAAmB,CAAC,OAAiB;IACnD,IAAI,QAAQ,GAAG;QACb,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  /**\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticHelpers?: boolean;\n\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticModifiers?: boolean;\n\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   *\n   * @deprecated use staticInvokables instead\n   */\n  staticComponents?: boolean;\n\n  /**\n   * When true, we statically resolve all components, modifiers, and helpers (collectively\n   * knows as Invokables) at build time. This causes any unused Invokables to be left out\n   * of the build if they are unused i.e. \"tree shaking\".\n   *\n   * Defaults to false which gives you greater compatibility with classic Ember apps at the\n   * cost of bigger builds.\n   *\n   * This setting takes over from `staticHelpers`, `staticModifiers`, and `staticComponents`\n   * because the Developer Experience was less than ideal if any of these settings did not\n   * agree i.e. they all needed to be true or they all needed to be false.\n   *\n   * Enabling this is a prerequisite for route splitting.\n   */\n  staticInvokables?: 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 type CoreOptionsType = Required<\n  Omit<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>\n> &\n  Pick<Options, 'staticHelpers' | 'staticModifiers' | 'staticComponents' | 'staticInvokables'>;\n\nexport function optionsWithDefaults(options?: Options): CoreOptionsType {\n  let defaults = {\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/packager.d.ts

@@ -1,4 +1,3 @@
-import type { AppMeta } from '@embroider/shared-internals';
 export interface Variant {
     name: string;
     runtime: 'all' | 'browser' | 'fastboot';
@@ -12,13 +11,6 @@ export interface Packager {
     build(): Promise<void>;
 }
 export declare function applyVariantToBabelConfig(variant: Variant, babelConfig: any): any;
-/**
- * Get the app meta-data for a package
- */
-export declare function getAppMeta(pathToVanillaApp: string): {
-    name: string;
-    "ember-addon": AppMeta;
-};
 /**
  * Get the path to a cache directory in the recommended location
  *

package/src/packager.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyVariantToBabelConfig = applyVariantToBabelConfig;
-exports.getAppMeta = getAppMeta;
 exports.getPackagerCacheDir = getPackagerCacheDir;
 const shared_internals_1 = require("@embroider/shared-internals");
-const fs_extra_1 = require("fs-extra");
 const lodash_1 = require("lodash");
 const path_1 = require("path");
 function applyVariantToBabelConfig(variant, babelConfig) {
@@ -25,13 +23,6 @@ function applyVariantToBabelConfig(variant, babelConfig) {
     }
     return babelConfig;
 }
-/**
- * Get the app meta-data for a package
- */
-function getAppMeta(pathToVanillaApp) {
-    let pkg = JSON.parse((0, fs_extra_1.readFileSync)((0, path_1.join)(pathToVanillaApp, 'package.json'), 'utf8'));
-    return pkg;
-}
 /**
  * Get the path to a cache directory in the recommended location
  *

package/src/packager.js.map

@@ -1 +1 @@
-{"version":3,"file":"packager.js","sourceRoot":"","sources":["packager.ts"],"names":[],"mappings":";;AAwEA,8DAkBC;AAKD,gCAGC;AAOD,kDAEC;AA1GD,kEAAqD;AACrD,uCAAwC;AACxC,mCAAmC;AACnC,+BAA4B;AAoE5B,SAAgB,yBAAyB,CAAC,OAAgB,EAAE,WAAgB;IAC1E,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACnC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC7C,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;QAC3B,CAAC;QACD,IAAI,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CACxC,CAAC,CAAM,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B,CACzE,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,mBAAmB,GAAG,IAAA,kBAAS,EAAC,WAAW,CAAC,CAAC;YACjD,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACnE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC/F,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,gBAAwB;IACjD,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,gBAAgB,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACnF,OAAO,GAA0D,CAAC;AACpE,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAA,WAAI,EAAC,yBAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC","sourcesContent":["import type { AppMeta } from '@embroider/shared-internals';\nimport { tmpdir } from '@embroider/shared-internals';\nimport { readFileSync } from 'fs-extra';\nimport { cloneDeep } from 'lodash';\nimport { join } from 'path';\n\n// This is a collection of flags that convey what kind of build you want. They\n// are intended to be generic across Packagers, and it's up to Packager authors\n// to support each option (or not).\nexport interface Variant {\n  // descriptive name that can be used by the packager to label which output\n  // goes with which variant.\n  name: string;\n\n  // Which runtime should this build work in? Dev builds will typically be \"all\"\n  // because we produce a single build that works in browser and fastboot. But\n  // production builds can be divided into a browser-only variant and a\n  // fastboot-only variant so that each can be separately optimized.\n  //\n  // Note that if you build *only* a fastboot variant, you're unlikely to end up\n  // with any assets that can boot and run in the browser too, so the typical\n  // thing to do is to have to two variants and for the packager to use the\n  // assets from the browser build to generate browser-facing <script> tags in\n  // the output of the fastboot build.\n  runtime: 'all' | 'browser' | 'fastboot';\n\n  // true if this build should be optimized for production, at the cost of\n  // slower builds and/or worse debuggability\n  optimizeForProduction: boolean;\n}\n\nexport interface PackagerConstructor<Options> {\n  new (\n    // where on disk the packager will find the app it's supposed to build. The\n    // app and its addons will necessarily already be in v2 format, which is\n    // what makes a Packager a cleanly separable stage that needs only a small\n    // amount of ember-specific knowledge.\n    inputPath: string,\n    // where the packager should write the packaged app.\n    outputPath: string,\n    // list of active build variants. There is always at least one variant, but\n    // there can be many.\n    //\n    // The main requirement for correctness is that the Packager is required to\n    // apply each variant to the babel and template-compiler configs that it\n    // finds in the app in order to build that variant.\n    //\n    // It is up to each Packager to decide how to combine the output from the\n    // multiple variants. It might choose to just put them in separate\n    // subdirectories of `outputPath`, or it might know how to combine them\n    // correctly into one build that will run each variant under the appropriate\n    // conditions.\n    //\n    // Not all packagers will support all arbitrary combinations of variants.\n    variants: Variant[],\n    // if possible, the packager should direct its console output through this\n    // hook.\n    consoleWrite: (message: string) => void,\n    // A packager can have whatever custom options type it wants here. If the\n    // packager is based on a third-party tool, this is where that tool's\n    // configuration can go.\n    options?: Options\n  ): Packager;\n\n  // a description for this packager that aids debugging & profiling\n  annotation: string;\n}\n\nexport interface Packager {\n  build(): Promise<void>;\n}\n\nexport function applyVariantToBabelConfig(variant: Variant, babelConfig: any) {\n  if (variant.runtime === 'fastboot') {\n    babelConfig = Object.assign({}, babelConfig);\n    if (babelConfig.plugins) {\n      babelConfig.plugins = babelConfig.plugins.slice();\n    } else {\n      babelConfig.plugins = [];\n    }\n    let macroPlugin = babelConfig.plugins.find(\n      (p: any) => Array.isArray(p) && p[1] && p[1].embroiderMacrosConfigMarker\n    );\n    if (macroPlugin) {\n      let modifiedMacroPlugin = cloneDeep(macroPlugin);\n      modifiedMacroPlugin[1].globalConfig.fastboot = { isRunning: true };\n      babelConfig.plugins.splice(babelConfig.plugins.indexOf(macroPlugin), 1, modifiedMacroPlugin);\n    }\n  }\n  return babelConfig;\n}\n\n/**\n * Get the app meta-data for a package\n */\nexport function getAppMeta(pathToVanillaApp: string) {\n  let pkg = JSON.parse(readFileSync(join(pathToVanillaApp, 'package.json'), 'utf8'));\n  return pkg as unknown as { name: string; 'ember-addon': AppMeta };\n}\n\n/**\n * Get the path to a cache directory in the recommended location\n *\n * This ensures they have exactly the same lifetime as some of embroider's own caches.\n */\nexport function getPackagerCacheDir(name: string): string {\n  return join(tmpdir, 'embroider', name);\n}\n"]}
+{"version":3,"file":"packager.js","sourceRoot":"","sources":["packager.ts"],"names":[],"mappings":";;AAsEA,8DAkBC;AAOD,kDAEC;AAjGD,kEAAqD;AACrD,mCAAmC;AACnC,+BAA4B;AAoE5B,SAAgB,yBAAyB,CAAC,OAAgB,EAAE,WAAgB;IAC1E,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QACnC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC7C,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;QAC3B,CAAC;QACD,IAAI,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CACxC,CAAC,CAAM,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B,CACzE,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,mBAAmB,GAAG,IAAA,kBAAS,EAAC,WAAW,CAAC,CAAC;YACjD,mBAAmB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;YACnE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC/F,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC9C,OAAO,IAAA,WAAI,EAAC,yBAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC","sourcesContent":["import { tmpdir } from '@embroider/shared-internals';\nimport { cloneDeep } from 'lodash';\nimport { join } from 'path';\n\n// This is a collection of flags that convey what kind of build you want. They\n// are intended to be generic across Packagers, and it's up to Packager authors\n// to support each option (or not).\nexport interface Variant {\n  // descriptive name that can be used by the packager to label which output\n  // goes with which variant.\n  name: string;\n\n  // Which runtime should this build work in? Dev builds will typically be \"all\"\n  // because we produce a single build that works in browser and fastboot. But\n  // production builds can be divided into a browser-only variant and a\n  // fastboot-only variant so that each can be separately optimized.\n  //\n  // Note that if you build *only* a fastboot variant, you're unlikely to end up\n  // with any assets that can boot and run in the browser too, so the typical\n  // thing to do is to have to two variants and for the packager to use the\n  // assets from the browser build to generate browser-facing <script> tags in\n  // the output of the fastboot build.\n  runtime: 'all' | 'browser' | 'fastboot';\n\n  // true if this build should be optimized for production, at the cost of\n  // slower builds and/or worse debuggability\n  optimizeForProduction: boolean;\n}\n\nexport interface PackagerConstructor<Options> {\n  new (\n    // where on disk the packager will find the app it's supposed to build. The\n    // app and its addons will necessarily already be in v2 format, which is\n    // what makes a Packager a cleanly separable stage that needs only a small\n    // amount of ember-specific knowledge.\n    inputPath: string,\n    // where the packager should write the packaged app.\n    outputPath: string,\n    // list of active build variants. There is always at least one variant, but\n    // there can be many.\n    //\n    // The main requirement for correctness is that the Packager is required to\n    // apply each variant to the babel and template-compiler configs that it\n    // finds in the app in order to build that variant.\n    //\n    // It is up to each Packager to decide how to combine the output from the\n    // multiple variants. It might choose to just put them in separate\n    // subdirectories of `outputPath`, or it might know how to combine them\n    // correctly into one build that will run each variant under the appropriate\n    // conditions.\n    //\n    // Not all packagers will support all arbitrary combinations of variants.\n    variants: Variant[],\n    // if possible, the packager should direct its console output through this\n    // hook.\n    consoleWrite: (message: string) => void,\n    // A packager can have whatever custom options type it wants here. If the\n    // packager is based on a third-party tool, this is where that tool's\n    // configuration can go.\n    options?: Options\n  ): Packager;\n\n  // a description for this packager that aids debugging & profiling\n  annotation: string;\n}\n\nexport interface Packager {\n  build(): Promise<void>;\n}\n\nexport function applyVariantToBabelConfig(variant: Variant, babelConfig: any) {\n  if (variant.runtime === 'fastboot') {\n    babelConfig = Object.assign({}, babelConfig);\n    if (babelConfig.plugins) {\n      babelConfig.plugins = babelConfig.plugins.slice();\n    } else {\n      babelConfig.plugins = [];\n    }\n    let macroPlugin = babelConfig.plugins.find(\n      (p: any) => Array.isArray(p) && p[1] && p[1].embroiderMacrosConfigMarker\n    );\n    if (macroPlugin) {\n      let modifiedMacroPlugin = cloneDeep(macroPlugin);\n      modifiedMacroPlugin[1].globalConfig.fastboot = { isRunning: true };\n      babelConfig.plugins.splice(babelConfig.plugins.indexOf(macroPlugin), 1, modifiedMacroPlugin);\n    }\n  }\n  return babelConfig;\n}\n\n/**\n * Get the path to a cache directory in the recommended location\n *\n * This ensures they have exactly the same lifetime as some of embroider's own caches.\n */\nexport function getPackagerCacheDir(name: string): string {\n  return join(tmpdir, 'embroider', name);\n}\n"]}

package/src/resolver-loader.js

@@ -14,6 +14,7 @@ var _ResolverLoader_resolver, _ResolverLoader_configFile, _ResolverLoader_watche
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolverLoader = void 0;
 const fs_extra_1 = require("fs-extra");
+const module_resolver_options_1 = require("./module-resolver-options");
 const module_resolver_1 = require("./module-resolver");
 const shared_internals_1 = require("@embroider/shared-internals");
 const path_1 = require("path");
@@ -37,7 +38,13 @@ class ResolverLoader {
     }
     get resolver() {
         if (!__classPrivateFieldGet(this, _ResolverLoader_resolver, "f")) {
-            let config = (0, fs_extra_1.readJSONSync)((0, path_1.join)((0, shared_internals_1.locateEmbroiderWorkingDir)(this.appRoot), 'resolver.json'));
+            let config;
+            if ((0, fs_extra_1.existsSync)(__classPrivateFieldGet(this, _ResolverLoader_configFile, "f"))) {
+                config = (0, fs_extra_1.readJSONSync)(__classPrivateFieldGet(this, _ResolverLoader_configFile, "f"));
+            }
+            else {
+                config = (0, module_resolver_options_1.buildResolverOptions)({});
+            }
             __classPrivateFieldSet(this, _ResolverLoader_resolver, new module_resolver_1.Resolver(config), "f");
         }
         return __classPrivateFieldGet(this, _ResolverLoader_resolver, "f");

package/src/resolver-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver-loader.js","sourceRoot":"","sources":["resolver-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAAwC;AAExC,uDAA6C;AAC7C,kEAAwE;AACxE,+BAA4B;AAE5B,2BAAsC;AAEtC,MAAa,cAAc;IAKzB,YAAqB,OAAe,EAAE,KAAK,GAAG,KAAK;QAA9B,YAAO,GAAP,OAAO,CAAQ;QAJpC,2CAAgC;QAChC,6CAAoB;QACpB,0CAAgC;QAG9B,uBAAA,IAAI,8BAAe,IAAA,WAAI,EAAC,IAAA,4CAAyB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,MAAA,CAAC;QAClF,IAAI,KAAK,EAAE,CAAC;YACV,uBAAA,IAAI,2BAAY,IAAA,UAAO,EAAC,uBAAA,IAAI,kCAAY,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE;gBACpE,uBAAA,IAAI,4BAAa,SAAS,MAAA,CAAC;YAC7B,CAAC,CAAC,MAAA,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK;;QACH,MAAA,uBAAA,IAAI,+BAAS,0CAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,CAAC,uBAAA,IAAI,gCAAU,EAAE,CAAC;YACpB,IAAI,MAAM,GAAY,IAAA,uBAAY,EAAC,IAAA,WAAI,EAAC,IAAA,4CAAyB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;YACnG,uBAAA,IAAI,4BAAa,IAAI,0BAAQ,CAAC,MAAM,CAAC,MAAA,CAAC;QACxC,CAAC;QACD,OAAO,uBAAA,IAAI,gCAAU,CAAC;IACxB,CAAC;CACF;AAzBD,wCAyBC","sourcesContent":["import { readJSONSync } from 'fs-extra';\nimport type { Options } from './module-resolver';\nimport { Resolver } from './module-resolver';\nimport { locateEmbroiderWorkingDir } from '@embroider/shared-internals';\nimport { join } from 'path';\nimport type { FSWatcher } from 'fs';\nimport { watch as fsWatch } from 'fs';\n\nexport class ResolverLoader {\n  #resolver: Resolver | undefined;\n  #configFile: string;\n  #watcher: FSWatcher | undefined;\n\n  constructor(readonly appRoot: string, watch = false) {\n    this.#configFile = join(locateEmbroiderWorkingDir(this.appRoot), 'resolver.json');\n    if (watch) {\n      this.#watcher = fsWatch(this.#configFile, { persistent: false }, () => {\n        this.#resolver = undefined;\n      });\n    }\n  }\n\n  close() {\n    this.#watcher?.close();\n  }\n\n  get resolver(): Resolver {\n    if (!this.#resolver) {\n      let config: Options = readJSONSync(join(locateEmbroiderWorkingDir(this.appRoot), 'resolver.json'));\n      this.#resolver = new Resolver(config);\n    }\n    return this.#resolver;\n  }\n}\n"]}
+{"version":3,"file":"resolver-loader.js","sourceRoot":"","sources":["resolver-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAAoD;AACpD,uEAA+E;AAC/E,uDAA6C;AAC7C,kEAAwE;AACxE,+BAA4B;AAE5B,2BAAsC;AAEtC,MAAa,cAAc;IAKzB,YAAqB,OAAe,EAAE,KAAK,GAAG,KAAK;QAA9B,YAAO,GAAP,OAAO,CAAQ;QAJpC,2CAAgC;QAChC,6CAAoB;QACpB,0CAAgC;QAG9B,uBAAA,IAAI,8BAAe,IAAA,WAAI,EAAC,IAAA,4CAAyB,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,MAAA,CAAC;QAClF,IAAI,KAAK,EAAE,CAAC;YACV,uBAAA,IAAI,2BAAY,IAAA,UAAO,EAAC,uBAAA,IAAI,kCAAY,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE;gBACpE,uBAAA,IAAI,4BAAa,SAAS,MAAA,CAAC;YAC7B,CAAC,CAAC,MAAA,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK;;QACH,MAAA,uBAAA,IAAI,+BAAS,0CAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,IAAI,CAAC,uBAAA,IAAI,gCAAU,EAAE,CAAC;YACpB,IAAI,MAAe,CAAC;YACpB,IAAI,IAAA,qBAAU,EAAC,uBAAA,IAAI,kCAAY,CAAC,EAAE,CAAC;gBACjC,MAAM,GAAG,IAAA,uBAAY,EAAC,uBAAA,IAAI,kCAAY,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,IAAA,8CAAoB,EAAC,EAAE,CAAC,CAAC;YACpC,CAAC;YACD,uBAAA,IAAI,4BAAa,IAAI,0BAAQ,CAAC,MAAM,CAAC,MAAA,CAAC;QACxC,CAAC;QACD,OAAO,uBAAA,IAAI,gCAAU,CAAC;IACxB,CAAC;CACF;AA9BD,wCA8BC","sourcesContent":["import { existsSync, readJSONSync } from 'fs-extra';\nimport { buildResolverOptions, type Options } from './module-resolver-options';\nimport { Resolver } from './module-resolver';\nimport { locateEmbroiderWorkingDir } from '@embroider/shared-internals';\nimport { join } from 'path';\nimport type { FSWatcher } from 'fs';\nimport { watch as fsWatch } from 'fs';\n\nexport class ResolverLoader {\n  #resolver: Resolver | undefined;\n  #configFile: string;\n  #watcher: FSWatcher | undefined;\n\n  constructor(readonly appRoot: string, watch = false) {\n    this.#configFile = join(locateEmbroiderWorkingDir(this.appRoot), 'resolver.json');\n    if (watch) {\n      this.#watcher = fsWatch(this.#configFile, { persistent: false }, () => {\n        this.#resolver = undefined;\n      });\n    }\n  }\n\n  close() {\n    this.#watcher?.close();\n  }\n\n  get resolver(): Resolver {\n    if (!this.#resolver) {\n      let config: Options;\n      if (existsSync(this.#configFile)) {\n        config = readJSONSync(this.#configFile);\n      } else {\n        config = buildResolverOptions({});\n      }\n      this.#resolver = new Resolver(config);\n    }\n    return this.#resolver;\n  }\n}\n"]}

package/src/virtual-content.d.ts

@@ -1,15 +1,35 @@
 import type { Resolver } from '.';
-export declare function virtualContent(filename: string, resolver: Resolver): string;
-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 | null): 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): {
+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 | TemplateOnlyComponentResponse);
+export interface VirtualContentResult {
+    src: string;
+    watches: 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 interface TemplateOnlyComponentResponse {
+    type: 'template-only-component-js';
+    specifier: string;
+}
+export {};

package/src/virtual-content.js

@@ -1,71 +1,59 @@
 "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");
-const externalESPrefix = '/@embroider/ext-es/';
-const externalCJSPrefix = '/@embroider/ext-cjs/';
+const virtual_test_support_1 = require("./virtual-test-support");
+const virtual_test_support_styles_1 = require("./virtual-test-support-styles");
+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 cjsExtern = decodeVirtualExternalCJSModule(filename);
-    if (cjsExtern) {
-        return renderCJSExternalShim(cjsExtern);
-    }
-    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 fastbootSwitchTemplate(fb);
-    }
-    let im = decodeImplicitModules(filename);
-    if (im) {
-        return renderImplicitModules(im, 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 externalESShim({
-        moduleName,
-        default: exports.includes('default'),
-        names: exports.filter(n => n !== 'default'),
-    });
+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);
+        case 'template-only-component-js':
+            return renderTemplateOnlyComponent(response);
+        default:
+            throw (0, assert_never_1.default)(response);
+    }
+}
+function pairedComponentShim(params) {
+    return {
+        src: pairedComponentShimTemplate(params),
+        watches: [],
+    };
 }
-const pairedComponentShim = (0, js_handlebars_1.compile)(`
+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,96 +70,23 @@ 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 url = new URL(filename.slice(externalESPrefix.length), 'http://example.com');
-        let nameString = url.searchParams.get('exports');
-        if (nameString) {
-            exports = nameString.split(',');
-        }
-        let moduleName = url.pathname.slice(1);
-        return { moduleName, exports };
-    }
-}
-function decodeVirtualExternalCJSModule(filename) {
-    if (filename.startsWith(externalCJSPrefix)) {
-        return { moduleName: filename.slice(externalCJSPrefix.length) };
-    }
-}
-const pairComponentMarker = '-embroider-pair-component';
-const pairComponentPattern = /^(?<hbsModule>.*)\/(?<jsModule>[^\/]*)-embroider-pair-component$/;
-function virtualPairComponent(hbsModule, jsModule) {
-    let relativeJSModule = '';
-    if (jsModule) {
-        relativeJSModule = (0, _1.explicitRelative)(hbsModule, jsModule);
-    }
-    return `${hbsModule}/${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);
+function renderFastbootSwitchTemplate(params) {
     return {
-        relativeHBSModule,
-        relativeJSModule: decodeURIComponent(jsModule) || null,
-        debugName: (0, path_1.basename)(relativeHBSModule).replace(/\.(js|hbs)$/, ''),
+        src: fastbootSwitchTemplate({
+            names: [...params.names].filter(name => name !== 'default'),
+            hasDefaultExport: params.names.has('default'),
+        }),
+        watches: [],
     };
 }
-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,
-        };
-    }
-}
 const fastbootSwitchTemplate = (0, js_handlebars_1.compile)(`
 import { macroCondition, getGlobalConfig, importSync } from '@embroider/macros';
 let mod;
@@ -187,28 +102,14 @@ 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())) {
         throw new Error(`bug: saw special implicit modules import in non-ember package at ${fromFile}`);
     }
-    let lazyModules = [];
-    let eagerModules = [];
+    let ownModules = [];
+    let dependencyModules = [];
     let deps = pkg.dependencies.sort(orderAddons);
     for (let dep of deps) {
         // anything that isn't a v2 ember package by this point is not an active
@@ -241,7 +142,7 @@ function renderImplicitModules({ type, fromFile, }, resolver) {
                     runtime = renamedModules[runtimeRenameLookup];
                 }
                 runtime = runtime.split(path_1.sep).join('/');
-                lazyModules.push({
+                ownModules.push({
                     runtime,
                     buildtime: path_1.posix.join(packageName, name),
                 });
@@ -250,20 +151,32 @@ function renderImplicitModules({ type, fromFile, }, resolver) {
         // we don't recurse across an engine boundary. Engines import their own
         // implicit-modules.
         if (!dep.isEngine()) {
-            eagerModules.push(path_1.posix.join(dep.name, `-embroider-${type}.js`));
+            dependencyModules.push(path_1.posix.join(dep.name, `-embroider-${type}.js`));
         }
     }
-    return implicitModulesTemplate({ lazyModules, eagerModules });
+    return { src: implicitModulesTemplate({ ownModules, dependencyModules }), watches: [] };
 }
 const implicitModulesTemplate = (0, js_handlebars_1.compile)(`
-import { importSync as i } from '@embroider/macros';
-let d = window.define;
-{{#each lazyModules as |module|}}
-d("{{js-string-escape module.runtime}}", function(){ return i("{{js-string-escape module.buildtime}}");});
+
+
+{{#each dependencyModules as |module index|}}
+  import dep{{index}} from "{{js-string-escape module}}";
 {{/each}}
-{{#each eagerModules as |module|}}
-import "{{js-string-escape module}}";
+
+{{#each ownModules as |module index|}}
+  import * as own{{index}} from "{{js-string-escape module.buildtime}}";
 {{/each}}
+
+export default Object.assign({},
+  {{#each dependencyModules as |module index|}}
+    dep{{index}},
+  {{/each}}
+  {
+    {{#each ownModules as |module index|}}
+      "{{js-string-escape module.runtime}}": own{{index}},
+    {{/each}}
+  }
+);
 `);
 // meta['renamed-modules'] has mapping from classic filename to real filename.
 // This takes that and converts it to the inverst mapping from real import path
@@ -289,26 +202,12 @@ function orderAddons(depA, depB) {
     }
     return depAIdx - depBIdx;
 }
-const renderCJSExternalShim = (0, js_handlebars_1.compile)(`
-{{#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 this, and they will break when other build systems
-  encounter them.
-
-  As far as I can tell, Ember's loader was already treating this
-  case as a module, so in theory we aren't breaking anything by
-  marking it as such when other packagers come looking.
-
-  todo: get review on this part.
--}}
-if (m.default && !m.__esModule) {
-  m.__esModule = true;
+function renderTemplateOnlyComponent({ specifier }) {
+    let watches = [specifier];
+    let hbs = (0, _1.syntheticJStoHBS)(specifier);
+    if (hbs) {
+        watches.push(hbs);
+    }
+    return { src: (0, _1.templateOnlyComponentSource)(), watches };
 }
-module.exports = m;
-`);
 //# sourceMappingURL=virtual-content.js.map