ember-cli 4.8.0 → 4.9.0-beta.0

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": "4.8.0-release-d65f2e1286"
+        "version": "4.9.0-beta.0-beta-34257a7c8e"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -4600,7 +4600,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1325,
+            "line": 1344,
             "description": "Used to retrieve a task with the given name. Passes the new task\nthe standard information available (like `ui`, `analytics`, `project`, etc).",
             "itemtype": "method",
             "name": "taskFor",
@@ -4617,7 +4617,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1343,
+            "line": 1362,
             "description": "Inserts the given content into a file. If the `contentsToInsert` string is already\npresent in the current contents, the file will not be changed unless `force` option\nis passed.\n\nIf `options.before` is specified, `contentsToInsert` will be inserted before\nthe first instance of that string.  If `options.after` is specified, the\ncontents will be inserted after the first instance of that string.\nIf the string specified by options.before or options.after is not in the file,\nno change will be made.\n\nIf neither `options.before` nor `options.after` are present, `contentsToInsert`\nwill be inserted at the end of the file.\n\nExample:\n```\n// app/router.js\nRouter.map(function () {\n});\n```\n\n```\ninsertIntoFile('app/router.js', '  this.route(\"admin\");', {\n  after: 'Router.map(function () {' + EOL\n}).then(function() {\n  // file has been inserted into!\n});\n\n\n```\n\n```\n// app/router.js\nRouter.map(function () {\n  this.route(\"admin\");\n});\n```",
             "itemtype": "method",
             "name": "insertIntoFile",
@@ -4647,7 +4647,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1447,
+            "line": 1466,
             "description": "Used to retrieve a blueprint with the given name.",
             "itemtype": "method",
             "name": "lookupBlueprint",
@@ -4669,7 +4669,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1464,
+            "line": 1483,
             "static": 1,
             "itemtype": "method",
             "name": "lookup",
@@ -4716,7 +4716,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1513,
+            "line": 1532,
             "description": "Loads a blueprint from given path.",
             "static": 1,
             "itemtype": "method",
@@ -4744,7 +4744,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1541,
+            "line": 1560,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4774,7 +4774,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1590,
+            "line": 1609,
             "description": "Files that are renamed when installed into the target directory.\nThis allows including files in the blueprint that would have an effect\non another process, such as a file named `.gitignore`.\n\nThe keys are the filenames used in the files folder.\nThe values are the filenames used in the target directory.",
             "static": 1,
             "itemtype": "property",
@@ -4785,7 +4785,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1605,
+            "line": 1624,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4795,7 +4795,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1611,
+            "line": 1630,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4805,7 +4805,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1617,
+            "line": 1636,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4815,7 +4815,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1625,
+            "line": 1644,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4837,7 +4837,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1638,
+            "line": 1657,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4855,7 +4855,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1649,
+            "line": 1668,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4873,7 +4873,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1658,
+            "line": 1677,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4900,7 +4900,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1672,
+            "line": 1691,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4922,7 +4922,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1684,
+            "line": 1703,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4945,7 +4945,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1699,
+            "line": 1718,
             "description": "Looks for a __path__ token in the files folder. Must be present for\nthe blueprint to support pod tokens.",
             "access": "private",
             "tagname": "",
@@ -4968,7 +4968,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1738,
+            "line": 1757,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4990,7 +4990,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1752,
+            "line": 1771,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5012,7 +5012,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1762,
+            "line": 1781,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5027,7 +5027,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1775,
+            "line": 1794,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5049,7 +5049,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 40,
+            "line": 39,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5065,7 +5065,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 55,
+            "line": 60,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5075,7 +5075,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 93,
+            "line": 98,
             "description": "Determine whether the output path is safe to delete. If the outputPath\nappears anywhere in the parents of the project root, the build would\ndelete the project directory. In this case return `false`, otherwise\nreturn `true`.",
             "access": "private",
             "tagname": "",
@@ -5097,7 +5097,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 115,
+            "line": 120,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5114,7 +5114,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 139,
+            "line": 144,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5138,7 +5138,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 164,
+            "line": 169,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5152,7 +5152,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 237,
+            "line": 244,
             "description": "Delegates to the `cleanup` method of the wrapped Broccoli builder.",
             "access": "private",
             "tagname": "",
@@ -5167,7 +5167,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 269,
+            "line": 276,
             "description": "Checks for issues in the environment that can't easily be detected until\nafter a build and issues any necessary deprecation warnings.\n\n- check for old (pre 0.1.4) versions of heimdalljs",
             "access": "private",
             "tagname": "",
@@ -6182,7 +6182,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 508,
+            "line": 509,
             "description": "Returns what commands are made available by addons by inspecting\n`includedCommands` for every addon.",
             "access": "private",
             "tagname": "",
@@ -6197,7 +6197,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 549,
+            "line": 550,
             "description": "Execute a given callback for every addon command.\nExample:\n\n```\nproject.eachAddonCommand(function(addonName, commands) {\n  console.log('Addon ' + addonName + ' exported the following commands:' + commands.keys().join(', '));\n});\n```",
             "access": "private",
             "tagname": "",
@@ -6215,7 +6215,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 572,
+            "line": 573,
             "description": "Path to the blueprints for this project.",
             "access": "private",
             "tagname": "",
@@ -6230,7 +6230,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 583,
+            "line": 584,
             "description": "Returns a list of paths (including addon paths) where blueprints will be looked up.",
             "access": "private",
             "tagname": "",
@@ -6245,7 +6245,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 601,
+            "line": 602,
             "description": "Returns a list of addon paths where blueprints will be looked up.",
             "access": "private",
             "tagname": "",
@@ -6260,7 +6260,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 624,
+            "line": 625,
             "description": "Reloads package.json of the project. Clears and reloads the packageInfo and\nper-bundle addon cache, too.",
             "access": "private",
             "tagname": "",
@@ -6275,7 +6275,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 652,
+            "line": 653,
             "description": "Re-initializes addons.",
             "access": "private",
             "tagname": "",
@@ -6286,7 +6286,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 665,
+            "line": 666,
             "description": "Find an addon by its name",
             "access": "public",
             "tagname": "",
@@ -6308,7 +6308,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 679,
+            "line": 680,
             "description": "Generate test file contents.\n\nThis method is supposed to be overwritten by test framework addons\nlike `ember-qunit` and `ember-mocha`.",
             "access": "public",
             "tagname": "",
@@ -6335,7 +6335,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 703,
+            "line": 704,
             "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": "",
@@ -6363,7 +6363,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 754,
+            "line": 755,
             "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": "",
@@ -6386,7 +6386,7 @@
         },
         {
             "file": "lib/models/project.js",
-            "line": 778,
+            "line": 779,
             "description": "Returns the project root based on the first package.json that is found",
             "static": 1,
             "itemtype": "method",
@@ -6411,7 +6411,7 @@
         },
         {
             "file": "lib/tasks/build-watch.js",
-            "line": 51,
+            "line": 53,
             "description": "Exit silently",
             "access": "private",
             "tagname": "",
@@ -6437,7 +6437,7 @@
         },
         {
             "file": "lib/tasks/serve.js",
-            "line": 101,
+            "line": 103,
             "description": "Exit silently",
             "access": "private",
             "tagname": "",

package/lib/commands/addon.js

@@ -26,6 +26,7 @@ module.exports = NewCommand.extend({
       default: 'github',
       description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
     },
+    { name: 'typescript', type: Boolean, default: false, description: 'Set up the addon to use TypeScript' },
   ],
 
   anonymousOptions: ['<addon-name>'],

package/lib/commands/destroy.js

@@ -68,7 +68,7 @@ module.exports = Command.extend({
     };
 
     if (this.settings && this.settings.usePods && !commandOptions.classic) {
-      commandOptions.pod = !commandOptions.pod;
+      commandOptions.pod = true;
     }
 
     if (commandOptions.in) {

package/lib/commands/generate.js

@@ -58,16 +58,8 @@ module.exports = Command.extend({
       args: rawArgs,
     };
 
-    if (this.settings && this.settings.usePods) {
-      if (commandOptions.pod) {
-        let warning = 'Using both .ember-cli usePods settings and --pod flag ';
-        warning += 'together has been deprecated.';
-        this.ui.writeDeprecateLine(warning);
-      }
-
-      if (!commandOptions.classic) {
-        commandOptions.pod = !commandOptions.pod;
-      }
+    if (this.settings && this.settings.usePods && !commandOptions.classic) {
+      commandOptions.pod = true;
     }
 
     if (commandOptions.in) {

package/lib/commands/init.js

@@ -42,6 +42,7 @@ module.exports = Command.extend({
       default: 'github',
       description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
     },
+    { name: 'typescript', type: Boolean, default: false, description: 'Set up the app to use TypeScript' },
   ],
 
   anonymousOptions: ['<glob-pattern>'],

package/lib/commands/new.js

@@ -38,9 +38,16 @@ module.exports = Command.extend({
     {
       name: 'ci-provider',
       type: ['travis', 'github'],
-      default: 'github',
       description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
     },
+    {
+      name: 'interactive',
+      type: Boolean,
+      default: false,
+      aliases: ['i'],
+      description: 'Create a new Ember app/addon in an interactive way.',
+    },
+    { name: 'typescript', type: Boolean, default: false, description: 'Set up the app to use TypeScript' },
   ],
 
   anonymousOptions: ['<app-name>'],
@@ -53,10 +60,31 @@ module.exports = Command.extend({
 
     commandOptions.name = rawArgs.shift();
 
-    if (!projectName) {
-      message = `The \`ember ${this.name}\` command requires a name to be specified. For more details, use \`ember help\`.`;
+    if (!projectName || commandOptions.interactive) {
+      let answers = await this.runTask('InteractiveNew', commandOptions);
 
-      return Promise.reject(new SilentError(message));
+      commandOptions.blueprint = answers.blueprint;
+
+      if (answers.name) {
+        projectName = answers.name;
+        commandOptions.name = answers.name;
+      }
+
+      if (answers.lang) {
+        commandOptions.lang = answers.lang;
+      }
+
+      if (answers.packageManager) {
+        commandOptions.yarn = answers.packageManager === 'yarn';
+      }
+
+      if (answers.ciProvider) {
+        commandOptions.ciProvider = answers.ciProvider;
+      }
+    }
+
+    if (!commandOptions.ciProvider) {
+      commandOptions.ciProvider = 'github';
     }
 
     if (commandOptions.dryRun) {

package/lib/models/asset-size-printer.js

@@ -11,7 +11,7 @@ module.exports = class AssetPrinterSize {
   }
 
   print() {
-    const filesize = require('filesize');
+    const { filesize } = require('filesize');
     let ui = this.ui;
 
     return this.makeAssetSizesObject().then((files) => {

package/lib/models/blueprint.js

@@ -490,7 +490,7 @@ let Blueprint = CoreObject.extend({
       // it's possible for people to set `{typescript: true}` in their `.ember-cli` file, which would
       // then erroneously trigger this message every time they generate a JS blueprint even though
       // they didn't pass the flag.
-      if (options.typescript === true) {
+      if (options.typescript === true && isJavaScriptFile(fileInfo.outputPath)) {
         this.ui.writeLine(
           chalk.yellow(
             "You passed the '--typescript' flag but there is no TypeScript blueprint available. " +
@@ -1319,6 +1319,25 @@ let Blueprint = CoreObject.extend({
     let installText = packages.length > 1 ? 'install addons' : 'install addon';
     this._writeStatusToUI(chalk.green, installText, taskOptions['packages'].join(', '));
 
+    if (!this.project.isEmberCLIProject()) {
+      // our blueprint ran *outside* an ember-cli project. So the only way this
+      // makes sense if the blueprint generated a new project, which we're now
+      // ready to add some addons into. So we need to switch from "outside" mode
+      // to "inside" by reinitializing the Project.
+      //
+      // One might think the cache clear is unnecessary, because in theory the
+      // caches should be shareable, but in practice the new Project we create
+      // below will have the same root dir as the NullProject and that makes bad
+      // things happen.
+      this.project.packageInfoCache._clear();
+      const Project = require('../../lib/models/project');
+      this.project = taskOptions.blueprintOptions.project = Project.closestSync(
+        this.project.root,
+        this.project.ui,
+        this.project.cli
+      );
+    }
+
     return this.taskFor('addon-install').run(taskOptions);
   },
 
@@ -1811,4 +1830,8 @@ function isTypeScriptFile(filePath) {
   return path.extname(filePath) === '.ts';
 }
 
+function isJavaScriptFile(filePath) {
+  return path.extname(filePath) === '.js';
+}
+
 module.exports = Blueprint;

package/lib/models/builder.js

@@ -26,7 +26,6 @@ class Builder extends CoreObject {
 
     // Use Broccoli 2.0 by default, if this fails due to .read/.rebuild API, fallback to broccoli-builder
     this.broccoliBuilderFallback = false;
-    this.setupBroccoliBuilder();
 
     this._instantiationStack = new Error().stack.replace(/[^\n]*\n/, '');
     this._cleanup = this.cleanup.bind(this);
@@ -42,25 +41,31 @@ class Builder extends CoreObject {
    * @method readBuildFile
    * @param path The file path to read the build file from
    */
-  readBuildFile(path) {
+  async readBuildFile(path) {
     // Load the build file
-    let buildFile = findBuildFile('ember-cli-build.js', path);
+    let buildFile = await findBuildFile(path);
     if (buildFile) {
-      return buildFile({ project: this.project });
+      return await buildFile({ project: this.project });
     }
 
     throw new SilentError('No ember-cli-build.js found.');
   }
 
+  async ensureBroccoliBuilder() {
+    if (this.builder === undefined) {
+      await this.setupBroccoliBuilder();
+    }
+  }
+
   /**
    * @private
    * @method setupBroccoliBuilder
    */
-  setupBroccoliBuilder() {
+  async setupBroccoliBuilder() {
     this.environment = this.environment || 'development';
     process.env.EMBER_ENV = process.env.EMBER_ENV || this.environment;
 
-    this.tree = this.readBuildFile(this.project.root);
+    this.tree = await this.readBuildFile(this.project.root);
 
     let broccoli = require('broccoli');
 
@@ -167,6 +172,8 @@ class Builder extends CoreObject {
    * @return {Promise}
    */
   async build(addWatchDirCallback, resultAnnotation) {
+    await this.ensureBroccoliBuilder();
+
     let buildResults, uiProgressIntervalID;
 
     try {

package/lib/models/project.js

@@ -311,7 +311,7 @@ class Project {
     if (fs.existsSync(`${targetsPath}.js`)) {
       this._targets = this.require(targetsPath);
     } else {
-      this._targets = require('../../blueprints/app/files/config/targets');
+      this._targets = { browsers: ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'] };
     }
     return this._targets;
   }
@@ -496,6 +496,7 @@ class Project {
       return;
     }
     this._addonsInitialized = true;
+    this._didDiscoverAddons = false;
 
     logger.info('initializeAddons for: %s', this.name());
 

package/lib/models/server-watcher.js

@@ -3,8 +3,8 @@
 const Watcher = require('./watcher');
 
 module.exports = class ServerWatcher extends Watcher {
-  constructor(options) {
-    super(options);
+  constructor(options, build) {
+    super(options, build);
 
     this.watcher.on('add', this.didAdd.bind(this));
     this.watcher.on('delete', this.didDelete.bind(this));

package/lib/models/watcher.js

@@ -12,19 +12,35 @@ const eventTypeNormalization = {
   change: 'changed',
 };
 
+const ConstructedFromBuilder = Symbol('Watcher.build');
+
 module.exports = class Watcher extends CoreObject {
-  constructor(_options) {
+  constructor(_options, build) {
+    if (build !== ConstructedFromBuilder) {
+      throw new Error('instantiate Watcher with (await Watcher.build()).watcher, not new Watcher()');
+    }
+
     super(_options);
 
     this.verbose = true;
+    this.serving = _options.serving;
+  }
 
-    let options = this.buildOptions();
+  static async build(_options) {
+    let watcher = new this(_options, ConstructedFromBuilder);
+    await watcher.setupBroccoliWatcher(_options);
 
-    logger.info('initialize %o', options);
+    // This indirection is because Watcher instances are themselves spec
+    // noncompliant thennables (see the then() method) so returning watcher
+    // directly will interfere with `await Watcher.build()`
+    return { watcher };
+  }
 
-    this.serving = _options.serving;
+  async setupBroccoliWatcher() {
+    let options = this.buildOptions();
 
-    this.watcher = this.watcher || this.constructBroccoliWatcher(options);
+    logger.info('initialize %o', options);
+    this.watcher = this.watcher || (await this.constructBroccoliWatcher(options));
 
     this.setupBroccoliChangeEvent();
     this.watcher.on('buildStart', this._setupBroccoliWatcherBuild.bind(this));
@@ -38,8 +54,9 @@ module.exports = class Watcher extends CoreObject {
     this.serveURL = serveURL;
   }
 
-  constructBroccoliWatcher(options) {
+  async constructBroccoliWatcher(options) {
     const { Watcher } = require('broccoli');
+    await this.builder.ensureBroccoliBuilder();
     const { watchedSourceNodeWrappers } = this.builder.builder;
 
     let watcher = new Watcher(this.builder, watchedSourceNodeWrappers, { saneOptions: options, ignored: this.ignored });