@embroider/core 3.4.20-unstable.b89b741 → 3.4.20-unstable.c3af848

package/src/virtual-route-entrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-route-entrypoint.js","sourceRoot":"","sources":["virtual-route-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { AppFiles } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport { resolve } from 'path';\nimport { compile } from './js-handlebars';\nimport { extensionsPattern } from '@embroider/shared-internals';\nimport { partition } from 'lodash';\nimport { getAppFiles, getFastbootFiles, importPaths, splitRoute, staticAppPathsPattern } from './virtual-entrypoint';\n\nconst entrypointPattern = /(?<filename>.*)[\\\\/]-embroider-route-entrypoint.js:route=(?<route>.*)/;\n\nexport function encodeRouteEntrypoint(packagePath: string, matched: string | undefined, routeName: string): string {\n  return resolve(\n    packagePath,\n    matched ? `${matched}:route=${routeName}` : `-embroider-route-entrypoint.js:route=${routeName}`\n  );\n}\n\nexport function decodeRouteEntrypoint(filename: string): { fromDir: string; route: string } | undefined {\n  // Performance: avoid paying regex exec cost unless needed\n  if (!filename.includes('-embroider-route-entrypoint')) {\n    return;\n  }\n  let m = entrypointPattern.exec(filename);\n  if (m) {\n    return {\n      fromDir: m.groups!.filename,\n      route: m.groups!.route,\n    };\n  }\n}\n\nexport function encodePublicRouteEntrypoint(routeNames: string[], _files: string[]) {\n  return `@embroider/core/route/${encodeURIComponent(routeNames[0])}`;\n}\n\nexport function decodePublicRouteEntrypoint(specifier: string): string | null {\n  const publicPrefix = '@embroider/core/route/';\n  if (!specifier.startsWith(publicPrefix)) {\n    return null;\n  }\n\n  return specifier.slice(publicPrefix.length);\n}\n\nexport function renderRouteEntrypoint(\n  resolver: Resolver,\n  { fromDir, route }: { fromDir: string; route: string }\n): { src: string; watches: string[] } {\n  const owner = resolver.packageCache.ownerOfFile(fromDir);\n\n  if (!owner) {\n    throw new Error('Owner expected'); // ToDo: Really bad error, update message\n  }\n\n  let engine = resolver.owningEngine(owner);\n  let isApp = owner?.root === resolver.options.engines[0]!.root;\n  let hasFastboot = Boolean(resolver.options.engines[0]!.activeAddons.find(a => a.name === 'ember-cli-fastboot'));\n\n  let appFiles = new AppFiles(\n    {\n      package: owner,\n      addons: new Map(\n        engine.activeAddons.map(addon => [\n          resolver.packageCache.get(addon.root) as V2AddonPackage,\n          addon.canResolveFromFile,\n        ])\n      ),\n      isApp,\n      modulePrefix: isApp ? resolver.options.modulePrefix : engine.packageName,\n      appRelativePath: 'NOT_USED_DELETE_ME',\n    },\n    getAppFiles(fromDir),\n    hasFastboot ? getFastbootFiles(owner.root) : new Set(),\n    extensionsPattern(resolver.options.resolvableExtensions),\n    staticAppPathsPattern(resolver.options.staticAppPaths),\n    resolver.options.podModulePrefix\n  );\n\n  let src = '';\n\n  for (let [routeName, routeFiles] of appFiles.routeFiles.children) {\n    splitRoute(\n      routeName,\n      routeFiles,\n      resolver.options.splitAtRoutes,\n      (_: string, _filename: string) => {\n        // noop\n      },\n      (routeNames: string[], routeFiles: string[]) => {\n        if (routeNames[0] === route) {\n          let [fastboot, nonFastboot] = partition(routeFiles, file => appFiles.isFastbootOnly.get(file));\n\n          const amdModules = nonFastboot.map(f => importPaths(resolver, appFiles, f));\n          const fastbootOnlyAmdModules = fastboot.map(f => importPaths(resolver, appFiles, f));\n\n          src = routeEntryTemplate({\n            amdModules,\n            fastbootOnlyAmdModules,\n          });\n        }\n      }\n    );\n  }\n\n  return { src, watches: [] };\n}\n\nconst routeEntryTemplate = compile(`\nconst output = {};\nexport default output;\n\n{{#each amdModules as |amdModule index| ~}}\n  import * as amdModule{{index}} from \"{{js-string-escape amdModule.buildtime}}\"\n  output[\"{{js-string-escape amdModule.runtime}}\"] = amdModule{{index}};\n{{/each}}\n\n{{#if fastbootOnlyAmdModules}}\n  if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {\n    {{#each fastbootOnlyAmdModules as |amdModule| ~}}\n      output[\"{{js-string-escape amdModule.runtime}}\"] = await import(\"{{js-string-escape amdModule.buildtime}}\");\n    {{/each}}\n  }\n{{/if}}\n`) as (params: {\n  amdModules: { runtime: string; buildtime: string }[];\n  fastbootOnlyAmdModules: { runtime: string; buildtime: string }[];\n}) => string;\n"]}
+{"version":3,"file":"virtual-route-entrypoint.js","sourceRoot":"","sources":["virtual-route-entrypoint.ts"],"names":[],"mappings":"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","sourcesContent":["import type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { AppFiles } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport { compile } from './js-handlebars';\nimport { extensionsPattern } from '@embroider/shared-internals';\nimport { partition } from 'lodash';\nimport { getAppFiles, getFastbootFiles, importPaths, splitRoute, staticAppPathsPattern } from './virtual-entrypoint';\n\nexport interface RouteEntrypointResponse {\n  type: 'route-entrypoint';\n  fromDir: string;\n  route: string;\n}\n\nexport function renderRouteEntrypoint(\n  { fromDir, route }: RouteEntrypointResponse,\n  resolver: Resolver\n): { src: string; watches: string[] } {\n  const owner = resolver.packageCache.ownerOfFile(fromDir);\n\n  if (!owner) {\n    throw new Error('Owner expected'); // ToDo: Really bad error, update message\n  }\n\n  let engine = resolver.owningEngine(owner);\n  let isApp = owner?.root === resolver.options.engines[0]!.root;\n  let hasFastboot = Boolean(resolver.options.engines[0]!.activeAddons.find(a => a.name === 'ember-cli-fastboot'));\n\n  let appFiles = new AppFiles(\n    {\n      package: owner,\n      addons: new Map(\n        engine.activeAddons.map(addon => [\n          resolver.packageCache.get(addon.root) as V2AddonPackage,\n          addon.canResolveFromFile,\n        ])\n      ),\n      isApp,\n      modulePrefix: isApp ? resolver.options.modulePrefix : engine.packageName,\n      appRelativePath: 'NOT_USED_DELETE_ME',\n    },\n    getAppFiles(fromDir),\n    hasFastboot ? getFastbootFiles(owner.root) : new Set(),\n    extensionsPattern(resolver.options.resolvableExtensions),\n    staticAppPathsPattern(resolver.options.staticAppPaths),\n    resolver.options.podModulePrefix\n  );\n\n  let src = '';\n\n  for (let [routeName, routeFiles] of appFiles.routeFiles.children) {\n    splitRoute(\n      routeName,\n      routeFiles,\n      resolver.options.splitAtRoutes,\n      (_: string, _filename: string) => {\n        // noop\n      },\n      (routeNames: string[], routeFiles: string[]) => {\n        if (routeNames[0] === route) {\n          let [fastboot, nonFastboot] = partition(routeFiles, file => appFiles.isFastbootOnly.get(file));\n\n          const amdModules = nonFastboot.map(f => importPaths(resolver, appFiles, f));\n          const fastbootOnlyAmdModules = fastboot.map(f => importPaths(resolver, appFiles, f));\n\n          src = routeEntryTemplate({\n            amdModules,\n            fastbootOnlyAmdModules,\n          });\n        }\n      }\n    );\n  }\n\n  return { src, watches: [] };\n}\n\nconst routeEntryTemplate = compile(`\nconst output = {};\nexport default output;\n\n{{#each amdModules as |amdModule index| ~}}\n  import * as amdModule{{index}} from \"{{js-string-escape amdModule.buildtime}}\"\n  output[\"{{js-string-escape amdModule.runtime}}\"] = amdModule{{index}};\n{{/each}}\n\n{{#if fastbootOnlyAmdModules}}\n  if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {\n    {{#each fastbootOnlyAmdModules as |amdModule| ~}}\n      output[\"{{js-string-escape amdModule.runtime}}\"] = await import(\"{{js-string-escape amdModule.buildtime}}\");\n    {{/each}}\n  }\n{{/if}}\n`) as (params: {\n  amdModules: { runtime: string; buildtime: string }[];\n  fastbootOnlyAmdModules: { runtime: string; buildtime: string }[];\n}) => string;\n"]}

package/src/virtual-test-support-styles.d.ts

@@ -1,4 +1,7 @@
 import type { Resolver } from './module-resolver';
 import type { VirtualContentResult } from './virtual-content';
-export declare function decodeTestSupportStyles(filename: string): boolean;
-export declare function renderTestSupportStyles(filename: string, resolver: Resolver): VirtualContentResult;
+export interface TestSupportStylesResponse {
+    type: 'test-support-css';
+    specifier: string;
+}
+export declare function renderTestSupportStyles(response: TestSupportStylesResponse, resolver: Resolver): VirtualContentResult;

package/src/virtual-test-support-styles.js

@@ -3,15 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeTestSupportStyles = decodeTestSupportStyles;
 exports.renderTestSupportStyles = renderTestSupportStyles;
 const fs_1 = require("fs");
 const lodash_1 = require("lodash");
 const resolve_1 = __importDefault(require("resolve"));
-function decodeTestSupportStyles(filename) {
-    return filename.endsWith('-embroider-test-support-styles.css');
-}
-function renderTestSupportStyles(filename, resolver) {
+function renderTestSupportStyles(response, resolver) {
+    const filename = response.specifier;
     const owner = resolver.packageCache.ownerOfFile(filename);
     if (!owner) {
         throw new Error(`Failed to find a valid owner for ${filename}`);

package/src/virtual-test-support-styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-test-support-styles.js","sourceRoot":"","sources":["virtual-test-support-styles.ts"],"names":[],"mappings":";;;;;AASA,0DAEC;AAED,0DAMC;AAjBD,2BAAkC;AAClC,mCAAgC;AAChC,sDAA8B;AAK9B,SAAgB,uBAAuB,CAAC,QAAgB;IACtD,OAAO,QAAQ,CAAC,QAAQ,CAAC,oCAAoC,CAAC,CAAC;AACjE,CAAC;AAED,SAAgB,uBAAuB,CAAC,QAAgB,EAAE,QAAkB;IAC1E,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc,EAAE,QAAkB;IAC9D,IAAI,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,GAAW;QACnB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,IAAI,GAAG,CACb,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB;YACvD,KAAK,CAAC,kBAAkB;SACzB,CAAC,CACH;QACD,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY;QAC3C,eAAe,EAAE,oBAAoB;KACtC,CAAC;IAEF,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAc;IAC/C,IAAI,MAAM,GAAa,6BAA6B,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAU,EAAE;QAC9F,IAAI,MAAM,GAAG,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,GAAG,MAAM,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,6BAA6B,CAAC,MAAc;IACnD,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;QAC/D,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,WAAW;gBACd,OAAO,CAAC,CAAC;YACX,KAAK,cAAc;gBACjB,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;QACH,IAAI,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACxD,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,iBAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Engine } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport function decodeTestSupportStyles(filename: string): boolean {\n  return filename.endsWith('-embroider-test-support-styles.css');\n}\n\nexport function renderTestSupportStyles(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getTestSupportStyles(owner, resolver), watches: [] };\n}\n\nfunction getTestSupportStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: true,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateTestSupportStyles(engine);\n}\n\nfunction generateTestSupportStyles(engine: Engine): string {\n  let result: string[] = impliedAddonTestSupportStyles(engine).map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonTestSupportStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    let implicitStyles = addon.meta['implicit-test-styles'];\n    if (implicitStyles) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitStyles) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}
+{"version":3,"file":"virtual-test-support-styles.js","sourceRoot":"","sources":["virtual-test-support-styles.ts"],"names":[],"mappings":";;;;;AAcA,0DAOC;AAnBD,2BAAkC;AAClC,mCAAgC;AAChC,sDAA8B;AAU9B,SAAgB,uBAAuB,CAAC,QAAmC,EAAE,QAAkB;IAC7F,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AACrE,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc,EAAE,QAAkB;IAC9D,IAAI,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,GAAW;QACnB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,IAAI,GAAG,CACb,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB;YACvD,KAAK,CAAC,kBAAkB;SACzB,CAAC,CACH;QACD,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY;QAC3C,eAAe,EAAE,oBAAoB;KACtC,CAAC;IAEF,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAc;IAC/C,IAAI,MAAM,GAAa,6BAA6B,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAU,EAAE;QAC9F,IAAI,MAAM,GAAG,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,GAAG,MAAM,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,6BAA6B,CAAC,MAAc;IACnD,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;QAC/D,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,WAAW;gBACd,OAAO,CAAC,CAAC;YACX,KAAK,cAAc;gBACjB,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;QACH,IAAI,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACxD,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,iBAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Engine } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport interface TestSupportStylesResponse {\n  type: 'test-support-css';\n  specifier: string;\n}\n\nexport function renderTestSupportStyles(response: TestSupportStylesResponse, resolver: Resolver): VirtualContentResult {\n  const filename = response.specifier;\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getTestSupportStyles(owner, resolver), watches: [] };\n}\n\nfunction getTestSupportStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: true,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateTestSupportStyles(engine);\n}\n\nfunction generateTestSupportStyles(engine: Engine): string {\n  let result: string[] = impliedAddonTestSupportStyles(engine).map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonTestSupportStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    let implicitStyles = addon.meta['implicit-test-styles'];\n    if (implicitStyles) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitStyles) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}

package/src/virtual-test-support.d.ts

@@ -1,4 +1,7 @@
 import type { Resolver } from './module-resolver';
 import type { VirtualContentResult } from './virtual-content';
-export declare function decodeImplicitTestScripts(filename: string): boolean;
-export declare function renderImplicitTestScripts(filename: string, resolver: Resolver): VirtualContentResult;
+export interface TestSupportResponse {
+    type: 'test-support-js';
+    specifier: string;
+}
+export declare function renderImplicitTestScripts(response: TestSupportResponse, resolver: Resolver): VirtualContentResult;

package/src/virtual-test-support.js

@@ -3,14 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeImplicitTestScripts = decodeImplicitTestScripts;
 exports.renderImplicitTestScripts = renderImplicitTestScripts;
 const fs_1 = require("fs");
 const resolve_1 = __importDefault(require("resolve"));
-function decodeImplicitTestScripts(filename) {
-    return filename.endsWith('-embroider-test-support.js');
-}
-function renderImplicitTestScripts(filename, resolver) {
+function renderImplicitTestScripts(response, resolver) {
+    const filename = response.specifier;
     const owner = resolver.packageCache.ownerOfFile(filename);
     if (!owner) {
         throw new Error(`Failed to find a valid owner for ${filename}`);

package/src/virtual-test-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-test-support.js","sourceRoot":"","sources":["virtual-test-support.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport resolve from 'resolve';\nimport type { Engine } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport function decodeImplicitTestScripts(filename: string): boolean {\n  return filename.endsWith('-embroider-test-support.js');\n}\n\nexport function renderImplicitTestScripts(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getTestSupport(owner, resolver), watches: [] };\n}\n\nfunction getTestSupport(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: true,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateTestSupport(engine);\n}\n\nfunction generateTestSupport(engine: Engine): string {\n  // Add classic addons test-support\n  let result: string[] = impliedAddonTestSupport(engine);\n  let hasEmbroiderMacrosTestSupport = result.find(sourcePath =>\n    sourcePath.endsWith('embroider-macros-test-support.js')\n  );\n  result = result.map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n\n  // Add _testing_suffix_.js\n  result.push(`\nvar runningTests=true;\nif (typeof Testem !== 'undefined' && (typeof QUnit !== 'undefined' || typeof Mocha !== 'undefined')) {\n  Testem.hookIntoTestFramework();\n}`);\n\n  // whether or not anybody was actually using @embroider/macros explicitly\n  // as an addon, we ensure its test-support file is always present.\n  if (!hasEmbroiderMacrosTestSupport) {\n    result.unshift(`${readFileSync(require.resolve('@embroider/macros/src/vendor/embroider-macros-test-support'))}`);\n  }\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonTestSupport(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of Array.from(engine.addons.keys())) {\n    let implicitScripts = addon.meta['implicit-test-scripts'];\n    if (implicitScripts) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitScripts) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}
+{"version":3,"file":"virtual-test-support.js","sourceRoot":"","sources":["virtual-test-support.ts"],"names":[],"mappings":";;;;;AAaA,8DAOC;AAlBD,2BAAkC;AAClC,sDAA8B;AAU9B,SAAgB,yBAAyB,CAAC,QAA6B,EAAE,QAAkB;IACzF,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,cAAc,CAAC,KAAc,EAAE,QAAkB;IACxD,IAAI,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,GAAW;QACnB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,IAAI,GAAG,CACb,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB;YACvD,KAAK,CAAC,kBAAkB;SACzB,CAAC,CACH;QACD,KAAK,EAAE,IAAI;QACX,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY;QAC3C,eAAe,EAAE,oBAAoB;KACtC,CAAC;IAEF,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IACzC,kCAAkC;IAClC,IAAI,MAAM,GAAa,uBAAuB,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,6BAA6B,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC3D,UAAU,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CACxD,CAAC;IACF,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAU,EAAE;QACjD,IAAI,MAAM,GAAG,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,GAAG,MAAM,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,0BAA0B;IAC1B,MAAM,CAAC,IAAI,CAAC;;;;EAIZ,CAAC,CAAC;IAEF,yEAAyE;IACzE,kEAAkE;IAClE,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACnC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,OAAO,CAAC,4DAA4D,CAAC,CAAC,EAAE,CAAC,CAAC;IACnH,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAc;IAC7C,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACnD,IAAI,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC1D,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,iBAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport resolve from 'resolve';\nimport type { Engine } from './app-files';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport interface TestSupportResponse {\n  type: 'test-support-js';\n  specifier: string;\n}\n\nexport function renderImplicitTestScripts(response: TestSupportResponse, resolver: Resolver): VirtualContentResult {\n  const filename = response.specifier;\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getTestSupport(owner, resolver), watches: [] };\n}\n\nfunction getTestSupport(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: true,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateTestSupport(engine);\n}\n\nfunction generateTestSupport(engine: Engine): string {\n  // Add classic addons test-support\n  let result: string[] = impliedAddonTestSupport(engine);\n  let hasEmbroiderMacrosTestSupport = result.find(sourcePath =>\n    sourcePath.endsWith('embroider-macros-test-support.js')\n  );\n  result = result.map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n\n  // Add _testing_suffix_.js\n  result.push(`\nvar runningTests=true;\nif (typeof Testem !== 'undefined' && (typeof QUnit !== 'undefined' || typeof Mocha !== 'undefined')) {\n  Testem.hookIntoTestFramework();\n}`);\n\n  // whether or not anybody was actually using @embroider/macros explicitly\n  // as an addon, we ensure its test-support file is always present.\n  if (!hasEmbroiderMacrosTestSupport) {\n    result.unshift(`${readFileSync(require.resolve('@embroider/macros/src/vendor/embroider-macros-test-support'))}`);\n  }\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonTestSupport(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of Array.from(engine.addons.keys())) {\n    let implicitScripts = addon.meta['implicit-test-scripts'];\n    if (implicitScripts) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitScripts) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}

package/src/virtual-vendor-styles.d.ts

@@ -1,4 +1,8 @@
 import type { Resolver } from './module-resolver';
 import type { VirtualContentResult } from './virtual-content';
+export interface VirtualVendorStylesResponse {
+    type: 'vendor-css';
+    specifier: string;
+}
 export declare function decodeVirtualVendorStyles(filename: string): boolean;
-export declare function renderVendorStyles(filename: string, resolver: Resolver): VirtualContentResult;
+export declare function renderVendorStyles(response: VirtualVendorStylesResponse, resolver: Resolver): VirtualContentResult;

package/src/virtual-vendor-styles.js

@@ -11,7 +11,8 @@ const resolve_1 = __importDefault(require("resolve"));
 function decodeVirtualVendorStyles(filename) {
     return filename.endsWith('-embroider-vendor-styles.css');
 }
-function renderVendorStyles(filename, resolver) {
+function renderVendorStyles(response, resolver) {
+    const filename = response.specifier;
     const owner = resolver.packageCache.ownerOfFile(filename);
     if (!owner) {
         throw new Error(`Failed to find a valid owner for ${filename}`);

package/src/virtual-vendor-styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-vendor-styles.js","sourceRoot":"","sources":["virtual-vendor-styles.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\nimport type { Engine } from './app-files';\n\nexport function decodeVirtualVendorStyles(filename: string): boolean {\n  return filename.endsWith('-embroider-vendor-styles.css');\n}\n\nexport function renderVendorStyles(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getVendorStyles(owner, resolver), watches: [] };\n}\n\nfunction getVendorStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: engineConfig.root === resolver.options.engines[0].root,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateVendorStyles(engine);\n}\n\nfunction generateVendorStyles(engine: Engine): string {\n  let result: string[] = impliedAddonVendorStyles(engine).map(sourcePath => readFileSync(sourcePath, 'utf-8'));\n\n  // add the engines own styles but only if it is not the top-level app, that is provided by @embroider/synthesized-styles\n  if (!engine.isApp) {\n    let engineStyles = [];\n\n    engineStyles = getAddonImplicitStyles(engine.package as V2AddonPackage).map(sourcePath =>\n      readFileSync(sourcePath, 'utf-8')\n    );\n\n    // add engine's own implicit styles after all vendor styles\n    if (engineStyles.length) {\n      result = [...result, ...engineStyles];\n    }\n  }\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonVendorStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    // exclude lazy engines because they will handle their own css importation\n    if (addon.isLazyEngine()) {\n      continue;\n    }\n\n    let styles = getAddonImplicitStyles(addon);\n\n    if (styles.length) {\n      result = [...styles, ...result];\n    }\n  }\n  return result;\n}\n\nfunction getAddonImplicitStyles(pkg: V2AddonPackage): string[] {\n  let implicitStyles = pkg.meta['implicit-styles'];\n  let styles = [];\n  if (implicitStyles) {\n    let options = { basedir: pkg.root };\n    for (let mod of implicitStyles) {\n      styles.push(resolve.sync(mod, options));\n    }\n  }\n  return styles;\n}\n"]}
+{"version":3,"file":"virtual-vendor-styles.js","sourceRoot":"","sources":["virtual-vendor-styles.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Package } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { readFileSync } from 'fs';\nimport { sortBy } from 'lodash';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\nimport type { Engine } from './app-files';\n\nexport interface VirtualVendorStylesResponse {\n  type: 'vendor-css';\n  specifier: string;\n}\n\nexport function decodeVirtualVendorStyles(filename: string): boolean {\n  return filename.endsWith('-embroider-vendor-styles.css');\n}\n\nexport function renderVendorStyles(response: VirtualVendorStylesResponse, resolver: Resolver): VirtualContentResult {\n  const filename = response.specifier;\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getVendorStyles(owner, resolver), watches: [] };\n}\n\nfunction getVendorStyles(owner: Package, resolver: Resolver): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let engine: Engine = {\n    package: owner,\n    addons: new Map(\n      engineConfig.activeAddons.map(addon => [\n        resolver.packageCache.get(addon.root) as V2AddonPackage,\n        addon.canResolveFromFile,\n      ])\n    ),\n    isApp: engineConfig.root === resolver.options.engines[0].root,\n    modulePrefix: resolver.options.modulePrefix,\n    appRelativePath: 'NOT_USED_DELETE_ME',\n  };\n\n  return generateVendorStyles(engine);\n}\n\nfunction generateVendorStyles(engine: Engine): string {\n  let result: string[] = impliedAddonVendorStyles(engine).map(sourcePath => readFileSync(sourcePath, 'utf-8'));\n\n  // add the engines own styles but only if it is not the top-level app, that is provided by @embroider/synthesized-styles\n  if (!engine.isApp) {\n    let engineStyles = [];\n\n    engineStyles = getAddonImplicitStyles(engine.package as V2AddonPackage).map(sourcePath =>\n      readFileSync(sourcePath, 'utf-8')\n    );\n\n    // add engine's own implicit styles after all vendor styles\n    if (engineStyles.length) {\n      result = [...result, ...engineStyles];\n    }\n  }\n\n  return result.join('') as string;\n}\n\nfunction impliedAddonVendorStyles(engine: Engine): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(engine.addons.keys()), pkg => {\n    switch (pkg.name) {\n      case 'loader.js':\n        return 0;\n      case 'ember-source':\n        return 10;\n      default:\n        return 1000;\n    }\n  })) {\n    // exclude lazy engines because they will handle their own css importation\n    if (addon.isLazyEngine()) {\n      continue;\n    }\n\n    let styles = getAddonImplicitStyles(addon);\n\n    if (styles.length) {\n      result = [...styles, ...result];\n    }\n  }\n  return result;\n}\n\nfunction getAddonImplicitStyles(pkg: V2AddonPackage): string[] {\n  let implicitStyles = pkg.meta['implicit-styles'];\n  let styles = [];\n  if (implicitStyles) {\n    let options = { basedir: pkg.root };\n    for (let mod of implicitStyles) {\n      styles.push(resolve.sync(mod, options));\n    }\n  }\n  return styles;\n}\n"]}

package/src/virtual-vendor.d.ts

@@ -1,4 +1,7 @@
 import type { Resolver } from './module-resolver';
 import type { VirtualContentResult } from './virtual-content';
-export declare function decodeVirtualVendor(filename: string): boolean;
-export declare function renderVendor(filename: string, resolver: Resolver): VirtualContentResult;
+export interface VirtualVendorResponse {
+    type: 'vendor-js';
+    specifier: string;
+}
+export declare function renderVendor(response: VirtualVendorResponse, resolver: Resolver): VirtualContentResult;

package/src/virtual-vendor.js

@@ -3,21 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeVirtualVendor = decodeVirtualVendor;
 exports.renderVendor = renderVendor;
 const shared_internals_1 = require("@embroider/shared-internals");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const resolve_1 = __importDefault(require("resolve"));
-function decodeVirtualVendor(filename) {
-    return filename.endsWith('-embroider-vendor.js');
-}
-function renderVendor(filename, resolver) {
-    const owner = resolver.packageCache.ownerOfFile(filename);
+function renderVendor(response, resolver) {
+    const owner = resolver.packageCache.ownerOfFile(response.specifier);
     if (!owner) {
-        throw new Error(`Failed to find a valid owner for ${filename}`);
+        throw new Error(`Failed to find a valid owner for ${response.specifier}`);
     }
-    return { src: getVendor(owner, resolver, filename), watches: [] };
+    return { src: getVendor(owner, resolver, response.specifier), watches: [] };
 }
 function getVendor(owner, resolver, filename) {
     let engineConfig = resolver.owningEngine(owner);

package/src/virtual-vendor.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-vendor.js","sourceRoot":"","sources":["virtual-vendor.ts"],"names":[],"mappings":";;;;;AAQA,kDAEC;AAED,oCAMC;AAlBD,kEAAsF;AAEtF,uCAAiE;AACjE,+BAA4B;AAC5B,sDAA8B;AAI9B,SAAgB,mBAAmB,CAAC,QAAgB;IAClD,OAAO,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;AACnD,CAAC;AAED,SAAgB,YAAY,CAAC,QAAgB,EAAE,QAAkB;IAC/D,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AACpE,CAAC;AAED,SAAS,SAAS,CAAC,KAAc,EAAE,QAAkB,EAAE,QAAgB;IACrE,IAAI,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB,CAAC,CAAC;IAE7G,IAAI,IAAI,GAAG,IAAA,WAAI,EAAC,IAAA,4CAAyB,EAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACvF,IAAI,CAAC,IAAA,oBAAS,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,iEAAiE,QAAQ,EAAE,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;IAElC,OAAO,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,cAAc,CAAC,MAAwB,EAAE,QAAkB;IAClE,8BAA8B;IAC9B,IAAI,MAAM,GAAa,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAU,EAAE;QACpF,IAAI,MAAM,GAAG,IAAA,uBAAY,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,GAAG,MAAM,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,0BAA0B;IAC1B,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC1C,qBAAqB;IACrB,MAAM,CAAC,OAAO,CAAC,oDAAoD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IAE3G,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAwB;IACnD,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,iBAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { type Package, locateEmbroiderWorkingDir } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { lstatSync, readFileSync, readJSONSync } from 'fs-extra';\nimport { join } from 'path';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport function decodeVirtualVendor(filename: string): boolean {\n  return filename.endsWith('-embroider-vendor.js');\n}\n\nexport function renderVendor(filename: string, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(filename);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${filename}`);\n  }\n  return { src: getVendor(owner, resolver, filename), watches: [] };\n}\n\nfunction getVendor(owner: Package, resolver: Resolver, filename: string): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let addons = engineConfig.activeAddons.map(addon => resolver.packageCache.get(addon.root) as V2AddonPackage);\n\n  let path = join(locateEmbroiderWorkingDir(resolver.options.appRoot), 'ember-env.json');\n  if (!lstatSync(path).isFile()) {\n    throw new Error(`Failed to read the ember-env.json when generating content for ${filename}`);\n  }\n  let emberENV = readJSONSync(path);\n\n  return generateVendor(addons, emberENV);\n}\n\nfunction generateVendor(addons: V2AddonPackage[], emberENV?: unknown): string {\n  // Add addons implicit-scripts\n  let vendor: string[] = impliedAddonVendors(addons).map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n  // Add _testing_prefix_.js\n  vendor.unshift(`var runningTests=false;`);\n  // Add _ember_env_.js\n  vendor.unshift(`window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`);\n\n  return vendor.join('') as string;\n}\n\nfunction impliedAddonVendors(addons: V2AddonPackage[]): string[] {\n  let result: Array<string> = [];\n  for (let addon of addons) {\n    let implicitScripts = addon.meta['implicit-scripts'];\n    if (implicitScripts) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitScripts) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}
+{"version":3,"file":"virtual-vendor.js","sourceRoot":"","sources":["virtual-vendor.ts"],"names":[],"mappings":";;;;;AAaA,oCAMC;AAnBD,kEAAsF;AAEtF,uCAAiE;AACjE,+BAA4B;AAC5B,sDAA8B;AAS9B,SAAgB,YAAY,CAAC,QAA+B,EAAE,QAAkB;IAC9E,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAC9E,CAAC;AAED,SAAS,SAAS,CAAC,KAAc,EAAE,QAAkB,EAAE,QAAgB;IACrE,IAAI,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB,CAAC,CAAC;IAE7G,IAAI,IAAI,GAAG,IAAA,WAAI,EAAC,IAAA,4CAAyB,EAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC;IACvF,IAAI,CAAC,IAAA,oBAAS,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,iEAAiE,QAAQ,EAAE,CAAC,CAAC;IAC/F,CAAC;IACD,IAAI,QAAQ,GAAG,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;IAElC,OAAO,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,cAAc,CAAC,MAAwB,EAAE,QAAkB;IAClE,8BAA8B;IAC9B,IAAI,MAAM,GAAa,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAU,EAAE;QACpF,IAAI,MAAM,GAAG,IAAA,uBAAY,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,GAAG,MAAM,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IACH,0BAA0B;IAC1B,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC1C,qBAAqB;IACrB,MAAM,CAAC,OAAO,CAAC,oDAAoD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IAE3G,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAwB;IACnD,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACrD,IAAI,eAAe,EAAE,CAAC;YACpB,IAAI,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACtC,KAAK,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,iBAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { type Package, locateEmbroiderWorkingDir } from '@embroider/shared-internals';\nimport type { V2AddonPackage } from '@embroider/shared-internals/src/package';\nimport { lstatSync, readFileSync, readJSONSync } from 'fs-extra';\nimport { join } from 'path';\nimport resolve from 'resolve';\nimport type { Resolver } from './module-resolver';\nimport type { VirtualContentResult } from './virtual-content';\n\nexport interface VirtualVendorResponse {\n  type: 'vendor-js';\n  specifier: string;\n}\n\nexport function renderVendor(response: VirtualVendorResponse, resolver: Resolver): VirtualContentResult {\n  const owner = resolver.packageCache.ownerOfFile(response.specifier);\n  if (!owner) {\n    throw new Error(`Failed to find a valid owner for ${response.specifier}`);\n  }\n  return { src: getVendor(owner, resolver, response.specifier), watches: [] };\n}\n\nfunction getVendor(owner: Package, resolver: Resolver, filename: string): string {\n  let engineConfig = resolver.owningEngine(owner);\n  let addons = engineConfig.activeAddons.map(addon => resolver.packageCache.get(addon.root) as V2AddonPackage);\n\n  let path = join(locateEmbroiderWorkingDir(resolver.options.appRoot), 'ember-env.json');\n  if (!lstatSync(path).isFile()) {\n    throw new Error(`Failed to read the ember-env.json when generating content for ${filename}`);\n  }\n  let emberENV = readJSONSync(path);\n\n  return generateVendor(addons, emberENV);\n}\n\nfunction generateVendor(addons: V2AddonPackage[], emberENV?: unknown): string {\n  // Add addons implicit-scripts\n  let vendor: string[] = impliedAddonVendors(addons).map((sourcePath: string): string => {\n    let source = readFileSync(sourcePath);\n    return `${source}`;\n  });\n  // Add _testing_prefix_.js\n  vendor.unshift(`var runningTests=false;`);\n  // Add _ember_env_.js\n  vendor.unshift(`window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`);\n\n  return vendor.join('') as string;\n}\n\nfunction impliedAddonVendors(addons: V2AddonPackage[]): string[] {\n  let result: Array<string> = [];\n  for (let addon of addons) {\n    let implicitScripts = addon.meta['implicit-scripts'];\n    if (implicitScripts) {\n      let options = { basedir: addon.root };\n      for (let mod of implicitScripts) {\n        result.push(resolve.sync(mod, options));\n      }\n    }\n  }\n  return result;\n}\n"]}