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

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;
 }
 

package/packages/blueprint-blueprint/files/blueprints/__name__/index.js

@@ -1,16 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: ''
-
-  // locals(options) {
-  //   // Return custom template variables here.
-  //   return {
-  //     foo: options.entity.options.foo
-  //   };
-  // }
-
-  // afterInstall(options) {
-  //   // Perform extra work here.
-  // }
-};

package/packages/blueprint-blueprint/index.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = {
-  description: 'Generates a blueprint and definition.',
-};

package/packages/blueprint-blueprint/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "@ember-tooling/blueprint-blueprint",
-  "version": "0.3.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ember-cli/ember-cli.git",
-    "directory": "packages/blueprint-blueprint"
-  },
-  "license": "MIT",
-  "keywords": [
-    "ember-blueprint"
-  ]
-}