ember-cli 7.2.0-alpha.1 → 7.2.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # ember-cli Changelog
 
+## Release (2026-08-14)
+
+* ember-cli 7.2.0-alpha.2 (patch)
+* @ember-tooling/classic-build-addon-blueprint 7.2.0-alpha.2 (patch)
+* @ember-tooling/classic-build-app-blueprint 7.2.0-alpha.2 (patch)
+* @ember-tooling/blueprint-model 0.7.1 (patch)
+
+#### :bug: Bug Fix
+* `ember-cli`, `@ember-tooling/blueprint-model`
+  * [#11050](https://github.com/ember-cli/ember-cli/pull/11050) fix default blueprint lookup ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `ember-cli`
+  * [#11051](https://github.com/ember-cli/ember-cli/pull/11051) fix release-plan ([@mansona](https://github.com/mansona))
+  * [#11052](https://github.com/ember-cli/ember-cli/pull/11052) speed up windows CI ([@mansona](https://github.com/mansona))
+  * [#11049](https://github.com/ember-cli/ember-cli/pull/11049) fix help tests to stop relying on private APIs ([@mansona](https://github.com/mansona))
+  * [#11048](https://github.com/ember-cli/ember-cli/pull/11048) update fixturify-project from v2 to v7 ([@mansona](https://github.com/mansona))
+  * [#11044](https://github.com/ember-cli/ember-cli/pull/11044) add a notify discord webhook action for CI ([@mansona](https://github.com/mansona))
+  * [#11023](https://github.com/ember-cli/ember-cli/pull/11023) Update RELEASE.md ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
 ## Release (2026-06-30)
 
 * ember-cli 7.2.0-alpha.1 (minor)

package/RELEASE.md

@@ -41,11 +41,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - **make sure to not update the .github/workflows/plan-stable-release.yml file** this should still plan a stable release
   - **make sure to not update the .github/workflows/publish-stable.yml file** this should still publish a stable release
   - **make sure to not update the CHANGELOG.md file** so as not to include the beta or alpha changelogs in the next release
-  - make sure to not update the version in the package.json during this step, this will be release-plan's job
-  - make sure to not update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job
-  - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
+  - make sure to not update the version in the `package.json`, `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job
+  - make sure to not update update the `ember-cli` reference in `packages/app-blueprint/files/package.json`, this has been automated in the release-plan process
+  - make sure to not add the `release-plan` config section to the `package.json`, `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
   - commit the merge `git commit -am "promote beta to release"`
-- Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta.
+- Update blueprint dependencies to latest.
 
   ```
   pnpm dlx update-blueprint-deps --filter 'ember-source$' --tag latest ./packages/*-blueprint/**/*ackage.json ./tests/fixtures/**/package.json
@@ -53,13 +53,14 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   pnpm dlx update-blueprint-deps --filter '.*' ./package.json ./packages/*-blueprint/**/*ackage.json ./tests/fixtures/*/package.json ./tests/fixtures/*/*/package.json
   ```
 
+- run `pnpm install` to update your pacakge.lock and download any new dependencies
 - run `pnpm lint:fix`
 - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@latest`
 - manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json
 - run `pnpm install` to make sure the lock file is up to date
 - commit this update `git commit -am "update blueprint dependencies to latest"`
 - push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release`
-- mark this PR as an `enhancement` if it is a minor release
+- mark this PR as an `enhancement` if it is a minor release, or `breaking` if it is a major
 - check that everything is ok (i.e. that CI has run correctly and that you have the changes you expect)
 - merge branch
 - check that the `Prepare Release` PR has been correctly opened by `release-plan`

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "7.2.0-alpha.1-master-52ee6a0bd8"
+        "version": "7.2.0-alpha.2-master-8f5fb9970c"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -4675,7 +4675,22 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 535,
+            "line": 532,
+            "description": "Returns the built-in ember-cli path for looking up blueprints",
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "builtInLookupPath",
+            "return": {
+                "description": "path to the ember-cli built-in blueprints",
+                "type": "String"
+            },
+            "class": "Project",
+            "module": "ember-cli"
+        },
+        {
+            "file": "lib/models/project.js",
+            "line": 543,
             "description": "Returns a list of addon paths where blueprints will be looked up.",
             "access": "private",
             "tagname": "",
@@ -4690,7 +4705,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 558,
+            "line": 566,
             "description": "Reloads package.json of the project. Clears and reloads the packageInfo and\nper-bundle addon cache, too.",
             "access": "private",
             "tagname": "",
@@ -4705,7 +4720,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 586,
+            "line": 594,
             "description": "Re-initializes addons.",
             "access": "private",
             "tagname": "",
@@ -4716,7 +4731,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 599,
+            "line": 607,
             "description": "Find an addon by its name",
             "access": "public",
             "tagname": "",
@@ -4738,7 +4753,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 613,
+            "line": 621,
             "description": "Generate test file contents.\n\nThis method is supposed to be overwritten by test framework addons\nlike `ember-qunit`.",
             "access": "public",
             "tagname": "",
@@ -4765,7 +4780,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 637,
+            "line": 645,
             "description": "Returns a new project based on the first `package.json` that is found\nin `pathName`.\n\nIf the above `package.json` specifies `ember-addon.projectRoot`, we load\nthe project based on the relative path between this directory and the\nspecified `projectRoot`.",
             "access": "private",
             "tagname": "",
@@ -4793,7 +4808,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 688,
+            "line": 696,
             "description": "Returns a new project based on the first package.json that is found\nin `pathName`, or the nullProject.\n\nThe nullProject signifies no-project, but abides by the null object pattern",
             "access": "private",
             "tagname": "",
@@ -4816,7 +4831,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 712,
+            "line": 720,
             "description": "Returns the project root based on the first package.json that is found",
             "static": 1,
             "itemtype": "method",

package/lib/models/project.js

@@ -523,15 +523,23 @@ class Project {
    */
   blueprintLookupPaths() {
     if (this.isEmberCLIProject()) {
-      let lookupPaths = [this.localBlueprintLookupPath()];
-      let addonLookupPaths = this.addonBlueprintLookupPaths();
-
-      return lookupPaths.concat(addonLookupPaths);
+      return [this.localBlueprintLookupPath(), ...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
     } else {
-      return this.addonBlueprintLookupPaths();
+      return [...this.addonBlueprintLookupPaths(), this.builtInLookupPath()];
     }
   }
 
+  /**
+   * Returns the built-in ember-cli path for looking up blueprints
+   *
+   * @private
+   * @method builtInLookupPath
+   * @return {string} path to the ember-cli built-in blueprints
+   */
+  builtInLookupPath() {
+    return path.resolve(__dirname, '..', '..', 'blueprints');
+  }
+
   /**
     Returns a list of addon paths where blueprints will be looked up.
 

package/lib/utilities/version-utils.js

@@ -3,11 +3,12 @@
 const fs = require('fs');
 const path = require('path');
 const getRepoInfo = require('git-repo-info');
+const version = require('../../package.json').version;
 
 module.exports = {
   emberCLIVersion() {
     let gitPath = path.join(__dirname, '..', '..', '.git');
-    let output = [require('../../package.json').version];
+    let output = [version];
 
     if (fs.existsSync(gitPath)) {
       let { branch, abbreviatedSha } = getRepoInfo(gitPath);
@@ -21,6 +22,10 @@ module.exports = {
     return output.join('-');
   },
 
+  emberCLIBareVersion() {
+    return version;
+  },
+
   isDevelopment(version) {
     // match postfix SHA in dev version
     return /\b[0-9a-f]{5,40}\b/.test(version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -117,9 +117,9 @@
     "workerpool": "^10.0.2",
     "yam": "^1.0.0",
     "@ember-tooling/blueprint-blueprint": "0.3.0",
-    "@ember-tooling/classic-build-app-blueprint": "7.2.0-alpha.1",
-    "@ember-tooling/classic-build-addon-blueprint": "7.2.0-alpha.1",
-    "@ember-tooling/blueprint-model": "0.7.0"
+    "@ember-tooling/blueprint-model": "0.7.1",
+    "@ember-tooling/classic-build-app-blueprint": "7.2.0-alpha.2",
+    "@ember-tooling/classic-build-addon-blueprint": "7.2.0-alpha.2"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.7",
@@ -129,6 +129,7 @@
     "chai-files": "^1.4.0",
     "chai-jest-snapshot": "^2.0.0",
     "concurrently": "^9.2.1",
+    "ember-cli": "link:.",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
     "eslint": "^8.57.1",
@@ -137,7 +138,7 @@
     "eslint-plugin-mocha": "^10.5.0",
     "eslint-plugin-n": "^17.24.0",
     "fixturify": "^3.0.0",
-    "fixturify-project": "^2.1.1",
+    "fixturify-project": "^7.1.3",
     "jsdom": "^21.1.2",
     "latest-version": "^9.0.0",
     "mocha": "^11.7.6",

package/packages/addon-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-addon-blueprint",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

package/packages/app-blueprint/files/package.json

@@ -63,7 +63,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^9.2.1",
     "ember-auto-import": "^2.13.1",
-    "ember-cli": "~7.2.0-alpha.1",
+    "ember-cli": "~7.2.0-alpha.2",
     "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.3.1",
     "ember-cli-clean-css": "^3.0.0",

package/packages/app-blueprint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/classic-build-app-blueprint",
-  "version": "7.2.0-alpha.1",
+  "version": "7.2.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

package/packages/blueprint-model/index.js

@@ -20,7 +20,6 @@ const zipObject = require('lodash/zipObject');
 const intersection = require('lodash/intersection');
 const cloneDeep = require('lodash/cloneDeep');
 const compact = require('lodash/compact');
-const uniq = require('lodash/uniq');
 const sortBy = require('lodash/sortBy');
 const walkSync = require('walk-sync');
 const SilentError = require('silent-error');
@@ -1425,10 +1424,13 @@ const builtInBlueprints = new Map([
 Blueprint.lookup = function (name, options) {
   options = options || {};
 
-  let lookupPaths = generateLookupPaths(options.paths);
+  let lookupPaths = new Set(options.paths);
 
-  let lookupPath;
-  for (let i = 0; (lookupPath = lookupPaths[i]); i++) {
+  for (let path of options?.project?.blueprintLookupPaths() ?? []) {
+    lookupPaths.add(path);
+  }
+
+  for (let lookupPath of lookupPaths) {
     let blueprintPath = path.resolve(lookupPath, name);
 
     if (Blueprint._existsSync(blueprintPath)) {
@@ -1502,10 +1504,15 @@ Blueprint.load = function (blueprintPath, blueprintOptions) {
 Blueprint.list = function (options) {
   options = options || {};
 
-  let lookupPaths = generateLookupPaths(options.paths);
+  let lookupPaths = new Set(options.paths);
+
+  for (let path of options?.project?.blueprintLookupPaths() ?? []) {
+    lookupPaths.add(path);
+  }
+
   let seen = [];
 
-  return lookupPaths.map((lookupPath) => {
+  return Array.from(lookupPaths).map((lookupPath) => {
     let source;
     let packagePath = path.join(lookupPath, '../package.json');
     if (Blueprint._existsSync(packagePath)) {
@@ -1582,14 +1589,6 @@ Blueprint.ignoredFiles = initialIgnoredFiles;
 */
 Blueprint.ignoredUpdateFiles = ['.gitkeep', 'app.css', 'LICENSE.md'];
 
-/**
-  @static
-  @property defaultLookupPaths
-*/
-Blueprint.defaultLookupPaths = function () {
-  return [path.resolve(__dirname, '..', '..', 'blueprints')];
-};
-
 /**
   @private
   @method prepareConfirm
@@ -1649,21 +1648,6 @@ function isIgnored(info) {
   return Blueprint.ignoredFiles.some((ignoredFile) => minimatch(fn, ignoredFile, { matchBase: true }));
 }
 
-/**
-  Combines provided lookup paths with defaults and removes
-  duplicates.
-
-  @private
-  @method generateLookupPaths
-  @param {Array} lookupPaths
-  @return {Array}
-*/
-function generateLookupPaths(lookupPaths) {
-  lookupPaths = lookupPaths || [];
-  lookupPaths = lookupPaths.concat(Blueprint.defaultLookupPaths());
-  return uniq(lookupPaths);
-}
-
 /**
   Looks for a __path__ token in the files folder. Must be present for
   the blueprint to support pod tokens.

package/packages/blueprint-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-tooling/blueprint-model",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/ember-cli/ember-cli.git",

package/tests/helpers/fixturify-project.js

@@ -4,9 +4,10 @@ const path = require('path');
 const merge = require('lodash/merge');
 // this is a test-only dependency
 // eslint-disable-next-line n/no-unpublished-require
-const FixturifyProject = require('fixturify-project');
+const { Project: FixturifyProject } = require('fixturify-project');
 const Project = require('../../lib/models/project');
 const MockCLI = require('./mock-cli');
+const { readFile } = require('fs/promises');
 
 // used in these tests to ensure we are only
 // operating on the addons added here
@@ -45,22 +46,9 @@ function getOptionsObjectWithCallbackFunction(defaultOptions, optionsOrCallback)
   );
 }
 
-// Essentially a copy of the function in node-fixturify-project, converted from TS to JS.
-// We need this for use during toJSON().
-function parseScoped(name) {
-  let matched = name.match(/(@[^@/]+)\/(.*)/);
-  if (matched) {
-    return {
-      scope: matched[1],
-      name: matched[2],
-    };
-  }
-  return null;
-}
-
 module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
-  writeSync() {
-    super.writeSync(...arguments);
+  async write() {
+    await super.write(...arguments);
     this._hasWritten = true;
   }
 
@@ -68,26 +56,24 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
     merge(this.files, filesObj);
   }
 
-  buildProjectModel(ProjectClass = ProjectWithoutInternalAddons) {
+  async buildProjectModel(ProjectClass = ProjectWithoutInternalAddons) {
     if (!this._hasWritten) {
-      this.writeSync();
+      await this.write();
     }
 
-    let pkg = JSON.parse(this.toJSON('package.json'));
     let cli = new MockCLI();
-    let root = path.join(this.root, this.name);
 
-    return new ProjectClass(root, pkg, cli.ui, cli);
+    return new ProjectClass(this.baseDir, this.pkg, cli.ui, cli);
   }
 
-  buildProjectModelForInRepoAddon(addonName, ProjectClass = ProjectWithoutInternalAddons) {
+  async buildProjectModelForInRepoAddon(addonName, ProjectClass = ProjectWithoutInternalAddons) {
     if (!this._hasWritten) {
-      this.writeSync();
+      await this.write();
     }
 
-    let pkg = JSON.parse(this.files.lib[addonName]['package.json']);
+    let root = path.join(this.baseDir, 'lib', addonName);
+    let pkg = JSON.parse(await readFile(path.join(root, 'package.json'), 'utf8'));
     let cli = new MockCLI();
-    let root = path.join(this.root, this.name, 'lib', addonName);
 
     return new ProjectClass(root, pkg, cli.ui, cli);
   }
@@ -105,31 +91,7 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
    */
   addDependency(name, version, optionsOrCallback) {
     const options = getOptionsObjectWithCallbackFunction(optionsOrCallback);
-    return super.addDependency(name, version, options.callback);
-  }
-
-  /**
-   * Add a 'reference' entry to this object's `dependencies` list. A 'reference' dependency is
-   * an entry in `dependencies` where the caller knows the dependency's source files are being
-   * created elsewhere in the project tree, so no source files should be created locally in
-   * `node_modules`, which is the standard FixturifyProject (and node-fixturify-project) behavior.
-   * We do this by adding the necessary reference to `dependencies` during `toJSON`.
-   *
-   * This is used when two addons wish to share a single definition on disk for a dependency (various parts of
-   * ember-cli optimize processing based on paths on disk.)
-   *
-   * Because there is no FixturifyProject being created, no callback is given as in other methods.
-   *
-   * @param {String} name name of the dependency
-   * @param {String} version version of the dependency, defaults to '*'. For our purposes, '*' means
-   * "whatever version was specified elsewhere."
-   */
-  addReferenceDependency(name, version = '*') {
-    if (!this._referenceDependencies) {
-      this._referenceDependencies = {};
-    }
-
-    this._referenceDependencies[name] = version;
+    return super.addDependency(new this.constructor(name, version), options.callback);
   }
 
   /**
@@ -148,30 +110,6 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
     return super.addDevDependency(name, version, options.callback);
   }
 
-  /**
-   * Add a 'reference' entry to this object's `devDependencies` list. A 'reference' devDependency is
-   * an entry in `devDependencies` where the caller knows the dependency's source files are being
-   * created elsewhere in the project tree, so no source files should be created locally in
-   * `node_modules`, which is the standard FixturifyProject (and node-fixturify-project) behavior.
-   * We do this by adding the necessary reference to `devDependencies` during `toJSON`.
-   *
-   * This is used when two addons wish to share a single definition on disk for a devDependency
-   * (various parts of ember-cli optimize processing based on paths on disk.)
-   *
-   * Because there is no FixturifyProject being created, no callback is given as in other methods.
-   *
-   * @param {String} name name of the devDependency
-   * @param {String} version version of the devDependency, defaults to '*'. For our purposes, '*' means
-   * "whatever version was specified elsewhere."
-   */
-  addReferenceDevDependency(name, version = '*') {
-    if (!this._referenceDevDependencies) {
-      this._referenceDevDependencies = {};
-    }
-
-    this._referenceDevDependencies[name] = version;
-  }
-
   /**
    * Add an addon to this object's `dependencies` list. The addon files will be written in
    * this object's `node_modules/<addon_name>` directory when this object is written out.
@@ -274,15 +212,22 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
    * a callback function while also specifying other properties.)
    * @returns {FixturifyProject} the newly-created addon
    */
-  addInRepoAddon(name, version = '0.0.0', optionsOrCallback) {
+  async addInRepoAddon(name, version = '0.0.0', optionsOrCallback) {
     const options = getOptionsObjectWithCallbackFunction({ allowCachingPerBundle: false }, optionsOrCallback);
 
-    const inRepoAddon = new EmberCLIFixturifyProject(name, version, (addon) => {
-      prepareAddon(addon, options);
+    let inRepoAddon;
 
-      if (typeof options.callback === 'function') {
-        options.callback(addon);
-      }
+    await new Promise((resolve) => {
+      inRepoAddon = new EmberCLIFixturifyProject(name, version, async (addon) => {
+        prepareAddon(addon, options);
+
+        if (typeof options.callback === 'function') {
+          await options.callback(addon);
+          resolve();
+        } else {
+          resolve();
+        }
+      });
     });
 
     // configure the current project to have an ember-addon configured at the
@@ -301,10 +246,9 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
 
     addon.paths.push(addonPath);
 
-    this.files[addonRootDir] = this.files[addonRootDir] || {};
+    inRepoAddon.baseDir = path.join(this.baseDir, addonRootDir, inRepoAddon.pkg.name);
 
-    let addonJSON = inRepoAddon.toJSON();
-    Object.assign(this.files[addonRootDir], addonJSON);
+    await inRepoAddon.write();
     return inRepoAddon;
   }
 
@@ -322,12 +266,12 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
    * @returns {FixturifyProject} the newly-created addon
    */
   addInRepoEngine(name, version = '0.0.0', options = { allowCachingPerBundle: false, enableLazyLoading: false }) {
-    const callback = (engine) => {
+    const callback = async (engine) => {
       engine.pkg.keywords.push('ember-engine');
 
       // call original callback if it exists
       if (typeof options.callback === 'function') {
-        options.callback(engine);
+        await options.callback(engine);
       }
     };
 
@@ -341,56 +285,4 @@ module.exports = class EmberCLIFixturifyProject extends FixturifyProject {
 
     return this.addInRepoAddon(name, version, { ...options, callback });
   }
-
-  /**
-   * Convert the object into a data structure suitable for passing to `fixturify`.
-   *
-   * @param {String} key optional key. If specified, the object will be run through toJSON, then the given
-   * property extracted and returned.
-   * @returns {Object} the `toJSON` value of the object (wrapped) or the toJSON value of the specified field
-   * (not wrapped.)
-   */
-  toJSON(key) {
-    if (key) {
-      return super.toJSON(key);
-    }
-
-    let jsonData = super.toJSON();
-
-    let scoped = parseScoped(this.name);
-
-    // Allowing for scoped names, get the object in the JSON structure that corresponds
-    // to this FixturifyProject.
-    let container = scoped ? jsonData[scoped.scope][scoped.name] : jsonData[this.name];
-
-    if (this._referenceDependencies || this._referenceDevDependencies) {
-      let pkg = JSON.parse(container['package.json']);
-
-      if (this._referenceDependencies) {
-        if (!pkg.dependencies) {
-          pkg.dependencies = {};
-        }
-
-        Object.assign(pkg.dependencies, this._referenceDependencies);
-      }
-
-      if (this._referenceDevDependencies) {
-        if (!pkg.devDependencies) {
-          pkg.devDependencies = {};
-        }
-
-        Object.assign(pkg.devDependencies, this._referenceDevDependencies);
-      }
-
-      container['package.json'] = JSON.stringify(pkg, undefined, 2);
-    }
-
-    // an optimization to remove any node_modules declaration that has nothing in it,
-    // to avoid creating extra directories for no reason.
-    if (container['node_modules'] && Object.keys(container['node_modules']).length === 0) {
-      delete container['node_modules'];
-    }
-
-    return jsonData;
-  }
 };

package/tests/helpers/per-bundle-addon-cache.js

@@ -110,53 +110,47 @@ function countAddons(projectOrAddon, config = { byName: {}, proxyCount: 0, realA
  *
  * @name createStandardCacheFixture
  */
-function createStandardCacheFixture() {
+async function createStandardCacheFixture() {
   let project = new FixturifyProject('test-ember-project', '1.0.0');
 
-  project.addInRepoAddon('test-addon-a', '1.0.0', {
+  await project.addInRepoAddon('test-addon-a', '1.0.0', {
     callback: (addonA) => {
-      addonA.addInRepoAddon('test-addon-dep', '1.0.0');
-
-      // At this point, TAD has been run through toJSON inside of TAA.
-      // TAD itself has no issues.
-      // in TAA, we want to store all the inrepo addons, at any level, in
-      // PROJ/lib, so move TAD from TAA and change its path in TAA.
       addonA.pkg['ember-addon'].paths = ['../test-addon-dep'];
-      project.files.lib = project.files.lib || {};
-      project.files.lib['test-addon-dep'] = addonA.files.lib['test-addon-dep'];
-      delete addonA.files.lib;
     },
   });
 
-  project.addInRepoEngine('lazy-engine-a', '1.0.0', {
+  await project.addInRepoAddon('test-addon-dep', '1.0.0');
+
+  await project.addInRepoAddon('test-engine-dep', '1.0.0');
+  await project.addInRepoEngine('lazy-engine-a', '1.0.0', {
     enableLazyLoading: true,
     callback: (lazyEngineA) => {
-      lazyEngineA.addInRepoAddon('test-engine-dep', '1.0.0');
-
-      // Similar to above
       lazyEngineA.pkg['ember-addon'].paths = ['../test-engine-dep'];
-      project.files.lib['test-engine-dep'] = lazyEngineA.files.lib['test-engine-dep'];
-      delete lazyEngineA.files.lib;
     },
   });
 
-  project.addInRepoEngine('lazy-engine-b', '1.0.0', {
+  await project.addInRepoEngine('lazy-engine-b', '1.0.0', {
     enableLazyLoading: true,
     callback: (lazyEngineB) => {
-      // These two addon definitions have already been moved to project, so just
-      // fix the ember-addon.paths and remove the files.lib entry.
       lazyEngineB.pkg['ember-addon'].paths = ['../test-engine-dep', '../test-addon-dep'];
-      delete lazyEngineB.files.lib;
     },
   });
 
-  project.addInRepoEngine('regular-engine-c', '1.0.0', {
+  await project.addInRepoEngine('regular-engine-c', '1.0.0', {
     callback: (regularEngineC) => {
       regularEngineC.pkg['ember-addon'].paths = ['../test-engine-dep'];
-      delete regularEngineC.files.lib;
     },
   });
 
+  // this test is actively trying to test a very strange setup of dependencies so we need to correct
+  // the config vs what the above fixturify-project setup would have added
+  project.pkg['ember-addon'].paths = [
+    'lib/test-addon-a',
+    'lib/lazy-engine-a',
+    'lib/lazy-engine-b',
+    'lib/regular-engine-c',
+  ];
+
   return project;
 }