@embroider/core 0.29.0 → 0.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "0.29.0",
+  "version": "0.33.0",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -24,15 +24,19 @@
     "@babel/core": "^7.12.3",
     "@babel/parser": "^7.12.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.12.1",
+    "@babel/runtime": "^7.12.5",
     "@babel/traverse": "^7.12.1",
     "@babel/types": "^7.12.1",
-    "@embroider/macros": "0.29.0",
+    "@embroider/macros": "0.33.0",
     "assert-never": "^1.1.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "broccoli-persistent-filter": "^2.2.2",
-    "broccoli-plugin": "^3.0.0",
-    "broccoli-source": "^1.1.0",
+    "broccoli-node-api": "^1.7.0",
+    "broccoli-persistent-filter": "^3.1.2",
+    "broccoli-plugin": "^4.0.1",
+    "broccoli-source": "^3.0.0",
     "debug": "^3.1.0",
+    "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^1.4.0",
     "filesize": "^4.1.2",
     "fs-extra": "^7.0.1",
@@ -53,7 +57,7 @@
   },
   "devDependencies": {
     "@embroider/sample-transforms": "0.0.0",
-    "@embroider/test-support": "0.29.0",
+    "@embroider/test-support": "0.33.0",
     "@types/babel__core": "^7.1.10",
     "@types/debug": "^0.0.31",
     "@types/filesize": "^4.1.0",

package/src/app-files.d.ts

@@ -14,8 +14,9 @@ export declare class AppFiles {
     readonly otherAppFiles: ReadonlyArray<string>;
     readonly relocatedFiles: Map<string, string>;
     readonly isFastbootOnly: Map<string, boolean>;
-    constructor(appDiffer: AppDiffer, resolvableExtensions: RegExp);
-    private handleRouteFile;
+    constructor(appDiffer: AppDiffer, resolvableExtensions: RegExp, podModulePrefix?: string);
+    private handleClassicRouteFile;
+    private handlePodsRouteFile;
     get routeFiles(): Readonly<RouteFiles>;
 }
 export interface EngineSummary {

package/src/app-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppFiles = void 0;
 const path_1 = require("path");
 class AppFiles {
-    constructor(appDiffer, resolvableExtensions) {
+    constructor(appDiffer, resolvableExtensions, podModulePrefix) {
         let tests = [];
         let components = [];
         let helpers = [];
@@ -27,8 +27,10 @@ class AppFiles {
             }
             // hbs files are resolvable, but not when they're inside the components
             // directory (where they are used for colocation only)
-            if (relativePath.startsWith('components/') && !relativePath.endsWith('.hbs')) {
-                components.push(relativePath);
+            if (relativePath.startsWith('components/')) {
+                if (!relativePath.endsWith('.hbs')) {
+                    components.push(relativePath);
+                }
                 continue;
             }
             if (relativePath.startsWith('templates/components/')) {
@@ -39,7 +41,8 @@ class AppFiles {
                 helpers.push(relativePath);
                 continue;
             }
-            if (this.handleRouteFile(relativePath)) {
+            if (this.handleClassicRouteFile(relativePath) ||
+                (podModulePrefix !== undefined && this.handlePodsRouteFile(relativePath, podModulePrefix))) {
                 continue;
             }
             otherAppFiles.push(relativePath);
@@ -57,7 +60,7 @@ class AppFiles {
         this.relocatedFiles = relocatedFiles;
         this.isFastbootOnly = appDiffer.isFastbootOnly;
     }
-    handleRouteFile(relativePath) {
+    handleClassicRouteFile(relativePath) {
         let [prefix, ...rest] = relativePath.replace(/\.\w{1,3}$/, '').split('/');
         if (!['controllers', 'templates', 'routes'].includes(prefix)) {
             return false;
@@ -78,6 +81,35 @@ class AppFiles {
         cursor[type] = relativePath;
         return true;
     }
+    handlePodsRouteFile(relativePath, podModulePrefix) {
+        let parts = relativePath.replace(/\.\w{1,3}$/, '').split('/');
+        let type = parts.pop();
+        if (!type || !['controller', 'template', 'route'].includes(type)) {
+            return false;
+        }
+        let podParts = podModulePrefix.split('/');
+        // The first part of podModulePrefix is the app's package name
+        podParts.shift();
+        for (let podPart of podParts) {
+            if (parts.shift() !== podPart) {
+                return false;
+            }
+        }
+        let cursor = this.perRoute;
+        for (let part of parts) {
+            let child = cursor.children.get(part);
+            if (child) {
+                cursor = child;
+            }
+            else {
+                let newEntry = { children: new Map() };
+                cursor.children.set(part, newEntry);
+                cursor = newEntry;
+            }
+        }
+        cursor[type] = relativePath;
+        return true;
+    }
     get routeFiles() {
         return this.perRoute;
     }

package/src/app-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-files.js","sourceRoot":"","sources":["app-files.ts"],"names":[],"mappings":"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"}

package/src/app.d.ts

@@ -2,10 +2,11 @@ import { OutputPaths } from './wait-for-trees';
 import Package, { V2AddonPackage } from './package';
 import { Asset } from './asset';
 import Options from './options';
-import { MacrosConfig } from '@embroider/macros';
+import { MacrosConfig } from '@embroider/macros/src/node';
 import { TransformOptions } from '@babel/core';
 import { TemplateCompilerPlugins } from '.';
 import { Resolver } from './resolver';
+import { Options as AdjustImportsOptions } from './babel-plugin-adjust-imports';
 export declare type EmberENV = unknown;
 export interface AppAdapter<TreeNames> {
     readonly allActiveAddons: V2AddonPackage[];
@@ -18,18 +19,14 @@ export interface AppAdapter<TreeNames> {
     mainModule(): string;
     mainModuleConfig(): unknown;
     modulePrefix(): string;
+    podModulePrefix(): string | undefined;
     rootURL(): string;
     templateCompilerPath(): string;
     templateResolver(): Resolver;
-    resolvableExtensions(): string[];
+    adjustImportsOptions(): AdjustImportsOptions;
     htmlbarsPlugins(): TemplateCompilerPlugins;
     babelConfig(): TransformOptions;
     babelMajorVersion(): 6 | 7;
-    extraImports(): {
-        absPath: string;
-        target: string;
-        runtimeName?: string;
-    }[];
     emberENV(): EmberENV;
     strictV2Format(): boolean;
     developingAddons(): string[];
@@ -74,11 +71,14 @@ export declare class AppBuilder<TreeNames> {
     build(inputPaths: OutputPaths<TreeNames>): Promise<void>;
     private combinePackageJSON;
     private templateCompiler;
+    private get portableHints();
     private addTemplateCompiler;
     private addBabelConfig;
     private shouldSplitRoute;
     private splitRoute;
     private topAppJSAsset;
+    private get staticAppPathsPattern();
+    private requiredOtherFiles;
     private appJSAsset;
     private get modulePrefix();
     private importPaths;

package/src/app.js

@@ -41,16 +41,16 @@ const app_differ_1 = __importDefault(require("./app-differ"));
 const ember_html_1 = require("./ember-html");
 const assert_never_1 = __importDefault(require("assert-never"));
 const fast_sourcemap_concat_1 = __importDefault(require("fast-sourcemap-concat"));
-const macros_1 = require("@embroider/macros");
-const portable_babel_config_1 = __importDefault(require("./portable-babel-config"));
-const template_compiler_1 = __importDefault(require("./template-compiler"));
-const os_1 = require("os");
+const node_1 = require("@embroider/macros/src/node");
+const portable_babel_config_1 = require("./portable-babel-config");
+const template_compiler_1 = require("./template-compiler");
 const paths_1 = require("./paths");
 const engine_mangler_1 = require("./engine-mangler");
 const app_files_1 = require("./app-files");
 const partition_1 = __importDefault(require("lodash/partition"));
 const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const escape_string_regexp_1 = __importDefault(require("escape-string-regexp"));
 function excludeDotFiles(files) {
     return files.filter(file => !file.startsWith('.') && !file.includes('/.'));
 }
@@ -115,10 +115,10 @@ class AppBuilder {
         }
     }
     get resolvableExtensionsPattern() {
-        return paths_1.extensionsPattern(this.adapter.resolvableExtensions());
+        return paths_1.extensionsPattern(this.adapter.adjustImportsOptions().resolvableExtensions);
     }
-    impliedAssets(type, emberENV) {
-        let result = this.impliedAddonAssets(type).map((sourcePath) => {
+    impliedAssets(type, engine, emberENV) {
+        let result = this.impliedAddonAssets(type, engine).map((sourcePath) => {
             let stats = fs_extra_1.statSync(sourcePath);
             return {
                 kind: 'on-disk',
@@ -171,16 +171,19 @@ class AppBuilder {
         }
         return result;
     }
-    impliedAddonAssets(type) {
+    impliedAddonAssets(type, engine) {
         let result = [];
-        for (let addon of sortBy_1.default(this.adapter.allActiveAddons, this.scriptPriority.bind(this))) {
+        for (let addon of 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') {
-                        styles.push(resolve_1.default.sync(mod, options));
+                        // exclude engines because they will handle their own css importation
+                        if (!addon.isLazyEngine()) {
+                            styles.push(resolve_1.default.sync(mod, options));
+                        }
                     }
                     else {
                         result.push(resolve_1.default.sync(mod, options));
@@ -207,7 +210,7 @@ class AppBuilder {
             : '@babel/plugin-syntax-dynamic-import'));
         return babel;
     }
-    babelConfig(templateCompiler, appFiles) {
+    babelConfig(templateCompilerParams, appFiles) {
         let babel = this.adapter.babelConfig();
         if (!babel.plugins) {
             babel.plugins = [];
@@ -221,7 +224,7 @@ class AppBuilder {
         babel.plugins.push([
             path_1.join(__dirname, 'babel-plugin-inline-hbs.js'),
             {
-                templateCompiler,
+                templateCompiler: templateCompilerParams,
                 stage: 3,
             },
         ]);
@@ -229,34 +232,24 @@ class AppBuilder {
         // this is @embroider/macros configured for full stage3 resolution
         babel.plugins.push(this.macrosConfig.babelPluginConfig());
         babel.plugins.push([require.resolve('./template-colocation-plugin')]);
-        return new portable_babel_config_1.default(babel, { basedir: this.root });
+        // we can use globally shared babel runtime by default
+        babel.plugins.push([
+            require.resolve('@babel/plugin-transform-runtime'),
+            { absoluteRuntime: __dirname, useESModules: true, regenerator: false },
+        ]);
+        return portable_babel_config_1.makePortable(babel, { basedir: this.root }, this.portableHints);
     }
     adjustImportsPlugin(engines) {
-        let renamePackages = Object.assign({}, ...this.adapter.allActiveAddons.map(dep => dep.meta['renamed-packages']));
-        let renameModules = Object.assign({}, ...this.adapter.allActiveAddons.map(dep => dep.meta['renamed-modules']));
-        let activeAddons = {};
-        for (let addon of this.adapter.allActiveAddons) {
-            activeAddons[addon.name] = addon.root;
-        }
         let relocatedFiles = {};
         for (let { destPath, appFiles } of engines) {
             for (let [relativePath, originalPath] of appFiles.relocatedFiles) {
                 relocatedFiles[path_1.join(destPath, relativePath).split(path_1.sep).join('/')] = originalPath;
             }
         }
-        let adjustOptions = {
-            activeAddons,
-            renameModules,
-            renamePackages,
-            extraImports: this.adapter.extraImports(),
-            relocatedFiles,
-            resolvableExtensions: this.adapter.resolvableExtensions(),
-            // it's important that this is a persistent location, because we fill it
-            // up as a side-effect of babel transpilation, and babel is subject to
-            // persistent caching.
-            externalsDir: path_1.join(os_1.tmpdir(), 'embroider', 'externals'),
-        };
-        return [require.resolve('./babel-plugin-adjust-imports'), adjustOptions];
+        return [
+            require.resolve('./babel-plugin-adjust-imports'),
+            Object.assign({}, this.adapter.adjustImportsOptions(), { relocatedFiles }),
+        ];
     }
     insertEmberApp(asset, appFiles, prepared, emberENV) {
         let html = asset.html;
@@ -282,7 +275,8 @@ class AppBuilder {
             }
         }
         html.insertStyleLink(html.styles, `assets/${this.app.name}.css`);
-        let vendorJS = this.implicitScriptsAsset(prepared, emberENV);
+        const parentEngine = appFiles.find(e => !e.parent);
+        let vendorJS = this.implicitScriptsAsset(prepared, parentEngine, emberENV);
         if (vendorJS) {
             html.insertScriptTag(html.implicitScripts, vendorJS.relativePath);
         }
@@ -294,7 +288,7 @@ class AppBuilder {
                 html.insertScriptTag(html.implicitScripts, script, { tag: 'fastboot-script' });
             }
         }
-        let implicitStyles = this.implicitStylesAsset(prepared);
+        let implicitStyles = this.implicitStylesAsset(prepared, parentEngine);
         if (implicitStyles) {
             html.insertStyleLink(html.implicitStyles, implicitStyles.relativePath);
         }
@@ -304,19 +298,19 @@ class AppBuilder {
         // 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);
+        let implicitTestScriptsAsset = this.implicitTestScriptsAsset(prepared, parentEngine);
         if (implicitTestScriptsAsset) {
             html.insertScriptTag(html.implicitTestScripts, implicitTestScriptsAsset.relativePath);
         }
-        let implicitTestStylesAsset = this.implicitTestStylesAsset(prepared);
+        let implicitTestStylesAsset = this.implicitTestStylesAsset(prepared, parentEngine);
         if (implicitTestStylesAsset) {
             html.insertStyleLink(html.implicitTestStyles, implicitTestStylesAsset.relativePath);
         }
     }
-    implicitScriptsAsset(prepared, emberENV) {
+    implicitScriptsAsset(prepared, application, emberENV) {
         let asset = prepared.get('assets/vendor.js');
         if (!asset) {
-            let implicitScripts = this.impliedAssets('implicit-scripts', emberENV);
+            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);
@@ -324,21 +318,22 @@ class AppBuilder {
         }
         return asset;
     }
-    implicitStylesAsset(prepared) {
+    implicitStylesAsset(prepared, application) {
         let asset = prepared.get('assets/vendor.css');
         if (!asset) {
-            let implicitStyles = this.impliedAssets('implicit-styles');
+            let implicitStyles = this.impliedAssets('implicit-styles', application);
             if (implicitStyles.length > 0) {
-                asset = new ConcatenatedAsset('assets/vendor.css', implicitStyles, this.resolvableExtensionsPattern);
+                // 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) {
+    implicitTestScriptsAsset(prepared, application) {
         let testSupportJS = prepared.get('assets/test-support.js');
         if (!testSupportJS) {
-            let implicitTestScripts = this.impliedAssets('implicit-test-scripts');
+            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);
@@ -346,10 +341,10 @@ class AppBuilder {
         }
         return testSupportJS;
     }
-    implicitTestStylesAsset(prepared) {
+    implicitTestStylesAsset(prepared, application) {
         let asset = prepared.get('assets/test-support.css');
         if (!asset) {
-            let implicitTestStyles = this.impliedAssets('implicit-test-styles');
+            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);
@@ -447,7 +442,7 @@ class AppBuilder {
             .forEach(a => a.differ.update());
         return this.appDiffers.map(a => {
             return Object.assign({}, a.engine, {
-                appFiles: new app_files_1.AppFiles(a.differ, this.resolvableExtensionsPattern),
+                appFiles: new app_files_1.AppFiles(a.differ, this.resolvableExtensionsPattern, this.adapter.podModulePrefix()),
             });
         });
     }
@@ -624,7 +619,7 @@ class AppBuilder {
         let finalAssets = await this.updateAssets(assets, appFiles, emberENV);
         let templateCompiler = this.templateCompiler(emberENV);
         let babelConfig = this.babelConfig(templateCompiler, appFiles);
-        this.addTemplateCompiler(templateCompiler);
+        let templateCompilerIsParallelSafe = this.addTemplateCompiler(templateCompiler);
         this.addBabelConfig(babelConfig);
         let assetPaths = assets.map(asset => asset.relativePath);
         if (this.activeFastboot) {
@@ -645,7 +640,7 @@ class AppBuilder {
             assets: assetPaths,
             'template-compiler': {
                 filename: '_template_compiler_.js',
-                isParallelSafe: templateCompiler.isParallelSafe,
+                isParallelSafe: templateCompilerIsParallelSafe,
             },
             babel: {
                 filename: '_babel_config_.js',
@@ -653,7 +648,7 @@ class AppBuilder {
                 majorVersion: this.adapter.babelMajorVersion(),
                 fileFilter: '_babel_filter_.js',
             },
-            'resolvable-extensions': this.adapter.resolvableExtensions(),
+            'resolvable-extensions': this.adapter.adjustImportsOptions().resolvableExtensions,
             'root-url': this.adapter.rootURL(),
         };
         if (!this.adapter.strictV2Format()) {
@@ -675,26 +670,41 @@ class AppBuilder {
         if (!plugins.ast) {
             plugins.ast = [];
         }
-        let { plugins: macroPlugins, setConfig } = macros_1.MacrosConfig.astPlugins();
+        let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.astPlugins();
         setConfig(this.macrosConfig);
         for (let macroPlugin of macroPlugins) {
             plugins.ast.push(macroPlugin);
         }
-        return new template_compiler_1.default({
+        return {
             plugins,
             compilerPath: resolve_1.default.sync(this.adapter.templateCompilerPath(), { basedir: this.root }),
             resolver: this.adapter.templateResolver(),
             EmberENV: config,
+        };
+    }
+    get portableHints() {
+        return this.options.pluginHints.map(hint => {
+            let cursor = path_1.join(this.app.root, 'package.json');
+            for (let i = 0; i < hint.resolve.length; i++) {
+                let target = hint.resolve[i];
+                if (i < hint.resolve.length - 1) {
+                    target = path_1.join(target, 'package.json');
+                }
+                cursor = resolve_1.default.sync(target, { basedir: path_1.dirname(cursor) });
+            }
+            return { requireFile: cursor, useMethod: hint.useMethod };
         });
     }
-    addTemplateCompiler(templateCompiler) {
-        fs_extra_1.writeFileSync(path_1.join(this.root, '_template_compiler_.js'), templateCompiler.serialize(), 'utf8');
+    addTemplateCompiler(params) {
+        let mod = template_compiler_1.templateCompilerModule(params, this.portableHints);
+        fs_extra_1.writeFileSync(path_1.join(this.root, '_template_compiler_.js'), mod.src, 'utf8');
+        return mod.isParallelSafe;
     }
-    addBabelConfig(babelConfig) {
-        if (!babelConfig.isParallelSafe) {
+    addBabelConfig(pconfig) {
+        if (!pconfig.isParallelSafe) {
             messages_1.warn('Your build is slower because some babel plugins are non-serializable');
         }
-        fs_extra_1.writeFileSync(path_1.join(this.root, '_babel_config_.js'), babelConfig.serialize(), 'utf8');
+        fs_extra_1.writeFileSync(path_1.join(this.root, '_babel_config_.js'), `module.exports = ${JSON.stringify(pconfig.config, null, 2)}`, 'utf8');
         fs_extra_1.writeFileSync(path_1.join(this.root, '_babel_filter_.js'), babelFilterTemplate({ skipBabel: this.options.skipBabel }), 'utf8');
     }
     shouldSplitRoute(routeName) {
@@ -767,6 +777,26 @@ class AppBuilder {
             appConfig: this.adapter.mainModuleConfig(),
         });
     }
+    get staticAppPathsPattern() {
+        if (this.options.staticAppPaths.length > 0) {
+            return new RegExp('^(?:' +
+                this.options.staticAppPaths.map(staticAppPath => escape_string_regexp_1.default(staticAppPath.replace(/\//g, path_1.sep))).join('|') +
+                ')(?:$|' +
+                path_1.sep +
+                ')');
+        }
+    }
+    requiredOtherFiles(appFiles) {
+        let pattern = this.staticAppPathsPattern;
+        if (pattern) {
+            return appFiles.otherAppFiles.filter(f => {
+                return !pattern.test(f);
+            });
+        }
+        else {
+            return appFiles.otherAppFiles;
+        }
+    }
     appJSAsset(relativePath, engine, childEngines, prepared, entryParams) {
         let { appFiles } = engine;
         let cached = prepared.get(relativePath);
@@ -774,13 +804,27 @@ class AppBuilder {
             return cached;
         }
         let eagerModules = [];
-        let requiredAppFiles = [appFiles.otherAppFiles];
+        let requiredAppFiles = [this.requiredOtherFiles(appFiles)];
         if (!this.options.staticComponents) {
             requiredAppFiles.push(appFiles.components);
         }
         if (!this.options.staticHelpers) {
             requiredAppFiles.push(appFiles.helpers);
         }
+        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 (engine.parent && engine.package.isLazyEngine()) {
+            let implicitStyles = this.impliedAssets('implicit-styles', engine);
+            for (let style of implicitStyles) {
+                styles.push({
+                    path: paths_1.explicitRelative('assets/_engine_', style.relativePath),
+                });
+            }
+            styles.push({
+                path: paths_1.explicitRelative(relativePath, engine.package.name + '/' + engine.package.name + '.css'),
+            });
+        }
         let lazyEngines = [];
         for (let childEngine of childEngines) {
             let asset = this.appJSAsset(`assets/_engine_/${encodeURIComponent(childEngine.package.name)}.js`, childEngine, [], prepared);
@@ -815,7 +859,7 @@ class AppBuilder {
         // this is a backward-compatibility feature: addons can force inclusion of
         // modules.
         this.gatherImplicitModules('implicit-modules', relativePath, engine, amdModules);
-        let params = { amdModules, fastbootOnlyAmdModules, lazyRoutes, lazyEngines, eagerModules };
+        let params = { amdModules, fastbootOnlyAmdModules, lazyRoutes, lazyEngines, eagerModules, styles };
         if (entryParams) {
             Object.assign(params, entryParams);
         }
@@ -937,21 +981,34 @@ __decorate([
 __decorate([
     typescript_memoize_1.Memoize()
 ], AppBuilder.prototype, "fastbootConfig", null);
+__decorate([
+    typescript_memoize_1.Memoize()
+], AppBuilder.prototype, "portableHints", null);
+__decorate([
+    typescript_memoize_1.Memoize()
+], AppBuilder.prototype, "staticAppPathsPattern", null);
 __decorate([
     typescript_memoize_1.Memoize()
 ], AppBuilder.prototype, "modulePrefix", null);
 exports.AppBuilder = AppBuilder;
 const entryTemplate = js_handlebars_1.compile(`
-import { importSync as i } from '@embroider/macros';
+import { importSync as i, macroCondition, getGlobalConfig } from '@embroider/macros';
 let w = window;
 let d = w.define;
 
+{{#if styles}}
+  if (macroCondition(!getGlobalConfig().fastboot?.isRunning)) {
+    {{#each styles as |stylePath| ~}}
+      i("{{stylePath.path}}");
+    {{/each}}
+  }
+{{/if}}
+
 {{#each amdModules as |amdModule| ~}}
   d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});
 {{/each}}
 
 {{#if fastbootOnlyAmdModules}}
-  import { macroCondition, getGlobalConfig } from '@embroider/macros';
   if (macroCondition(getGlobalConfig().fastboot?.isRunning)) {
     {{#each fastbootOnlyAmdModules as |amdModule| ~}}
       d("{{js-string-escape amdModule.runtime}}", function(){ return i("{{js-string-escape amdModule.buildtime}}");});