@embroider/compat 3.5.7-unstable.d9fc688 → 3.5.7-unstable.dce753f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.5.7-unstable.d9fc688",
+  "version": "3.5.7-unstable.dce753f",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -45,7 +45,6 @@
     "broccoli-source": "^3.0.1",
     "chalk": "^4.1.1",
     "debug": "^4.3.2",
-    "escape-string-regexp": "^4.0.0",
     "fast-sourcemap-concat": "^2.1.1",
     "fs-extra": "^9.1.0",
     "fs-tree-diff": "^2.0.1",
@@ -53,6 +52,7 @@
     "lodash": "^4.17.21",
     "pkg-up": "^3.1.0",
     "resolve": "^1.20.0",
+    "resolve.exports": "^2.0.2",
     "resolve-package-path": "^4.0.1",
     "semver": "^7.3.5",
     "symlink-or-copy": "^1.3.1",
@@ -60,7 +60,7 @@
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
     "yargs": "^17.0.1",
-    "@embroider/macros": "1.16.6-unstable.d9fc688"
+    "@embroider/macros": "1.16.6-unstable.dce753f"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.3",
@@ -83,12 +83,12 @@
     "ember-engines": "^0.8.19",
     "scenario-tester": "^3.0.1",
     "typescript": "^5.4.5",
-    "@embroider/core": "^3.4.15-unstable.d9fc688",
+    "@embroider/sample-transforms": "0.0.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/sample-transforms": "0.0.0"
+    "@embroider/core": "^3.4.15-unstable.dce753f"
   },
   "peerDependencies": {
-    "@embroider/core": "^3.4.15-unstable.d9fc688"
+    "@embroider/core": "^3.4.15-unstable.dce753f"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/compat-app-builder.d.ts

@@ -1,12 +1,9 @@
-import type { Node as BroccoliNode } from 'broccoli-node-api';
-import type { OutputPaths } from '@embroider/core';
 import type Options from './options';
 import type ContentForConfig from './content-for-config';
 import type { V1Config } from './v1-config';
 import type { Package } from '@embroider/core';
 import type CompatApp from './compat-app';
 export declare class CompatAppBuilder {
-    private root;
     private origAppPackage;
     private appPackageWithMovedDeps;
     private options;
@@ -15,32 +12,22 @@ export declare class CompatAppBuilder {
     private contentForTree;
     private synthVendor;
     private synthStyles;
-    constructor(root: string, origAppPackage: Package, appPackageWithMovedDeps: Package, options: Required<Options>, compatApp: CompatApp, configTree: V1Config, contentForTree: ContentForConfig, synthVendor: Package, synthStyles: Package);
-    private fastbootJSSrcDir;
+    constructor(origAppPackage: Package, appPackageWithMovedDeps: Package, options: Required<Options>, compatApp: CompatApp, configTree: V1Config, contentForTree: ContentForConfig, synthVendor: Package, synthStyles: Package);
     private activeAddonChildren;
     private get allActiveAddons();
     private isActiveAddon;
     private orderAddons;
     private resolvableExtensions;
-    private addEmberEntrypoints;
     private modulePrefix;
     private podModulePrefix;
-    private rootURL;
     private activeRules;
     private resolverConfig;
-    private get resolvableExtensionsPattern();
     private babelConfig;
     private findActiveAddons;
     private partitionEngines;
-    private get activeFastboot();
     private emberVersion;
-    private get fastbootConfig();
     private engines;
-    private updateAppJS;
-    private get staticAppPathsPattern();
-    private firstBuild;
-    build(inputPaths: OutputPaths<TreeNames>): Promise<void>;
-    private combinePackageJSON;
+    build(): Promise<void>;
     private etcOptions;
     private get portableHints();
     private addBabelConfig;
@@ -50,10 +37,3 @@ export declare class CompatAppBuilder {
     private addMacrosConfig;
     private outputAppBootError;
 }
-interface TreeNames {
-    appJS: BroccoliNode;
-    htmlTree: BroccoliNode;
-    publicTree: BroccoliNode | undefined;
-    configTree: BroccoliNode;
-}
-export {};

package/src/compat-app-builder.js

@@ -14,25 +14,20 @@ const core_1 = require("@embroider/core");
 const path_1 = require("path");
 const dependency_rules_1 = require("./dependency-rules");
 const flatMap_1 = __importDefault(require("lodash/flatMap"));
-const mergeWith_1 = __importDefault(require("lodash/mergeWith"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const bind_decorator_1 = __importDefault(require("bind-decorator"));
 const fs_extra_1 = require("fs-extra");
 const portable_babel_config_1 = require("@embroider/core/src/portable-babel-config");
-const app_files_1 = require("@embroider/core/src/app-files");
 const portable_1 = require("@embroider/core/src/portable");
 const typescript_memoize_1 = require("typescript-memoize");
 const path_2 = require("path");
 const resolve_1 = __importDefault(require("resolve"));
 const fs_extra_2 = require("fs-extra");
 const node_1 = require("@embroider/macros/src/node");
-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, contentForTree, synthVendor, synthStyles) {
-        this.root = root;
+    constructor(origAppPackage, appPackageWithMovedDeps, options, compatApp, configTree, contentForTree, synthVendor, synthStyles) {
         this.origAppPackage = origAppPackage;
         this.appPackageWithMovedDeps = appPackageWithMovedDeps;
         this.options = options;
@@ -41,13 +36,6 @@ class CompatAppBuilder {
         this.contentForTree = contentForTree;
         this.synthVendor = synthVendor;
         this.synthStyles = synthStyles;
-        this.firstBuild = true;
-    }
-    fastbootJSSrcDir() {
-        let target = (0, path_2.join)(this.compatApp.root, 'fastboot');
-        if ((0, fs_extra_2.pathExistsSync)(target)) {
-            return target;
-        }
     }
     activeAddonChildren(pkg) {
         let result = pkg.dependencies.filter(this.isActiveAddon).filter(
@@ -99,30 +87,15 @@ class CompatAppBuilder {
         // ember-cli-typescript
         return ['.wasm', '.mjs', '.js', '.json', '.ts', '.hbs', '.hbs.js', '.gjs', '.gts'];
     }
-    addEmberEntrypoints(htmlTreePath) {
-        let classicEntrypoints = ['index.html', 'tests/index.html'];
-        if (!this.compatApp.shouldBuildTests) {
-            classicEntrypoints.pop();
-        }
-        for (let entrypoint of classicEntrypoints) {
-            let sourcePath = (0, path_2.join)(htmlTreePath, entrypoint);
-            let rewrittenAppPath = (0, path_2.join)(this.root, entrypoint);
-            (0, fs_extra_1.writeFileSync)(rewrittenAppPath, (0, fs_extra_1.readFileSync)(sourcePath));
-        }
-        return classicEntrypoints;
-    }
     modulePrefix() {
         return this.configTree.readConfig().modulePrefix;
     }
     podModulePrefix() {
         return this.configTree.readConfig().podModulePrefix;
     }
-    rootURL() {
-        return this.configTree.readConfig().rootURL;
-    }
     activeRules() {
         return (0, dependency_rules_1.activePackageRules)(this.options.packageRules.concat(defaultAddonPackageRules()), [
-            { name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.root },
+            { name: this.origAppPackage.name, version: this.origAppPackage.version, root: this.origAppPackage.root },
             ...this.allActiveAddons.filter(p => p.meta['auto-upgraded']),
         ]);
     }
@@ -141,13 +114,12 @@ class CompatAppBuilder {
             renamePackages,
             resolvableExtensions: this.resolvableExtensions(),
             appRoot: this.origAppPackage.root,
-            engines: engines.map((appFiles, index) => ({
-                packageName: appFiles.engine.package.name,
-                // first engine is the app, which has been relocated to this.root
+            engines: engines.map(engine => ({
+                packageName: engine.package.name,
                 // we need to use the real path here because webpack requests always use the real path i.e. follow symlinks
-                root: (0, fs_extra_1.realpathSync)(index === 0 ? this.root : appFiles.engine.package.root),
-                fastbootFiles: appFiles.fastbootFiles,
-                activeAddons: [...appFiles.engine.addons]
+                root: (0, fs_extra_1.realpathSync)(engine.package.root),
+                fastbootFiles: {},
+                activeAddons: [...engine.addons]
                     .map(([addon, canResolveFromFile]) => ({
                     name: addon.name,
                     root: addon.root,
@@ -157,7 +129,7 @@ class CompatAppBuilder {
                     // that the last one wins. Our resolver's order is the order to
                     // search, so first one wins.
                     .reverse(),
-                isLazy: appFiles.engine.package.isLazyEngine(),
+                isLazy: engine.package.isLazyEngine(),
             })),
             amdCompatibility: this.options.amdCompatibility,
             // this is the additional stufff that @embroider/compat adds on top to do
@@ -172,9 +144,6 @@ class CompatAppBuilder {
         };
         return config;
     }
-    get resolvableExtensionsPattern() {
-        return (0, core_1.extensionsPattern)(this.resolvableExtensions());
-    }
     async babelConfig(resolverConfig) {
         let babel = (0, cloneDeep_1.default)(this.compatApp.babelConfig());
         if (!babel.plugins) {
@@ -236,7 +205,7 @@ class CompatAppBuilder {
             require.resolve('@babel/plugin-transform-runtime'),
             { absoluteRuntime: __dirname, useESModules: true, regenerator: false },
         ]);
-        const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.root }, this.portableHints);
+        const portable = (0, portable_babel_config_1.makePortable)(babel, { basedir: this.origAppPackage.root }, this.portableHints);
         addCachablePlugin(portable.config);
         return portable;
     }
@@ -249,16 +218,7 @@ class CompatAppBuilder {
             if (!child.isEngine()) {
                 this.findActiveAddons(child, engine, true);
             }
-            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');
-            }
+            let 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)
@@ -294,7 +254,7 @@ class CompatAppBuilder {
                         addons: new Map(),
                         isApp: !current,
                         modulePrefix: addon.name,
-                        appRelativePath: (0, core_1.explicitRelative)(this.root, addon.root),
+                        appRelativePath: (0, core_1.explicitRelative)(this.origAppPackage.root, addon.root),
                     });
                 }
             }
@@ -302,9 +262,6 @@ class CompatAppBuilder {
         }
         return done;
     }
-    get activeFastboot() {
-        return this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-cli-fastboot');
-    }
     emberVersion() {
         let pkg = this.activeAddonChildren(this.appPackageWithMovedDeps).find(a => a.name === 'ember-source');
         if (!pkg) {
@@ -312,82 +269,14 @@ class CompatAppBuilder {
         }
         return pkg.version;
     }
-    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 = (0, fs_extra_1.readJSONSync)((0, path_2.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');
-            return { packageJSON, extraAppFiles, extraVendorFiles };
-        }
-    }
-    updateAppJS(appJSPath) {
-        var _a;
-        if (!this.engines) {
-            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;
-                    if (this.activeFastboot) {
-                        let fastbootDir = this.fastbootJSSrcDir();
-                        if (fastbootDir) {
-                            fastbootSync = new sync_dir_1.SyncDir(fastbootDir, (0, path_1.resolve)(this.root, '_fastboot_'));
-                        }
-                    }
-                    return {
-                        engine,
-                        appSync: new sync_dir_1.SyncDir(appJSPath, this.root),
-                        fastbootSync,
-                    };
-                }
-                else {
-                    // this is not the app, so it's some other engine. Engines are already
-                    // built by stage1 like all other addons, so we only need to observe
-                    // their files, not doing any actual copying or building.
-                    return {
-                        engine,
-                        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,
-                    };
-                }
-            });
-        }
-        for (let engine of this.engines) {
-            engine.appSync.update();
-            (_a = engine.fastbootSync) === null || _a === void 0 ? void 0 : _a.update();
-        }
-        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.staticAppPathsPattern, this.podModulePrefix());
-        });
-    }
-    get staticAppPathsPattern() {
-        if (this.options.staticAppPaths.length > 0) {
-            return new RegExp('^(?:' + this.options.staticAppPaths.map(staticAppPath => (0, escape_string_regexp_1.default)(staticAppPath)).join('|') + ')(?:$|/)');
-        }
-    }
-    async build(inputPaths) {
+    async build() {
         // on the first build, we lock down the macros config. on subsequent builds,
         // this doesn't do anything anyway because it's idempotent.
         this.compatApp.macrosConfig.finalize();
-        // on first build, clear the output directory completely
-        if (this.firstBuild) {
-            (0, fs_extra_1.rmSync)(this.root, { recursive: true, force: true });
-            this.firstBuild = false;
-        }
-        let appFiles = this.updateAppJS(inputPaths.appJS);
-        let assetPaths = this.addEmberEntrypoints(inputPaths.htmlTree);
-        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');
+        if (!this.engines) {
+            this.engines = this.partitionEngines();
         }
-        let pkg = this.combinePackageJSON(assetPaths);
-        (0, fs_extra_1.writeFileSync)((0, path_2.join)(this.root, 'package.json'), JSON.stringify(pkg, null, 2), 'utf8');
-        let resolverConfig = this.resolverConfig(appFiles);
+        let resolverConfig = this.resolverConfig(this.engines);
         let config = this.configTree.readConfig();
         let contentForConfig = this.contentForTree.readContents();
         this.addResolverConfig(resolverConfig);
@@ -398,32 +287,6 @@ class CompatAppBuilder {
         this.addBabelConfig(babelConfig);
         this.addMacrosConfig(this.compatApp.macrosConfig.babelPluginConfig()[0]);
     }
-    combinePackageJSON(assetPaths) {
-        var _a, _b;
-        let pkgLayers = [this.origAppPackage.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);
-        }
-        let meta = {
-            type: 'app',
-            version: 2,
-            assets: assetPaths,
-            babel: {
-                filename: '_babel_config_.js',
-                isParallelSafe: true, // TODO
-                majorVersion: this.compatApp.babelMajorVersion(),
-                fileFilter: '_babel_filter_.js',
-            },
-            'root-url': this.rootURL(),
-        };
-        if (((_b = (_a = this.origAppPackage.packageJSON['ember-addon']) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : 0) < 2) {
-            meta['auto-upgraded'] = true;
-        }
-        pkgLayers.push({ 'ember-addon': meta });
-        return combinePackageJSON(...pkgLayers);
-    }
     async etcOptions(resolverConfig) {
         let transforms = this.compatApp.htmlbarsPlugins;
         let { plugins: macroPlugins, setConfig } = node_1.MacrosConfig.transforms();
@@ -442,9 +305,9 @@ class CompatAppBuilder {
             transforms.push([require.resolve('./resolver-transform'), opts]);
         }
         let resolver = new core_1.Resolver(resolverConfig);
-        let resolution = await 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.origAppPackage.root, 'package.json'));
         if (resolution.type !== 'real') {
-            throw new Error(`bug: unable to resolve ember-template-compiler from ${this.root}`);
+            throw new Error(`bug: unable to resolve ember-template-compiler from ${this.origAppPackage.root}`);
         }
         return {
             transforms,
@@ -548,9 +411,6 @@ class CompatAppBuilder {
     }
 }
 exports.CompatAppBuilder = CompatAppBuilder;
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "fastbootJSSrcDir", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "allActiveAddons", null);
@@ -563,21 +423,9 @@ __decorate([
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "activeRules", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "resolvableExtensionsPattern", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "babelConfig", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "activeFastboot", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "fastbootConfig", null);
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], CompatAppBuilder.prototype, "staticAppPathsPattern", null);
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], CompatAppBuilder.prototype, "portableHints", null);
@@ -596,16 +444,6 @@ const babelFilterTemplate = (0, core_1.jsHandlebarsCompile)(`
 const { babelFilter } = require(${JSON.stringify(require.resolve('@embroider/core'))});
 module.exports = babelFilter({{json-stringify skipBabel}}, "{{js-string-escape appRoot}}");
 `);
-function combinePackageJSON(...layers) {
-    function custom(objValue, srcValue, key, _object, _source, stack) {
-        if (key === 'keywords' && stack.size === 0) {
-            if (Array.isArray(objValue)) {
-                return objValue.concat(srcValue);
-            }
-        }
-    }
-    return (0, mergeWith_1.default)({}, ...layers, custom);
-}
 function addCachablePlugin(babelConfig) {
     if (Array.isArray(babelConfig.plugins) && babelConfig.plugins.length > 0) {
         const plugins = Object.create(null);