@embroider/core 3.4.20-unstable.aaeb674 → 3.4.20-unstable.b470496

package/src/virtual-vendor.js

@@ -3,29 +3,21 @@ 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 lodash_1 = require("lodash");
 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);
-    let addons = new Map(engineConfig.activeAddons.map(addon => [
-        resolver.packageCache.get(addon.root),
-        addon.canResolveFromFile,
-    ]));
+    let addons = engineConfig.activeAddons.map(addon => resolver.packageCache.get(addon.root));
     let path = (0, path_1.join)((0, shared_internals_1.locateEmbroiderWorkingDir)(resolver.options.appRoot), 'ember-env.json');
     if (!(0, fs_extra_1.lstatSync)(path).isFile()) {
         throw new Error(`Failed to read the ember-env.json when generating content for ${filename}`);
@@ -43,22 +35,11 @@ function generateVendor(addons, emberENV) {
     vendor.unshift(`var runningTests=false;`);
     // Add _ember_env_.js
     vendor.unshift(`window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`);
-    // Add _loader_.js
-    vendor.push(`loader.makeDefaultExport=false;`);
     return vendor.join('');
 }
 function impliedAddonVendors(addons) {
     let result = [];
-    for (let addon of (0, lodash_1.sortBy)(Array.from(addons.keys()), pkg => {
-        switch (pkg.name) {
-            case 'loader.js':
-                return 0;
-            case 'ember-source':
-                return 10;
-            default:
-                return 1000;
-        }
-    })) {
+    for (let addon of addons) {
         let implicitScripts = addon.meta['implicit-scripts'];
         if (implicitScripts) {
             let options = { basedir: addon.root };

package/src/virtual-vendor.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-vendor.js","sourceRoot":"","sources":["virtual-vendor.ts"],"names":[],"mappings":";;;;;AASA,kDAEC;AAED,oCAMC;AAnBD,kEAAsF;AAEtF,uCAAiE;AACjE,mCAAgC;AAChC,+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,IAAI,GAAG,CAClB,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmB;QACvD,KAAK,CAAC,kBAAkB;KACzB,CAAC,CACH,CAAC;IAEF,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,MAAmC,EAAE,QAAkB;IAC7E,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;IAC3G,kBAAkB;IAClB,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAE/C,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAW,CAAC;AACnC,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAmC;IAC9D,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,KAAK,IAAI,KAAK,IAAI,IAAA,eAAM,EAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE;QACxD,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,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 { sortBy } from 'lodash';\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 = new Map(\n    engineConfig.activeAddons.map(addon => [\n      resolver.packageCache.get(addon.root) as V2AddonPackage,\n      addon.canResolveFromFile,\n    ])\n  );\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: Map<V2AddonPackage, string>, 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  // Add _loader_.js\n  vendor.push(`loader.makeDefaultExport=false;`);\n\n  return vendor.join('') as string;\n}\n\nfunction impliedAddonVendors(addons: Map<V2AddonPackage, string>): string[] {\n  let result: Array<string> = [];\n  for (let addon of sortBy(Array.from(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 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"]}

package/src/to-broccoli-plugin.d.ts

@@ -1,8 +0,0 @@
-import Plugin from 'broccoli-plugin';
-import type { PackagerConstructor, Variant } from './packager';
-import type Stage from './stage';
-interface BroccoliPackager<Options> {
-    new (stage: Stage, variants: Variant[], options?: Options): Plugin;
-}
-export default function toBroccoliPlugin<Options>(packagerClass: PackagerConstructor<Options>): BroccoliPackager<Options>;
-export {};

package/src/to-broccoli-plugin.js

@@ -1,30 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = toBroccoliPlugin;
-const broccoli_plugin_1 = __importDefault(require("broccoli-plugin"));
-const shared_internals_1 = require("@embroider/shared-internals");
-function toBroccoliPlugin(packagerClass) {
-    class PackagerRunner extends broccoli_plugin_1.default {
-        constructor(stage, variants, options) {
-            super([stage.tree], {
-                persistentOutput: true,
-                needsCache: false,
-                annotation: packagerClass.annotation,
-            });
-            this.stage = stage;
-            this.variants = variants;
-            this.options = options;
-        }
-        async build() {
-            if (!this.packager) {
-                this.packager = new packagerClass(this.stage.inputPath, this.outputPath, this.variants, msg => console.log(msg.split(shared_internals_1.tmpdir).join('$TMPDIR')), this.options);
-            }
-            return this.packager.build();
-        }
-    }
-    return PackagerRunner;
-}
-//# sourceMappingURL=to-broccoli-plugin.js.map

package/src/to-broccoli-plugin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"to-broccoli-plugin.js","sourceRoot":"","sources":["to-broccoli-plugin.ts"],"names":[],"mappings":";;;;;AASA,mCA2BC;AApCD,sEAAqC;AAGrC,kEAAqD;AAMrD,SAAwB,gBAAgB,CACtC,aAA2C;IAE3C,MAAM,cAAe,SAAQ,yBAAM;QAEjC,YAAoB,KAAY,EAAU,QAAmB,EAAU,OAAiB;YACtF,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAClB,gBAAgB,EAAE,IAAI;gBACtB,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,aAAa,CAAC,UAAU;aACrC,CAAC,CAAC;YALe,UAAK,GAAL,KAAK,CAAO;YAAU,aAAQ,GAAR,QAAQ,CAAW;YAAU,YAAO,GAAP,OAAO,CAAU;QAMxF,CAAC;QAED,KAAK,CAAC,KAAK;YACT,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAC/B,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,QAAQ,EACb,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EACrD,IAAI,CAAC,OAAO,CACb,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC/B,CAAC;KACF;IACD,OAAO,cAAc,CAAC;AACxB,CAAC","sourcesContent":["import Plugin from 'broccoli-plugin';\nimport type { Packager, PackagerConstructor, Variant } from './packager';\nimport type Stage from './stage';\nimport { tmpdir } from '@embroider/shared-internals';\n\ninterface BroccoliPackager<Options> {\n  new (stage: Stage, variants: Variant[], options?: Options): Plugin;\n}\n\nexport default function toBroccoliPlugin<Options>(\n  packagerClass: PackagerConstructor<Options>\n): BroccoliPackager<Options> {\n  class PackagerRunner extends Plugin {\n    private packager: Packager | undefined;\n    constructor(private stage: Stage, private variants: Variant[], private options?: Options) {\n      super([stage.tree], {\n        persistentOutput: true,\n        needsCache: false,\n        annotation: packagerClass.annotation,\n      });\n    }\n\n    async build() {\n      if (!this.packager) {\n        this.packager = new packagerClass(\n          this.stage.inputPath,\n          this.outputPath,\n          this.variants,\n          msg => console.log(msg.split(tmpdir).join('$TMPDIR')),\n          this.options\n        );\n      }\n      return this.packager.build();\n    }\n  }\n  return PackagerRunner;\n}\n"]}