@embroider/compat 3.4.9 → 3.5.1-unstable.14b84ff

package/src/compat-app-builder.js

@@ -1,49 +1,21 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompatAppBuilder = void 0;
 const core_1 = require("@embroider/core");
-const walk_sync_1 = __importDefault(require("walk-sync"));
 const path_1 = require("path");
 const dependency_rules_1 = require("./dependency-rules");
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
-const sortBy_1 = __importDefault(require("lodash/sortBy"));
-const flatten_1 = __importDefault(require("lodash/flatten"));
-const partition_1 = __importDefault(require("lodash/partition"));
 const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-const resolve_1 = require("resolve");
 const bind_decorator_1 = __importDefault(require("bind-decorator"));
 const fs_extra_1 = require("fs-extra");
 const ember_html_1 = require("@embroider/core/src/ember-html");
@@ -53,22 +25,22 @@ const portable_1 = require("@embroider/core/src/portable");
 const assert_never_1 = __importDefault(require("assert-never"));
 const typescript_memoize_1 = require("typescript-memoize");
 const path_2 = require("path");
-const resolve_2 = __importDefault(require("resolve"));
+const resolve_1 = __importDefault(require("resolve"));
 const fs_extra_2 = require("fs-extra");
 const node_1 = require("@embroider/macros/src/node");
-const fast_sourcemap_concat_1 = __importDefault(require("fast-sourcemap-concat"));
 const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 const sync_dir_1 = require("./sync-dir");
 // This exists during the actual broccoli build step. As opposed to CompatApp,
 // which also exists during pipeline-construction time.
 class CompatAppBuilder {
-    constructor(root, origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, synthVendor, synthStyles) {
+    constructor(root, origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, contentForTree, synthVendor, synthStyles) {
         this.root = root;
         this.origAppPackage = origAppPackage;
         this.appPackageWithMovedDeps = appPackageWithMovedDeps;
         this.options = options;
         this.compatApp = compatApp;
         this.configTree = configTree;
+        this.contentForTree = contentForTree;
         this.synthVendor = synthVendor;
         this.synthStyles = synthStyles;
         // for each relativePath, an Asset we have already emitted
@@ -83,52 +55,11 @@ class CompatAppBuilder {
     }
     extractAssets(treePaths) {
         let assets = [];
-        // Everything in our traditional public tree is an on-disk asset
-        if (treePaths.publicTree) {
-            walk_sync_1.default
-                .entries(treePaths.publicTree, {
-                directories: false,
-            })
-                .forEach(entry => {
-                assets.push({
-                    kind: 'on-disk',
-                    relativePath: entry.relativePath,
-                    sourcePath: entry.fullPath,
-                    mtime: entry.mtime,
-                    size: entry.size,
-                });
-            });
-        }
-        // ember-cli traditionally outputs a dummy testem.js file to prevent
-        // spurious errors when running tests under "ember s".
-        if (this.compatApp.shouldBuildTests) {
-            let testemAsset = this.findTestemAsset();
-            if (testemAsset) {
-                assets.push(testemAsset);
-            }
-        }
         for (let asset of this.emberEntrypoints(treePaths.htmlTree)) {
             assets.push(asset);
         }
         return assets;
     }
-    findTestemAsset() {
-        let sourcePath;
-        try {
-            sourcePath = (0, resolve_1.sync)('ember-cli/lib/broccoli/testem.js', { basedir: this.root });
-        }
-        catch (err) { }
-        if (sourcePath) {
-            let stat = (0, fs_extra_1.statSync)(sourcePath);
-            return {
-                kind: 'on-disk',
-                relativePath: 'testem.js',
-                sourcePath,
-                mtime: stat.mtime.getTime(),
-                size: stat.size,
-            };
-        }
-    }
     activeAddonChildren(pkg) {
         let result = pkg.dependencies.filter(this.isActiveAddon).filter(
         // When looking for child addons, we want to ignore 'peerDependencies' of
@@ -177,7 +108,7 @@ class CompatAppBuilder {
         // For TS, we defer to ember-cli-babel, and the setting for
         // "enableTypescriptTransform" can be set with and without
         // ember-cli-typescript
-        return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js'];
+        return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js', '.gjs', '.gts'];
     }
     *emberEntrypoints(htmlTreePath) {
         let classicEntrypoints = [
@@ -205,10 +136,7 @@ class CompatAppBuilder {
                         javascript: this.compatApp.findAppScript(scripts, entrypoint),
                         styles: this.compatApp.findAppStyles(styles, entrypoint),
                         implicitScripts: this.compatApp.findVendorScript(scripts, entrypoint),
-                        implicitStyles: this.compatApp.findVendorStyles(styles, entrypoint),
                         testJavascript: this.compatApp.findTestScript(scripts),
-                        implicitTestScripts: this.compatApp.findTestSupportScript(scripts),
-                        implicitTestStyles: this.compatApp.findTestSupportStyles(styles),
                     };
                 },
             };
@@ -233,10 +161,6 @@ class CompatAppBuilder {
     resolverConfig(engines) {
         let renamePackages = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-packages']));
         let renameModules = Object.assign({}, ...this.allActiveAddons.map(dep => dep.meta['renamed-modules']));
-        let activeAddons = {};
-        for (let addon of this.allActiveAddons) {
-            activeAddons[addon.name] = addon.root;
-        }
         let options = {
             staticHelpers: this.options.staticHelpers,
             staticModifiers: this.options.staticModifiers,
@@ -245,7 +169,6 @@ class CompatAppBuilder {
         };
         let config = {
             // this part is the base ModuleResolverOptions as required by @embroider/core
-            activeAddons,
             renameModules,
             renamePackages,
             resolvableExtensions: this.resolvableExtensions(),
@@ -257,118 +180,34 @@ class CompatAppBuilder {
                 root: (0, fs_extra_1.realpathSync)(index === 0 ? this.root : appFiles.engine.package.root),
                 fastbootFiles: appFiles.fastbootFiles,
                 activeAddons: [...appFiles.engine.addons]
-                    .map(a => ({
-                    name: a.name,
-                    root: a.root,
+                    .map(([addon, canResolveFromFile]) => ({
+                    name: addon.name,
+                    root: addon.root,
+                    canResolveFromFile,
                 }))
                     // the traditional order is the order in which addons will run, such
                     // that the last one wins. Our resolver's order is the order to
                     // search, so first one wins.
                     .reverse(),
+                isLazy: appFiles.engine.package.isLazyEngine(),
             })),
             amdCompatibility: this.options.amdCompatibility,
             // this is the additional stufff that @embroider/compat adds on top to do
             // global template resolving
             modulePrefix: this.modulePrefix(),
+            splitAtRoutes: this.options.splitAtRoutes,
             podModulePrefix: this.podModulePrefix(),
             activePackageRules: this.activeRules(),
             options,
+            autoRun: this.compatApp.autoRun,
+            staticAppPaths: this.options.staticAppPaths,
         };
         return config;
     }
-    scriptPriority(pkg) {
-        switch (pkg.name) {
-            case 'loader.js':
-                return 0;
-            case 'ember-source':
-                return 10;
-            default:
-                return 1000;
-        }
-    }
     get resolvableExtensionsPattern() {
         return (0, core_1.extensionsPattern)(this.resolvableExtensions());
     }
-    impliedAssets(type, engine, emberENV) {
-        let result = this.impliedAddonAssets(type, engine).map((sourcePath) => {
-            let stats = (0, fs_extra_1.statSync)(sourcePath);
-            return {
-                kind: 'on-disk',
-                relativePath: (0, core_1.explicitRelative)(this.root, sourcePath),
-                sourcePath,
-                mtime: stats.mtimeMs,
-                size: stats.size,
-            };
-        });
-        if (type === 'implicit-scripts') {
-            result.unshift({
-                kind: 'in-memory',
-                relativePath: '_testing_prefix_.js',
-                source: `var runningTests=false;`,
-            });
-            result.unshift({
-                kind: 'in-memory',
-                relativePath: '_ember_env_.js',
-                source: `window.EmberENV={ ...(window.EmberENV || {}), ...${JSON.stringify(emberENV, null, 2)} };`,
-            });
-            result.push({
-                kind: 'in-memory',
-                relativePath: '_loader_.js',
-                source: `loader.makeDefaultExport=false;`,
-            });
-        }
-        if (type === 'implicit-test-scripts') {
-            // this is the traditional test-support-suffix.js
-            result.push({
-                kind: 'in-memory',
-                relativePath: '_testing_suffix_.js',
-                source: `
-        var runningTests=true;
-        if (typeof Testem !== 'undefined' && (typeof QUnit !== 'undefined' || typeof Mocha !== 'undefined')) {
-          Testem.hookIntoTestFramework();
-        }`,
-            });
-            // whether or not anybody was actually using @embroider/macros
-            // explicitly as an addon, we ensure its test-support file is always
-            // present.
-            if (!result.find(s => s.kind === 'on-disk' && s.sourcePath.endsWith('embroider-macros-test-support.js'))) {
-                result.unshift({
-                    kind: 'on-disk',
-                    sourcePath: require.resolve('@embroider/macros/src/vendor/embroider-macros-test-support'),
-                    mtime: 0,
-                    size: 0,
-                    relativePath: 'embroider-macros-test-support.js',
-                });
-            }
-        }
-        return result;
-    }
-    impliedAddonAssets(type, { engine }) {
-        let result = [];
-        for (let addon of (0, sortBy_1.default)(Array.from(engine.addons), this.scriptPriority.bind(this))) {
-            let implicitScripts = addon.meta[type];
-            if (implicitScripts) {
-                let styles = [];
-                let options = { basedir: addon.root };
-                for (let mod of implicitScripts) {
-                    if (type === 'implicit-styles') {
-                        // exclude engines because they will handle their own css importation
-                        if (!addon.isLazyEngine()) {
-                            styles.push(resolve_2.default.sync(mod, options));
-                        }
-                    }
-                    else {
-                        result.push(resolve_2.default.sync(mod, options));
-                    }
-                }
-                if (styles.length) {
-                    result = [...styles, ...result];
-                }
-            }
-        }
-        return result;
-    }
-    babelConfig(resolverConfig) {
+    async babelConfig(resolverConfig) {
         let babel = (0, cloneDeep_1.default)(this.compatApp.babelConfig());
         if (!babel.plugins) {
             babel.plugins = [];
@@ -378,7 +217,10 @@ class CompatAppBuilder {
         babel.plugins.push(require.resolve('@babel/plugin-syntax-dynamic-import'));
         // https://github.com/webpack/webpack/issues/12154
         babel.plugins.push(require.resolve('./rename-require-plugin'));
-        babel.plugins.push([require.resolve('babel-plugin-ember-template-compilation'), this.etcOptions(resolverConfig)]);
+        babel.plugins.push([
+            require.resolve('babel-plugin-ember-template-compilation'),
+            await this.etcOptions(resolverConfig),
+        ]);
         // this is @embroider/macros configured for full stage3 resolution
         babel.plugins.push(...this.compatApp.macrosConfig.babelPluginConfig());
         let colocationOptions = {
@@ -430,7 +272,7 @@ class CompatAppBuilder {
         addCachablePlugin(portable.config);
         return portable;
     }
-    insertEmberApp(asset, appFiles, prepared, emberENV) {
+    insertEmberApp(asset, appFiles, prepared) {
         let html = asset.html;
         if (this.fastbootConfig) {
             // ignore scripts like ember-cli-livereload.js which are not really associated with
@@ -440,12 +282,6 @@ class CompatAppBuilder {
                 script.setAttribute('data-fastboot-ignore', '');
             });
         }
-        // our tests entrypoint already includes a correct module dependency on the
-        // app, so we only insert the app when we're not inserting tests
-        if (!asset.fileAsset.includeTests) {
-            let appJS = this.topAppJSAsset(appFiles, prepared);
-            html.insertScriptTag(html.javascript, appJS.relativePath, { type: 'module' });
-        }
         if (this.fastbootConfig) {
             // any extra fastboot app files get inserted into our html.javascript
             // section, after the app has been inserted.
@@ -454,11 +290,6 @@ class CompatAppBuilder {
             }
         }
         html.insertStyleLink(html.styles, `assets/${this.origAppPackage.name}.css`);
-        const parentEngine = appFiles.find(e => !e.engine.parent);
-        let vendorJS = this.implicitScriptsAsset(prepared, parentEngine, emberENV);
-        if (vendorJS) {
-            html.insertScriptTag(html.implicitScripts, vendorJS.relativePath);
-        }
         if (this.fastbootConfig) {
             // any extra fastboot vendor files get inserted into our
             // html.implicitScripts section, after the regular implicit script
@@ -467,69 +298,12 @@ class CompatAppBuilder {
                 html.insertScriptTag(html.implicitScripts, script, { tag: 'fastboot-script' });
             }
         }
-        let implicitStyles = this.implicitStylesAsset(prepared, parentEngine);
-        if (implicitStyles) {
-            html.insertStyleLink(html.implicitStyles, implicitStyles.relativePath);
-        }
         if (!asset.fileAsset.includeTests) {
             return;
         }
         // Test-related assets happen below this point
         let testJS = this.testJSEntrypoint(appFiles, prepared);
         html.insertScriptTag(html.testJavascript, testJS.relativePath, { type: 'module' });
-        let implicitTestScriptsAsset = this.implicitTestScriptsAsset(prepared, parentEngine);
-        if (implicitTestScriptsAsset) {
-            html.insertScriptTag(html.implicitTestScripts, implicitTestScriptsAsset.relativePath);
-        }
-        let implicitTestStylesAsset = this.implicitTestStylesAsset(prepared, parentEngine);
-        if (implicitTestStylesAsset) {
-            html.insertStyleLink(html.implicitTestStyles, implicitTestStylesAsset.relativePath);
-        }
-    }
-    implicitScriptsAsset(prepared, application, emberENV) {
-        let asset = prepared.get('assets/vendor.js');
-        if (!asset) {
-            let implicitScripts = this.impliedAssets('implicit-scripts', application, emberENV);
-            if (implicitScripts.length > 0) {
-                asset = new ConcatenatedAsset('assets/vendor.js', implicitScripts, this.resolvableExtensionsPattern);
-                prepared.set(asset.relativePath, asset);
-            }
-        }
-        return asset;
-    }
-    implicitStylesAsset(prepared, application) {
-        let asset = prepared.get('assets/vendor.css');
-        if (!asset) {
-            let implicitStyles = this.impliedAssets('implicit-styles', application);
-            if (implicitStyles.length > 0) {
-                // we reverse because we want the synthetic vendor style at the top
-                asset = new ConcatenatedAsset('assets/vendor.css', implicitStyles.reverse(), this.resolvableExtensionsPattern);
-                prepared.set(asset.relativePath, asset);
-            }
-        }
-        return asset;
-    }
-    implicitTestScriptsAsset(prepared, application) {
-        let testSupportJS = prepared.get('assets/test-support.js');
-        if (!testSupportJS) {
-            let implicitTestScripts = this.impliedAssets('implicit-test-scripts', application);
-            if (implicitTestScripts.length > 0) {
-                testSupportJS = new ConcatenatedAsset('assets/test-support.js', implicitTestScripts, this.resolvableExtensionsPattern);
-                prepared.set(testSupportJS.relativePath, testSupportJS);
-            }
-        }
-        return testSupportJS;
-    }
-    implicitTestStylesAsset(prepared, application) {
-        let asset = prepared.get('assets/test-support.css');
-        if (!asset) {
-            let implicitTestStyles = this.impliedAssets('implicit-test-styles', application);
-            if (implicitTestStyles.length > 0) {
-                asset = new ConcatenatedAsset('assets/test-support.css', implicitTestStyles, this.resolvableExtensionsPattern);
-                prepared.set(asset.relativePath, asset);
-            }
-        }
-        return asset;
     }
     // recurse to find all active addons that don't cross an engine boundary.
     // Inner engines themselves will be returned, but not those engines' children.
@@ -540,22 +314,31 @@ class CompatAppBuilder {
             if (!child.isEngine()) {
                 this.findActiveAddons(child, engine, true);
             }
-            engine.addons.add(child);
+            let canResolveFrom;
+            if (pkg === this.appPackageWithMovedDeps) {
+                // we want canResolveFrom to always be a rewritten package path, and our
+                // app's package is not rewritten yet here.
+                canResolveFrom = (0, path_1.resolve)(this.root, 'package.json');
+            }
+            else {
+                // whereas our addons are already moved
+                canResolveFrom = (0, path_1.resolve)(pkg.root, 'package.json');
+            }
+            engine.addons.set(child, canResolveFrom);
         }
         // ensure addons are applied in the correct order, if set (via @embroider/compat/v1-addon)
         if (!isChild) {
-            engine.addons = new Set([...engine.addons].sort((a, b) => {
+            engine.addons = new Map([...engine.addons].sort(([a], [b]) => {
                 return (a.meta['order-index'] || 0) - (b.meta['order-index'] || 0);
             }));
         }
     }
-    partitionEngines(appJSPath) {
+    partitionEngines() {
         let queue = [
             {
                 package: this.appPackageWithMovedDeps,
-                addons: new Set(),
-                parent: undefined,
-                sourcePath: appJSPath,
+                addons: new Map(),
+                isApp: true,
                 modulePrefix: this.modulePrefix(),
                 appRelativePath: '.',
             },
@@ -568,14 +351,13 @@ class CompatAppBuilder {
                 break;
             }
             this.findActiveAddons(current.package, current);
-            for (let addon of current.addons) {
+            for (let addon of current.addons.keys()) {
                 if (addon.isEngine() && !seenEngines.has(addon)) {
                     seenEngines.add(addon);
                     queue.push({
                         package: addon,
-                        addons: new Set(),
-                        parent: current,
-                        sourcePath: addon.root,
+                        addons: new Map(),
+                        isApp: !current,
                         modulePrefix: addon.name,
                         appRelativePath: (0, core_1.explicitRelative)(this.root, addon.root),
                     });
@@ -601,8 +383,8 @@ class CompatAppBuilder {
     updateAppJS(appJSPath) {
         var _a;
         if (!this.engines) {
-            this.engines = this.partitionEngines(appJSPath).map(engine => {
-                if (engine.sourcePath === appJSPath) {
+            this.engines = this.partitionEngines().map(engine => {
+                if (engine.isApp) {
                     // this is the app. We have more to do for the app than for other
                     // engines.
                     let fastbootSync;
@@ -624,7 +406,7 @@ class CompatAppBuilder {
                     // their files, not doing any actual copying or building.
                     return {
                         engine,
-                        appSync: new sync_dir_1.SyncDir(engine.sourcePath, undefined),
+                        appSync: new sync_dir_1.SyncDir(engine.package.root, undefined),
                         // AFAIK, we've never supported a fastboot overlay directory in an
                         // engine. But if we do need that, it would go here.
                         fastbootSync: undefined,
@@ -638,10 +420,15 @@ class CompatAppBuilder {
         }
         return this.engines.map(({ engine, appSync, fastbootSync }) => {
             var _a;
-            return new app_files_1.AppFiles(engine, appSync.files, (_a = fastbootSync === null || fastbootSync === void 0 ? void 0 : fastbootSync.files) !== null && _a !== void 0 ? _a : new Set(), this.resolvableExtensionsPattern, this.podModulePrefix());
+            return new app_files_1.AppFiles(engine, appSync.files, (_a = fastbootSync === null || fastbootSync === void 0 ? void 0 : fastbootSync.files) !== null && _a !== void 0 ? _a : new Set(), this.resolvableExtensionsPattern, this.staticAppPathsPattern, this.podModulePrefix());
         });
     }
-    prepareAsset(asset, appFiles, prepared, emberENV) {
+    get staticAppPathsPattern() {
+        if (this.options.staticAppPaths.length > 0) {
+            return new RegExp('^(?:' + this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
+        }
+    }
+    prepareAsset(asset, appFiles, prepared) {
         if (asset.kind === 'ember') {
             let prior = this.assets.get(asset.relativePath);
             let parsed;
@@ -653,17 +440,17 @@ class CompatAppBuilder {
             else {
                 parsed = new ParsedEmberAsset(asset);
             }
-            this.insertEmberApp(parsed, appFiles, prepared, emberENV);
+            this.insertEmberApp(parsed, appFiles, prepared);
             prepared.set(asset.relativePath, new BuiltEmberAsset(parsed));
         }
         else {
             prepared.set(asset.relativePath, asset);
         }
     }
-    prepareAssets(requestedAssets, appFiles, emberENV) {
+    prepareAssets(requestedAssets, appFiles) {
         let prepared = new Map();
         for (let asset of requestedAssets) {
-            this.prepareAsset(asset, appFiles, prepared, emberENV);
+            this.prepareAsset(asset, appFiles, prepared);
         }
         return prepared;
     }
@@ -678,13 +465,6 @@ class CompatAppBuilder {
                 return prior.kind === 'in-memory' && stringOrBufferEqual(prior.source, asset.source);
             case 'built-ember':
                 return prior.kind === 'built-ember' && prior.source === asset.source;
-            case 'concatenated-asset':
-                return (prior.kind === 'concatenated-asset' &&
-                    prior.sources.length === asset.sources.length &&
-                    prior.sources.every((priorFile, index) => {
-                        let newFile = asset.sources[index];
-                        return this.assetIsValid(newFile, priorFile);
-                    }));
         }
     }
     updateOnDiskAsset(asset) {
@@ -702,35 +482,8 @@ class CompatAppBuilder {
         (0, fs_extra_2.ensureDirSync)((0, path_2.dirname)(destination));
         (0, fs_extra_1.writeFileSync)(destination, asset.source, 'utf8');
     }
-    async updateConcatenatedAsset(asset) {
-        let concat = new fast_sourcemap_concat_1.default({
-            outputFile: (0, path_2.join)(this.root, asset.relativePath),
-            mapCommentType: asset.relativePath.endsWith('.js') ? 'line' : 'block',
-            baseDir: this.root,
-        });
-        if (process.env.EMBROIDER_CONCAT_STATS) {
-            let MeasureConcat = (await Promise.resolve().then(() => __importStar(require('@embroider/core/src/measure-concat')))).default;
-            concat = new MeasureConcat(asset.relativePath, concat, this.root);
-        }
-        for (let source of asset.sources) {
-            switch (source.kind) {
-                case 'on-disk':
-                    concat.addFile((0, core_1.explicitRelative)(this.root, source.sourcePath));
-                    break;
-                case 'in-memory':
-                    if (typeof source.source !== 'string') {
-                        throw new Error(`attempted to concatenated a Buffer-backed in-memory asset`);
-                    }
-                    concat.addSpace(source.source);
-                    break;
-                default:
-                    (0, assert_never_1.default)(source);
-            }
-        }
-        await concat.end();
-    }
-    async updateAssets(requestedAssets, appFiles, emberENV) {
-        let assets = this.prepareAssets(requestedAssets, appFiles, emberENV);
+    async updateAssets(requestedAssets, appFiles) {
+        let assets = this.prepareAssets(requestedAssets, appFiles);
         for (let asset of assets.values()) {
             if (this.assetIsValid(asset, this.assets.get(asset.relativePath))) {
                 continue;
@@ -746,9 +499,6 @@ class CompatAppBuilder {
                 case 'built-ember':
                     this.updateBuiltEmberAsset(asset);
                     break;
-                case 'concatenated-asset':
-                    await this.updateConcatenatedAsset(asset);
-                    break;
                 default:
                     (0, assert_never_1.default)(asset);
             }
@@ -759,26 +509,10 @@ class CompatAppBuilder {
             }
         }
         this.assets = assets;
-        return [...assets.values()];
     }
     gatherAssets(inputPaths) {
         // first gather all the assets out of addons
         let assets = [];
-        for (let pkg of this.allActiveAddons) {
-            if (pkg.meta['public-assets']) {
-                for (let [filename, appRelativeURL] of Object.entries(pkg.meta['public-assets'] || {})) {
-                    let sourcePath = (0, path_1.resolve)(pkg.root, filename);
-                    let stats = (0, fs_extra_1.statSync)(sourcePath);
-                    assets.push({
-                        kind: 'on-disk',
-                        sourcePath,
-                        relativePath: appRelativeURL,
-                        mtime: stats.mtimeMs,
-                        size: stats.size,
-                    });
-                }
-            }
-        }
         if (this.activeFastboot) {
             const source = `
       (function(){
@@ -807,29 +541,20 @@ class CompatAppBuilder {
             this.firstBuild = false;
         }
         let appFiles = this.updateAppJS(inputPaths.appJS);
-        let emberENV = this.configTree.readConfig().EmberENV;
         let assets = this.gatherAssets(inputPaths);
-        let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
+        await this.updateAssets(assets, appFiles);
         let assetPaths = assets.map(asset => asset.relativePath);
         if (this.activeFastboot) {
             // when using fastboot, our own package.json needs to be in the output so fastboot can read it.
             assetPaths.push('package.json');
         }
-        for (let asset of finalAssets) {
-            // our concatenated assets all have map files that ride along. Here we're
-            // telling the final stage packager to be sure and serve the map files
-            // too.
-            if (asset.kind === 'concatenated-asset') {
-                assetPaths.push(asset.sourcemapPath);
-            }
-        }
         let meta = {
             type: 'app',
             version: 2,
             assets: assetPaths,
             babel: {
                 filename: '_babel_config_.js',
-                isParallelSafe: true,
+                isParallelSafe: true, // TODO
                 majorVersion: this.compatApp.babelMajorVersion(),
                 fileFilter: '_babel_filter_.js',
             },
@@ -841,8 +566,12 @@ class CompatAppBuilder {
         (0, fs_extra_1.writeFileSync)((0, path_2.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
         let resolverConfig = this.resolverConfig(appFiles);
         this.addResolverConfig(resolverConfig);
-        let babelConfig = this.babelConfig(resolverConfig);
+        this.addContentForConfig(this.contentForTree.readContents());
+        this.addEmberEnvConfig(this.configTree.readConfig().EmberENV);
+        this.addAppBoot(this.compatApp.appBoot.readAppBoot());
+        let babelConfig = await this.babelConfig(resolverConfig);
         this.addBabelConfig(babelConfig);
+        (0, fs_extra_1.writeFileSync)((0, path_2.join)(this.root, 'macros-config.json'), JSON.stringify(this.compatApp.macrosConfig.babelPluginConfig()[0], null, 2));
     }
     combinePackageJSON(meta) {
         let pkgLayers = [this.origAppPackage.packageJSON];
@@ -855,7 +584,7 @@ class CompatAppBuilder {
         pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
         return combinePackageJSON(...pkgLayers);
     }
-    etcOptions(resolverConfig) {
+    async etcOptions(resolverConfig) {
         let transforms = this.compatApp.htmlbarsPlugins;
         let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
         setConfig(this.compatApp.macrosConfig);
@@ -872,7 +601,7 @@ class CompatAppBuilder {
             transforms.push([require.resolve('./resolver-transform'), opts]);
         }
         let resolver = new core_1.Resolver(resolverConfig);
-        let resolution = resolver.nodeResolve('ember-source/vendor/ember/ember-template-compiler', (0, path_1.resolve)(this.root, 'package.json'));
+        let resolution = await resolver.nodeResolve('ember-source/vendor/ember/ember-template-compiler', (0, path_1.resolve)(this.root, 'package.json'));
         if (resolution.type !== 'real') {
             throw new Error(`bug: unable to resolve ember-template-compiler from ${this.root}`);
         }
@@ -890,7 +619,7 @@ class CompatAppBuilder {
                 if (i < hint.resolve.length - 1) {
                     target = (0, path_2.join)(target, 'package.json');
                 }
-                cursor = resolve_2.default.sync(target, { basedir: (0, path_2.dirname)(cursor) });
+                cursor = resolve_1.default.sync(target, { basedir: (0, path_2.dirname)(cursor) });
             }
             return {
                 requireFile: cursor,
@@ -909,173 +638,18 @@ class CompatAppBuilder {
     addResolverConfig(config) {
         (0, fs_extra_1.outputJSONSync)((0, path_2.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'resolver.json'), config, { spaces: 2 });
     }
-    shouldSplitRoute(routeName) {
-        return (!this.options.splitAtRoutes ||
-            this.options.splitAtRoutes.find(pattern => {
-                if (typeof pattern === 'string') {
-                    return pattern === routeName;
-                }
-                else {
-                    return pattern.test(routeName);
-                }
-            }));
-    }
-    splitRoute(routeName, files, addToParent, addLazyBundle) {
-        let shouldSplit = routeName && this.shouldSplitRoute(routeName);
-        let ownFiles = [];
-        let ownNames = new Set();
-        if (files.template) {
-            if (shouldSplit) {
-                ownFiles.push(files.template);
-                ownNames.add(routeName);
-            }
-            else {
-                addToParent(routeName, files.template);
-            }
-        }
-        if (files.controller) {
-            if (shouldSplit) {
-                ownFiles.push(files.controller);
-                ownNames.add(routeName);
-            }
-            else {
-                addToParent(routeName, files.controller);
-            }
-        }
-        if (files.route) {
-            if (shouldSplit) {
-                ownFiles.push(files.route);
-                ownNames.add(routeName);
-            }
-            else {
-                addToParent(routeName, files.route);
-            }
-        }
-        for (let [childName, childFiles] of files.children) {
-            this.splitRoute(`${routeName}.${childName}`, childFiles, (childRouteName, childFile) => {
-                // this is our child calling "addToParent"
-                if (shouldSplit) {
-                    ownFiles.push(childFile);
-                    ownNames.add(childRouteName);
-                }
-                else {
-                    addToParent(childRouteName, childFile);
-                }
-            }, (routeNames, files) => {
-                addLazyBundle(routeNames, files);
-            });
-        }
-        if (ownFiles.length > 0) {
-            addLazyBundle([...ownNames], ownFiles);
-        }
-    }
-    topAppJSAsset(engines, prepared) {
-        let [app, ...childEngines] = engines;
-        let relativePath = `assets/${this.origAppPackage.name}.js`;
-        return this.appJSAsset(relativePath, app, childEngines, prepared, {
-            autoRun: this.compatApp.autoRun,
-            appBoot: !this.compatApp.autoRun ? this.compatApp.appBoot.readAppBoot() : '',
-            mainModule: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), 'app'),
-            appConfig: this.configTree.readConfig().APP,
+    addContentForConfig(contentForConfig) {
+        (0, fs_extra_1.outputJSONSync)((0, path_2.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'content-for.json'), contentForConfig, {
+            spaces: 2,
         });
     }
-    get staticAppPathsPattern() {
-        if (this.options.staticAppPaths.length > 0) {
-            return new RegExp('^(?:' + this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
-        }
+    addEmberEnvConfig(emberEnvConfig) {
+        (0, fs_extra_1.outputJSONSync)((0, path_2.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'ember-env.json'), emberEnvConfig, {
+            spaces: 2,
+        });
     }
-    requiredOtherFiles(appFiles) {
-        let pattern = this.staticAppPathsPattern;
-        if (pattern) {
-            return appFiles.otherAppFiles.filter(f => {
-                return !pattern.test(f);
-            });
-        }
-        else {
-            return appFiles.otherAppFiles;
-        }
-    }
-    appJSAsset(relativePath, appFiles, childEngines, prepared, entryParams) {
-        let cached = prepared.get(relativePath);
-        if (cached) {
-            return cached;
-        }
-        let eagerModules = [];
-        let requiredAppFiles = [this.requiredOtherFiles(appFiles)];
-        if (!this.options.staticComponents) {
-            requiredAppFiles.push(appFiles.components);
-        }
-        if (!this.options.staticHelpers) {
-            requiredAppFiles.push(appFiles.helpers);
-        }
-        if (!this.options.staticModifiers) {
-            requiredAppFiles.push(appFiles.modifiers);
-        }
-        let styles = [];
-        // only import styles from engines with a parent (this excludeds the parent application) as their styles
-        // will be inserted via a direct <link> tag.
-        if (appFiles.engine.parent && appFiles.engine.package.isLazyEngine()) {
-            let implicitStyles = this.impliedAssets('implicit-styles', appFiles);
-            for (let style of implicitStyles) {
-                styles.push({
-                    path: (0, core_1.explicitRelative)('assets/_engine_', style.relativePath),
-                });
-            }
-            let engineMeta = appFiles.engine.package.meta;
-            if (engineMeta && engineMeta['implicit-styles']) {
-                for (let style of engineMeta['implicit-styles']) {
-                    styles.push({
-                        path: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), (0, path_2.join)(appFiles.engine.appRelativePath, style)),
-                    });
-                }
-            }
-        }
-        let lazyEngines = [];
-        for (let childEngine of childEngines) {
-            let asset = this.appJSAsset(`assets/_engine_/${encodeURIComponent(childEngine.engine.package.name)}.js`, childEngine, [], prepared);
-            if (childEngine.engine.package.isLazyEngine()) {
-                lazyEngines.push({
-                    names: [childEngine.engine.package.name],
-                    path: (0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), asset.relativePath),
-                });
-            }
-            else {
-                eagerModules.push((0, core_1.explicitRelative)((0, path_2.dirname)(relativePath), asset.relativePath));
-            }
-        }
-        let lazyRoutes = [];
-        for (let [routeName, routeFiles] of appFiles.routeFiles.children) {
-            this.splitRoute(routeName, routeFiles, (_, filename) => {
-                requiredAppFiles.push([filename]);
-            }, (routeNames, files) => {
-                let routeEntrypoint = `assets/_route_/${encodeURIComponent(routeNames[0])}.js`;
-                if (!prepared.has(routeEntrypoint)) {
-                    prepared.set(routeEntrypoint, this.routeEntrypoint(appFiles, routeEntrypoint, files));
-                }
-                lazyRoutes.push({
-                    names: routeNames,
-                    path: this.importPaths(appFiles, routeEntrypoint).buildtime,
-                });
-            });
-        }
-        let [fastboot, nonFastboot] = (0, partition_1.default)(excludeDotFiles((0, flatten_1.default)(requiredAppFiles)), file => appFiles.isFastbootOnly.get(file));
-        let amdModules = nonFastboot.map(file => this.importPaths(appFiles, file));
-        let fastbootOnlyAmdModules = fastboot.map(file => this.importPaths(appFiles, file));
-        // this is a backward-compatibility feature: addons can force inclusion of
-        // modules.
-        eagerModules.push('./-embroider-implicit-modules.js');
-        let params = { amdModules, fastbootOnlyAmdModules, lazyRoutes, lazyEngines, eagerModules, styles };
-        if (entryParams) {
-            Object.assign(params, entryParams);
-        }
-        let source = entryTemplate(params);
-        let asset = {
-            kind: 'in-memory',
-            source,
-            relativePath,
-        };
-        prepared.set(relativePath, asset);
-        return asset;
+    addAppBoot(appBoot) {
+        (0, fs_extra_1.writeFileSync)((0, path_2.join)((0, core_1.locateEmbroiderWorkingDir)(this.compatApp.root), 'ember-app-boot.js'), appBoot !== null && appBoot !== void 0 ? appBoot : '');
     }
     importPaths({ engine }, engineRelativePath) {
         let noHBS = engineRelativePath.replace(this.resolvableExtensionsPattern, '').replace(/\.hbs$/, '');
@@ -1084,18 +658,6 @@ class CompatAppBuilder {
             buildtime: path_1.posix.join(engine.package.name, engineRelativePath),
         };
     }
-    routeEntrypoint(appFiles, relativePath, files) {
-        let [fastboot, nonFastboot] = (0, partition_1.default)(files, file => appFiles.isFastbootOnly.get(file));
-        let asset = {
-            kind: 'in-memory',
-            source: routeEntryTemplate({
-                files: nonFastboot.map(f => this.importPaths(appFiles, f)),
-                fastbootOnlyFiles: fastboot.map(f => this.importPaths(appFiles, f)),
-            }),
-            relativePath,
-        };
-        return asset;
-    }
     testJSEntrypoint(appFiles, prepared) {
         let asset = prepared.get(`assets/test.js`);
         if (asset) {
@@ -1106,26 +668,15 @@ class CompatAppBuilder {
         // the app.
         let engine = appFiles[0];
         const myName = 'assets/test.js';
-        // tests necessarily also include the app. This is where we account for
-        // that. The classic solution was to always include the app's separate
-        // script tag in the tests HTML, but that isn't as easy for final stage
-        // packagers to understand. It's better to express it here as a direct
-        // module dependency.
-        let eagerModules = [
-            'ember-testing',
-            (0, core_1.explicitRelative)((0, path_2.dirname)(myName), this.topAppJSAsset(appFiles, prepared).relativePath),
-        ];
         let amdModules = [];
-        // this is a backward-compatibility feature: addons can force inclusion of
-        // test support modules.
-        eagerModules.push('./-embroider-implicit-test-modules.js');
         for (let relativePath of engine.tests) {
             amdModules.push(this.importPaths(engine, relativePath));
         }
         let source = entryTemplate({
             amdModules,
-            eagerModules,
             testSuffix: true,
+            // this is a backward-compatibility feature: addons can force inclusion of test support modules.
+            defineModulesFrom: './-embroider-implicit-test-modules.js',
         });
         asset = {
             kind: 'in-memory',
@@ -1140,9 +691,6 @@ exports.CompatAppBuilder = CompatAppBuilder;
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "fastbootJSSrcDir", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "findTestemAsset", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "allActiveAddons", null);
@@ -1169,10 +717,10 @@ __decorate([
 ], CompatAppBuilder.prototype, "fastbootConfig", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "portableHints", null);
+], CompatAppBuilder.prototype, "staticAppPathsPattern", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "staticAppPathsPattern", null);
+], CompatAppBuilder.prototype, "portableHints", null);
 function defaultAddonPackageRules() {
     return (0, fs_extra_2.readdirSync)((0, path_2.join)(__dirname, 'addon-dependency-rules'))
         .map(filename => {
@@ -1197,9 +745,17 @@ let d = w.define;
   }
 {{/if}}
 
-{{#each eagerModules as |eagerModule| ~}}
-  i("{{js-string-escape eagerModule}}");
-{{/each}}
+{{#if defineModulesFrom ~}}
+  import implicitModules from "{{js-string-escape defineModulesFrom}}";
+
+  for(const [name, module] of Object.entries(implicitModules)) {
+    d(name, function() { return module });
+  }
+{{/if}}
+
+
+import "ember-testing";
+import "@embroider/core/entrypoint";
 
 {{#each amdModules as |amdModule| ~}}
   d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
@@ -1207,9 +763,17 @@ let d = w.define;
 
 {{#if fastbootOnlyAmdModules}}
   if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {
+    let fastbootModules = {};
+
     {{#each fastbootOnlyAmdModules as |amdModule| ~}}
-      d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
+      fastbootModules["{{js-string-escape amdModule.runtime}}"] = import("{{js-string-escape amdModule.buildtime}}");
     {{/each}}
+
+    const resolvedValues = await Promise.all(Object.values(fastbootModules));
+
+    Object.keys(fastbootModules).forEach((k, i) => {
+      d(k, function(){ return resolvedValues[i];});
+    })
   }
 {{/if}}
 
@@ -1258,21 +822,6 @@ if (!runningTests) {
   EmberENV.TESTS_FILE_LOADED = true;
 {{/if}}
 `);
-const routeEntryTemplate = (0, core_1.jsHandlebarsCompile)(`
-import { importSync as i } from '@embroider/macros';
-let d = window.define;
-{{#each files as |amdModule| ~}}
-d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
-{{/each}}
-{{#if fastbootOnlyFiles}}
-  import { macroCondition, getGlobalConfig } from '@embroider/macros';
-  if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {
-    {{#each fastbootOnlyFiles as |amdModule| ~}}
-    d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
-    {{/each}}
-  }
-{{/if}}
-`);
 function stringOrBufferEqual(a, b) {
     if (typeof a === 'string' && typeof b === 'string') {
         return a === b;
@@ -1321,9 +870,6 @@ function addCachablePlugin(babelConfig) {
         ]);
     }
 }
-function excludeDotFiles(files) {
-    return files.filter(file => !file.startsWith('.') && !file.includes('/.'));
-}
 class ParsedEmberAsset {
     constructor(asset) {
         this.kind = 'parsed-ember';
@@ -1343,15 +889,4 @@ class BuiltEmberAsset {
         this.relativePath = asset.relativePath;
     }
 }
-class ConcatenatedAsset {
-    constructor(relativePath, sources, resolvableExtensions) {
-        this.relativePath = relativePath;
-        this.sources = sources;
-        this.resolvableExtensions = resolvableExtensions;
-        this.kind = 'concatenated-asset';
-    }
-    get sourcemapPath() {
-        return this.relativePath.replace(this.resolvableExtensions, '') + '.map';
-    }
-}
 //# sourceMappingURL=compat-app-builder.js.map