ember-cli 4.8.0 → 4.9.0

package/lib/tasks/build-watch.js

@@ -35,13 +35,15 @@ class BuildWatchTask extends Task {
 
     let watcher =
       options._watcher ||
-      new Watcher({
-        ui,
-        builder,
-        analytics: this.analytics,
-        options,
-        ignored: [path.resolve(this.project.root, options.outputPath)],
-      });
+      (
+        await Watcher.build({
+          ui,
+          builder,
+          analytics: this.analytics,
+          options,
+          ignored: [path.resolve(this.project.root, options.outputPath)],
+        })
+      ).watcher;
 
     await watcher;
     // Run until failure or signal to exit

package/lib/tasks/generate-from-blueprint.js

@@ -17,7 +17,7 @@ class GenerateTask extends Task {
 
     if (options.lintFix) {
       try {
-        await lintFix.run(this.ui);
+        await lintFix.run(this.project);
       } catch (error) {
         logger.error('Lint fix failed: %o', error);
       }

package/lib/tasks/install-blueprint.js

@@ -51,7 +51,7 @@ class InstallBlueprintTask extends Task {
 
     if (options.lintFix) {
       try {
-        await lintFix.run(this.ui);
+        await lintFix.run(this.project);
       } catch (error) {
         logger.error('Lint fix failed: %o', error);
       }

package/lib/tasks/interactive-new.js

@@ -0,0 +1,153 @@
+'use strict';
+
+const inquirer = require('inquirer');
+const { isLangCode } = require('is-language-code');
+const osLocale = require('os-locale');
+
+const Task = require('../models/task');
+const isValidProjectName = require('../utilities/valid-project-name');
+
+const DEFAULT_LOCALE = 'en-US';
+
+class InteractiveNewTask extends Task {
+  async run(newCommandOptions, _testAnswers) {
+    let prompt = inquirer.createPromptModule();
+    let questions = await this.getQuestions(newCommandOptions);
+    let answers = await prompt(questions, _testAnswers);
+
+    answers.lang = answers.langSelection || answers.langDifferent;
+
+    delete answers.langSelection;
+    delete answers.langDifferent;
+
+    return answers;
+  }
+
+  async getQuestions(newCommandOptions = {}) {
+    return [
+      {
+        name: 'blueprint',
+        type: 'list',
+        message: 'Is this an app or an addon?',
+        choices: [
+          {
+            name: 'App',
+            value: 'app',
+          },
+          {
+            name: 'Addon',
+            value: 'addon',
+          },
+        ],
+      },
+      {
+        name: 'name',
+        type: 'input',
+        message: ({ blueprint }) => `Please provide the name of your ${blueprint}:`,
+        when: !newCommandOptions.name,
+        validate: (name) => {
+          if (name) {
+            if (isValidProjectName(name)) {
+              return true;
+            }
+
+            return `We currently do not support \`${name}\` as a name.`;
+          }
+
+          return 'Please provide a name.';
+        },
+      },
+      {
+        name: 'langSelection',
+        type: 'list',
+        message: ({ blueprint }) => `Please provide the spoken/content language of your ${blueprint}:`,
+        when: !newCommandOptions.lang,
+        choices: await this.getLangChoices(),
+      },
+      {
+        name: 'langDifferent',
+        type: 'input',
+        message: 'Please provide the different language:',
+        when: ({ langSelection } = {}) => !newCommandOptions.lang && !langSelection,
+        validate: (lang) => {
+          if (isLangCode(lang).res) {
+            return true;
+          }
+
+          return 'Please provide a valid locale code.';
+        },
+      },
+      {
+        name: 'packageManager',
+        type: 'list',
+        message: 'Pick the package manager to use when installing dependencies:',
+        when: !newCommandOptions.yarn,
+        choices: [
+          {
+            name: 'NPM',
+            value: 'npm',
+          },
+          {
+            name: 'Yarn',
+            value: 'yarn',
+          },
+          {
+            name: 'Ignore/Skip',
+            value: null,
+          },
+        ],
+      },
+      {
+        name: 'ciProvider',
+        type: 'list',
+        message: 'Which CI provider do you want to use?',
+        when: !newCommandOptions.ciProvider,
+        choices: [
+          {
+            name: 'GitHub Actions',
+            value: 'github',
+          },
+          {
+            name: 'Travis CI',
+            value: 'travis',
+          },
+          {
+            name: 'Ignore/Skip',
+            value: null,
+          },
+        ],
+      },
+    ];
+  }
+
+  async getLangChoices() {
+    let userLocale = await this.getUserLocale();
+    let langChoices = [
+      {
+        name: DEFAULT_LOCALE,
+        value: DEFAULT_LOCALE,
+      },
+    ];
+
+    if (userLocale !== DEFAULT_LOCALE) {
+      langChoices.push({
+        name: userLocale,
+        value: userLocale,
+      });
+    }
+
+    langChoices.push({
+      name: 'I want to manually provide a different language',
+      value: null,
+    });
+
+    return langChoices;
+  }
+
+  getUserLocale() {
+    return osLocale();
+  }
+}
+
+module.exports = InteractiveNewTask;
+module.exports.DEFAULT_LOCALE = DEFAULT_LOCALE;

package/lib/tasks/npm-task.js

@@ -26,7 +26,7 @@ class NpmTask extends Task {
     // The command to run: can be 'install' or 'uninstall'
     this.command = '';
 
-    this.versionConstraints = '3 || 4 || 5 || 6';
+    this.versionConstraints = '3 || 4 || 5 || 6 || 7 || 8';
   }
 
   get packageManagerOutputName() {

package/lib/tasks/serve.js

@@ -55,14 +55,16 @@ class ServeTask extends Task {
 
     let watcher =
       options._watcher ||
-      new Watcher({
-        ui: this.ui,
-        builder,
-        analytics: this.analytics,
-        options,
-        serving: true,
-        ignored: [path.resolve(this.project.root, options.outputPath)],
-      });
+      (
+        await Watcher.build({
+          ui: this.ui,
+          builder,
+          analytics: this.analytics,
+          options,
+          serving: true,
+          ignored: [path.resolve(this.project.root, options.outputPath)],
+        })
+      ).watcher;
 
     let serverRoot = './server';
     let serverWatcher = null;

package/lib/utilities/find-build-file.js

@@ -1,24 +1,32 @@
 'use strict';
 const findUp = require('find-up');
 const path = require('path');
+const url = require('url');
 
-module.exports = function (file, dir) {
-  let buildFilePath = findUp.sync(file, { cwd: dir });
+module.exports = async function (dir) {
+  let buildFilePath = null;
 
-  // Note: In the future this should throw
-  if (!buildFilePath) {
+  for (let ext of ['js', 'mjs', 'cjs']) {
+    let candidate = findUp.sync(`ember-cli-build.${ext}`, { cwd: dir });
+    if (candidate) {
+      buildFilePath = candidate;
+      break;
+    }
+  }
+
+  if (buildFilePath === null) {
     return null;
   }
 
   process.chdir(path.dirname(buildFilePath));
 
-  let buildFile = null;
+  let buildFileUrl = url.pathToFileURL(buildFilePath);
   try {
-    buildFile = require(buildFilePath);
+    // eslint-disable-next-line node/no-unsupported-features/es-syntax
+    let fn = (await import(buildFileUrl)).default;
+    return fn;
   } catch (err) {
-    err.message = `Could not require '${file}': ${err.message}`;
+    err.message = `Could not \`import('${buildFileUrl}')\`: ${err.message}`;
     throw err;
   }
-
-  return buildFile;
 };

package/lib/utilities/lint-fix.js

@@ -1,26 +1,27 @@
 'use strict';
 
-const fs = require('fs-extra');
 const execa = require('../utilities/execa');
+const isYarnProject = require('../utilities/is-yarn-project');
+const prependEmoji = require('../utilities/prepend-emoji');
 
-async function run(ui) {
+async function run(project) {
   let lintFixScriptName = 'lint:fix';
-  let cwd = process.cwd();
-  let packageJson = fs.readJsonSync('package.json');
-
-  let hasLintFixScript = !!packageJson.scripts[lintFixScriptName];
+  let hasLintFixScript = Boolean(project.pkg.scripts[lintFixScriptName]);
 
   if (!hasLintFixScript) {
-    ui.writeWarnLine(
-      'Lint fix skipped: "lint:fix" not found in package.json scripts. New files might not pass linting.'
+    project.ui.writeWarnLine(
+      `Lint fix skipped: "${lintFixScriptName}" script not found in "package.json". New files might not pass linting.`
     );
 
     return;
   }
 
-  let usingYarn = fs.existsSync('yarn.lock');
+  project.ui.writeLine('');
+  project.ui.writeLine(prependEmoji('✨', `Running "${lintFixScriptName}" script...`));
+
+  let cwd = process.cwd();
 
-  if (usingYarn) {
+  if (isYarnProject(project.root)) {
     await execa('yarn', [lintFixScriptName], { cwd });
   } else {
     await execa('npm', ['run', lintFixScriptName], { cwd });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.8.0",
+  "version": "4.9.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,7 +37,7 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.19.3",
     "@babel/plugin-transform-modules-amd": "^7.18.6",
     "amd-name-resolver": "^1.3.1",
     "babel-plugin-module-resolver": "^4.1.0",
@@ -61,7 +61,7 @@
     "calculate-cache-key-for-tree": "^2.0.0",
     "capture-exit": "^2.0.0",
     "chalk": "^4.1.2",
-    "ci-info": "^3.3.2",
+    "ci-info": "^3.4.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -79,7 +79,7 @@
     "execa": "^5.1.1",
     "exit": "^0.1.2",
     "express": "^4.18.1",
-    "filesize": "^9.0.11",
+    "filesize": "^10.0.5",
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
@@ -87,13 +87,14 @@
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^7.2.0",
+    "glob": "^8.0.3",
     "heimdalljs": "^0.2.6",
     "heimdalljs-fs-monitor": "^1.1.1",
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
     "inflection": "^1.13.1",
+    "inquirer": "^8.2.1",
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
     "isbinaryfile": "^5.0.0",
@@ -105,9 +106,10 @@
     "minimatch": "^5.1.0",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
-    "npm-package-arg": "^9.1.0",
+    "npm-package-arg": "^9.1.2",
+    "os-locale": "^5.0.0",
     "p-defer": "^3.0.0",
-    "portfinder": "^1.0.29",
+    "portfinder": "^1.0.32",
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.8",
@@ -121,7 +123,7 @@
     "sort-package-json": "^1.57.0",
     "symlink-or-copy": "^1.3.1",
     "temp": "0.9.4",
-    "testem": "^3.8.0",
+    "testem": "^3.9.0",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
     "uuid": "^8.3.2",
@@ -141,7 +143,7 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.23.0",
+    "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.1.0",
@@ -154,7 +156,7 @@
     "nock": "^13.2.9",
     "nyc": "^15.1.0",
     "prettier": "2.7.1",
-    "release-it": "^15.4.1",
+    "release-it": "^15.4.2",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
     "supertest": "^6.2.4",

package/blueprints/addon/additional-dev-dependencies.json

@@ -1,8 +0,0 @@
-{
-  "devDependencies": {
-    "@embroider/test-setup": "^1.8.3",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-try": "^2.0.0",
-    "ember-source-channel-url": "^3.0.0"
-  }
-}

package/blueprints/addon/files/addon-config/environment.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};