@embroider/core 4.4.7 → 4.5.0

package/dist/src/app-files.js

@@ -3,6 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppFiles = void 0;
 const path_1 = require("path");
 class AppFiles {
+    engine;
+    components;
+    helpers;
+    modifiers;
+    perRoute;
+    otherAppFiles;
+    isFastbootOnly;
+    fastbootFiles;
     constructor(engine, appFiles, fastbootFiles, resolvableExtensions, staticAppPathsPattern, podModulePrefix) {
         this.engine = engine;
         let components = [];

package/dist/src/app-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-files.js","sourceRoot":"","sources":["../../src/app-files.ts"],"names":[],"mappings":"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","sourcesContent":["import { sep } from 'path';\nimport type { Package, AddonPackage } from '@embroider/shared-internals';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n  readonly fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n\n  constructor(\n    readonly engine: Engine,\n    appFiles: Set<string>,\n    fastbootFiles: Set<string>,\n    resolvableExtensions: RegExp,\n    staticAppPathsPattern: RegExp | undefined,\n    podModulePrefix?: string\n  ) {\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n\n    let combinedFiles = new Map<string, string>();\n    let combinedNonFastbootFiles = new Map<string, string>();\n\n    function add(map: Map<string, string>, filename: string): void {\n      if (!resolvableExtensions.test(filename)) {\n        return;\n      }\n\n      if (/\\.d\\.ts$/.test(filename)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        return;\n      }\n\n      filename = filename.split(sep).join('/');\n\n      let extensionless = filename.replace(resolvableExtensions, '');\n      let prior = map.get(extensionless);\n\n      if (!prior) {\n        // no prior, so we win\n        map.set(extensionless, filename);\n      } else if (prior.startsWith('components/') && prior.endsWith('.hbs') && !prior.endsWith('/template.hbs')) {\n        // The prior entry in combinedFiles is a colocated hbs component. The\n        // name \"template.hbs\" is special in the template colocation rules due\n        // to earlier pods patterns.\n        //\n        // colocated hbs never wins over the corresponding other resolvable js\n        // or ts.\n        map.set(extensionless, filename);\n      }\n    }\n\n    for (let f of appFiles) {\n      add(combinedFiles, f);\n      add(combinedNonFastbootFiles, f);\n    }\n    for (let f of fastbootFiles) {\n      add(combinedFiles, f);\n    }\n\n    for (let addon of engine.addons.keys()) {\n      let appJS = addon.meta['app-js'];\n      if (appJS) {\n        for (let filename of Object.keys(appJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          add(combinedFiles, filename);\n          add(combinedNonFastbootFiles, filename);\n        }\n      }\n\n      let fastbootJS = addon.meta['fastboot-js'];\n      if (fastbootJS) {\n        for (let filename of Object.keys(fastbootJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          add(combinedFiles, filename);\n        }\n      }\n    }\n\n    let isFastbootOnly = new Map<string, boolean>();\n    for (let [extensionless, relativePath] of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(extensionless));\n\n      if (relativePath.startsWith('tests/')) {\n        // skip tests because they are dealt with separately\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are not resolvable when they're used via co-location with\n        // an associated js file because it's the js that is resolvable.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        let isHbs = relativePath.endsWith('.hbs');\n        if (!isHbs || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        } else if (isHbs) {\n          // template-only components will be compiled as js files during the\n          // build process, so we push a virtual path to js in the list of files\n          // because the resolver will be able to recognize a template-only and\n          // give a correct answer in the end.\n          let jsPath = relativePath.replace(/\\.hbs$/, '.js');\n          components.push(jsPath);\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix)) ||\n        this.handleClassicRouteFile(relativePath)\n      ) {\n        continue;\n      }\n\n      if (staticAppPathsPattern) {\n        if (!staticAppPathsPattern.test(relativePath)) {\n          otherAppFiles.push(relativePath);\n        }\n      } else {\n        otherAppFiles.push(relativePath);\n      }\n    }\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n    this.isFastbootOnly = isFastbootOnly;\n\n    // this deliberately only describes the app's fastboot files. Not the full\n    // merge from all the addons. This is because they need different handling\n    // in the module resolver -- addon fastboot files can always be a\n    // fallbackResolve, because if the app happens to define the same name\n    // (whether fastboot-specific or just browser) that wins over the addon.\n    // Whereas if the app itself defines a fastbot-specific version of a file,\n    // that must take precedence over the *normal* resolution, and must be\n    // implemented in beforeResolve.\n    this.fastbootFiles = Object.fromEntries(\n      [...fastbootFiles].map(name => [\n        `./${name}`,\n        {\n          localFilename: `./_fastboot_/${name}`,\n          shadowedFilename: appFiles.has(name) ? `./${name}` : undefined,\n        },\n      ])\n    );\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface Engine {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine. For each one we keep track of a file that can resolve the addon, because we'll need that later.\n  addons: Map<AddonPackage, string>;\n  // is this the top-level engine?\n  isApp: boolean;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // TODO: remove this after we remove the stage2 entrypoint\n  appRelativePath: string;\n}\n"]}
+{"version":3,"file":"app-files.js","sourceRoot":"","sources":["../../src/app-files.ts"],"names":[],"mappings":"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","sourcesContent":["import { sep } from 'path';\nimport type { Package, AddonPackage } from '@embroider/shared-internals';\n\nexport interface RouteFiles {\n  route?: string;\n  template?: string;\n  controller?: string;\n  children: Map<string, RouteFiles>;\n}\n\nexport class AppFiles {\n  readonly components: ReadonlyArray<string>;\n  readonly helpers: ReadonlyArray<string>;\n  readonly modifiers: ReadonlyArray<string>;\n  private perRoute: RouteFiles;\n  readonly otherAppFiles: ReadonlyArray<string>;\n  readonly isFastbootOnly: Map<string, boolean>;\n  readonly fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n\n  constructor(\n    readonly engine: Engine,\n    appFiles: Set<string>,\n    fastbootFiles: Set<string>,\n    resolvableExtensions: RegExp,\n    staticAppPathsPattern: RegExp | undefined,\n    podModulePrefix?: string\n  ) {\n    let components: string[] = [];\n    let helpers: string[] = [];\n    let modifiers: string[] = [];\n    let otherAppFiles: string[] = [];\n    this.perRoute = { children: new Map() };\n\n    let combinedFiles = new Map<string, string>();\n    let combinedNonFastbootFiles = new Map<string, string>();\n\n    function add(map: Map<string, string>, filename: string): void {\n      if (!resolvableExtensions.test(filename)) {\n        return;\n      }\n\n      if (/\\.d\\.ts$/.test(filename)) {\n        // .d.ts files are technically \"*.ts\" files but aren't really and we\n        // don't want to include them when we crawl through the app.\n        return;\n      }\n\n      filename = filename.split(sep).join('/');\n\n      let extensionless = filename.replace(resolvableExtensions, '');\n      let prior = map.get(extensionless);\n\n      if (!prior) {\n        // no prior, so we win\n        map.set(extensionless, filename);\n      } else if (prior.startsWith('components/') && prior.endsWith('.hbs') && !prior.endsWith('/template.hbs')) {\n        // The prior entry in combinedFiles is a colocated hbs component. The\n        // name \"template.hbs\" is special in the template colocation rules due\n        // to earlier pods patterns.\n        //\n        // colocated hbs never wins over the corresponding other resolvable js\n        // or ts.\n        map.set(extensionless, filename);\n      }\n    }\n\n    for (let f of appFiles) {\n      add(combinedFiles, f);\n      add(combinedNonFastbootFiles, f);\n    }\n    for (let f of fastbootFiles) {\n      add(combinedFiles, f);\n    }\n\n    for (let addon of engine.addons.keys()) {\n      let appJS = addon.meta['app-js'];\n      if (appJS) {\n        for (let filename of Object.keys(appJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          add(combinedFiles, filename);\n          add(combinedNonFastbootFiles, filename);\n        }\n      }\n\n      let fastbootJS = addon.meta['fastboot-js'];\n      if (fastbootJS) {\n        for (let filename of Object.keys(fastbootJS)) {\n          filename = filename.replace(/^\\.\\//, '');\n          add(combinedFiles, filename);\n        }\n      }\n    }\n\n    let isFastbootOnly = new Map<string, boolean>();\n    for (let [extensionless, relativePath] of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(extensionless));\n\n      if (relativePath.startsWith('tests/')) {\n        // skip tests because they are dealt with separately\n        continue;\n      }\n\n      if (relativePath.startsWith('components/')) {\n        // hbs files are not resolvable when they're used via co-location with\n        // an associated js file because it's the js that is resolvable.\n        // An hbs file is used via colocation when it's inside the components\n        // directory, and also not named \"template.hbs\" (because that is an\n        // older pattern used with pods-like layouts).\n        let isHbs = relativePath.endsWith('.hbs');\n        if (!isHbs || relativePath.endsWith('/template.hbs')) {\n          components.push(relativePath);\n        } else if (isHbs) {\n          // template-only components will be compiled as js files during the\n          // build process, so we push a virtual path to js in the list of files\n          // because the resolver will be able to recognize a template-only and\n          // give a correct answer in the end.\n          let jsPath = relativePath.replace(/\\.hbs$/, '.js');\n          components.push(jsPath);\n        }\n        continue;\n      }\n\n      if (relativePath.startsWith('templates/components/')) {\n        components.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('helpers/')) {\n        helpers.push(relativePath);\n        continue;\n      }\n\n      if (relativePath.startsWith('modifiers/')) {\n        modifiers.push(relativePath);\n        continue;\n      }\n\n      if (\n        (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix)) ||\n        this.handleClassicRouteFile(relativePath)\n      ) {\n        continue;\n      }\n\n      if (staticAppPathsPattern) {\n        if (!staticAppPathsPattern.test(relativePath)) {\n          otherAppFiles.push(relativePath);\n        }\n      } else {\n        otherAppFiles.push(relativePath);\n      }\n    }\n    this.components = components;\n    this.helpers = helpers;\n    this.modifiers = modifiers;\n    this.otherAppFiles = otherAppFiles;\n    this.isFastbootOnly = isFastbootOnly;\n\n    // this deliberately only describes the app's fastboot files. Not the full\n    // merge from all the addons. This is because they need different handling\n    // in the module resolver -- addon fastboot files can always be a\n    // fallbackResolve, because if the app happens to define the same name\n    // (whether fastboot-specific or just browser) that wins over the addon.\n    // Whereas if the app itself defines a fastbot-specific version of a file,\n    // that must take precedence over the *normal* resolution, and must be\n    // implemented in beforeResolve.\n    this.fastbootFiles = Object.fromEntries(\n      [...fastbootFiles].map(name => [\n        `./${name}`,\n        {\n          localFilename: `./_fastboot_/${name}`,\n          shadowedFilename: appFiles.has(name) ? `./${name}` : undefined,\n        },\n      ])\n    );\n  }\n\n  private handleClassicRouteFile(relativePath: string): boolean {\n    let [prefix, ...rest] = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    if (!['controllers', 'templates', 'routes'].includes(prefix)) {\n      return false;\n    }\n    let type = prefix.slice(0, -1) as 'controller' | 'template' | 'route';\n    let cursor = this.perRoute;\n    for (let part of rest) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type] = relativePath;\n    return true;\n  }\n\n  private handlePodsRouteFile(relativePath: string, podModulePrefix: string): boolean {\n    let parts = relativePath.replace(/\\.\\w{1,3}$/, '').split('/');\n    let type = parts.pop();\n    if (!type || !['controller', 'template', 'route'].includes(type)) {\n      return false;\n    }\n    let podParts = podModulePrefix.split('/');\n    // The first part of podModulePrefix is the app's package name\n    podParts.shift();\n\n    for (let podPart of podParts) {\n      if (parts.shift() !== podPart) {\n        return false;\n      }\n    }\n\n    let cursor = this.perRoute;\n    for (let part of parts) {\n      let child = cursor.children.get(part);\n      if (child) {\n        cursor = child;\n      } else {\n        let newEntry = { children: new Map() };\n        cursor.children.set(part, newEntry);\n        cursor = newEntry;\n      }\n    }\n    cursor[type as 'controller' | 'template' | 'route'] = relativePath;\n    return true;\n  }\n\n  get routeFiles(): Readonly<RouteFiles> {\n    return this.perRoute;\n  }\n}\n\nexport interface Engine {\n  // the engine's own package\n  package: Package;\n  // the set of active addons in the engine. For each one we keep track of a file that can resolve the addon, because we'll need that later.\n  addons: Map<AddonPackage, string>;\n  // is this the top-level engine?\n  isApp: boolean;\n  // runtime name for the engine's own module namespace\n  modulePrefix: string;\n  // TODO: remove this after we remove the stage2 entrypoint\n  appRelativePath: string;\n}\n"]}

package/dist/src/html-entrypoint.js

@@ -12,15 +12,20 @@ const partition_1 = __importDefault(require("lodash/partition"));
 const zip_1 = __importDefault(require("lodash/zip"));
 const html_placeholder_1 = __importDefault(require("./html-placeholder"));
 class HTMLEntrypoint {
+    pathToVanillaApp;
+    rootURL;
+    publicAssetURL;
+    filename;
+    dom;
+    placeholders = new Map();
+    modules = [];
+    scripts = [];
+    styles = [];
     constructor(pathToVanillaApp, rootURL, publicAssetURL, filename) {
         this.pathToVanillaApp = pathToVanillaApp;
         this.rootURL = rootURL;
         this.publicAssetURL = publicAssetURL;
         this.filename = filename;
-        this.placeholders = new Map();
-        this.modules = [];
-        this.scripts = [];
-        this.styles = [];
         this.dom = new jsdom_1.JSDOM((0, fs_extra_1.readFileSync)((0, path_1.join)(this.pathToVanillaApp, this.filename), 'utf8'));
         for (let tag of this.handledStyles()) {
             let styleTag = tag;
@@ -100,7 +105,7 @@ class HTMLEntrypoint {
                             // fastboot always loads scripts from. If there's no
                             // fastboot-specific variant, fastboot loads the base variant, but
                             // still from rootURL rather than publicAssetURL.
-                            fastboot = this.rootURL + (fastboot !== null && fastboot !== void 0 ? fastboot : base);
+                            fastboot = this.rootURL + (fastboot ?? base);
                         }
                         if (base) {
                             // the browser version gets prefixed with the publicAssetURL

package/dist/src/html-entrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"html-entrypoint.js","sourceRoot":"","sources":["../../src/html-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOrCreate } from '@embroider/shared-internals';\nimport { readFileSync } from 'fs-extra';\nimport { join } from 'path';\nimport { JSDOM } from 'jsdom';\nimport partition from 'lodash/partition';\nimport zip from 'lodash/zip';\nimport Placeholder from './html-placeholder';\nimport type { Variant } from './packager';\n\nexport class HTMLEntrypoint {\n  private dom: JSDOM;\n  private placeholders: Map<string, Placeholder[]> = new Map();\n  modules: string[] = [];\n  scripts: string[] = [];\n  styles: string[] = [];\n\n  constructor(\n    private pathToVanillaApp: string,\n    private rootURL: string,\n    private publicAssetURL: string,\n    public filename: string\n  ) {\n    this.dom = new JSDOM(readFileSync(join(this.pathToVanillaApp, this.filename), 'utf8'));\n\n    for (let tag of this.handledStyles()) {\n      let styleTag = tag as HTMLLinkElement;\n      let href = styleTag.href;\n      if (!isAbsoluteURL(href)) {\n        let url = this.relativeToApp(href);\n        this.styles.push(url);\n        let placeholder = new Placeholder(styleTag);\n        let list = getOrCreate(this.placeholders, url, () => []);\n        list.push(placeholder);\n      }\n    }\n\n    for (let scriptTag of this.handledScripts()) {\n      // scriptTag.src include rootURL. Convert it to be relative to the app.\n      let src = this.relativeToApp(scriptTag.src);\n\n      if (scriptTag.type === 'module') {\n        this.modules.push(src);\n      } else {\n        this.scripts.push(src);\n      }\n\n      let placeholder = new Placeholder(scriptTag);\n      let list = getOrCreate(this.placeholders, src, () => []);\n      list.push(placeholder);\n    }\n  }\n\n  private relativeToApp(rootRelativeURL: string) {\n    return rootRelativeURL.replace(this.rootURL, '');\n  }\n\n  private handledScripts() {\n    let scriptTags = [...this.dom.window.document.querySelectorAll('script')] as HTMLScriptElement[];\n    let [ignoredScriptTags, handledScriptTags] = partition(scriptTags, scriptTag => {\n      return !scriptTag.src || scriptTag.hasAttribute('data-embroider-ignore') || isAbsoluteURL(scriptTag.src);\n    });\n    for (let scriptTag of ignoredScriptTags) {\n      scriptTag.removeAttribute('data-embroider-ignore');\n    }\n    return handledScriptTags;\n  }\n\n  private handledStyles() {\n    let styleTags = [...this.dom.window.document.querySelectorAll('link[rel*=\"stylesheet\"]')] as HTMLLinkElement[];\n    let [ignoredStyleTags, handledStyleTags] = partition(styleTags, styleTag => {\n      return !styleTag.href || styleTag.hasAttribute('data-embroider-ignore') || isAbsoluteURL(styleTag.href);\n    });\n    for (let styleTag of ignoredStyleTags) {\n      styleTag.removeAttribute('data-embroider-ignore');\n    }\n    return handledStyleTags;\n  }\n\n  // bundles maps from input asset to a per-variant map of output assets\n  render(stats: BundleSummary): string {\n    let insertedLazy = new Set<string>();\n    let fastbootVariant = stats.variants.findIndex(v => Boolean(v.runtime === 'fastboot'));\n    let supportsFastboot = stats.variants.some(v => v.runtime === 'fastboot' || v.runtime === 'all');\n\n    for (let [src, placeholders] of this.placeholders) {\n      let match = stats.entrypoints.get(src);\n      if (match) {\n        let firstVariant = stats.variants.findIndex((_, index) => Boolean(match!.get(index)));\n        let matchingBundles = match.get(firstVariant)!;\n        let matchingFastbootBundles = fastbootVariant >= 0 ? match.get(fastbootVariant) || [] : [];\n\n        for (let placeholder of placeholders) {\n          placeholder.clear();\n          if (supportsFastboot && placeholder.isScript()) {\n            // if there is any fastboot involved, we will emit the lazy bundles\n            // right before our first script.\n\n            let lazyMatch = stats.lazyBundles.get(src);\n            if (lazyMatch && !insertedLazy.has(src)) {\n              insertLazyJavascript(lazyMatch, placeholder, this.rootURL);\n              insertLazyStyles(lazyMatch, placeholder, this.publicAssetURL);\n              insertedLazy.add(src);\n            }\n          }\n          for (let [base, fastboot] of zip(matchingBundles, matchingFastbootBundles)) {\n            if (supportsFastboot) {\n              // the fastboot version gets prefixed with the rootURL, which\n              // points to our local build directory, because that's where\n              // fastboot always loads scripts from. If there's no\n              // fastboot-specific variant, fastboot loads the base variant, but\n              // still from rootURL rather than publicAssetURL.\n              fastboot = this.rootURL + (fastboot ?? base);\n            }\n\n            if (base) {\n              // the browser version gets prefixed with the publicAssetURL\n              // because that's where browsers will load it from\n              base = this.publicAssetURL + base;\n            }\n\n            if (!base) {\n              // this bundle only exists in the fastboot variant\n              let element = placeholder.start.ownerDocument.createElement('fastboot-script');\n              element.setAttribute('src', fastboot!);\n              placeholder.insert(element);\n              placeholder.insertNewline();\n            } else if (!fastboot) {\n              // no fastboot variant\n              placeholder.insertURL(base);\n            } else if (fastboot === base) {\n              // fastboot variant happens to be exactly the same bundle as base\n              // (and publicAssetURL===rootURL), so a plain script tag covers\n              // both\n              placeholder.insertURL(base);\n            } else {\n              // we have both and they differ\n              let element = placeholder.insertURL(base);\n              if (element) {\n                element.setAttribute('data-fastboot-src', fastboot);\n              }\n            }\n          }\n        }\n      } else {\n        // no match means keep the original HTML content for this placeholder.\n        // (If we really wanted it empty instead, there would be matchingBundles\n        // and it would be an empty list.)\n        for (let placeholder of placeholders) {\n          placeholder.reset();\n        }\n      }\n    }\n    return this.dom.serialize();\n  }\n}\n\nexport interface BundleSummary {\n  // entrypoints.get(inputAsset).get(variantIndex) === outputAssets\n  //\n  // these are the output assets that are needed eagerly to boot the given input\n  // asset\n  entrypoints: Map<string, Map<number, string[]>>;\n\n  // lazyBundles.get(inputAsset) === lazyOutputAssets\n  //\n  // these are the output assets that might be loaded lazyily at runtime by the\n  // given input asset.\n  //\n  // These are tracked specifically for the fastboot variant, because that's\n  // where we need to be responsble for them.\n  lazyBundles: Map<string, string[]>;\n\n  variants: Variant[];\n}\n\nfunction isAbsoluteURL(url: string) {\n  return /^(?:[a-z]+:)?\\/\\//i.test(url);\n}\n\n// we (somewhat arbitrarily) decide to put the lazy javascript bundles before\n// the very first <script> that we have rewritten\nfunction insertLazyJavascript(lazyBundles: string[], placeholder: Placeholder, rootURL: string) {\n  for (let bundle of lazyBundles) {\n    if (bundle.endsWith('.js')) {\n      let element = placeholder.start.ownerDocument.createElement('fastboot-script');\n      // we're using rootURL instead of publicAssetURL here because\n      // <fastboot-script> is executed by fastboot, which always loads them from\n      // the local build directory. NOT from the publicAssetURL that browsers\n      // will use, which could be a CDN.\n      element.setAttribute('src', rootURL + bundle);\n      placeholder.insert(element);\n      placeholder.insertNewline();\n    }\n  }\n}\n\nfunction insertLazyStyles(lazyBundles: string[], placeholder: Placeholder, publicAssetURL: string) {\n  for (let bundle of lazyBundles) {\n    if (bundle.endsWith('.css')) {\n      let element = placeholder.start.ownerDocument.createElement('link');\n      element.setAttribute('href', publicAssetURL + bundle);\n      element.setAttribute('rel', 'stylesheet');\n      placeholder.insert(element);\n      placeholder.insertNewline();\n    }\n  }\n}\n"]}
+{"version":3,"file":"html-entrypoint.js","sourceRoot":"","sources":["../../src/html-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import { getOrCreate } from '@embroider/shared-internals';\nimport { readFileSync } from 'fs-extra';\nimport { join } from 'path';\nimport { JSDOM } from 'jsdom';\nimport partition from 'lodash/partition';\nimport zip from 'lodash/zip';\nimport Placeholder from './html-placeholder';\nimport type { Variant } from './packager';\n\nexport class HTMLEntrypoint {\n  private dom: JSDOM;\n  private placeholders: Map<string, Placeholder[]> = new Map();\n  modules: string[] = [];\n  scripts: string[] = [];\n  styles: string[] = [];\n\n  constructor(\n    private pathToVanillaApp: string,\n    private rootURL: string,\n    private publicAssetURL: string,\n    public filename: string\n  ) {\n    this.dom = new JSDOM(readFileSync(join(this.pathToVanillaApp, this.filename), 'utf8'));\n\n    for (let tag of this.handledStyles()) {\n      let styleTag = tag as HTMLLinkElement;\n      let href = styleTag.href;\n      if (!isAbsoluteURL(href)) {\n        let url = this.relativeToApp(href);\n        this.styles.push(url);\n        let placeholder = new Placeholder(styleTag);\n        let list = getOrCreate(this.placeholders, url, () => []);\n        list.push(placeholder);\n      }\n    }\n\n    for (let scriptTag of this.handledScripts()) {\n      // scriptTag.src include rootURL. Convert it to be relative to the app.\n      let src = this.relativeToApp(scriptTag.src);\n\n      if (scriptTag.type === 'module') {\n        this.modules.push(src);\n      } else {\n        this.scripts.push(src);\n      }\n\n      let placeholder = new Placeholder(scriptTag);\n      let list = getOrCreate(this.placeholders, src, () => []);\n      list.push(placeholder);\n    }\n  }\n\n  private relativeToApp(rootRelativeURL: string) {\n    return rootRelativeURL.replace(this.rootURL, '');\n  }\n\n  private handledScripts() {\n    let scriptTags = [...this.dom.window.document.querySelectorAll('script')] as HTMLScriptElement[];\n    let [ignoredScriptTags, handledScriptTags] = partition(scriptTags, scriptTag => {\n      return !scriptTag.src || scriptTag.hasAttribute('data-embroider-ignore') || isAbsoluteURL(scriptTag.src);\n    });\n    for (let scriptTag of ignoredScriptTags) {\n      scriptTag.removeAttribute('data-embroider-ignore');\n    }\n    return handledScriptTags;\n  }\n\n  private handledStyles() {\n    let styleTags = [...this.dom.window.document.querySelectorAll('link[rel*=\"stylesheet\"]')] as HTMLLinkElement[];\n    let [ignoredStyleTags, handledStyleTags] = partition(styleTags, styleTag => {\n      return !styleTag.href || styleTag.hasAttribute('data-embroider-ignore') || isAbsoluteURL(styleTag.href);\n    });\n    for (let styleTag of ignoredStyleTags) {\n      styleTag.removeAttribute('data-embroider-ignore');\n    }\n    return handledStyleTags;\n  }\n\n  // bundles maps from input asset to a per-variant map of output assets\n  render(stats: BundleSummary): string {\n    let insertedLazy = new Set<string>();\n    let fastbootVariant = stats.variants.findIndex(v => Boolean(v.runtime === 'fastboot'));\n    let supportsFastboot = stats.variants.some(v => v.runtime === 'fastboot' || v.runtime === 'all');\n\n    for (let [src, placeholders] of this.placeholders) {\n      let match = stats.entrypoints.get(src);\n      if (match) {\n        let firstVariant = stats.variants.findIndex((_, index) => Boolean(match!.get(index)));\n        let matchingBundles = match.get(firstVariant)!;\n        let matchingFastbootBundles = fastbootVariant >= 0 ? match.get(fastbootVariant) || [] : [];\n\n        for (let placeholder of placeholders) {\n          placeholder.clear();\n          if (supportsFastboot && placeholder.isScript()) {\n            // if there is any fastboot involved, we will emit the lazy bundles\n            // right before our first script.\n\n            let lazyMatch = stats.lazyBundles.get(src);\n            if (lazyMatch && !insertedLazy.has(src)) {\n              insertLazyJavascript(lazyMatch, placeholder, this.rootURL);\n              insertLazyStyles(lazyMatch, placeholder, this.publicAssetURL);\n              insertedLazy.add(src);\n            }\n          }\n          for (let [base, fastboot] of zip(matchingBundles, matchingFastbootBundles)) {\n            if (supportsFastboot) {\n              // the fastboot version gets prefixed with the rootURL, which\n              // points to our local build directory, because that's where\n              // fastboot always loads scripts from. If there's no\n              // fastboot-specific variant, fastboot loads the base variant, but\n              // still from rootURL rather than publicAssetURL.\n              fastboot = this.rootURL + (fastboot ?? base);\n            }\n\n            if (base) {\n              // the browser version gets prefixed with the publicAssetURL\n              // because that's where browsers will load it from\n              base = this.publicAssetURL + base;\n            }\n\n            if (!base) {\n              // this bundle only exists in the fastboot variant\n              let element = placeholder.start.ownerDocument.createElement('fastboot-script');\n              element.setAttribute('src', fastboot!);\n              placeholder.insert(element);\n              placeholder.insertNewline();\n            } else if (!fastboot) {\n              // no fastboot variant\n              placeholder.insertURL(base);\n            } else if (fastboot === base) {\n              // fastboot variant happens to be exactly the same bundle as base\n              // (and publicAssetURL===rootURL), so a plain script tag covers\n              // both\n              placeholder.insertURL(base);\n            } else {\n              // we have both and they differ\n              let element = placeholder.insertURL(base);\n              if (element) {\n                element.setAttribute('data-fastboot-src', fastboot);\n              }\n            }\n          }\n        }\n      } else {\n        // no match means keep the original HTML content for this placeholder.\n        // (If we really wanted it empty instead, there would be matchingBundles\n        // and it would be an empty list.)\n        for (let placeholder of placeholders) {\n          placeholder.reset();\n        }\n      }\n    }\n    return this.dom.serialize();\n  }\n}\n\nexport interface BundleSummary {\n  // entrypoints.get(inputAsset).get(variantIndex) === outputAssets\n  //\n  // these are the output assets that are needed eagerly to boot the given input\n  // asset\n  entrypoints: Map<string, Map<number, string[]>>;\n\n  // lazyBundles.get(inputAsset) === lazyOutputAssets\n  //\n  // these are the output assets that might be loaded lazyily at runtime by the\n  // given input asset.\n  //\n  // These are tracked specifically for the fastboot variant, because that's\n  // where we need to be responsble for them.\n  lazyBundles: Map<string, string[]>;\n\n  variants: Variant[];\n}\n\nfunction isAbsoluteURL(url: string) {\n  return /^(?:[a-z]+:)?\\/\\//i.test(url);\n}\n\n// we (somewhat arbitrarily) decide to put the lazy javascript bundles before\n// the very first <script> that we have rewritten\nfunction insertLazyJavascript(lazyBundles: string[], placeholder: Placeholder, rootURL: string) {\n  for (let bundle of lazyBundles) {\n    if (bundle.endsWith('.js')) {\n      let element = placeholder.start.ownerDocument.createElement('fastboot-script');\n      // we're using rootURL instead of publicAssetURL here because\n      // <fastboot-script> is executed by fastboot, which always loads them from\n      // the local build directory. NOT from the publicAssetURL that browsers\n      // will use, which could be a CDN.\n      element.setAttribute('src', rootURL + bundle);\n      placeholder.insert(element);\n      placeholder.insertNewline();\n    }\n  }\n}\n\nfunction insertLazyStyles(lazyBundles: string[], placeholder: Placeholder, publicAssetURL: string) {\n  for (let bundle of lazyBundles) {\n    if (bundle.endsWith('.css')) {\n      let element = placeholder.start.ownerDocument.createElement('link');\n      element.setAttribute('href', publicAssetURL + bundle);\n      element.setAttribute('rel', 'stylesheet');\n      placeholder.insert(element);\n      placeholder.insertNewline();\n    }\n  }\n}\n"]}

package/dist/src/html-placeholder.js

@@ -11,7 +11,7 @@ function makeTag(document, { from, tag, attributes } = {}) {
         throw new Error('Must supply one of `options.from` or `options.tag`');
     }
     let cloned = document.createElement(tag);
-    let overrides = new Map(Object.entries(attributes !== null && attributes !== void 0 ? attributes : {}));
+    let overrides = new Map(Object.entries(attributes ?? {}));
     if (from) {
         for (let { name, value: originalValue } of from.attributes) {
             let value = overrides.has(name) ? overrides.get(name) : originalValue;
@@ -47,6 +47,9 @@ function normalizeStyleLink(tag) {
     }
 }
 class Placeholder {
+    target;
+    end;
+    start;
     // remove the target Element from the DOM, and track where it was so we can
     // update that location later.
     constructor(target) {

package/dist/src/html-placeholder.js.map

@@ -1 +1 @@
-{"version":3,"file":"html-placeholder.js","sourceRoot":"","sources":["../../src/html-placeholder.ts"],"names":[],"mappings":"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","sourcesContent":["export function makeTag(\n  document: Document,\n  options: { from: HTMLElement; tag?: string; attributes?: { [name: string]: string | null } }\n): HTMLElement;\nexport function makeTag(\n  document: Document,\n  options: { from?: HTMLElement; tag: string; attributes?: { [name: string]: string | null } }\n): HTMLElement;\nexport function makeTag(\n  document: Document,\n  { from, tag, attributes }: { from?: HTMLElement; tag?: string; attributes?: { [name: string]: string | null } } = {}\n): HTMLElement {\n  if (!tag && from) {\n    tag = from.tagName;\n  }\n\n  if (!tag) {\n    throw new Error('Must supply one of `options.from` or `options.tag`');\n  }\n\n  let cloned = document.createElement(tag);\n  let overrides = new Map(Object.entries(attributes ?? {}));\n\n  if (from) {\n    for (let { name, value: originalValue } of from.attributes) {\n      let value = overrides.has(name) ? overrides.get(name)! : originalValue;\n      overrides.delete(name);\n\n      if (value === null) {\n        continue;\n      } else {\n        cloned.setAttribute(name, value);\n      }\n    }\n  }\n\n  for (let [name, value] of overrides) {\n    if (value !== null) {\n      cloned.setAttribute(name, value);\n    }\n  }\n\n  return cloned;\n}\n\nexport function normalizeScriptTag(tag: HTMLElement): void {\n  if (tag.getAttribute('type') === 'module') {\n    // we always convert modules to scripts, dropping\n    tag.removeAttribute('type');\n  }\n}\n\nexport function normalizeStyleLink(tag: HTMLElement): void {\n  let rel = tag.getAttribute('rel');\n\n  if (rel === null) {\n    tag.setAttribute('rel', 'stylesheet');\n  } else if (!rel.includes('stylesheet')) {\n    tag.setAttribute('rel', `${rel} stylesheet`);\n  }\n}\n\nexport default class Placeholder {\n  end: InDOMNode;\n  start: StartNode;\n\n  // remove the target Element from the DOM, and track where it was so we can\n  // update that location later.\n  constructor(private target: HTMLElement) {\n    if (!target.ownerDocument || !target.parentElement) {\n      throw new Error('can only construct a placeholder for an element that is in DOM');\n    }\n    let start = target.ownerDocument.createTextNode('');\n    target.parentElement.insertBefore(start, target);\n    let endNode = target.ownerDocument.createTextNode('');\n    target.replaceWith(endNode);\n\n    // Type cast is justified because start always has a nextSibling (it's\n    // \"end\") and because we know we already inserted the node.\n    this.start = start as StartNode;\n\n    // Type cast is justified because we know we already inserted the node.\n    this.end = endNode as InDOMNode;\n  }\n\n  reset() {\n    this.clear();\n    this.insert(this.target);\n  }\n\n  clear() {\n    while (this.start.nextSibling !== this.end) {\n      this.start.parentElement.removeChild(this.start.nextSibling);\n    }\n  }\n\n  insert(node: Node): void {\n    this.end.parentElement.insertBefore(node, this.end);\n  }\n\n  appendToHead(node: Node): void {\n    this.end.ownerDocument.head.appendChild(node);\n  }\n\n  isScript(): boolean {\n    return this.target.tagName === 'SCRIPT';\n  }\n\n  insertURL(url: string) {\n    if (url.endsWith('.js')) {\n      return this.insertScriptTag(url);\n    }\n    if (url.endsWith('.css')) {\n      return this.insertStyleLink(url);\n    }\n    throw new Error(`don't know how to insertURL ${url}`);\n  }\n\n  insertScriptTag(src: string) {\n    let newTag = makeTag(this.end.ownerDocument, { from: this.target, attributes: { src } });\n    normalizeScriptTag(newTag);\n\n    this.insert(newTag);\n    this.insertNewline();\n    return newTag;\n  }\n\n  insertStyleLink(href: string) {\n    let newTag: HTMLElement;\n\n    if (this.isScript()) {\n      // Add dynamic styles from scripts to the bottom of the head, and not to where the script was,\n      // to prevent FOUC when pre-rendering (FastBoot)\n      newTag = makeTag(this.end.ownerDocument, {\n        from: this.target,\n        tag: 'link',\n        attributes: { href, type: null, src: null },\n      });\n      normalizeStyleLink(newTag);\n      this.appendToHead(newTag);\n    } else {\n      // Keep the new style in the same place as the original one\n      newTag = makeTag(this.end.ownerDocument, { from: this.target, attributes: { href } });\n      normalizeStyleLink(newTag);\n      this.insert(newTag);\n    }\n    this.insertNewline(newTag as InDOMNode);\n  }\n\n  insertNewline(node: InDOMNode = this.end): void {\n    node.parentElement.insertBefore(node.ownerDocument.createTextNode('\\n'), node);\n  }\n}\n\n// an html node that's definitely inserted into the DOM\ninterface InDOMNode extends Node {\n  parentElement: HTMLElement;\n  ownerDocument: Document;\n}\n\n// an html node that definitely has a next sibling.\ninterface StartNode extends InDOMNode {\n  nextSibling: InDOMNode & ChildNode;\n}\n"]}
+{"version":3,"file":"html-placeholder.js","sourceRoot":"","sources":["../../src/html-placeholder.ts"],"names":[],"mappings":";;AAQA,0BAmCC;AAED,gDAKC;AAED,gDAQC;AApDD,SAAgB,OAAO,CACrB,QAAkB,EAClB,EAAE,IAAI,EAAE,GAAG,EAAE,UAAU,KAA2F,EAAE;IAEpH,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACjB,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;IAE1D,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3D,IAAI,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YACvE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEvB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,SAAS;YACX,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;QACpC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAgB;IACjD,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC1C,iDAAiD;QACjD,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAgB;IACjD,IAAI,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAElC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC;SAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,aAAa,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,MAAqB,WAAW;IAMV;IALpB,GAAG,CAAY;IACf,KAAK,CAAY;IAEjB,2EAA2E;IAC3E,8BAA8B;IAC9B,YAAoB,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QACrC,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QACD,IAAI,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACtD,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE5B,sEAAsE;QACtE,2DAA2D;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAkB,CAAC;QAEhC,uEAAuE;QACvE,IAAI,CAAC,GAAG,GAAG,OAAoB,CAAC;IAClC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,MAAM,CAAC,IAAU;QACf,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,YAAY,CAAC,IAAU;QACrB,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;IAC1C,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,eAAe,CAAC,GAAW;QACzB,IAAI,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACzF,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,IAAI,MAAmB,CAAC;QAExB,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,8FAA8F;YAC9F,gDAAgD;YAChD,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;gBACvC,IAAI,EAAE,IAAI,CAAC,MAAM;gBACjB,GAAG,EAAE,MAAM;gBACX,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE;aAC5C,CAAC,CAAC;YACH,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,2DAA2D;YAC3D,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACtF,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,MAAmB,CAAC,CAAC;IAC1C,CAAC;IAED,aAAa,CAAC,OAAkB,IAAI,CAAC,GAAG;QACtC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC;CACF;AA1FD,8BA0FC","sourcesContent":["export function makeTag(\n  document: Document,\n  options: { from: HTMLElement; tag?: string; attributes?: { [name: string]: string | null } }\n): HTMLElement;\nexport function makeTag(\n  document: Document,\n  options: { from?: HTMLElement; tag: string; attributes?: { [name: string]: string | null } }\n): HTMLElement;\nexport function makeTag(\n  document: Document,\n  { from, tag, attributes }: { from?: HTMLElement; tag?: string; attributes?: { [name: string]: string | null } } = {}\n): HTMLElement {\n  if (!tag && from) {\n    tag = from.tagName;\n  }\n\n  if (!tag) {\n    throw new Error('Must supply one of `options.from` or `options.tag`');\n  }\n\n  let cloned = document.createElement(tag);\n  let overrides = new Map(Object.entries(attributes ?? {}));\n\n  if (from) {\n    for (let { name, value: originalValue } of from.attributes) {\n      let value = overrides.has(name) ? overrides.get(name)! : originalValue;\n      overrides.delete(name);\n\n      if (value === null) {\n        continue;\n      } else {\n        cloned.setAttribute(name, value);\n      }\n    }\n  }\n\n  for (let [name, value] of overrides) {\n    if (value !== null) {\n      cloned.setAttribute(name, value);\n    }\n  }\n\n  return cloned;\n}\n\nexport function normalizeScriptTag(tag: HTMLElement): void {\n  if (tag.getAttribute('type') === 'module') {\n    // we always convert modules to scripts, dropping\n    tag.removeAttribute('type');\n  }\n}\n\nexport function normalizeStyleLink(tag: HTMLElement): void {\n  let rel = tag.getAttribute('rel');\n\n  if (rel === null) {\n    tag.setAttribute('rel', 'stylesheet');\n  } else if (!rel.includes('stylesheet')) {\n    tag.setAttribute('rel', `${rel} stylesheet`);\n  }\n}\n\nexport default class Placeholder {\n  end: InDOMNode;\n  start: StartNode;\n\n  // remove the target Element from the DOM, and track where it was so we can\n  // update that location later.\n  constructor(private target: HTMLElement) {\n    if (!target.ownerDocument || !target.parentElement) {\n      throw new Error('can only construct a placeholder for an element that is in DOM');\n    }\n    let start = target.ownerDocument.createTextNode('');\n    target.parentElement.insertBefore(start, target);\n    let endNode = target.ownerDocument.createTextNode('');\n    target.replaceWith(endNode);\n\n    // Type cast is justified because start always has a nextSibling (it's\n    // \"end\") and because we know we already inserted the node.\n    this.start = start as StartNode;\n\n    // Type cast is justified because we know we already inserted the node.\n    this.end = endNode as InDOMNode;\n  }\n\n  reset() {\n    this.clear();\n    this.insert(this.target);\n  }\n\n  clear() {\n    while (this.start.nextSibling !== this.end) {\n      this.start.parentElement.removeChild(this.start.nextSibling);\n    }\n  }\n\n  insert(node: Node): void {\n    this.end.parentElement.insertBefore(node, this.end);\n  }\n\n  appendToHead(node: Node): void {\n    this.end.ownerDocument.head.appendChild(node);\n  }\n\n  isScript(): boolean {\n    return this.target.tagName === 'SCRIPT';\n  }\n\n  insertURL(url: string) {\n    if (url.endsWith('.js')) {\n      return this.insertScriptTag(url);\n    }\n    if (url.endsWith('.css')) {\n      return this.insertStyleLink(url);\n    }\n    throw new Error(`don't know how to insertURL ${url}`);\n  }\n\n  insertScriptTag(src: string) {\n    let newTag = makeTag(this.end.ownerDocument, { from: this.target, attributes: { src } });\n    normalizeScriptTag(newTag);\n\n    this.insert(newTag);\n    this.insertNewline();\n    return newTag;\n  }\n\n  insertStyleLink(href: string) {\n    let newTag: HTMLElement;\n\n    if (this.isScript()) {\n      // Add dynamic styles from scripts to the bottom of the head, and not to where the script was,\n      // to prevent FOUC when pre-rendering (FastBoot)\n      newTag = makeTag(this.end.ownerDocument, {\n        from: this.target,\n        tag: 'link',\n        attributes: { href, type: null, src: null },\n      });\n      normalizeStyleLink(newTag);\n      this.appendToHead(newTag);\n    } else {\n      // Keep the new style in the same place as the original one\n      newTag = makeTag(this.end.ownerDocument, { from: this.target, attributes: { href } });\n      normalizeStyleLink(newTag);\n      this.insert(newTag);\n    }\n    this.insertNewline(newTag as InDOMNode);\n  }\n\n  insertNewline(node: InDOMNode = this.end): void {\n    node.parentElement.insertBefore(node.ownerDocument.createTextNode('\\n'), node);\n  }\n}\n\n// an html node that's definitely inserted into the DOM\ninterface InDOMNode extends Node {\n  parentElement: HTMLElement;\n  ownerDocument: Document;\n}\n\n// an html node that definitely has a next sibling.\ninterface StartNode extends InDOMNode {\n  nextSibling: InDOMNode & ChildNode;\n}\n"]}

package/dist/src/measure-concat.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = require("path");
 const fs_1 = require("fs");
 class MeasureConcat {
+    name;
+    concat;
+    baseDir;
+    stats = {};
     constructor(name, concat, baseDir) {
         this.name = name;
         this.concat = concat;
         this.baseDir = baseDir;
-        this.stats = {};
     }
     addFile(filename) {
         this.stats[filename] = (0, fs_1.statSync)((0, path_1.join)(this.baseDir, filename)).size;

package/dist/src/measure-concat.js.map

@@ -1 +1 @@
-{"version":3,"file":"measure-concat.js","sourceRoot":"","sources":["../../src/measure-concat.ts"],"names":[],"mappings":";;AACA,+BAA4B;AAC5B,2BAA8B;AAE9B,MAAqB,aAAa;IAEhC,YAAoB,IAAY,EAAU,MAAuB,EAAU,OAAe;QAAtE,SAAI,GAAJ,IAAI,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAiB;QAAU,YAAO,GAAP,OAAO,CAAQ;QAD1F,UAAK,GAAmC,EAAE,CAAC;IACkD,CAAC;IAC9F,OAAO,CAAC,QAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,KAAK,QAAQ,CAAC;aACnD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACF;AArBD,gCAqBC","sourcesContent":["import type SourceMapConcat from 'fast-sourcemap-concat';\nimport { join } from 'path';\nimport { statSync } from 'fs';\n\nexport default class MeasureConcat {\n  stats: { [filename: string]: number } = {};\n  constructor(private name: string, private concat: SourceMapConcat, private baseDir: string) {}\n  addFile(filename: string) {\n    this.stats[filename] = statSync(join(this.baseDir, filename)).size;\n    return this.concat.addFile(filename);\n  }\n  addSpace(contents: string) {\n    this.stats['in-memory'] = (this.stats['in-memory'] || 0) + contents.length;\n    return this.concat.addSpace(contents);\n  }\n  async end() {\n    console.log(`Concatenated ${this.name}:`);\n    console.log(\n      Object.entries(this.stats)\n        .sort((a, b) => b[1] - a[1])\n        .map(([name, bytes]) => `  ${name}: ${bytes} bytes`)\n        .join('\\n')\n    );\n    return await this.concat.end();\n  }\n}\n"]}
+{"version":3,"file":"measure-concat.js","sourceRoot":"","sources":["../../src/measure-concat.ts"],"names":[],"mappings":";;AACA,+BAA4B;AAC5B,2BAA8B;AAE9B,MAAqB,aAAa;IAEZ;IAAsB;IAAiC;IAD3E,KAAK,GAAmC,EAAE,CAAC;IAC3C,YAAoB,IAAY,EAAU,MAAuB,EAAU,OAAe;QAAtE,SAAI,GAAJ,IAAI,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAiB;QAAU,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAC9F,OAAO,CAAC,QAAgB;QACtB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAA,aAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IACD,QAAQ,CAAC,QAAgB;QACvB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CACT,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;aACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,KAAK,KAAK,QAAQ,CAAC;aACnD,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACF;AArBD,gCAqBC","sourcesContent":["import type SourceMapConcat from 'fast-sourcemap-concat';\nimport { join } from 'path';\nimport { statSync } from 'fs';\n\nexport default class MeasureConcat {\n  stats: { [filename: string]: number } = {};\n  constructor(private name: string, private concat: SourceMapConcat, private baseDir: string) {}\n  addFile(filename: string) {\n    this.stats[filename] = statSync(join(this.baseDir, filename)).size;\n    return this.concat.addFile(filename);\n  }\n  addSpace(contents: string) {\n    this.stats['in-memory'] = (this.stats['in-memory'] || 0) + contents.length;\n    return this.concat.addSpace(contents);\n  }\n  async end() {\n    console.log(`Concatenated ${this.name}:`);\n    console.log(\n      Object.entries(this.stats)\n        .sort((a, b) => b[1] - a[1])\n        .map(([name, bytes]) => `  ${name}: ${bytes} bytes`)\n        .join('\\n')\n    );\n    return await this.concat.end();\n  }\n}\n"]}

package/dist/src/module-request.js

@@ -1,16 +1,4 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ModuleRequest_adapter, _ModuleRequest_specifier, _ModuleRequest_fromFile, _ModuleRequest_meta, _ModuleRequest_resolvedTo;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleRequest = void 0;
 exports.extractResolution = extractResolution;
@@ -21,74 +9,73 @@ class ModuleRequest {
             return new ModuleRequest(result.adapter, result.initialState);
         }
     }
+    #adapter;
+    #specifier;
+    #fromFile;
+    #meta;
+    #resolvedTo;
     constructor(adapter, initialize) {
-        _ModuleRequest_adapter.set(this, void 0);
-        _ModuleRequest_specifier.set(this, void 0);
-        _ModuleRequest_fromFile.set(this, void 0);
-        _ModuleRequest_meta.set(this, void 0);
-        _ModuleRequest_resolvedTo.set(this, void 0);
-        __classPrivateFieldSet(this, _ModuleRequest_adapter, adapter, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_specifier, initialize.specifier, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_fromFile, initialize.fromFile, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_meta, initialize.meta, "f");
+        this.#adapter = adapter;
+        this.#specifier = initialize.specifier;
+        this.#fromFile = initialize.fromFile;
+        this.#meta = initialize.meta;
     }
     get specifier() {
-        return __classPrivateFieldGet(this, _ModuleRequest_specifier, "f");
+        return this.#specifier;
     }
     get fromFile() {
-        return __classPrivateFieldGet(this, _ModuleRequest_fromFile, "f");
+        return this.#fromFile;
     }
     get debugType() {
-        return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").debugType;
+        return this.#adapter.debugType;
     }
     get meta() {
-        return __classPrivateFieldGet(this, _ModuleRequest_meta, "f");
+        return this.#meta;
     }
     get resolvedTo() {
-        return __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f");
+        return this.#resolvedTo;
     }
     alias(newSpecifier) {
-        if (__classPrivateFieldGet(this, _ModuleRequest_specifier, "f") === newSpecifier) {
+        if (this.#specifier === newSpecifier) {
             return this;
         }
         let result = this.clone();
-        __classPrivateFieldSet(result, _ModuleRequest_specifier, newSpecifier, "f");
+        result.#specifier = newSpecifier;
         return result;
     }
     rehome(newFromFile) {
-        if (__classPrivateFieldGet(this, _ModuleRequest_fromFile, "f") === newFromFile) {
+        if (this.#fromFile === newFromFile) {
             return this;
         }
         let result = this.clone();
-        __classPrivateFieldSet(result, _ModuleRequest_fromFile, newFromFile, "f");
+        result.#fromFile = newFromFile;
         return result;
     }
     virtualize(virtualResponse) {
-        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").virtualResponse(this, virtualResponse));
+        return this.resolveTo(this.#adapter.virtualResponse(this, virtualResponse));
     }
     withMeta(meta) {
         let result = this.clone();
-        __classPrivateFieldSet(result, _ModuleRequest_meta, meta, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f"), "f");
+        result.#meta = meta;
+        result.#resolvedTo = this.#resolvedTo;
         return result;
     }
     notFound() {
-        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").notFoundResponse(this));
+        return this.resolveTo(this.#adapter.notFoundResponse(this));
     }
     resolveTo(res) {
         let result = this.clone();
-        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, res, "f");
+        result.#resolvedTo = res;
         return result;
     }
     defaultResolve() {
-        return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").resolve(this);
+        return this.#adapter.resolve(this);
     }
     clone() {
-        return new ModuleRequest(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f"), this);
+        return new ModuleRequest(this.#adapter, this);
     }
 }
 exports.ModuleRequest = ModuleRequest;
-_ModuleRequest_adapter = new WeakMap(), _ModuleRequest_specifier = new WeakMap(), _ModuleRequest_fromFile = new WeakMap(), _ModuleRequest_meta = new WeakMap(), _ModuleRequest_resolvedTo = new WeakMap();
 async function extractResolution(res) {
     if (typeof res === 'function') {
         return await res();

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

@@ -1 +1 @@
-{"version":3,"file":"module-request.js","sourceRoot":"","sources":["../../src/module-request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AA4HA,8CAQC;AApGD,MAAa,aAAa;IACxB,MAAM,CAAC,MAAM,CACX,aAA8C,EAC9C,MAAY;QAEZ,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAQD,YAAoB,OAA4B,EAAE,UAA+B;QANjF,yCAA8B;QAC9B,2CAAmB;QACnB,0CAAkB;QAClB,sCAA2C;QAC3C,4CAAoD;QAGlD,uBAAA,IAAI,0BAAY,OAAO,MAAA,CAAC;QACxB,uBAAA,IAAI,4BAAc,UAAU,CAAC,SAAS,MAAA,CAAC;QACvC,uBAAA,IAAI,2BAAa,UAAU,CAAC,QAAQ,MAAA,CAAC;QACrC,uBAAA,IAAI,uBAAS,UAAU,CAAC,IAAI,MAAA,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,gCAAW,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,uBAAA,IAAI,+BAAU,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,8BAAS,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2BAAM,CAAC;IACpB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,iCAAY,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,IAAI,uBAAA,IAAI,gCAAW,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,4BAAc,YAAY,MAAA,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,WAAmB;QACxB,IAAI,uBAAA,IAAI,+BAAU,KAAK,WAAW,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,2BAAa,WAAW,MAAA,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,eAAgC;QACzC,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,QAAQ,CAAC,IAAqC;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,uBAAS,IAAI,MAAA,CAAC;QACpB,uBAAA,MAAM,6BAAe,uBAAA,IAAI,iCAAY,MAAA,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,GAA+B;QACvC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,6BAAe,GAAG,MAAA,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,OAAO,uBAAA,IAAI,8BAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,uBAAA,IAAI,8BAAS,EAAE,IAAI,CAAS,CAAC;IACxD,CAAC;CACF;AA1FD,sCA0FC;;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAA+B;IAE/B,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;QAC9B,OAAO,MAAM,GAAG,EAAE,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC","sourcesContent":["import type { VirtualResponse } from './virtual-content';\n\n// This is generic because different build systems have different ways of\n// representing a found module, and we just pass those values through.\nexport type Resolution<T = unknown, E = unknown> =\n  | { type: 'found'; filename: string; virtual: VirtualResponse | false; result: T }\n\n  // the important thing about this Resolution is that embroider should do its\n  // fallback behaviors here.\n  | { type: 'not_found'; err: E };\n\nexport type RequestAdapterCreate<Init, Res extends Resolution> = (\n  params: Init\n) => { initialState: InitialRequestState; adapter: RequestAdapter<Res> } | undefined;\n\nexport interface RequestAdapter<Res extends Resolution> {\n  readonly debugType: string;\n  resolve(request: ModuleRequest<Res>): Promise<Res>;\n\n  // the function-returning variants of both of these are only because webpack\n  // plugins are a pain in the butt. Integrators are encouraged to use the plain\n  // Response-returning variants in all sane build environments.\n  notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);\n  virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);\n}\n\nexport interface InitialRequestState {\n  readonly specifier: string;\n  readonly fromFile: string;\n  readonly meta: Record<string, unknown> | undefined;\n}\n\nexport class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {\n  static create<Init, Res extends Resolution>(\n    createAdapter: RequestAdapterCreate<Init, Res>,\n    params: Init\n  ): ModuleRequest<Res> | undefined {\n    let result = createAdapter(params);\n    if (result) {\n      return new ModuleRequest(result.adapter, result.initialState);\n    }\n  }\n\n  #adapter: RequestAdapter<Res>;\n  #specifier: string;\n  #fromFile: string;\n  #meta: Record<string, unknown> | undefined;\n  #resolvedTo: Res | (() => Promise<Res>) | undefined;\n\n  private constructor(adapter: RequestAdapter<Res>, initialize: InitialRequestState) {\n    this.#adapter = adapter;\n    this.#specifier = initialize.specifier;\n    this.#fromFile = initialize.fromFile;\n    this.#meta = initialize.meta;\n  }\n\n  get specifier(): string {\n    return this.#specifier;\n  }\n\n  get fromFile(): string {\n    return this.#fromFile;\n  }\n\n  get debugType(): string {\n    return this.#adapter.debugType;\n  }\n\n  get meta(): Record<string, unknown> | undefined {\n    return this.#meta;\n  }\n\n  get resolvedTo(): Res | (() => Promise<Res>) | undefined {\n    return this.#resolvedTo;\n  }\n\n  alias(newSpecifier: string): this {\n    if (this.#specifier === newSpecifier) {\n      return this;\n    }\n    let result = this.clone();\n    result.#specifier = newSpecifier;\n    return result;\n  }\n\n  rehome(newFromFile: string): this {\n    if (this.#fromFile === newFromFile) {\n      return this;\n    }\n    let result = this.clone();\n    result.#fromFile = newFromFile;\n    return result;\n  }\n\n  virtualize(virtualResponse: VirtualResponse): this {\n    return this.resolveTo(this.#adapter.virtualResponse(this, virtualResponse));\n  }\n\n  withMeta(meta: Record<string, any> | undefined): this {\n    let result = this.clone();\n    result.#meta = meta;\n    result.#resolvedTo = this.#resolvedTo;\n    return result;\n  }\n\n  notFound(): this {\n    return this.resolveTo(this.#adapter.notFoundResponse(this));\n  }\n\n  resolveTo(res: Res | (() => Promise<Res>)): this {\n    let result = this.clone();\n    result.#resolvedTo = res;\n    return result;\n  }\n\n  defaultResolve(): Promise<Res> {\n    return this.#adapter.resolve(this);\n  }\n\n  clone(): this {\n    return new ModuleRequest(this.#adapter, this) as this;\n  }\n}\n\nexport async function extractResolution<Res extends Resolution = Resolution>(\n  res: Res | (() => Promise<Res>)\n): Promise<Res> {\n  if (typeof res === 'function') {\n    return await res();\n  } else {\n    return res;\n  }\n}\n"]}
+{"version":3,"file":"module-request.js","sourceRoot":"","sources":["../../src/module-request.ts"],"names":[],"mappings":"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","sourcesContent":["import type { VirtualResponse } from './virtual-content';\n\n// This is generic because different build systems have different ways of\n// representing a found module, and we just pass those values through.\nexport type Resolution<T = unknown, E = unknown> =\n  | { type: 'found'; filename: string; virtual: VirtualResponse | false; result: T }\n\n  // the important thing about this Resolution is that embroider should do its\n  // fallback behaviors here.\n  | { type: 'not_found'; err: E };\n\nexport type RequestAdapterCreate<Init, Res extends Resolution> = (\n  params: Init\n) => { initialState: InitialRequestState; adapter: RequestAdapter<Res> } | undefined;\n\nexport interface RequestAdapter<Res extends Resolution> {\n  readonly debugType: string;\n  resolve(request: ModuleRequest<Res>): Promise<Res>;\n\n  // the function-returning variants of both of these are only because webpack\n  // plugins are a pain in the butt. Integrators are encouraged to use the plain\n  // Response-returning variants in all sane build environments.\n  notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);\n  virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);\n}\n\nexport interface InitialRequestState {\n  readonly specifier: string;\n  readonly fromFile: string;\n  readonly meta: Record<string, unknown> | undefined;\n}\n\nexport class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {\n  static create<Init, Res extends Resolution>(\n    createAdapter: RequestAdapterCreate<Init, Res>,\n    params: Init\n  ): ModuleRequest<Res> | undefined {\n    let result = createAdapter(params);\n    if (result) {\n      return new ModuleRequest(result.adapter, result.initialState);\n    }\n  }\n\n  #adapter: RequestAdapter<Res>;\n  #specifier: string;\n  #fromFile: string;\n  #meta: Record<string, unknown> | undefined;\n  #resolvedTo: Res | (() => Promise<Res>) | undefined;\n\n  private constructor(adapter: RequestAdapter<Res>, initialize: InitialRequestState) {\n    this.#adapter = adapter;\n    this.#specifier = initialize.specifier;\n    this.#fromFile = initialize.fromFile;\n    this.#meta = initialize.meta;\n  }\n\n  get specifier(): string {\n    return this.#specifier;\n  }\n\n  get fromFile(): string {\n    return this.#fromFile;\n  }\n\n  get debugType(): string {\n    return this.#adapter.debugType;\n  }\n\n  get meta(): Record<string, unknown> | undefined {\n    return this.#meta;\n  }\n\n  get resolvedTo(): Res | (() => Promise<Res>) | undefined {\n    return this.#resolvedTo;\n  }\n\n  alias(newSpecifier: string): this {\n    if (this.#specifier === newSpecifier) {\n      return this;\n    }\n    let result = this.clone();\n    result.#specifier = newSpecifier;\n    return result;\n  }\n\n  rehome(newFromFile: string): this {\n    if (this.#fromFile === newFromFile) {\n      return this;\n    }\n    let result = this.clone();\n    result.#fromFile = newFromFile;\n    return result;\n  }\n\n  virtualize(virtualResponse: VirtualResponse): this {\n    return this.resolveTo(this.#adapter.virtualResponse(this, virtualResponse));\n  }\n\n  withMeta(meta: Record<string, any> | undefined): this {\n    let result = this.clone();\n    result.#meta = meta;\n    result.#resolvedTo = this.#resolvedTo;\n    return result;\n  }\n\n  notFound(): this {\n    return this.resolveTo(this.#adapter.notFoundResponse(this));\n  }\n\n  resolveTo(res: Res | (() => Promise<Res>)): this {\n    let result = this.clone();\n    result.#resolvedTo = res;\n    return result;\n  }\n\n  defaultResolve(): Promise<Res> {\n    return this.#adapter.resolve(this);\n  }\n\n  clone(): this {\n    return new ModuleRequest(this.#adapter, this) as this;\n  }\n}\n\nexport async function extractResolution<Res extends Resolution = Resolution>(\n  res: Res | (() => Promise<Res>)\n): Promise<Res> {\n  if (typeof res === 'function') {\n    return await res();\n  } else {\n    return res;\n  }\n}\n"]}

package/dist/src/module-resolver-options.js

@@ -10,7 +10,6 @@ const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
 function buildResolverOptions(inputs) {
-    var _a, _b;
     let appPackage;
     if (inputs.appPackage) {
         appPackage = inputs.appPackage;
@@ -19,7 +18,7 @@ function buildResolverOptions(inputs) {
         let packageCache = shared_internals_1.RewrittenPackageCache.shared('embroider', process.cwd());
         appPackage = packageCache.get(packageCache.appRoot);
     }
-    let extraDeps = (_a = inputs.extraDeps) !== null && _a !== void 0 ? _a : new Map();
+    let extraDeps = inputs.extraDeps ?? new Map();
     let allActiveAddons = findAllActiveAddons(appPackage, extraDeps);
     let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));
     let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));
@@ -32,7 +31,7 @@ function buildResolverOptions(inputs) {
         appRoot: appPackage.root,
         engines,
         modulePrefix,
-        staticAppPaths: (_b = inputs.staticAppPaths) !== null && _b !== void 0 ? _b : [],
+        staticAppPaths: inputs.staticAppPaths ?? [],
         emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source').version,
         splitAtRoutes: inputs.splitAtRoutes,
         podModulePrefix: inputs.podModulePrefix,

package/dist/src/module-resolver-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-resolver-options.js","sourceRoot":"","sources":["../../src/module-resolver-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { explicitRelative, RewrittenPackageCache, type AddonPackage, type Package } from '@embroider/shared-internals';\nimport type { Engine } from './app-files';\nimport { resolvableExtensions } from './resolvable-extensions';\nimport { resolve as resolvePath } from 'path';\nimport { realpathSync } from 'fs-extra';\nimport flatMap from 'lodash/flatMap';\n\nexport interface Options {\n  renamePackages: {\n    [fromName: string]: string;\n  };\n  renameModules: {\n    [fromName: string]: string;\n  };\n  resolvableExtensions: string[];\n  appRoot: string;\n  engines: EngineConfig[];\n  modulePrefix: string;\n  splitAtRoutes?: (RegExp | string)[];\n  podModulePrefix?: string;\n  staticAppPaths: string[];\n  emberVersion: string;\n}\n\nexport interface EngineConfig {\n  packageName: string;\n  activeAddons: { name: string; root: string; canResolveFromFile: string }[];\n  fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n  root: string;\n  isLazy: boolean;\n}\n\nexport function buildResolverOptions<T extends Options>(inputs: {\n  appPackage?: Package;\n  extraDeps?: Map<string, AddonPackage[]>;\n  modulePrefix?: string;\n  podModulePrefix?: string;\n  splitAtRoutes?: (RegExp | string)[];\n  staticAppPaths?: string[];\n  extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;\n}): T {\n  let appPackage: Package;\n  if (inputs.appPackage) {\n    appPackage = inputs.appPackage;\n  } else {\n    let packageCache = RewrittenPackageCache.shared('embroider', process.cwd());\n    appPackage = packageCache.get(packageCache.appRoot);\n  }\n\n  let extraDeps = inputs.extraDeps ?? new Map();\n\n  let allActiveAddons: AddonPackage[] = findAllActiveAddons(appPackage, extraDeps);\n  let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));\n  let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));\n  let modulePrefix = appPackage.name;\n  let engines = partitionEngines(appPackage, modulePrefix, extraDeps);\n\n  let output: Options = {\n    renamePackages,\n    renameModules,\n    resolvableExtensions: resolvableExtensions(),\n    appRoot: appPackage.root,\n    engines,\n    modulePrefix,\n    staticAppPaths: inputs.staticAppPaths ?? [],\n    emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source')!.version,\n    splitAtRoutes: inputs.splitAtRoutes,\n    podModulePrefix: inputs.podModulePrefix,\n  };\n\n  if (inputs.extend) {\n    return inputs.extend(output as T, allActiveAddons);\n  }\n  return output as T;\n}\n\nfunction partitionEngines(\n  appPackage: Package,\n  modulePrefix: string,\n  extraDeps: Map<string, AddonPackage[]>\n): EngineConfig[] {\n  let queue: Engine[] = [\n    {\n      package: appPackage,\n      addons: new Map(),\n      isApp: true,\n      modulePrefix,\n      appRelativePath: '.',\n    },\n  ];\n  let done: Engine[] = [];\n  let seenEngines: Set<Package> = new Set();\n  while (true) {\n    let current = queue.shift();\n    if (!current) {\n      break;\n    }\n    findActiveAddons(current.package, current, extraDeps);\n    // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)\n    current.addons = new Map(\n      [...current.addons].sort(([a], [b]) => {\n        return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);\n      })\n    );\n\n    for (let addon of current.addons.keys()) {\n      if (addon.isEngine() && !seenEngines.has(addon)) {\n        seenEngines.add(addon);\n        queue.push({\n          package: addon,\n          addons: new Map(),\n          isApp: !current,\n          modulePrefix: addon.name,\n          appRelativePath: explicitRelative(appPackage.root, addon.root),\n        });\n      }\n    }\n    done.push(current);\n  }\n\n  return done.map(engine => ({\n    packageName: engine.package.name,\n    // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks\n    root: realpathSync(engine.package.root),\n    fastbootFiles: {},\n    activeAddons: [...engine.addons]\n      .map(([addon, canResolveFromFile]) => ({\n        name: addon.name,\n        root: addon.root,\n        canResolveFromFile,\n      }))\n      // the traditional order is the order in which addons will run, such\n      // that the last one wins. Our resolver's order is the order to\n      // search, so first one wins.\n      .reverse(),\n    isLazy: engine.package.isLazyEngine(),\n  }));\n}\n\n// recurse to find all active addons that don't cross an engine boundary.\n// Inner engines themselves will be returned, but not those engines' children.\n// The output set's insertion order is the proper ember-cli compatible\n// ordering of the addons.\nfunction findActiveAddons(pkg: Package, engine: Engine, extraDeps: Map<string, AddonPackage[]>): void {\n  for (let child of activeAddonChildren(pkg, extraDeps)) {\n    if (engine.addons.has(child)) continue;\n    if (!child.isEngine()) {\n      findActiveAddons(child, engine, extraDeps);\n    }\n    let canResolveFrom = resolvePath(pkg.root, 'package.json');\n    engine.addons.set(child, canResolveFrom);\n  }\n}\n\nfunction activeAddonChildren(pkg: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = (pkg.dependencies.filter(isActiveAddon) as AddonPackage[]).filter(\n    // When looking for child addons, we want to ignore 'peerDependencies' of\n    // a given package, to align with how ember-cli resolves addons. So here\n    // we only include dependencies that are definitely active due to one of\n    // the other sections.\n    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies'\n  );\n  let extras = extraDeps.get(pkg.root);\n  if (extras) {\n    result = [...result, ...extras];\n  }\n  return result.sort(orderAddons);\n}\n\nfunction isActiveAddon(pkg: Package): boolean {\n  // stage1 already took care of converting everything that's actually active\n  // into v2 addons. If it's not a v2 addon, we don't want it.\n  //\n  // We can encounter v1 addons here when there is inactive stuff floating\n  // around in the node_modules that accidentally satisfy something like an\n  // optional peer dep.\n  return pkg.isV2Addon();\n}\n\nfunction orderAddons(depA: Package, depB: Package): number {\n  let depAIdx = 0;\n  let depBIdx = 0;\n\n  if (depA && depA.meta && depA.isV2Addon()) {\n    depAIdx = depA.meta['order-index'] || 0;\n  }\n  if (depB && depB.meta && depB.isV2Addon()) {\n    depBIdx = depB.meta['order-index'] || 0;\n  }\n\n  return depAIdx - depBIdx;\n}\n\nfunction findAllActiveAddons(appPackage: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = appPackage.findDescendants(isActiveAddon) as AddonPackage[];\n  let extras = extraDeps.get(appPackage.root);\n  if (extras) {\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n  }\n  return result.sort(orderAddons);\n}\n"]}
+{"version":3,"file":"module-resolver-options.js","sourceRoot":"","sources":["../../src/module-resolver-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { explicitRelative, RewrittenPackageCache, type AddonPackage, type Package } from '@embroider/shared-internals';\nimport type { Engine } from './app-files';\nimport { resolvableExtensions } from './resolvable-extensions';\nimport { resolve as resolvePath } from 'path';\nimport { realpathSync } from 'fs-extra';\nimport flatMap from 'lodash/flatMap';\n\nexport interface Options {\n  renamePackages: {\n    [fromName: string]: string;\n  };\n  renameModules: {\n    [fromName: string]: string;\n  };\n  resolvableExtensions: string[];\n  appRoot: string;\n  engines: EngineConfig[];\n  modulePrefix: string;\n  splitAtRoutes?: (RegExp | string)[];\n  podModulePrefix?: string;\n  staticAppPaths: string[];\n  emberVersion: string;\n}\n\nexport interface EngineConfig {\n  packageName: string;\n  activeAddons: { name: string; root: string; canResolveFromFile: string }[];\n  fastbootFiles: { [appName: string]: { localFilename: string; shadowedFilename: string | undefined } };\n  root: string;\n  isLazy: boolean;\n}\n\nexport function buildResolverOptions<T extends Options>(inputs: {\n  appPackage?: Package;\n  extraDeps?: Map<string, AddonPackage[]>;\n  modulePrefix?: string;\n  podModulePrefix?: string;\n  splitAtRoutes?: (RegExp | string)[];\n  staticAppPaths?: string[];\n  extend?: (opts: T, allActiveAddons: AddonPackage[]) => T;\n}): T {\n  let appPackage: Package;\n  if (inputs.appPackage) {\n    appPackage = inputs.appPackage;\n  } else {\n    let packageCache = RewrittenPackageCache.shared('embroider', process.cwd());\n    appPackage = packageCache.get(packageCache.appRoot);\n  }\n\n  let extraDeps = inputs.extraDeps ?? new Map();\n\n  let allActiveAddons: AddonPackage[] = findAllActiveAddons(appPackage, extraDeps);\n  let renamePackages = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-packages']));\n  let renameModules = Object.assign({}, ...allActiveAddons.map(dep => dep.meta['renamed-modules']));\n  let modulePrefix = appPackage.name;\n  let engines = partitionEngines(appPackage, modulePrefix, extraDeps);\n\n  let output: Options = {\n    renamePackages,\n    renameModules,\n    resolvableExtensions: resolvableExtensions(),\n    appRoot: appPackage.root,\n    engines,\n    modulePrefix,\n    staticAppPaths: inputs.staticAppPaths ?? [],\n    emberVersion: appPackage.dependencies.find(d => d.name === 'ember-source')!.version,\n    splitAtRoutes: inputs.splitAtRoutes,\n    podModulePrefix: inputs.podModulePrefix,\n  };\n\n  if (inputs.extend) {\n    return inputs.extend(output as T, allActiveAddons);\n  }\n  return output as T;\n}\n\nfunction partitionEngines(\n  appPackage: Package,\n  modulePrefix: string,\n  extraDeps: Map<string, AddonPackage[]>\n): EngineConfig[] {\n  let queue: Engine[] = [\n    {\n      package: appPackage,\n      addons: new Map(),\n      isApp: true,\n      modulePrefix,\n      appRelativePath: '.',\n    },\n  ];\n  let done: Engine[] = [];\n  let seenEngines: Set<Package> = new Set();\n  while (true) {\n    let current = queue.shift();\n    if (!current) {\n      break;\n    }\n    findActiveAddons(current.package, current, extraDeps);\n    // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)\n    current.addons = new Map(\n      [...current.addons].sort(([a], [b]) => {\n        return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);\n      })\n    );\n\n    for (let addon of current.addons.keys()) {\n      if (addon.isEngine() && !seenEngines.has(addon)) {\n        seenEngines.add(addon);\n        queue.push({\n          package: addon,\n          addons: new Map(),\n          isApp: !current,\n          modulePrefix: addon.name,\n          appRelativePath: explicitRelative(appPackage.root, addon.root),\n        });\n      }\n    }\n    done.push(current);\n  }\n\n  return done.map(engine => ({\n    packageName: engine.package.name,\n    // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks\n    root: realpathSync(engine.package.root),\n    fastbootFiles: {},\n    activeAddons: [...engine.addons]\n      .map(([addon, canResolveFromFile]) => ({\n        name: addon.name,\n        root: addon.root,\n        canResolveFromFile,\n      }))\n      // the traditional order is the order in which addons will run, such\n      // that the last one wins. Our resolver's order is the order to\n      // search, so first one wins.\n      .reverse(),\n    isLazy: engine.package.isLazyEngine(),\n  }));\n}\n\n// recurse to find all active addons that don't cross an engine boundary.\n// Inner engines themselves will be returned, but not those engines' children.\n// The output set's insertion order is the proper ember-cli compatible\n// ordering of the addons.\nfunction findActiveAddons(pkg: Package, engine: Engine, extraDeps: Map<string, AddonPackage[]>): void {\n  for (let child of activeAddonChildren(pkg, extraDeps)) {\n    if (engine.addons.has(child)) continue;\n    if (!child.isEngine()) {\n      findActiveAddons(child, engine, extraDeps);\n    }\n    let canResolveFrom = resolvePath(pkg.root, 'package.json');\n    engine.addons.set(child, canResolveFrom);\n  }\n}\n\nfunction activeAddonChildren(pkg: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = (pkg.dependencies.filter(isActiveAddon) as AddonPackage[]).filter(\n    // When looking for child addons, we want to ignore 'peerDependencies' of\n    // a given package, to align with how ember-cli resolves addons. So here\n    // we only include dependencies that are definitely active due to one of\n    // the other sections.\n    addon => pkg.categorizeDependency(addon.name) !== 'peerDependencies'\n  );\n  let extras = extraDeps.get(pkg.root);\n  if (extras) {\n    result = [...result, ...extras];\n  }\n  return result.sort(orderAddons);\n}\n\nfunction isActiveAddon(pkg: Package): boolean {\n  // stage1 already took care of converting everything that's actually active\n  // into v2 addons. If it's not a v2 addon, we don't want it.\n  //\n  // We can encounter v1 addons here when there is inactive stuff floating\n  // around in the node_modules that accidentally satisfy something like an\n  // optional peer dep.\n  return pkg.isV2Addon();\n}\n\nfunction orderAddons(depA: Package, depB: Package): number {\n  let depAIdx = 0;\n  let depBIdx = 0;\n\n  if (depA && depA.meta && depA.isV2Addon()) {\n    depAIdx = depA.meta['order-index'] || 0;\n  }\n  if (depB && depB.meta && depB.isV2Addon()) {\n    depBIdx = depB.meta['order-index'] || 0;\n  }\n\n  return depAIdx - depBIdx;\n}\n\nfunction findAllActiveAddons(appPackage: Package, extraDeps: Map<string, AddonPackage[]>): AddonPackage[] {\n  let result = appPackage.findDescendants(isActiveAddon) as AddonPackage[];\n  let extras = extraDeps.get(appPackage.root);\n  if (extras) {\n    let extraDescendants = flatMap(extras, dep => dep.findDescendants(isActiveAddon)) as AddonPackage[];\n    result = [...result, ...extras, ...extraDescendants];\n  }\n  return result.sort(orderAddons);\n}\n"]}