@embroider/core 3.1.2 → 3.1.3-unstable.1cfdcec

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.1.2",
+  "version": "3.1.3-unstable.1cfdcec",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -16,10 +16,15 @@
     "src/**/*.d.ts",
     "src/**/*.js.map"
   ],
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@babel/core": "^7.14.5",
     "@babel/parser": "^7.14.5",
     "@babel/traverse": "^7.14.5",
+    "@embroider/macros": "1.12.3-unstable.1cfdcec",
+    "@embroider/shared-internals": "2.2.3-unstable.1cfdcec",
     "assert-never": "^1.2.1",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "broccoli-node-api": "^1.7.0",
@@ -38,11 +43,11 @@
     "resolve": "^1.20.0",
     "resolve-package-path": "^4.0.1",
     "typescript-memoize": "^1.0.1",
-    "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.12.2",
-    "@embroider/shared-internals": "2.2.2"
+    "walk-sync": "^3.0.0"
   },
   "devDependencies": {
+    "@embroider/sample-transforms": "workspace:*",
+    "@embroider/test-support": "workspace:*",
     "@glimmer/syntax": "^0.84.2",
     "@glint/template": "^1.0.0",
     "@types/babel__core": "^7.1.14",
@@ -57,17 +62,12 @@
     "@types/tmp": "^0.1.0",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
-    "typescript": "^4.9.0",
-    "@embroider/sample-transforms": "0.0.0",
-    "@embroider/test-support": "0.36.0"
+    "typescript": "^4.9.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },
   "volta": {
     "extends": "../../package.json"
-  },
-  "scripts": {
-    "test": "jest"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Edward Faulkner
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/app-differ.d.ts

@@ -1,11 +0,0 @@
-import { AddonPackage } from '@embroider/shared-internals';
-export default class AppDiffer {
-    private differ;
-    private sources;
-    private firstFastbootTree;
-    readonly files: Set<string>;
-    isFastbootOnly: Map<string, boolean>;
-    constructor(ownAppJSDir: string, activeAddonDescendants: AddonPackage[], fastbootEnabled?: boolean, ownFastbootJSDir?: string | undefined);
-    update(): void;
-    private updateFiles;
-}

package/src/app-differ.js

@@ -1,178 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const multi_tree_diff_1 = __importDefault(require("./multi-tree-diff"));
-const walk_sync_1 = __importDefault(require("walk-sync"));
-const path_1 = require("path");
-const messages_1 = require("./messages");
-const assert_never_1 = __importDefault(require("assert-never"));
-const fs_1 = require("fs");
-const util_1 = require("util");
-class AppDiffer {
-    constructor(ownAppJSDir, activeAddonDescendants, 
-    // arguments below this point are only needed in fastboot mode. Fastboot
-    // makes this pretty messy because fastboot trees all merge into the app 🤮.
-    fastbootEnabled = false, ownFastbootJSDir) {
-        this.firstFastbootTree = Infinity;
-        // set of filenames logically located in the app
-        this.files = new Set();
-        // true for files that are fastboot-only.
-        this.isFastbootOnly = new Map();
-        this.sources = activeAddonDescendants.map(addon => maybeSource(addon, 'app-js')).filter(Boolean);
-        this.sources.push({
-            mayChange: true,
-            walk() {
-                return walk_sync_1.default.entries(ownAppJSDir);
-            },
-            isRelocated: false,
-            locate(relativePath) {
-                return (0, path_1.resolve)(ownAppJSDir, relativePath);
-            },
-        });
-        if (!fastbootEnabled) {
-            this.differ = new multi_tree_diff_1.default(this.sources, lastOneWins);
-            return;
-        }
-        this.firstFastbootTree = this.sources.length;
-        for (let addon of activeAddonDescendants) {
-            let source = maybeSource(addon, 'fastboot-js');
-            if (source) {
-                this.sources.push(source);
-            }
-        }
-        if (ownFastbootJSDir) {
-            this.sources.push({
-                mayChange: true,
-                walk() {
-                    return walk_sync_1.default.entries(ownFastbootJSDir);
-                },
-                isRelocated: false,
-                locate(relativePath) {
-                    return (0, path_1.resolve)(ownFastbootJSDir, relativePath);
-                },
-            });
-        }
-        this.differ = new multi_tree_diff_1.default(this.sources, fastbootMerge(this.firstFastbootTree));
-    }
-    update() {
-        let { ops, sources } = this.differ.update();
-        (0, messages_1.debug)(`app-differ operations count: %s`, ops.length);
-        for (let [operation, relativePath] of ops) {
-            switch (operation) {
-                case 'unlink':
-                    this.files.delete(relativePath);
-                    break;
-                case 'rmdir':
-                case 'mkdir':
-                case 'change':
-                    // this used to actually write to disk but we have moved the functionality into the resolver code
-                    break;
-                case 'create':
-                    let sourceIndices = sources.get(relativePath);
-                    if (sourceIndices.length === 1) {
-                        // a single file won. whether it's fastboot or non-fastboot doesn't
-                        // actually change what we do here. It gets emitted in the app's
-                        // namespace (if it's fastboot-only, non-fastboot code shouldn't be
-                        // trying to import it anyway, because that would have already been
-                        // an error pre-embroider).
-                        this.isFastbootOnly.set(relativePath, sourceIndices[0] >= this.firstFastbootTree);
-                        this.updateFiles(relativePath);
-                    }
-                    else {
-                        // we have both fastboot and non-fastboot files for this path.
-                        // Because of the way fastbootMerge is written, the first one is the
-                        // non-fastboot.
-                        this.isFastbootOnly.set(relativePath, false);
-                        this.updateFiles(relativePath);
-                    }
-                    break;
-                default:
-                    (0, assert_never_1.default)(operation);
-            }
-        }
-    }
-    updateFiles(relativePath) {
-        this.files.add(relativePath);
-    }
-}
-exports.default = AppDiffer;
-function lastOneWins(treeIds) {
-    return treeIds.slice(-1);
-}
-function fastbootMerge(firstFastbootTree) {
-    return function _fastbootMerge(treeIds) {
-        let mainWinner, fastbootWinner;
-        for (let id of treeIds) {
-            if (id < firstFastbootTree) {
-                mainWinner = id;
-            }
-            else {
-                fastbootWinner = id;
-            }
-        }
-        if (mainWinner != null && fastbootWinner != null) {
-            return [mainWinner, fastbootWinner];
-        }
-        else if (mainWinner != null) {
-            return [mainWinner];
-        }
-        else if (fastbootWinner != null) {
-            return [fastbootWinner];
-        }
-        else {
-            throw new Error(`bug: should always have at least one winner in fastbootMerge`);
-        }
-    };
-}
-function maybeSource(addon, key) {
-    let maybeFiles = addon.meta[key];
-    if (maybeFiles) {
-        let files = maybeFiles;
-        return {
-            mayChange: addon.mayRebuild,
-            walk() {
-                return Object.entries(files).map(([externalName, internalName]) => {
-                    try {
-                        let stat = (0, fs_1.statSync)((0, path_1.resolve)(addon.root, internalName));
-                        return {
-                            relativePath: withoutMandatoryDotSlash(externalName, [
-                                'in package.json at %s in key ember-addon.%s',
-                                addon.root,
-                                key,
-                            ]),
-                            mode: stat.mode,
-                            size: stat.size,
-                            mtime: stat.mtime,
-                            isDirectory() {
-                                return false;
-                            },
-                        };
-                    }
-                    catch (err) {
-                        if (err.code === 'ENOENT') {
-                            throw new Error(`${addon.name}/package.json lists ${internalName} in ember-addon.${key}, but that file does not exist`);
-                        }
-                        throw err;
-                    }
-                });
-            },
-            isRelocated: true,
-            locate(relativePath) {
-                let internal = files['./' + relativePath];
-                if (!internal) {
-                    throw new Error(`bug: couldn't find ${relativePath} in ${JSON.stringify(files)}`);
-                }
-                return (0, path_1.resolve)(addon.root, internal);
-            },
-        };
-    }
-}
-function withoutMandatoryDotSlash(filename, debugInfo) {
-    if (!filename.startsWith('./')) {
-        throw new Error(`${(0, util_1.format)(debugInfo)}: ${filename} is required to start with "./"`);
-    }
-    return filename.slice(2);
-}
-//# sourceMappingURL=app-differ.js.map

package/src/app-differ.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"app-differ.js","sourceRoot":"","sources":["app-differ.ts"],"names":[],"mappings":";;;;;AACA,wEAA6D;AAC7D,0DAAiC;AACjC,+BAA+B;AAC/B,yCAAmC;AACnC,gEAAuC;AACvC,2BAA8B;AAC9B,+BAA8B;AAE9B,MAAqB,SAAS;IAW5B,YACE,WAAmB,EACnB,sBAAsC;IACtC,wEAAwE;IACxE,4EAA4E;IAC5E,eAAe,GAAG,KAAK,EACvB,gBAAqC;QAd/B,sBAAiB,GAAG,QAAQ,CAAC;QAErC,gDAAgD;QACvC,UAAK,GAAgB,IAAI,GAAG,EAAE,CAAC;QAExC,yCAAyC;QACzC,mBAAc,GAAyB,IAAI,GAAG,EAAE,CAAC;QAU/C,IAAI,CAAC,OAAO,GAAG,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAa,CAAC;QAE7G,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAChB,SAAS,EAAE,IAAI;YACf,IAAI;gBACF,OAAO,mBAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC;YACD,WAAW,EAAE,KAAK;YAClB,MAAM,CAAC,YAAoB;gBACzB,OAAO,IAAA,cAAO,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,eAAe,EAAE;YACpB,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC3D,OAAO;SACR;QAED,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7C,KAAK,IAAI,KAAK,IAAI,sBAAsB,EAAE;YACxC,IAAI,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAC/C,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3B;SACF;QACD,IAAI,gBAAgB,EAAE;YACpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;gBAChB,SAAS,EAAE,IAAI;gBACf,IAAI;oBACF,OAAO,mBAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,CAAC;gBACD,WAAW,EAAE,KAAK;gBAClB,MAAM,CAAC,YAAY;oBACjB,OAAO,IAAA,cAAO,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;gBACjD,CAAC;aACF,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACvF,CAAC;IAED,MAAM;QACJ,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,IAAA,gBAAK,EAAC,iCAAiC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACrD,KAAK,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,GAAG,EAAE;YACzC,QAAQ,SAAS,EAAE;gBACjB,KAAK,QAAQ;oBACX,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBAChC,MAAM;gBACR,KAAK,OAAO,CAAC;gBACb,KAAK,OAAO,CAAC;gBACb,KAAK,QAAQ;oBACX,iGAAiG;oBACjG,MAAM;gBACR,KAAK,QAAQ;oBACX,IAAI,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC;oBAC/C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC9B,mEAAmE;wBACnE,gEAAgE;wBAChE,mEAAmE;wBACnE,mEAAmE;wBACnE,2BAA2B;wBAC3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAC;wBAClF,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;qBAChC;yBAAM;wBACL,8DAA8D;wBAC9D,oEAAoE;wBACpE,gBAAgB;wBAChB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;wBAC7C,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;qBAChC;oBACD,MAAM;gBACR;oBACE,IAAA,sBAAW,EAAC,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IAEO,WAAW,CAAC,YAAoB;QACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;CACF;AAnGD,4BAmGC;AAED,SAAS,WAAW,CAAC,OAAiB;IACpC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,aAAa,CAAC,iBAAyB;IAC9C,OAAO,SAAS,cAAc,CAAC,OAAiB;QAC9C,IAAI,UAAU,EAAE,cAAc,CAAC;QAC/B,KAAK,IAAI,EAAE,IAAI,OAAO,EAAE;YACtB,IAAI,EAAE,GAAG,iBAAiB,EAAE;gBAC1B,UAAU,GAAG,EAAE,CAAC;aACjB;iBAAM;gBACL,cAAc,GAAG,EAAE,CAAC;aACrB;SACF;QACD,IAAI,UAAU,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,EAAE;YAChD,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;SACrC;aAAM,IAAI,UAAU,IAAI,IAAI,EAAE;YAC7B,OAAO,CAAC,UAAU,CAAC,CAAC;SACrB;aAAM,IAAI,cAAc,IAAI,IAAI,EAAE;YACjC,OAAO,CAAC,cAAc,CAAC,CAAC;SACzB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;SACjF;IACH,CAAC,CAAC;AACJ,CAAC;AAYD,SAAS,WAAW,CAAC,KAAmB,EAAE,GAA6B;IACrE,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,UAAU,EAAE;QACd,IAAI,KAAK,GAAG,UAAU,CAAC;QACvB,OAAO;YACL,SAAS,EAAE,KAAK,CAAC,UAAU;YAC3B,IAAI;gBACF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,EAAE;oBAChE,IAAI;wBACF,IAAI,IAAI,GAAG,IAAA,aAAQ,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;wBACvD,OAAO;4BACL,YAAY,EAAE,wBAAwB,CAAC,YAAY,EAAE;gCACnD,6CAA6C;gCAC7C,KAAK,CAAC,IAAI;gCACV,GAAG;6BACJ,CAAC;4BACF,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,WAAW;gCACT,OAAO,KAAK,CAAC;4BACf,CAAC;yBACF,CAAC;qBACH;oBAAC,OAAO,GAAG,EAAE;wBACZ,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;4BACzB,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,CAAC,IAAI,uBAAuB,YAAY,mBAAmB,GAAG,gCAAgC,CACvG,CAAC;yBACH;wBACD,MAAM,GAAG,CAAC;qBACX;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YACD,WAAW,EAAE,IAAI;YACjB,MAAM,CAAC,YAAoB;gBACzB,IAAI,QAAQ,GAAG,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;gBAC1C,IAAI,CAAC,QAAQ,EAAE;oBACb,MAAM,IAAI,KAAK,CAAC,sBAAsB,YAAY,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACnF;gBACD,OAAO,IAAA,cAAO,EAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACvC,CAAC;SACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,QAAgB,EAAE,SAAgB;IAClE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,aAAM,EAAC,SAAS,CAAC,KAAK,QAAQ,iCAAiC,CAAC,CAAC;KACrF;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC","sourcesContent":["import { AddonPackage } from '@embroider/shared-internals';\nimport MultiTreeDiff, { InputTree } from './multi-tree-diff';\nimport walkSync from 'walk-sync';\nimport { resolve } from 'path';\nimport { debug } from './messages';\nimport assertNever from 'assert-never';\nimport { statSync } from 'fs';\nimport { format } from 'util';\n\nexport default class AppDiffer {\n  private differ: MultiTreeDiff;\n  private sources: Source[];\n  private firstFastbootTree = Infinity;\n\n  // set of filenames logically located in the app\n  readonly files: Set<string> = new Set();\n\n  // true for files that are fastboot-only.\n  isFastbootOnly: Map<string, boolean> = new Map();\n\n  constructor(\n    ownAppJSDir: string,\n    activeAddonDescendants: AddonPackage[],\n    // arguments below this point are only needed in fastboot mode. Fastboot\n    // makes this pretty messy because fastboot trees all merge into the app 🤮.\n    fastbootEnabled = false,\n    ownFastbootJSDir?: string | undefined\n  ) {\n    this.sources = activeAddonDescendants.map(addon => maybeSource(addon, 'app-js')).filter(Boolean) as Source[];\n\n    this.sources.push({\n      mayChange: true,\n      walk() {\n        return walkSync.entries(ownAppJSDir);\n      },\n      isRelocated: false,\n      locate(relativePath: string) {\n        return resolve(ownAppJSDir, relativePath);\n      },\n    });\n\n    if (!fastbootEnabled) {\n      this.differ = new MultiTreeDiff(this.sources, lastOneWins);\n      return;\n    }\n\n    this.firstFastbootTree = this.sources.length;\n    for (let addon of activeAddonDescendants) {\n      let source = maybeSource(addon, 'fastboot-js');\n      if (source) {\n        this.sources.push(source);\n      }\n    }\n    if (ownFastbootJSDir) {\n      this.sources.push({\n        mayChange: true,\n        walk() {\n          return walkSync.entries(ownFastbootJSDir);\n        },\n        isRelocated: false,\n        locate(relativePath) {\n          return resolve(ownFastbootJSDir, relativePath);\n        },\n      });\n    }\n    this.differ = new MultiTreeDiff(this.sources, fastbootMerge(this.firstFastbootTree));\n  }\n\n  update() {\n    let { ops, sources } = this.differ.update();\n    debug(`app-differ operations count: %s`, ops.length);\n    for (let [operation, relativePath] of ops) {\n      switch (operation) {\n        case 'unlink':\n          this.files.delete(relativePath);\n          break;\n        case 'rmdir':\n        case 'mkdir':\n        case 'change':\n          // this used to actually write to disk but we have moved the functionality into the resolver code\n          break;\n        case 'create':\n          let sourceIndices = sources.get(relativePath)!;\n          if (sourceIndices.length === 1) {\n            // a single file won. whether it's fastboot or non-fastboot doesn't\n            // actually change what we do here. It gets emitted in the app's\n            // namespace (if it's fastboot-only, non-fastboot code shouldn't be\n            // trying to import it anyway, because that would have already been\n            // an error pre-embroider).\n            this.isFastbootOnly.set(relativePath, sourceIndices[0] >= this.firstFastbootTree);\n            this.updateFiles(relativePath);\n          } else {\n            // we have both fastboot and non-fastboot files for this path.\n            // Because of the way fastbootMerge is written, the first one is the\n            // non-fastboot.\n            this.isFastbootOnly.set(relativePath, false);\n            this.updateFiles(relativePath);\n          }\n          break;\n        default:\n          assertNever(operation);\n      }\n    }\n  }\n\n  private updateFiles(relativePath: string) {\n    this.files.add(relativePath);\n  }\n}\n\nfunction lastOneWins(treeIds: number[]) {\n  return treeIds.slice(-1);\n}\n\nfunction fastbootMerge(firstFastbootTree: number) {\n  return function _fastbootMerge(treeIds: number[]): number[] {\n    let mainWinner, fastbootWinner;\n    for (let id of treeIds) {\n      if (id < firstFastbootTree) {\n        mainWinner = id;\n      } else {\n        fastbootWinner = id;\n      }\n    }\n    if (mainWinner != null && fastbootWinner != null) {\n      return [mainWinner, fastbootWinner];\n    } else if (mainWinner != null) {\n      return [mainWinner];\n    } else if (fastbootWinner != null) {\n      return [fastbootWinner];\n    } else {\n      throw new Error(`bug: should always have at least one winner in fastbootMerge`);\n    }\n  };\n}\n\ninterface Source extends InputTree {\n  // find the real on disk location of the file that is presented externally as\n  // `relativePath`\n  locate(relativePath: string): string;\n\n  // true if this source relocates its file out of their original package,\n  // meaning we will need to track them in order to adjust package resolution\n  isRelocated: boolean;\n}\n\nfunction maybeSource(addon: AddonPackage, key: 'app-js' | 'fastboot-js'): Source | undefined {\n  let maybeFiles = addon.meta[key];\n  if (maybeFiles) {\n    let files = maybeFiles;\n    return {\n      mayChange: addon.mayRebuild,\n      walk() {\n        return Object.entries(files).map(([externalName, internalName]) => {\n          try {\n            let stat = statSync(resolve(addon.root, internalName));\n            return {\n              relativePath: withoutMandatoryDotSlash(externalName, [\n                'in package.json at %s in key ember-addon.%s',\n                addon.root,\n                key,\n              ]),\n              mode: stat.mode,\n              size: stat.size,\n              mtime: stat.mtime,\n              isDirectory() {\n                return false;\n              },\n            };\n          } catch (err) {\n            if (err.code === 'ENOENT') {\n              throw new Error(\n                `${addon.name}/package.json lists ${internalName} in ember-addon.${key}, but that file does not exist`\n              );\n            }\n            throw err;\n          }\n        });\n      },\n      isRelocated: true,\n      locate(relativePath: string) {\n        let internal = files['./' + relativePath];\n        if (!internal) {\n          throw new Error(`bug: couldn't find ${relativePath} in ${JSON.stringify(files)}`);\n        }\n        return resolve(addon.root, internal);\n      },\n    };\n  }\n}\n\nfunction withoutMandatoryDotSlash(filename: string, debugInfo: any[]): string {\n  if (!filename.startsWith('./')) {\n    throw new Error(`${format(debugInfo)}: ${filename} is required to start with \"./\"`);\n  }\n  return filename.slice(2);\n}\n"]}

package/src/app.d.ts

@@ -1,94 +0,0 @@
-import { Package, AddonPackage } from '@embroider/shared-internals';
-import { OutputPaths } from './wait-for-trees';
-import { Asset } from './asset';
-import Options from './options';
-import { MacrosConfig } from '@embroider/macros/src/node';
-import { PluginItem, TransformOptions } from '@babel/core';
-import { Options as ResolverConfig } from './module-resolver';
-import { Engine } from './app-files';
-import type { Transform } from 'babel-plugin-ember-template-compilation';
-export type EmberENV = unknown;
-export interface AppAdapter<TreeNames, SpecificResolverConfig extends ResolverConfig = ResolverConfig> {
-    readonly allActiveAddons: AddonPackage[];
-    activeAddonChildren(pkg: Package): AddonPackage[];
-    appJSSrcDir(treePaths: OutputPaths<TreeNames>): string;
-    fastbootJSSrcDir(treePaths: OutputPaths<TreeNames>): string | undefined;
-    assets(treePaths: OutputPaths<TreeNames>): Asset[];
-    autoRun(): boolean;
-    appBoot(): string | undefined;
-    mainModule(): string;
-    mainModuleConfig(): unknown;
-    modulePrefix(): string;
-    podModulePrefix(): string | undefined;
-    rootURL(): string;
-    templateCompilerPath(): string;
-    hbsTransforms(resolverConfig: SpecificResolverConfig): Transform[];
-    jsPlugins(resolverConfig: SpecificResolverConfig): PluginItem[];
-    resolverConfig(engines: Engine[]): SpecificResolverConfig;
-    resolvableExtensions(): string[];
-    htmlbarsPlugins(): Transform[];
-    babelConfig(): TransformOptions;
-    babelMajorVersion(): 7;
-    emberENV(): EmberENV;
-    strictV2Format(): boolean;
-    developingAddons(): string[];
-    env: string;
-}
-export declare function excludeDotFiles(files: string[]): string[];
-export declare const CACHE_BUSTING_PLUGIN: {
-    path: string;
-    version: any;
-};
-export declare function addCachablePlugin(babelConfig: TransformOptions): void;
-export declare class AppBuilder<TreeNames> {
-    private root;
-    private app;
-    private adapter;
-    private options;
-    private macrosConfig;
-    private assets;
-    constructor(root: string, app: Package, adapter: AppAdapter<TreeNames>, options: Required<Options>, macrosConfig: MacrosConfig);
-    private scriptPriority;
-    private get resolvableExtensionsPattern();
-    private impliedAssets;
-    private impliedAddonAssets;
-    private babelParserConfig;
-    private babelConfig;
-    private insertEmberApp;
-    private implicitScriptsAsset;
-    private implicitStylesAsset;
-    private implicitTestScriptsAsset;
-    private implicitTestStylesAsset;
-    private findActiveAddons;
-    private partitionEngines;
-    private get activeFastboot();
-    private get fastbootConfig();
-    private appDiffers;
-    private updateAppJS;
-    private prepareAsset;
-    private prepareAssets;
-    private assetIsValid;
-    private updateOnDiskAsset;
-    private updateInMemoryAsset;
-    private updateBuiltEmberAsset;
-    private updateConcatenatedAsset;
-    private updateAssets;
-    private gatherAssets;
-    build(inputPaths: OutputPaths<TreeNames>): Promise<void>;
-    private combinePackageJSON;
-    private etcOptions;
-    private get portableHints();
-    private addBabelConfig;
-    private addResolverConfig;
-    private shouldSplitRoute;
-    private splitRoute;
-    private topAppJSAsset;
-    private get staticAppPathsPattern();
-    private requiredOtherFiles;
-    private appJSAsset;
-    private get modulePrefix();
-    private importPaths;
-    private routeEntrypoint;
-    private testJSEntrypoint;
-    private gatherImplicitModules;
-}