@embroider/core 3.4.15-unstable.9372659 → 3.4.15-unstable.bd04b35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.15-unstable.9372659",
+  "version": "3.4.15-unstable.bd04b35",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -41,9 +41,9 @@
     "resolve.exports": "^2.0.2",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.6-unstable.9372659",
-    "@embroider/reverse-exports": "0.1.1-unstable.9372659",
-    "@embroider/shared-internals": "2.6.3-unstable.9372659"
+    "@embroider/macros": "1.16.6-unstable.bd04b35",
+    "@embroider/reverse-exports": "0.1.1-unstable.bd04b35",
+    "@embroider/shared-internals": "2.6.3-unstable.bd04b35"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",

package/src/app-files.d.ts

@@ -7,7 +7,6 @@ export interface RouteFiles {
 }
 export declare class AppFiles {
     readonly engine: Engine;
-    readonly tests: ReadonlyArray<string>;
     readonly components: ReadonlyArray<string>;
     readonly helpers: ReadonlyArray<string>;
     readonly modifiers: ReadonlyArray<string>;

package/src/app-files.js

@@ -5,7 +5,6 @@ const path_1 = require("path");
 class AppFiles {
     constructor(engine, appFiles, fastbootFiles, resolvableExtensions, staticAppPathsPattern, podModulePrefix) {
         this.engine = engine;
-        let tests = [];
         let components = [];
         let helpers = [];
         let modifiers = [];
@@ -50,7 +49,7 @@ class AppFiles {
                 continue;
             }
             if (relativePath.startsWith('tests/')) {
-                tests.push(relativePath);
+                // skip tests because they are dealt with separately
                 continue;
             }
             if (relativePath.startsWith('components/')) {
@@ -100,7 +99,6 @@ class AppFiles {
                 otherAppFiles.push(relativePath);
             }
         }
-        this.tests = tests;
         this.components = components;
         this.helpers = helpers;
         this.modifiers = modifiers;

package/src/app-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAU3B,MAAa,QAAQ;IAUnB,YACW,MAAc,EACvB,QAAqB,EACrB,aAA0B,EAC1B,oBAA4B,EAC5B,qBAAyC,EACzC,eAAwB;QALf,WAAM,GAAN,MAAM,CAAQ;QAOvB,IAAI,KAAK,GAAa,EAAE,CAAC;QACzB,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,aAAa,GAAa,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;QAExC,IAAI,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACtC,IAAI,wBAAwB,GAAG,IAAI,GAAG,EAAU,CAAC;QACjD,IAAI,cAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;QAEhD,KAAK,IAAI,CAAC,IAAI,QAAQ,EAAE,CAAC;YACvB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;QACD,KAAK,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC;YAC5B,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;QAED,KAAK,IAAI,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YACvC,IAAI,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBACzC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC5B,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YAED,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,UAAU,EAAE,CAAC;gBACf,KAAK,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7C,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBACzC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,IAAI,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YAC9E,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC7C,SAAS;YACX,CAAC;YAED,IAAI,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBAClC,oEAAoE;gBACpE,4DAA4D;gBAC5D,SAAS;YACX,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACtC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACzB,SAAS;YACX,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC3C,sEAAsE;gBACtE,gEAAgE;gBAChE,qEAAqE;gBACrE,mEAAmE;gBACnE,8CAA8C;gBAC9C,IAAI,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBACrD,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAChC,CAAC;qBAAM,IAAI,KAAK,EAAE,CAAC;oBACjB,mEAAmE;oBACnE,sEAAsE;oBACtE,qEAAqE;oBACrE,oCAAoC;oBACpC,IAAI,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBACnD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC/B,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC1B,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBACrD,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC9B,SAAS;YACX,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC3B,SAAS;YACX,CAAC;YAED,IAAI,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC1C,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC7B,SAAS;YACX,CAAC;YAED,IACE,CAAC,eAAe,KAAK,SAAS,IAAI,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBAC1F,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,EACzC,CAAC;gBACD,SAAS;YACX,CAAC;YAED,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;oBAC9C,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,0EAA0E;QAC1E,0EAA0E;QAC1E,iEAAiE;QACjE,sEAAsE;QACtE,wEAAwE;QACxE,0EAA0E;QAC1E,sEAAsE;QACtE,gCAAgC;QAChC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CACrC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,KAAK,IAAI,EAAE;YACX;gBACE,aAAa,EAAE,gBAAgB,IAAI,EAAE;gBACrC,gBAAgB,EAAE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS;aAC/D;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAAC,YAAoB;QACjD,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1E,IAAI,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAwC,CAAC;QACtE,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACtB,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACpC,MAAM,GAAG,QAAQ,CAAC;YACpB,CAAC;QACH,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,mBAAmB,CAAC,YAAoB,EAAE,eAAuB;QACvE,IAAI,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9D,IAAI,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,8DAA8D;QAC9D,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,OAAO,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC3B,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;gBACvC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACpC,MAAM,GAAG,QAAQ,CAAC;YACpB,CAAC;QACH,CAAC;QACD,MAAM,CAAC,IAA2C,CAAC,GAAG,YAAY,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AA/MD,4BA+MC","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 tests: ReadonlyArray<string>;\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 tests: string[] = [];\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 Set<string>();\n    let combinedNonFastbootFiles = new Set<string>();\n    let isFastbootOnly = new Map<string, boolean>();\n\n    for (let f of appFiles) {\n      combinedFiles.add(f);\n      combinedNonFastbootFiles.add(f);\n    }\n    for (let f of fastbootFiles) {\n      combinedFiles.add(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          combinedFiles.add(filename);\n          combinedNonFastbootFiles.add(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          combinedFiles.add(filename);\n        }\n      }\n    }\n\n    for (let relativePath of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(relativePath));\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\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        continue;\n      }\n\n      if (relativePath.startsWith('tests/')) {\n        tests.push(relativePath);\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          if (!combinedFiles.has(jsPath)) {\n            components.push(jsPath);\n          }\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.tests = tests;\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":["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 Set<string>();\n    let combinedNonFastbootFiles = new Set<string>();\n    let isFastbootOnly = new Map<string, boolean>();\n\n    for (let f of appFiles) {\n      combinedFiles.add(f);\n      combinedNonFastbootFiles.add(f);\n    }\n    for (let f of fastbootFiles) {\n      combinedFiles.add(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          combinedFiles.add(filename);\n          combinedNonFastbootFiles.add(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          combinedFiles.add(filename);\n        }\n      }\n    }\n\n    for (let relativePath of combinedFiles) {\n      isFastbootOnly.set(relativePath, !combinedNonFastbootFiles.has(relativePath));\n      relativePath = relativePath.split(sep).join('/');\n      if (!resolvableExtensions.test(relativePath)) {\n        continue;\n      }\n\n      if (/\\.d\\.ts$/.test(relativePath)) {\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        continue;\n      }\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          if (!combinedFiles.has(jsPath)) {\n            components.push(jsPath);\n          }\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/src/module-resolver.d.ts

@@ -84,7 +84,6 @@ export declare class Resolver {
     private handleFastbootSwitch;
     private handleImplicitModules;
     private handleEntrypoint;
-    private handleTestEntrypoint;
     private handleRouteEntrypoint;
     private handleImplicitTestScripts;
     private handleTestSupportStyles;

package/src/module-resolver.js

@@ -15,7 +15,7 @@ const path_1 = require("path");
 const shared_internals_2 = require("@embroider/shared-internals");
 const debug_1 = __importDefault(require("debug"));
 const assert_never_1 = __importDefault(require("assert-never"));
-const reverse_exports_1 = __importDefault(require("@embroider/reverse-exports"));
+const reverse_exports_1 = require("@embroider/reverse-exports");
 const resolve_exports_1 = require("resolve.exports");
 const virtual_content_1 = require("./virtual-content");
 const typescript_memoize_1 = require("typescript-memoize");
@@ -86,7 +86,6 @@ class Resolver {
         request = this.handleVendorStyles(request);
         request = this.handleTestSupportStyles(request);
         request = this.handleEntrypoint(request);
-        request = this.handleTestEntrypoint(request);
         request = this.handleRouteEntrypoint(request);
         request = this.handleRenaming(request);
         request = this.handleVendor(request);
@@ -267,6 +266,7 @@ class Resolver {
         }
     }
     handleEntrypoint(request) {
+        var _a;
         if (isTerminal(request)) {
             return request;
         }
@@ -292,26 +292,11 @@ class Resolver {
         else {
             pkg = requestingPkg;
         }
-        return logTransition('entrypoint', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-entrypoint.js')));
-    }
-    handleTestEntrypoint(request) {
-        if (isTerminal(request)) {
-            return request;
-        }
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/core/test-entrypoint',
-            '/@embroider/core/test-entrypoint',
-            './@embroider/core/test-entrypoint',
-        ];
-        if (!candidates.some(c => request.specifier === c)) {
-            return request;
-        }
-        const pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember()) || !pkg.isV2App()) {
-            throw new Error(`bug: found test entrypoint import from somewhere other than the top-level app engine: ${request.fromFile}`);
-        }
-        return logTransition('test-entrypoint', request, request.virtualize((0, path_1.resolve)(pkg.root, '-embroider-test-entrypoint.js')));
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        return logTransition('entrypoint', request, request.virtualize((0, path_1.resolve)(pkg.root, (_a = matched === null || matched === void 0 ? void 0 : matched[0]) !== null && _a !== void 0 ? _a : '-embroider-entrypoint.js')));
     }
     handleRouteEntrypoint(request) {
         if (isTerminal(request)) {
@@ -325,7 +310,11 @@ class Resolver {
         if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
         }
-        return logTransition('route entrypoint', request, request.virtualize((0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg.root, routeName)));
+        let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-route-entrypoint.js', {
+            browser: true,
+            conditions: ['default', 'imports'],
+        });
+        return logTransition('route entrypoint', request, request.virtualize((0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg.root, matched === null || matched === void 0 ? void 0 : matched[0], routeName)));
     }
     handleImplicitTestScripts(request) {
         //TODO move the extra forwardslash handling out into the vite plugin
@@ -534,13 +523,17 @@ class Resolver {
                         if (!inAddonName.startsWith('./')) {
                             throw new Error(`addon ${addon.name} declares app-js in its package.json with the illegal name "${inAddonName}". It must start with "./" to make it clear that it's relative to the addon`);
                         }
+                        let specifier = (0, reverse_exports_1.externalName)(addon.packageJSON, inAddonName);
+                        if (!specifier) {
+                            throw new Error(`${addon.name}'s package.json app-js refers to ${inAddonName}, but that module is not accessible from outside the package`);
+                        }
                         let prevEntry = engineModules.get(inEngineName);
                         switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'app-only',
                                     'app-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
+                                        specifier,
                                         fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
@@ -554,7 +547,7 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'app-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
+                                        specifier,
                                         fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
@@ -573,13 +566,17 @@ class Resolver {
                         if (!inAddonName.startsWith('./')) {
                             throw new Error(`addon ${addon.name} declares fastboot-js in its package.json with the illegal name "${inAddonName}". It must start with "./" to make it clear that it's relative to the addon`);
                         }
+                        let specifier = (0, reverse_exports_1.externalName)(addon.packageJSON, inAddonName);
+                        if (!specifier) {
+                            throw new Error(`${addon.name}'s package.json fastboot-js refers to ${inAddonName}, but that module is not accessible from outside the package`);
+                        }
                         let prevEntry = engineModules.get(inEngineName);
                         switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'fastboot-only',
                                     'fastboot-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
+                                        specifier,
                                         fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
@@ -593,7 +590,7 @@ class Resolver {
                                 engineModules.set(inEngineName, {
                                     type: 'both',
                                     'fastboot-js': {
-                                        specifier: (0, reverse_exports_1.default)(addon.packageJSON, inAddonName),
+                                        specifier,
                                         fromFile: addonConfig.canResolveFromFile,
                                         fromPackageName: addon.name,
                                     },
@@ -684,6 +681,9 @@ class Resolver {
         // ember-source might provide backburner via module renaming, but if you
         // have an explicit dependency on backburner you should still get that real
         // copy.
+        // if (pkg.root === this.options.engines[0].root && request.specifier === `${pkg.name}/environment/config`) {
+        //   return logTransition('legacy config location', request, request.alias(`${pkg.name}/app/environment/config`));
+        // }
         if (!pkg.hasDependency(packageName)) {
             for (let [candidate, replacement] of Object.entries(this.options.renameModules)) {
                 if (candidate === request.specifier) {
@@ -713,28 +713,28 @@ class Resolver {
                 let owningEngine = this.owningEngine(pkg);
                 let addonConfig = owningEngine.activeAddons.find(a => a.root === pkg.root);
                 if (addonConfig) {
+                    // auto-upgraded addons get special support for self-resolving here.
                     return logTransition(`v1 addon self-import`, request, request.rehome(addonConfig.canResolveFromFile));
                 }
                 else {
-                    let selfImportPath = request.specifier === pkg.name ? './' : request.specifier.replace(pkg.name, '.');
-                    return logTransition(`v1 app self-import`, request, request.alias(selfImportPath).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
+                    // auto-upgraded apps will necessarily have packageJSON.exports
+                    // because we insert them, so for that support we can fall through to
+                    // that support below.
                 }
             }
-            else {
-                // v2 packages are supposed to use package.json `exports` to enable
-                // self-imports, but not all build tools actually follow the spec. This
-                // is a workaround for badly behaved packagers.
-                //
-                // Known upstream bugs this works around:
-                // - https://github.com/vitejs/vite/issues/9731
-                if (pkg.packageJSON.exports) {
-                    let found = (0, resolve_exports_1.exports)(pkg.packageJSON, request.specifier, {
-                        browser: true,
-                        conditions: ['default', 'imports'],
-                    });
-                    if (found === null || found === void 0 ? void 0 : found[0]) {
-                        return logTransition(`v2 self-import with package.json exports`, request, request.alias(found === null || found === void 0 ? void 0 : found[0]).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
-                    }
+            // v2 packages are supposed to use package.json `exports` to enable
+            // self-imports, but not all build tools actually follow the spec. This
+            // is a workaround for badly behaved packagers.
+            //
+            // Known upstream bugs this works around:
+            // - https://github.com/vitejs/vite/issues/9731
+            if (pkg.packageJSON.exports) {
+                let found = (0, resolve_exports_1.exports)(pkg.packageJSON, request.specifier, {
+                    browser: true,
+                    conditions: ['default', 'imports'],
+                });
+                if (found === null || found === void 0 ? void 0 : found[0]) {
+                    return logTransition(`v2 self-import with package.json exports`, request, request.alias(found === null || found === void 0 ? void 0 : found[0]).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
                 }
             }
         }
@@ -797,18 +797,10 @@ class Resolver {
             }
             // if the requesting file is in an addon's app-js, the relative request
             // should really be understood as a request for a module in the containing
-            // engine
+            // engine.
             let logicalLocation = this.reverseSearchAppTree(pkg, request.fromFile);
             if (logicalLocation) {
-                return logTransition('beforeResolve: relative import in app-js', request, request
-                    .alias('./' + path_1.posix.join((0, path_1.dirname)(logicalLocation.inAppName), request.specifier))
-                    // it's important that we're rehoming this to the root of the engine
-                    // (which we know really exists), and not to a subdir like
-                    // logicalLocation.inAppName (which might not physically exist),
-                    // because some environments (including node's require.resolve) will
-                    // refuse to do resolution from a notional path that doesn't
-                    // physically exist.
-                    .rehome((0, path_1.resolve)(logicalLocation.owningEngine.root, 'package.json')));
+                return logTransition('beforeResolve: relative import in app-js', request, request.alias(path_1.posix.join(logicalLocation.owningEngine.packageName, (0, path_1.dirname)(logicalLocation.inAppName), request.specifier)));
             }
             return request;
         }
@@ -849,12 +841,10 @@ class Resolver {
             }
         }
         // assertions on what native v2 addons can import
-        if (!pkg.meta['auto-upgraded']) {
-            if (!pkg.meta['auto-upgraded'] &&
-                !appImportInAppTree(pkg, logicalPackage, packageName) &&
-                !reliablyResolvable(pkg, packageName)) {
-                throw new Error(`${pkg.name} is trying to import from ${packageName} but that is not one of its explicit dependencies`);
-            }
+        if (!pkg.needsLooseResolving() &&
+            !appImportInAppTree(pkg, logicalPackage, packageName) &&
+            !reliablyResolvable(pkg, packageName)) {
+            throw new Error(`${pkg.name} is trying to import from ${packageName} but that is not one of its explicit dependencies`);
         }
         return request;
     }
@@ -960,7 +950,11 @@ class Resolver {
             if (withinEngine) {
                 // it's a relative import inside an engine (which also means app), which
                 // means we may need to satisfy the request via app tree merging.
-                let appJSMatch = await this.searchAppTree(request, withinEngine, (0, shared_internals_2.explicitRelative)(pkg.root, (0, path_1.resolve)((0, path_1.dirname)(request.fromFile), request.specifier)));
+                let logicalName = engineRelativeName(pkg, (0, path_1.resolve)((0, path_1.dirname)(request.fromFile), request.specifier));
+                if (!logicalName) {
+                    return logTransition('fallbackResolve: relative failure because this file is not externally accessible', request);
+                }
+                let appJSMatch = await this.searchAppTree(request, withinEngine, logicalName);
                 if (appJSMatch) {
                     return logTransition('fallbackResolve: relative appJsMatch', request, appJSMatch);
                 }
@@ -974,7 +968,7 @@ class Resolver {
             }
         }
         // auto-upgraded packages can fall back to the set of known active addons
-        if (pkg.meta['auto-upgraded']) {
+        if (pkg.needsLooseResolving()) {
             let addon = this.locateActiveAddon(packageName);
             if (addon) {
                 const rehomed = request.rehome(addon.canResolveFromFile);
@@ -1004,7 +998,7 @@ class Resolver {
                 return logTransition('fallbackResolve: non-relative appJsMatch', request, appJSMatch);
             }
         }
-        if (pkg.meta['auto-upgraded'] && ((_c = (_b = request.meta) === null || _b === void 0 ? void 0 : _b.runtimeFallback) !== null && _c !== void 0 ? _c : true)) {
+        if (pkg.needsLooseResolving() && ((_c = (_b = request.meta) === null || _b === void 0 ? void 0 : _b.runtimeFallback) !== null && _c !== void 0 ? _c : true)) {
             // auto-upgraded packages can fall back to attempting to find dependencies at
             // runtime. Native v2 packages can only get this behavior in the
             // isExplicitlyExternal case above because they need to explicitly ask for
@@ -1094,14 +1088,10 @@ class Resolver {
         if (engineConfig) {
             // we're directly inside an engine, so we're potentially resolvable as a
             // global component
-            // this kind of mapping is not true in general for all packages, but it
-            // *is* true for all classical engines (which includes apps) since they
-            // don't support package.json `exports`. As for a future v2 engine or app:
-            // this whole method is only relevant for implementing packageRules, which
-            // should only be for classic stuff. v2 packages should do the right
-            // things from the beginning and not need packageRules about themselves.
-            let inAppName = (0, shared_internals_2.explicitRelative)(engineConfig.root, filename);
-            return this.tryReverseComponent(engineConfig.packageName, inAppName);
+            let inAppName = engineRelativeName(owningPackage, filename);
+            if (inAppName) {
+                return this.tryReverseComponent(engineConfig.packageName, inAppName);
+            }
         }
         let engineInfo = this.reverseSearchAppTree(owningPackage, filename);
         if (engineInfo) {
@@ -1149,4 +1139,10 @@ function reliablyResolvable(pkg, packageName) {
 function appImportInAppTree(inPackage, inLogicalPackage, importedPackageName) {
     return inPackage !== inLogicalPackage && importedPackageName === inLogicalPackage.name;
 }
+function engineRelativeName(pkg, filename) {
+    let outsideName = (0, reverse_exports_1.externalName)(pkg.packageJSON, (0, shared_internals_2.explicitRelative)(pkg.root, filename));
+    if (outsideName) {
+        return '.' + outsideName.slice(pkg.name.length);
+    }
+}
 //# sourceMappingURL=module-resolver.js.map