@embroider/core 0.44.0-alpha.2 → 0.45.0

package/src/app.js

@@ -59,7 +59,7 @@ function excludeDotFiles(files) {
 exports.excludeDotFiles = excludeDotFiles;
 exports.CACHE_BUSTING_PLUGIN = {
     path: require.resolve('@embroider/shared-internals/src/babel-plugin-cache-busting.js'),
-    version: fs_extra_1.readJSONSync(`${__dirname}/../package.json`).version,
+    version: (0, fs_extra_1.readJSONSync)(`${__dirname}/../package.json`).version,
 };
 function addCachablePlugin(babelConfig) {
     if (Array.isArray(babelConfig.plugins) && babelConfig.plugins.length > 0) {
@@ -76,7 +76,7 @@ function addCachablePlugin(babelConfig) {
             else {
                 throw new Error(`[Embroider] a babel plugin without an absolute path was from: ${plugin}`);
             }
-            plugins[absolutePathToPlugin] = portable_1.maybeNodeModuleVersion(absolutePathToPlugin);
+            plugins[absolutePathToPlugin] = (0, portable_1.maybeNodeModuleVersion)(absolutePathToPlugin);
         }
         babelConfig.plugins.push([
             exports.CACHE_BUSTING_PLUGIN.path,
@@ -147,14 +147,14 @@ class AppBuilder {
         }
     }
     get resolvableExtensionsPattern() {
-        return shared_internals_1.extensionsPattern(this.adapter.adjustImportsOptions().resolvableExtensions);
+        return (0, shared_internals_1.extensionsPattern)(this.adapter.adjustImportsOptions().resolvableExtensions);
     }
     impliedAssets(type, engine, emberENV) {
         let result = this.impliedAddonAssets(type, engine).map((sourcePath) => {
-            let stats = fs_extra_1.statSync(sourcePath);
+            let stats = (0, fs_extra_1.statSync)(sourcePath);
             return {
                 kind: 'on-disk',
-                relativePath: shared_internals_1.explicitRelative(this.root, sourcePath),
+                relativePath: (0, shared_internals_1.explicitRelative)(this.root, sourcePath),
                 sourcePath,
                 mtime: stats.mtimeMs,
                 size: stats.size,
@@ -205,7 +205,7 @@ class AppBuilder {
     }
     impliedAddonAssets(type, engine) {
         let result = [];
-        for (let addon of sortBy_1.default(Array.from(engine.addons), this.scriptPriority.bind(this))) {
+        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 = [];
@@ -231,7 +231,7 @@ class AppBuilder {
     // unlike our full config, this one just needs to know how to parse all the
     // syntax our app can contain.
     babelParserConfig() {
-        let babel = cloneDeep_1.default(this.adapter.babelConfig());
+        let babel = (0, cloneDeep_1.default)(this.adapter.babelConfig());
         if (!babel.plugins) {
             babel.plugins = [];
         }
@@ -241,7 +241,7 @@ class AppBuilder {
         return babel;
     }
     babelConfig(templateCompilerParams, appFiles) {
-        let babel = cloneDeep_1.default(this.adapter.babelConfig());
+        let babel = (0, cloneDeep_1.default)(this.adapter.babelConfig());
         if (!babel.plugins) {
             babel.plugins = [];
         }
@@ -250,33 +250,14 @@ class AppBuilder {
         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'));
-        if (this.adapter.adjustImportsOptions().emberNeedsModulesPolyfill) {
-            // on older ember versions that need the modules-api-polyfill, we use our
-            // bespoke inline template compiler plugin.
-            babel.plugins.push([
-                path_1.join(__dirname, 'babel-plugin-inline-hbs-node.js'),
-                {
-                    templateCompiler: templateCompilerParams,
-                    stage: 3,
-                },
-            ]);
-        }
-        else {
-            // on newer ember versions that don't need the modules-api-polyfill, we
-            // can compose with the newer babel-plugin-htmlbars-inline-precompile, and
-            // use a simpler plugin that only needs to handle inserting discovered
-            // dependencies.
-            babel.plugins.push([
-                path_1.join(__dirname, '../src/babel-plugin-inline-hbs-deps-node.js'),
-                { templateCompiler: templateCompilerParams },
-            ]);
-            babel.plugins.push([
-                require.resolve('@ef4/babel-plugin-htmlbars-inline-precompile'),
-                {
-                    precompilerPath: path_1.join(__dirname, '../src/babel-plugin-inline-hbs-deps-node.js'),
-                },
-            ]);
-        }
+        // this is our built-in support for the inline hbs macro
+        babel.plugins.push([
+            (0, path_1.join)(__dirname, 'babel-plugin-inline-hbs-node.js'),
+            {
+                templateCompiler: templateCompilerParams,
+                stage: 3,
+            },
+        ]);
         // this is @embroider/macros configured for full stage3 resolution
         babel.plugins.push(...this.macrosConfig.babelPluginConfig());
         babel.plugins.push([require.resolve('./template-colocation-plugin')]);
@@ -286,7 +267,7 @@ class AppBuilder {
             require.resolve('@babel/plugin-transform-runtime'),
             { absoluteRuntime: __dirname, useESModules: true, regenerator: false },
         ]);
-        const portable = portable_babel_config_1.makePortable(babel, { basedir: this.root }, this.portableHints);
+        const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.root }, this.portableHints);
         addCachablePlugin(portable.config);
         return portable;
     }
@@ -294,11 +275,11 @@ class AppBuilder {
         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;
+                relocatedFiles[(0, path_1.join)(destPath, relativePath).split(path_1.sep).join('/')] = originalPath;
             }
         }
-        let relocatedFilesPath = path_1.join(this.root, '_relocated_files.json');
-        fs_extra_1.writeFileSync(relocatedFilesPath, JSON.stringify({ relocatedFiles }));
+        let relocatedFilesPath = (0, path_1.join)(this.root, '_relocated_files.json');
+        (0, fs_extra_1.writeFileSync)(relocatedFilesPath, JSON.stringify({ relocatedFiles }));
         return [
             require.resolve('./babel-plugin-adjust-imports'),
             {
@@ -447,10 +428,10 @@ class AppBuilder {
                         package: addon,
                         addons: new Set(),
                         parent: current,
-                        sourcePath: engine_mangler_1.mangledEngineRoot(addon),
+                        sourcePath: (0, engine_mangler_1.mangledEngineRoot)(addon),
                         destPath: addon.root,
                         modulePrefix: addon.name,
-                        appRelativePath: shared_internals_1.explicitRelative(this.root, addon.root),
+                        appRelativePath: (0, shared_internals_1.explicitRelative)(this.root, addon.root),
                     });
                 }
             }
@@ -464,7 +445,7 @@ class AppBuilder {
     get fastbootConfig() {
         if (this.activeFastboot) {
             // this is relying on work done in stage1 by @embroider/compat/src/compat-adapters/ember-cli-fastboot.ts
-            let packageJSON = fs_extra_1.readJSONSync(path_1.join(this.activeFastboot.root, '_fastboot_', 'package.json'));
+            let packageJSON = (0, fs_extra_1.readJSONSync)((0, path_1.join)(this.activeFastboot.root, '_fastboot_', 'package.json'));
             let { extraAppFiles, extraVendorFiles } = packageJSON['embroider-fastboot'];
             delete packageJSON['embroider-fastboot'];
             extraVendorFiles.push('assets/embroider_macros_fastboot_init.js');
@@ -549,23 +530,23 @@ class AppBuilder {
         }
     }
     updateOnDiskAsset(asset) {
-        let destination = path_1.join(this.root, asset.relativePath);
-        fs_extra_1.ensureDirSync(path_1.dirname(destination));
-        fs_extra_1.copySync(asset.sourcePath, destination, { dereference: true });
+        let destination = (0, path_1.join)(this.root, asset.relativePath);
+        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(destination));
+        (0, fs_extra_1.copySync)(asset.sourcePath, destination, { dereference: true });
     }
     updateInMemoryAsset(asset) {
-        let destination = path_1.join(this.root, asset.relativePath);
-        fs_extra_1.ensureDirSync(path_1.dirname(destination));
-        fs_extra_1.writeFileSync(destination, asset.source, 'utf8');
+        let destination = (0, path_1.join)(this.root, asset.relativePath);
+        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(destination));
+        (0, fs_extra_1.writeFileSync)(destination, asset.source, 'utf8');
     }
     updateBuiltEmberAsset(asset) {
-        let destination = path_1.join(this.root, asset.relativePath);
-        fs_extra_1.ensureDirSync(path_1.dirname(destination));
-        fs_extra_1.writeFileSync(destination, asset.source, 'utf8');
+        let destination = (0, path_1.join)(this.root, asset.relativePath);
+        (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(destination));
+        (0, fs_extra_1.writeFileSync)(destination, asset.source, 'utf8');
     }
     async updateConcatenatedAsset(asset) {
         let concat = new fast_sourcemap_concat_1.default({
-            outputFile: path_1.join(this.root, asset.relativePath),
+            outputFile: (0, path_1.join)(this.root, asset.relativePath),
             mapCommentType: asset.relativePath.endsWith('.js') ? 'line' : 'block',
             baseDir: this.root,
         });
@@ -576,7 +557,7 @@ class AppBuilder {
         for (let source of asset.sources) {
             switch (source.kind) {
                 case 'on-disk':
-                    concat.addFile(shared_internals_1.explicitRelative(this.root, source.sourcePath));
+                    concat.addFile((0, shared_internals_1.explicitRelative)(this.root, source.sourcePath));
                     break;
                 case 'in-memory':
                     if (typeof source.source !== 'string') {
@@ -585,7 +566,7 @@ class AppBuilder {
                     concat.addSpace(source.source);
                     break;
                 default:
-                    assert_never_1.default(source);
+                    (0, assert_never_1.default)(source);
             }
         }
         await concat.end();
@@ -596,7 +577,7 @@ class AppBuilder {
             if (this.assetIsValid(asset, this.assets.get(asset.relativePath))) {
                 continue;
             }
-            messages_1.debug('rebuilding %s', asset.relativePath);
+            (0, messages_1.debug)('rebuilding %s', asset.relativePath);
             switch (asset.kind) {
                 case 'on-disk':
                     this.updateOnDiskAsset(asset);
@@ -611,12 +592,12 @@ class AppBuilder {
                     await this.updateConcatenatedAsset(asset);
                     break;
                 default:
-                    assert_never_1.default(asset);
+                    (0, assert_never_1.default)(asset);
             }
         }
         for (let oldAsset of this.assets.values()) {
             if (!assets.has(oldAsset.relativePath)) {
-                fs_extra_1.unlinkSync(path_1.join(this.root, oldAsset.relativePath));
+                (0, fs_extra_1.unlinkSync)((0, path_1.join)(this.root, oldAsset.relativePath));
             }
         }
         this.assets = assets;
@@ -628,8 +609,8 @@ class AppBuilder {
         for (let pkg of this.adapter.allActiveAddons) {
             if (pkg.meta['public-assets']) {
                 for (let [filename, appRelativeURL] of Object.entries(pkg.meta['public-assets'] || {})) {
-                    let sourcePath = path_1.resolve(pkg.root, filename);
-                    let stats = fs_extra_1.statSync(sourcePath);
+                    let sourcePath = (0, path_1.resolve)(pkg.root, filename);
+                    let stats = (0, fs_extra_1.statSync)(sourcePath);
                     assets.push({
                         kind: 'on-disk',
                         sourcePath,
@@ -711,14 +692,17 @@ class AppBuilder {
             meta['auto-upgraded'] = true;
         }
         let pkg = this.combinePackageJSON(meta);
-        fs_extra_1.writeFileSync(path_1.join(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
+        (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
     }
     combinePackageJSON(meta) {
-        let pkgLayers = [this.app.packageJSON, { keywords: ['ember-addon'], 'ember-addon': meta }];
+        let pkgLayers = [this.app.packageJSON];
         let fastbootConfig = this.fastbootConfig;
         if (fastbootConfig) {
+            // fastboot-specific package.json output is allowed to add to our original package.json
             pkgLayers.push(fastbootConfig.packageJSON);
         }
+        // but our own new v2 app metadata takes precedence over both
+        pkgLayers.push({ keywords: ['ember-addon'], 'ember-addon': meta });
         return combinePackageJSON(...pkgLayers);
     }
     templateCompiler(config) {
@@ -732,7 +716,7 @@ class AppBuilder {
             plugins.ast.push(macroPlugin);
         }
         const compilerPath = resolve_1.default.sync(this.adapter.templateCompilerPath(), { basedir: this.root });
-        const compilerChecksum = load_ember_template_compiler_1.getEmberExports(compilerPath).cacheKey;
+        const compilerChecksum = (0, load_ember_template_compiler_1.getEmberExports)(compilerPath).cacheKey;
         return {
             plugins,
             compilerPath,
@@ -743,32 +727,32 @@ class AppBuilder {
     }
     get portableHints() {
         return this.options.pluginHints.map(hint => {
-            let cursor = path_1.join(this.app.root, 'package.json');
+            let cursor = (0, 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');
+                    target = (0, path_1.join)(target, 'package.json');
                 }
-                cursor = resolve_1.default.sync(target, { basedir: path_1.dirname(cursor) });
+                cursor = resolve_1.default.sync(target, { basedir: (0, path_1.dirname)(cursor) });
             }
             return {
                 requireFile: cursor,
                 useMethod: hint.useMethod,
-                packageVersion: portable_1.maybeNodeModuleVersion(cursor),
+                packageVersion: (0, portable_1.maybeNodeModuleVersion)(cursor),
             };
         });
     }
     addTemplateCompiler(params) {
-        let mod = write_template_compiler_1.templateCompilerModule(params, this.portableHints);
-        fs_extra_1.writeFileSync(path_1.join(this.root, '_template_compiler_.js'), mod.src, 'utf8');
+        let mod = (0, write_template_compiler_1.templateCompilerModule)(params, this.portableHints);
+        (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, '_template_compiler_.js'), mod.src, 'utf8');
         return mod.isParallelSafe;
     }
     addBabelConfig(pconfig) {
         if (!pconfig.isParallelSafe) {
-            messages_1.warn('Your build is slower because some babel plugins are non-serializable');
+            (0, 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'), `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');
+        (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, '_babel_config_.js'), `module.exports = ${JSON.stringify(pconfig.config, null, 2)}`, 'utf8');
+        (0, fs_extra_1.writeFileSync)((0, path_1.join)(this.root, '_babel_filter_.js'), babelFilterTemplate({ skipBabel: this.options.skipBabel }), 'utf8');
     }
     shouldSplitRoute(routeName) {
         return (!this.options.splitAtRoutes ||
@@ -836,14 +820,14 @@ class AppBuilder {
         return this.appJSAsset(relativePath, app, childEngines, prepared, {
             autoRun: this.adapter.autoRun(),
             appBoot: !this.adapter.autoRun() ? this.adapter.appBoot() : '',
-            mainModule: shared_internals_1.explicitRelative(path_1.dirname(relativePath), this.adapter.mainModule()),
+            mainModule: (0, shared_internals_1.explicitRelative)((0, path_1.dirname)(relativePath), this.adapter.mainModule()),
             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('|') +
+                this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath.replace(/\//g, path_1.sep))).join('|') +
                 ')(?:$|' +
                 path_1.sep +
                 ')');
@@ -867,12 +851,6 @@ class AppBuilder {
             return cached;
         }
         let eagerModules = [];
-        if (!this.adapter.adjustImportsOptions().emberNeedsModulesPolyfill) {
-            // when we're running with fake ember modules, vendor.js takes care of
-            // this bootstrapping. But when we're running with real ember modules,
-            // it's up to our entrypoint.
-            eagerModules.push('@ember/-internals/bootstrap');
-        }
         let requiredAppFiles = [this.requiredOtherFiles(appFiles)];
         if (!this.options.staticComponents) {
             requiredAppFiles.push(appFiles.components);
@@ -887,14 +865,14 @@ class AppBuilder {
             let implicitStyles = this.impliedAssets('implicit-styles', engine);
             for (let style of implicitStyles) {
                 styles.push({
-                    path: shared_internals_1.explicitRelative('assets/_engine_', style.relativePath),
+                    path: (0, shared_internals_1.explicitRelative)('assets/_engine_', style.relativePath),
                 });
             }
             let engineMeta = engine.package.meta;
             if (engineMeta && engineMeta['implicit-styles']) {
                 for (let style of engineMeta['implicit-styles']) {
                     styles.push({
-                        path: shared_internals_1.explicitRelative(path_1.dirname(relativePath), path_1.join(engine.appRelativePath, style)),
+                        path: (0, shared_internals_1.explicitRelative)((0, path_1.dirname)(relativePath), (0, path_1.join)(engine.appRelativePath, style)),
                     });
                 }
             }
@@ -905,11 +883,11 @@ class AppBuilder {
             if (childEngine.package.isLazyEngine()) {
                 lazyEngines.push({
                     names: [childEngine.package.name],
-                    path: shared_internals_1.explicitRelative(path_1.dirname(relativePath), asset.relativePath),
+                    path: (0, shared_internals_1.explicitRelative)((0, path_1.dirname)(relativePath), asset.relativePath),
                 });
             }
             else {
-                eagerModules.push(shared_internals_1.explicitRelative(path_1.dirname(relativePath), asset.relativePath));
+                eagerModules.push((0, shared_internals_1.explicitRelative)((0, path_1.dirname)(relativePath), asset.relativePath));
             }
         }
         let lazyRoutes = [];
@@ -927,7 +905,7 @@ class AppBuilder {
                 });
             });
         }
-        let [fastboot, nonFastboot] = partition_1.default(excludeDotFiles(flatten_1.default(requiredAppFiles)), file => appFiles.isFastbootOnly.get(file));
+        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(engine, file, relativePath));
         let fastbootOnlyAmdModules = fastboot.map(file => this.importPaths(engine, file, relativePath));
         // this is a backward-compatibility feature: addons can force inclusion of
@@ -950,15 +928,15 @@ class AppBuilder {
         return this.adapter.modulePrefix();
     }
     importPaths(engine, engineRelativePath, fromFile) {
-        let appRelativePath = path_1.join(engine.appRelativePath, engineRelativePath);
+        let appRelativePath = (0, path_1.join)(engine.appRelativePath, engineRelativePath);
         let noHBS = engineRelativePath.replace(this.resolvableExtensionsPattern, '').replace(/\.hbs$/, '');
         return {
             runtime: `${engine.modulePrefix}/${noHBS}`,
-            buildtime: shared_internals_1.explicitRelative(path_1.dirname(fromFile), appRelativePath),
+            buildtime: (0, shared_internals_1.explicitRelative)((0, path_1.dirname)(fromFile), appRelativePath),
         };
     }
     routeEntrypoint(engine, relativePath, files) {
-        let [fastboot, nonFastboot] = partition_1.default(files, file => engine.appFiles.isFastbootOnly.get(file));
+        let [fastboot, nonFastboot] = (0, partition_1.default)(files, file => engine.appFiles.isFastbootOnly.get(file));
         let asset = {
             kind: 'in-memory',
             source: routeEntryTemplate({
@@ -985,14 +963,8 @@ class AppBuilder {
         // packagers to understand. It's better to express it here as a direct
         // module dependency.
         let eagerModules = [
-            shared_internals_1.explicitRelative(path_1.dirname(myName), this.topAppJSAsset(engines, prepared).relativePath),
+            (0, shared_internals_1.explicitRelative)((0, path_1.dirname)(myName), this.topAppJSAsset(engines, prepared).relativePath),
         ];
-        if (!this.adapter.adjustImportsOptions().emberNeedsModulesPolyfill) {
-            // when we're running with fake ember modules, the prebuilt test-support
-            // script takes care of this bootstrapping. But when we're running with
-            // real ember modules, it's up to our entrypoint.
-            eagerModules.push('ember-testing');
-        }
         let amdModules = [];
         // this is a backward-compatibility feature: addons can force inclusion of
         // test support modules.
@@ -1031,7 +1003,7 @@ class AppBuilder {
                             });
                         }
                     }
-                    let runtime = path_1.join(packageName, name).replace(this.resolvableExtensionsPattern, '');
+                    let runtime = (0, path_1.join)(packageName, name).replace(this.resolvableExtensionsPattern, '');
                     let runtimeRenameLookup = runtime.split('\\').join('/');
                     if (renamedModules && renamedModules[runtimeRenameLookup]) {
                         runtime = renamedModules[runtimeRenameLookup];
@@ -1040,8 +1012,8 @@ class AppBuilder {
                     lazyModules.push({
                         runtime,
                         buildtime: this.options.implicitModulesStrategy === 'packageNames'
-                            ? path_1.join(packageName, name)
-                            : shared_internals_1.explicitRelative(path_1.dirname(path_1.join(this.root, relativeTo)), path_1.join(addon.root, name)),
+                            ? (0, path_1.join)(packageName, name)
+                            : (0, shared_internals_1.explicitRelative)((0, path_1.dirname)((0, path_1.join)(this.root, relativeTo)), (0, path_1.join)(addon.root, name)),
                     });
                 }
             }
@@ -1049,31 +1021,31 @@ class AppBuilder {
     }
 }
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "resolvableExtensionsPattern", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "babelParserConfig", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "babelConfig", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "activeFastboot", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "fastbootConfig", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "portableHints", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "staticAppPathsPattern", null);
 __decorate([
-    typescript_memoize_1.Memoize()
+    (0, typescript_memoize_1.Memoize)()
 ], AppBuilder.prototype, "modulePrefix", null);
 exports.AppBuilder = AppBuilder;
-const entryTemplate = js_handlebars_1.compile(`
+const entryTemplate = (0, js_handlebars_1.compile)(`
 import { importSync as i, macroCondition, getGlobalConfig } from '@embroider/macros';
 let w = window;
 let d = w.define;
@@ -1146,7 +1118,7 @@ if (!runningTests) {
   EmberENV.TESTS_FILE_LOADED = true;
 {{/if}}
 `);
-const routeEntryTemplate = js_handlebars_1.compile(`
+const routeEntryTemplate = (0, js_handlebars_1.compile)(`
 import { importSync as i } from '@embroider/macros';
 let d = window.define;
 {{#each files as |amdModule| ~}}
@@ -1170,7 +1142,7 @@ function stringOrBufferEqual(a, b) {
     }
     return false;
 }
-const babelFilterTemplate = js_handlebars_1.compile(`
+const babelFilterTemplate = (0, js_handlebars_1.compile)(`
 const { babelFilter } = require('@embroider/core');
 module.exports = babelFilter({{{json-stringify skipBabel}}});
 `);
@@ -1195,6 +1167,6 @@ function combinePackageJSON(...layers) {
             }
         }
     }
-    return mergeWith_1.default({}, ...layers, custom);
+    return (0, mergeWith_1.default)({}, ...layers, custom);
 }
 //# sourceMappingURL=app.js.map