@embroider/core 3.4.20-unstable.e6197c7 → 3.5.0

package/src/portable-babel-config.js

@@ -0,0 +1,132 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makePortable = makePortable;
+const path_1 = require("path");
+const resolve_1 = __importDefault(require("resolve"));
+const portable_1 = require("./portable");
+function makePortable(config, resolveOptions, hints) {
+    return new PortableBabelConfig(resolveOptions, hints).convert(config);
+}
+class PortableBabelConfig {
+    constructor(resolveOptions, hints) {
+        this.hints = hints;
+        if ('resolve' in resolveOptions) {
+            this.resolve = resolveOptions.resolve;
+        }
+        else {
+            this.basedir = resolveOptions.basedir;
+            this.resolve = (name) => resolve_1.default.sync(name, { basedir: resolveOptions.basedir });
+        }
+    }
+    convert(config) {
+        let portable = new portable_1.Portable({
+            hints: this.hints,
+            dehydrate: (value, accessPath) => {
+                // this custom dehydrate hook handles babel plugins & presets. If we're
+                // not looking at plugins or presets, continue with stock Portable
+                // behavior
+                if (accessPath.length !== 2 || (accessPath[0] !== 'plugins' && accessPath[0] !== 'presets')) {
+                    return undefined;
+                }
+                // standardize to always handle an array
+                if (!Array.isArray(value)) {
+                    value = [value];
+                }
+                let [plugin, argument, asName] = value;
+                // string plugins need to get resolved correctly into absolute paths,
+                // so they will really be portable
+                if (typeof plugin === 'string') {
+                    plugin = this.resolveBabelPlugin(plugin);
+                }
+                // next we deal with serializability. Our Portable system already
+                // understands the protocol used by ember-cli-babel to identify plugin
+                // classes and get back to their serializable forms, so this will
+                // handle that case.
+                let dehydrated = portable.dehydrate([plugin, argument, asName], accessPath.concat('_internal'));
+                if (dehydrated.needsHydrate) {
+                    // we can eliminate the need for rehydration by going through our own
+                    // portable babel launcher
+                    return {
+                        value: [
+                            (0, path_1.join)(__dirname, 'portable-babel-launcher.js'),
+                            { module: dehydrated.value[0], arg: dehydrated.value[1], hints: this.hints },
+                            dehydrated.value[2] || `portable-babel-launcher-${accessPath[1]}`,
+                        ],
+                        needsHydrate: false,
+                        isParallelSafe: dehydrated.isParallelSafe,
+                    };
+                }
+                else {
+                    // trim back down our array, because trailing undefined will get
+                    // converted into null via json.stringify, and babel will complain
+                    // about that.
+                    while (dehydrated.value.length > 0 && dehydrated.value[dehydrated.value.length - 1] == null) {
+                        dehydrated.value.pop();
+                    }
+                    if (dehydrated.value.length === 1) {
+                        dehydrated.value = dehydrated.value[0];
+                    }
+                    return {
+                        value: dehydrated.value,
+                        needsHydrate: dehydrated.needsHydrate,
+                        isParallelSafe: dehydrated.isParallelSafe,
+                    };
+                }
+            },
+        });
+        let result = portable.dehydrate(config);
+        if (result.needsHydrate) {
+            throw new Error(`bug: portable babel configs aren't supposed to need hydration`);
+        }
+        return { config: result.value, isParallelSafe: result.isParallelSafe };
+    }
+    // babel lets you use relative paths, absolute paths, package names, and
+    // package name shorthands.
+    //
+    // my-plugin  -> my-plugin
+    // my-plugin  -> babel-plugin-my-plugin
+    // @me/thing  -> @me/thing
+    // @me/thing  -> @me/babel-plugin-thing
+    // ./here     -> /your/app/here
+    // /tmp/there -> /tmp/there
+    //
+    resolveBabelPlugin(name) {
+        try {
+            return this.resolve(name);
+        }
+        catch (err) {
+            if (err.code !== 'MODULE_NOT_FOUND') {
+                throw err;
+            }
+            if (name.startsWith('.') || name.startsWith('/')) {
+                throw err;
+            }
+            try {
+                let expanded;
+                if (name.startsWith('@')) {
+                    let [space, pkg, ...rest] = name.split('/');
+                    expanded = [space, `babel-plugin-${pkg}`, ...rest].join('/');
+                }
+                else {
+                    expanded = `babel-plugin-${name}`;
+                }
+                return this.resolve(expanded);
+            }
+            catch (err2) {
+                if (err2.code !== 'MODULE_NOT_FOUND') {
+                    throw err2;
+                }
+                if (this.basedir) {
+                    throw new Error(`unable to resolve babel plugin ${name} from ${this.basedir}`);
+                }
+                else {
+                    throw new Error(`unable to resolve babel plugin ${name}`);
+                }
+            }
+        }
+    }
+}
+//# sourceMappingURL=portable-babel-config.js.map

package/src/portable-babel-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable-babel-config.js","sourceRoot":"","sources":["portable-babel-config.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TransformOptions } from '@babel/core';\nimport { join } from 'path';\nimport resolve from 'resolve';\nimport type { PortableHint } from './portable';\nimport { Portable } from './portable';\n\nexport type ResolveOptions = { basedir: string } | { resolve: (name: string) => any };\n\nexport function makePortable(\n  config: TransformOptions,\n  resolveOptions: ResolveOptions,\n  hints: PortableHint[]\n): { config: TransformOptions; isParallelSafe: boolean } {\n  return new PortableBabelConfig(resolveOptions, hints).convert(config);\n}\n\nclass PortableBabelConfig {\n  private resolve: (name: string) => any;\n  private basedir: string | undefined;\n\n  constructor(resolveOptions: ResolveOptions, private hints: PortableHint[]) {\n    if ('resolve' in resolveOptions) {\n      this.resolve = resolveOptions.resolve;\n    } else {\n      this.basedir = resolveOptions.basedir;\n      this.resolve = (name: string) => resolve.sync(name, { basedir: resolveOptions.basedir });\n    }\n  }\n\n  convert(config: TransformOptions): { config: TransformOptions; isParallelSafe: boolean } {\n    let portable: Portable = new Portable({\n      hints: this.hints,\n      dehydrate: (value: any, accessPath: string[]) => {\n        // this custom dehydrate hook handles babel plugins & presets. If we're\n        // not looking at plugins or presets, continue with stock Portable\n        // behavior\n        if (accessPath.length !== 2 || (accessPath[0] !== 'plugins' && accessPath[0] !== 'presets')) {\n          return undefined;\n        }\n\n        // standardize to always handle an array\n        if (!Array.isArray(value)) {\n          value = [value];\n        }\n\n        let [plugin, argument, asName] = value;\n\n        // string plugins need to get resolved correctly into absolute paths,\n        // so they will really be portable\n        if (typeof plugin === 'string') {\n          plugin = this.resolveBabelPlugin(plugin);\n        }\n\n        // next we deal with serializability. Our Portable system already\n        // understands the protocol used by ember-cli-babel to identify plugin\n        // classes and get back to their serializable forms, so this will\n        // handle that case.\n        let dehydrated = portable.dehydrate([plugin, argument, asName], accessPath.concat('_internal'));\n\n        if (dehydrated.needsHydrate) {\n          // we can eliminate the need for rehydration by going through our own\n          // portable babel launcher\n          return {\n            value: [\n              join(__dirname, 'portable-babel-launcher.js'),\n              { module: dehydrated.value[0], arg: dehydrated.value[1], hints: this.hints },\n              dehydrated.value[2] || `portable-babel-launcher-${accessPath[1]}`,\n            ],\n            needsHydrate: false,\n            isParallelSafe: dehydrated.isParallelSafe,\n          };\n        } else {\n          // trim back down our array, because trailing undefined will get\n          // converted into null via json.stringify, and babel will complain\n          // about that.\n          while (dehydrated.value.length > 0 && dehydrated.value[dehydrated.value.length - 1] == null) {\n            dehydrated.value.pop();\n          }\n          if (dehydrated.value.length === 1) {\n            dehydrated.value = dehydrated.value[0];\n          }\n          return {\n            value: dehydrated.value,\n            needsHydrate: dehydrated.needsHydrate,\n            isParallelSafe: dehydrated.isParallelSafe,\n          };\n        }\n      },\n    });\n    let result = portable.dehydrate(config);\n    if (result.needsHydrate) {\n      throw new Error(`bug: portable babel configs aren't supposed to need hydration`);\n    }\n    return { config: result.value, isParallelSafe: result.isParallelSafe };\n  }\n\n  // babel lets you use relative paths, absolute paths, package names, and\n  // package name shorthands.\n  //\n  // my-plugin  -> my-plugin\n  // my-plugin  -> babel-plugin-my-plugin\n  // @me/thing  -> @me/thing\n  // @me/thing  -> @me/babel-plugin-thing\n  // ./here     -> /your/app/here\n  // /tmp/there -> /tmp/there\n  //\n  private resolveBabelPlugin(name: string) {\n    try {\n      return this.resolve(name);\n    } catch (err) {\n      if (err.code !== 'MODULE_NOT_FOUND') {\n        throw err;\n      }\n      if (name.startsWith('.') || name.startsWith('/')) {\n        throw err;\n      }\n      try {\n        let expanded;\n        if (name.startsWith('@')) {\n          let [space, pkg, ...rest] = name.split('/');\n          expanded = [space, `babel-plugin-${pkg}`, ...rest].join('/');\n        } else {\n          expanded = `babel-plugin-${name}`;\n        }\n        return this.resolve(expanded);\n      } catch (err2) {\n        if (err2.code !== 'MODULE_NOT_FOUND') {\n          throw err2;\n        }\n        if (this.basedir) {\n          throw new Error(`unable to resolve babel plugin ${name} from ${this.basedir}`);\n        } else {\n          throw new Error(`unable to resolve babel plugin ${name}`);\n        }\n      }\n    }\n  }\n}\n"]}

package/src/portable-babel-launcher.d.ts

@@ -0,0 +1,6 @@
+import type { PortableHint } from './portable';
+export default function babelLauncher(this: any, babel: any, launch: {
+    module: any;
+    arg: any;
+    hints: PortableHint[];
+}, key: string): any;

package/src/portable-babel-launcher.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = babelLauncher;
+const portable_1 = require("./portable");
+function babelLauncher(babel, launch, key) {
+    let p = new portable_1.Portable({ hints: launch.hints });
+    let hydrated = p.hydrate(launch);
+    let module;
+    if (typeof hydrated.module === 'string') {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        module = require(hydrated.module);
+        if (module.__esModule) {
+            module = module.default;
+        }
+    }
+    else {
+        module = hydrated.module;
+    }
+    let plugin = module.call(this, babel, hydrated.arg, key);
+    let innerStates = new WeakMap();
+    function convertState(state) {
+        let innerState = innerStates.get(state);
+        if (!innerState) {
+            innerState = Object.assign({}, state, { opts: hydrated.arg });
+            innerStates.set(state, innerState);
+        }
+        return innerState;
+    }
+    function wrap1(original) {
+        if (typeof original === 'function') {
+            return function (file) {
+                return original.call(convertState(this), file);
+            };
+        }
+    }
+    function wrap2(original) {
+        return function (path, state) {
+            return original.call(convertState(this), path, convertState(state));
+        };
+    }
+    let visitorProxy = {
+        get(target, prop) {
+            let original = target[prop];
+            if (typeof original === 'function') {
+                return wrap2(original);
+            }
+            if (original && typeof original === 'object') {
+                let wrapped = {};
+                if (typeof original.exit === 'function') {
+                    wrapped.exit = wrap2(original.exit);
+                }
+                if (typeof original.enter === 'function') {
+                    wrapped.enter = wrap2(original.enter);
+                }
+                return wrapped;
+            }
+            return original;
+        },
+    };
+    return new Proxy(plugin, {
+        get(target, prop) {
+            let original = target[prop];
+            switch (prop) {
+                case 'pre':
+                case 'post':
+                    return wrap1(original);
+                case 'visitor':
+                    return new Proxy(original, visitorProxy);
+                default:
+                    return original;
+            }
+        },
+    });
+}
+//# sourceMappingURL=portable-babel-launcher.js.map

package/src/portable-babel-launcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable-babel-launcher.js","sourceRoot":"","sources":["portable-babel-launcher.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PortableHint } from './portable';\nimport { Portable } from './portable';\n\nexport default function babelLauncher(\n  this: any,\n  babel: any,\n  launch: { module: any; arg: any; hints: PortableHint[] },\n  key: string\n) {\n  let p = new Portable({ hints: launch.hints });\n  let hydrated = p.hydrate(launch);\n  let module;\n  if (typeof hydrated.module === 'string') {\n    // eslint-disable-next-line @typescript-eslint/no-require-imports\n    module = require(hydrated.module);\n    if (module.__esModule) {\n      module = module.default;\n    }\n  } else {\n    module = hydrated.module;\n  }\n\n  let plugin = module.call(this, babel, hydrated.arg, key);\n  let innerStates = new WeakMap();\n\n  function convertState(state: any) {\n    let innerState = innerStates.get(state);\n    if (!innerState) {\n      innerState = Object.assign({}, state, { opts: hydrated.arg });\n      innerStates.set(state, innerState);\n    }\n    return innerState;\n  }\n\n  function wrap1(original: any) {\n    if (typeof original === 'function') {\n      return function (this: any, file: any) {\n        return original.call(convertState(this), file);\n      };\n    }\n  }\n\n  function wrap2(original: Function) {\n    return function (this: any, path: any, state: any) {\n      return original.call(convertState(this), path, convertState(state));\n    };\n  }\n\n  let visitorProxy = {\n    get(target: any, prop: string) {\n      let original = target[prop];\n      if (typeof original === 'function') {\n        return wrap2(original);\n      }\n      if (original && typeof original === 'object') {\n        let wrapped: any = {};\n        if (typeof original.exit === 'function') {\n          wrapped.exit = wrap2(original.exit);\n        }\n        if (typeof original.enter === 'function') {\n          wrapped.enter = wrap2(original.enter);\n        }\n        return wrapped;\n      }\n      return original;\n    },\n  };\n\n  return new Proxy(plugin, {\n    get(target, prop) {\n      let original = target[prop];\n      switch (prop) {\n        case 'pre':\n        case 'post':\n          return wrap1(original);\n        case 'visitor':\n          return new Proxy(original, visitorProxy);\n        default:\n          return original;\n      }\n    },\n  });\n}\n"]}

package/src/resolver-loader.js

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

package/src/resolver-loader.js.map

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

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,30 @@
+"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

@@ -0,0 +1 @@
+{"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"]}

package/src/virtual-content.d.ts

@@ -1,33 +1,8 @@
 import type { Resolver } from '.';
-export type VirtualResponse = {
-    specifier: string;
-} & ({
-    type: 'fastboot-switch';
-} | {
-    type: 'implicit-modules';
-} | {
-    type: 'implicit-test-modules';
-} | {
-    type: 'entrypoint';
-} | {
-    type: 'route-entrypoint';
-} | {
-    type: 'test-support-js';
-} | {
-    type: 'test-support-css';
-} | {
-    type: 'vendor-js';
-} | {
-    type: 'vendor-css';
-} | {
-    type: 'component-pair';
-});
-export interface VirtualContentResult {
-    src: string;
-    watches: string[];
-}
-export declare function virtualContent(filename: string, resolver: Resolver): VirtualContentResult;
-export declare function virtualPairComponent(appRoot: string, hbsModule: string, jsModule: string | undefined): string;
+export declare function virtualContent(filename: string, resolver: Resolver): string;
+export declare function virtualExternalESModule(specifier: string, exports: string[] | undefined): string;
+export declare function virtualExternalCJSModule(specifier: string): string;
+export declare function virtualPairComponent(hbsModule: string, jsModule: string | null): string;
 export declare function fastbootSwitch(specifier: string, fromFile: string, names: Set<string>): string;
 export declare function decodeFastbootSwitch(filename: string): {
     names: string[];

package/src/virtual-content.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.virtualContent = virtualContent;
+exports.virtualExternalESModule = virtualExternalESModule;
+exports.virtualExternalCJSModule = virtualExternalCJSModule;
 exports.virtualPairComponent = virtualPairComponent;
 exports.fastbootSwitch = fastbootSwitch;
 exports.decodeFastbootSwitch = decodeFastbootSwitch;
@@ -8,24 +10,20 @@ exports.decodeImplicitModules = decodeImplicitModules;
 const path_1 = require("path");
 const _1 = require(".");
 const js_handlebars_1 = require("./js-handlebars");
-const virtual_test_support_1 = require("./virtual-test-support");
-const virtual_test_support_styles_1 = require("./virtual-test-support-styles");
-const virtual_vendor_1 = require("./virtual-vendor");
-const virtual_vendor_styles_1 = require("./virtual-vendor-styles");
-const virtual_entrypoint_1 = require("./virtual-entrypoint");
-const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
+const externalESPrefix = '/@embroider/ext-es/';
+const externalCJSPrefix = '/@embroider/ext-cjs/';
 // Given a filename that was passed to your ModuleRequest's `virtualize()`,
 // this produces the corresponding contents. It's a static, stateless function
 // because we recognize that that process that did resolution might not be the
 // same one that loads the content.
 function virtualContent(filename, resolver) {
-    let entrypoint = (0, virtual_entrypoint_1.decodeEntrypoint)(filename);
-    if (entrypoint) {
-        return (0, virtual_entrypoint_1.renderEntrypoint)(resolver, entrypoint);
+    let cjsExtern = decodeVirtualExternalCJSModule(filename);
+    if (cjsExtern) {
+        return renderCJSExternalShim(cjsExtern);
     }
-    let routeEntrypoint = (0, virtual_route_entrypoint_1.decodeRouteEntrypoint)(filename);
-    if (routeEntrypoint) {
-        return (0, virtual_route_entrypoint_1.renderRouteEntrypoint)(resolver, routeEntrypoint);
+    let extern = decodeVirtualExternalESModule(filename);
+    if (extern) {
+        return renderESExternalShim(extern);
     }
     let match = decodeVirtualPairComponent(filename);
     if (match) {
@@ -33,39 +31,41 @@ function virtualContent(filename, resolver) {
     }
     let fb = decodeFastbootSwitch(filename);
     if (fb) {
-        return renderFastbootSwitchTemplate(fb);
+        return fastbootSwitchTemplate(fb);
     }
     let im = decodeImplicitModules(filename);
     if (im) {
         return renderImplicitModules(im, resolver);
     }
-    let isVendor = (0, virtual_vendor_1.decodeVirtualVendor)(filename);
-    if (isVendor) {
-        return (0, virtual_vendor_1.renderVendor)(filename, resolver);
-    }
-    let isImplicitTestScripts = (0, virtual_test_support_1.decodeImplicitTestScripts)(filename);
-    if (isImplicitTestScripts) {
-        return (0, virtual_test_support_1.renderImplicitTestScripts)(filename, resolver);
-    }
-    let isVendorStyles = (0, virtual_vendor_styles_1.decodeVirtualVendorStyles)(filename);
-    if (isVendorStyles) {
-        return (0, virtual_vendor_styles_1.renderVendorStyles)(filename, resolver);
-    }
-    let isTestSupportStyles = (0, virtual_test_support_styles_1.decodeTestSupportStyles)(filename);
-    if (isTestSupportStyles) {
-        return (0, virtual_test_support_styles_1.renderTestSupportStyles)(filename, resolver);
-    }
     throw new Error(`not an @embroider/core virtual file: ${filename}`);
 }
-function pairedComponentShim(params) {
-    return {
-        src: pairedComponentShimTemplate(params),
-        watches: [],
-    };
+const externalESShim = (0, js_handlebars_1.compile)(`
+{{#if (eq moduleName "require")}}
+const m = window.requirejs;
+export default m;
+const has = m.has;
+export { has }
+{{else}}
+const m = window.require("{{{js-string-escape moduleName}}}");
+{{#if default}}
+export default m.default;
+{{/if}}
+{{#if names}}
+const { {{#each names as |name|}}{{name}}, {{/each}} } = m;
+export { {{#each names as |name|}}{{name}}, {{/each}} }
+{{/if}}
+{{/if}}
+`);
+function renderESExternalShim({ moduleName, exports }) {
+    return externalESShim({
+        moduleName,
+        default: exports.includes('default'),
+        names: exports.filter(n => n !== 'default'),
+    });
 }
-const pairedComponentShimTemplate = (0, js_handlebars_1.compile)(`
+const pairedComponentShim = (0, js_handlebars_1.compile)(`
 import { setComponentTemplate } from "@ember/component";
-import template from "{{{js-string-escape hbsModule}}}";
+import template from "{{{js-string-escape relativeHBSModule}}}";
 import { deprecate } from "@ember/debug";
 
 
@@ -82,18 +82,50 @@ deprecate("Components with separately resolved templates are deprecated. Migrate
   }
 );
 
-{{#if jsModule}}
-import component from "{{{js-string-escape jsModule}}}";
+{{#if relativeJSModule}}
+import component from "{{{js-string-escape relativeJSModule}}}";
 export default setComponentTemplate(template, component);
 {{else}}
 import templateOnlyComponent from "@ember/component/template-only";
 export default setComponentTemplate(template, templateOnlyComponent(undefined, "{{{js-string-escape debugName}}}"));
 {{/if}}
 `);
-const pairComponentMarker = '/embroider-pair-component/';
-const pairComponentPattern = /\/embroider-pair-component\/(?<hbsModule>[^\/]*)\/__vpc__\/(?<jsModule>[^\/]*)$/;
-function virtualPairComponent(appRoot, hbsModule, jsModule) {
-    return `${appRoot}/embroider-pair-component/${encodeURIComponent(hbsModule)}/__vpc__/${encodeURIComponent(jsModule !== null && jsModule !== void 0 ? jsModule : '')}`;
+function virtualExternalESModule(specifier, exports) {
+    if (exports) {
+        return externalESPrefix + specifier + `?exports=${exports.join(',')}`;
+    }
+    else {
+        return externalESPrefix + specifier;
+    }
+}
+function virtualExternalCJSModule(specifier) {
+    return externalCJSPrefix + specifier;
+}
+function decodeVirtualExternalESModule(filename) {
+    if (filename.startsWith(externalESPrefix)) {
+        let exports = [];
+        let url = new URL(filename.slice(externalESPrefix.length), 'http://example.com');
+        let nameString = url.searchParams.get('exports');
+        if (nameString) {
+            exports = nameString.split(',');
+        }
+        let moduleName = url.pathname.slice(1);
+        return { moduleName, exports };
+    }
+}
+function decodeVirtualExternalCJSModule(filename) {
+    if (filename.startsWith(externalCJSPrefix)) {
+        return { moduleName: filename.slice(externalCJSPrefix.length) };
+    }
+}
+const pairComponentMarker = '-embroider-pair-component';
+const pairComponentPattern = /^(?<hbsModule>.*)\/(?<jsModule>[^\/]*)-embroider-pair-component$/;
+function virtualPairComponent(hbsModule, jsModule) {
+    let relativeJSModule = '';
+    if (jsModule) {
+        relativeJSModule = (0, _1.explicitRelative)(hbsModule, jsModule);
+    }
+    return `${hbsModule}/${encodeURIComponent(relativeJSModule)}${pairComponentMarker}`;
 }
 function decodeVirtualPairComponent(filename) {
     // Performance: avoid paying regex exec cost unless needed
@@ -105,10 +137,12 @@ function decodeVirtualPairComponent(filename) {
         return null;
     }
     let { hbsModule, jsModule } = match.groups;
+    // target our real hbs module from our virtual module
+    let relativeHBSModule = (0, _1.explicitRelative)((0, path_1.dirname)(filename), hbsModule);
     return {
-        hbsModule: decodeURIComponent(hbsModule),
-        jsModule: jsModule ? decodeURIComponent(jsModule) : null,
-        debugName: (0, path_1.basename)(decodeURIComponent(hbsModule)).replace(/\.(js|hbs)$/, ''),
+        relativeHBSModule,
+        relativeJSModule: decodeURIComponent(jsModule) || null,
+        debugName: (0, path_1.basename)(relativeHBSModule).replace(/\.(js|hbs)$/, ''),
     };
 }
 const fastbootSwitchSuffix = '/embroider_fastboot_switch';
@@ -138,12 +172,6 @@ function decodeFastbootSwitch(filename) {
         };
     }
 }
-function renderFastbootSwitchTemplate(params) {
-    return {
-        src: fastbootSwitchTemplate(params),
-        watches: [],
-    };
-}
 const fastbootSwitchTemplate = (0, js_handlebars_1.compile)(`
 import { macroCondition, getGlobalConfig, importSync } from '@embroider/macros';
 let mod;
@@ -179,8 +207,8 @@ function renderImplicitModules({ type, fromFile, }, resolver) {
     if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
         throw new Error(`bug: saw special implicit modules import in non-ember package at ${fromFile}`);
     }
-    let ownModules = [];
-    let dependencyModules = [];
+    let lazyModules = [];
+    let eagerModules = [];
     let deps = pkg.dependencies.sort(orderAddons);
     for (let dep of deps) {
         // anything that isn't a v2 ember package by this point is not an active
@@ -213,7 +241,7 @@ function renderImplicitModules({ type, fromFile, }, resolver) {
                     runtime = renamedModules[runtimeRenameLookup];
                 }
                 runtime = runtime.split(path_1.sep).join('/');
-                ownModules.push({
+                lazyModules.push({
                     runtime,
                     buildtime: path_1.posix.join(packageName, name),
                 });
@@ -222,32 +250,20 @@ function renderImplicitModules({ type, fromFile, }, resolver) {
         // we don't recurse across an engine boundary. Engines import their own
         // implicit-modules.
         if (!dep.isEngine()) {
-            dependencyModules.push(path_1.posix.join(dep.name, `-embroider-${type}.js`));
+            eagerModules.push(path_1.posix.join(dep.name, `-embroider-${type}.js`));
         }
     }
-    return { src: implicitModulesTemplate({ ownModules, dependencyModules }), watches: [] };
+    return implicitModulesTemplate({ lazyModules, eagerModules });
 }
 const implicitModulesTemplate = (0, js_handlebars_1.compile)(`
-
-
-{{#each dependencyModules as |module index|}}
-  import dep{{index}} from "{{js-string-escape module}}";
+import { importSync as i } from '@embroider/macros';
+let d = window.define;
+{{#each lazyModules as |module|}}
+d("{{js-string-escape module.runtime}}", function(){ return i("{{js-string-escape module.buildtime}}");});
 {{/each}}
-
-{{#each ownModules as |module index|}}
-  import * as own{{index}} from "{{js-string-escape module.buildtime}}";
+{{#each eagerModules as |module|}}
+import "{{js-string-escape module}}";
 {{/each}}
-
-export default Object.assign({},
-  {{#each dependencyModules as |module index|}}
-    dep{{index}},
-  {{/each}}
-  {
-    {{#each ownModules as |module index|}}
-      "{{js-string-escape module.runtime}}": own{{index}},
-    {{/each}}
-  }
-);
 `);
 // meta['renamed-modules'] has mapping from classic filename to real filename.
 // This takes that and converts it to the inverst mapping from real import path
@@ -273,4 +289,26 @@ function orderAddons(depA, depB) {
     }
     return depAIdx - depBIdx;
 }
+const renderCJSExternalShim = (0, js_handlebars_1.compile)(`
+{{#if (eq moduleName "require")}}
+const m = window.requirejs;
+{{else}}
+const m = window.require("{{{js-string-escape moduleName}}}");
+{{/if}}
+{{!-
+  There are plenty of hand-written AMD defines floating around
+  that lack this, and they will break when other build systems
+  encounter them.
+
+  As far as I can tell, Ember's loader was already treating this
+  case as a module, so in theory we aren't breaking anything by
+  marking it as such when other packagers come looking.
+
+  todo: get review on this part.
+-}}
+if (m.default && !m.__esModule) {
+  m.__esModule = true;
+}
+module.exports = m;
+`);
 //# sourceMappingURL=virtual-content.js.map