ember-cli 4.9.0 → 4.10.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ember-cli Changelog
 
+## v4.10.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.9.0...v4.10.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.9.0...v4.10.0-beta.0)
+
+#### Changelog
+
+- [#10048](https://github.com/ember-cli/ember-cli/pull/10048) Make addAddonsToProject support creating a new project with custom target directory [@simonihmig](https://github.com/simonihmig)
+- [#10054](https://github.com/ember-cli/ember-cli/pull/10054) [ENHANCEMENT] Conditionally apply ESLint parser options in `app` and `addon` blueprints [@Windvis](https://github.com/Windvis)
+- [#10056](https://github.com/ember-cli/ember-cli/pull/10056) [INTERNAL] Use `eslint-plugin-n` instead of `eslint-plugin-node` [@bertdeblock](https://github.com/bertdeblock)
+- [#10060](https://github.com/ember-cli/ember-cli/pull/10060) [ENHANCEMENT] Replace `eslint-plugin-node` with `eslint-plugin-n` in blueprints [@Windvis](https://github.com/Windvis)
+- [#10062](https://github.com/ember-cli/ember-cli/pull/10062) [ENHANCEMENT] Update Prettier config in blueprints to only use single quotes for `.js` and `.ts` files [@Windvis](https://github.com/Windvis)
+
+Thank you to all who took the time to contribute!
+
 ## v4.9.0
 
 #### Blueprint Changes

package/blueprints/app/files/.eslintrc.js

@@ -4,11 +4,11 @@ module.exports = {
   root: true,
   parser: '<%= typescript ? '@typescript-eslint/parser' : 'babel-eslint' %>',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 2018,<% if (!typescript) { %>
     sourceType: 'module',
     ecmaFeatures: {
       legacyDecorators: true,
-    },
+    },<% } %>
   },
   plugins: ['ember'<% if (typescript) { %>, '@typescript-eslint'<% } %>],
   extends: [
@@ -45,20 +45,14 @@ module.exports = {
         './server/**/*.js',<% } else { %>
         './tests/dummy/config/**/*.js',<% } %>
       ],
-      parserOptions: {
+<% if (!typescript) { %>      parserOptions: {
         sourceType: 'script',
       },
-      env: {
+<% } %>      env: {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],<% if (blueprint === 'app') {%>
-      rules: {
-        // this can be removed once the following is fixed
-        // https://github.com/mysticatea/eslint-plugin-node/issues/77
-        'node/no-unpublished-require': 'off',
-      },<% } %>
+      extends: ['plugin:n/recommended'],
     },
     {
       // test files

package/blueprints/app/files/.prettierrc.js

@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

package/blueprints/app/files/package.json

@@ -45,19 +45,19 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.9.1",
+    "ember-data": "~4.10.0-beta.2",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.9.1",
+    "ember-source": "~4.10.0-beta.2",
     "ember-template-lint": "^5.2.0<% if (welcome) { %>",
     "ember-welcome-page": "^6.2.0<% } %>",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^11.2.1",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.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.9.0-release-f420b7f917"
+        "version": "4.10.0-beta.0-beta-0fcb3a31a0"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -4600,7 +4600,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1344,
+            "line": 1356,
             "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": 1362,
+            "line": 1374,
             "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": 1466,
+            "line": 1478,
             "description": "Used to retrieve a blueprint with the given name.",
             "itemtype": "method",
             "name": "lookupBlueprint",
@@ -4669,7 +4669,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1483,
+            "line": 1495,
             "static": 1,
             "itemtype": "method",
             "name": "lookup",
@@ -4716,7 +4716,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1532,
+            "line": 1544,
             "description": "Loads a blueprint from given path.",
             "static": 1,
             "itemtype": "method",
@@ -4744,7 +4744,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1560,
+            "line": 1572,
             "static": 1,
             "itemtype": "method",
             "name": "list",
@@ -4774,7 +4774,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1609,
+            "line": 1621,
             "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": 1624,
+            "line": 1636,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredFiles",
@@ -4795,7 +4795,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1630,
+            "line": 1642,
             "static": 1,
             "itemtype": "property",
             "name": "ignoredUpdateFiles",
@@ -4805,7 +4805,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1636,
+            "line": 1648,
             "static": 1,
             "itemtype": "property",
             "name": "defaultLookupPaths",
@@ -4815,7 +4815,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1644,
+            "line": 1656,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4837,7 +4837,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1657,
+            "line": 1669,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4855,7 +4855,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1668,
+            "line": 1680,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4873,7 +4873,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1677,
+            "line": 1689,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4900,7 +4900,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1691,
+            "line": 1703,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4922,7 +4922,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1703,
+            "line": 1715,
             "description": "Combines provided lookup paths with defaults and removes\nduplicates.",
             "access": "private",
             "tagname": "",
@@ -4945,7 +4945,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1718,
+            "line": 1730,
             "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": 1757,
+            "line": 1769,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -4990,7 +4990,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1771,
+            "line": 1783,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5012,7 +5012,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1781,
+            "line": 1793,
             "access": "private",
             "tagname": "",
             "itemtype": "method",
@@ -5027,7 +5027,7 @@
         },
         {
             "file": "lib/models/blueprint.js",
-            "line": 1794,
+            "line": 1806,
             "access": "private",
             "tagname": "",
             "itemtype": "method",

package/lib/models/blueprint.js

@@ -1319,6 +1319,7 @@ let Blueprint = CoreObject.extend({
     let installText = packages.length > 1 ? 'install addons' : 'install addon';
     this._writeStatusToUI(chalk.green, installText, taskOptions['packages'].join(', '));
 
+    let previousCwd;
     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
@@ -1332,13 +1333,24 @@ let Blueprint = CoreObject.extend({
       this.project.packageInfoCache._clear();
       const Project = require('../../lib/models/project');
       this.project = taskOptions.blueprintOptions.project = Project.closestSync(
-        this.project.root,
+        options.blueprintOptions.target,
         this.project.ui,
         this.project.cli
       );
+
+      // The install task adds dependencies based on the current working directory.
+      // But in case we created the new project by calling the blueprint with a custom target directory (options.target),
+      // the current directory will *not* be the one the project is created in, so we must adjust this here.
+      previousCwd = process.cwd();
+      process.chdir(options.blueprintOptions.target);
+    }
+
+    let result = this.taskFor('addon-install').run(taskOptions);
+    if (previousCwd) {
+      return result.then(() => process.chdir(previousCwd));
     }
 
-    return this.taskFor('addon-install').run(taskOptions);
+    return result;
   },
 
   /**

package/lib/models/command.js

@@ -190,7 +190,7 @@ let Command = CoreObject.extend({
     } else {
       // interrupt all external commands which don't use `runTask()` with an error
 
-      // eslint-disable-next-line no-process-exit
+      // eslint-disable-next-line n/no-process-exit
       process.exit(1);
     }
   },

package/lib/models/task.js

@@ -15,7 +15,7 @@ class Task extends CoreObject {
    * @method onInterrupt
    */
   onInterrupt() {
-    // eslint-disable-next-line no-process-exit
+    // eslint-disable-next-line n/no-process-exit
     process.exit(1);
   }
 }

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

@@ -22,7 +22,6 @@ module.exports = async function (dir) {
 
   let buildFileUrl = url.pathToFileURL(buildFilePath);
   try {
-    // eslint-disable-next-line node/no-unsupported-features/es-syntax
     let fn = (await import(buildFileUrl)).default;
     return fn;
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.9.0",
+  "version": "4.10.0-beta.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.19.3",
+    "@babel/core": "^7.19.6",
     "@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.4.0",
+    "ci-info": "^3.5.0",
     "clean-base-url": "^1.0.0",
     "compression": "^1.7.4",
     "configstore": "^5.0.1",
@@ -93,7 +93,7 @@
     "heimdalljs-graph": "^1.0.0",
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
-    "inflection": "^1.13.1",
+    "inflection": "^1.13.4",
     "inquirer": "^8.2.1",
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
@@ -134,7 +134,7 @@
   },
   "devDependencies": {
     "@ember/edition-utils": "^1.2.0",
-    "@octokit/rest": "^19.0.4",
+    "@octokit/rest": "^19.0.5",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.6",
@@ -147,7 +147,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^15.3.0",
     "eslint-plugin-prettier": "^4.2.1",
     "fixturify": "^2.1.0",
     "jsdom": "^20.0.0",
@@ -159,7 +159,7 @@
     "release-it": "^15.4.2",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
-    "supertest": "^6.2.4",
+    "supertest": "^6.3.1",
     "testdouble": "^3.16.6",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",

package/tests/helpers/assert-version-lock.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// eslint-disable-next-line node/no-unpublished-require
+// eslint-disable-next-line n/no-unpublished-require
 const expect = require('chai').expect;
 const semver = require('semver');
 

package/tests/helpers/dist-checker.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-// eslint-disable-next-line node/no-unpublished-require
+// eslint-disable-next-line n/no-unpublished-require
 const jsdom = require('jsdom');
 const { AssertionError } = require('assert');
 

package/tests/helpers/has-global-yarn.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* eslint-disable node/no-unpublished-require */
+// eslint-disable-next-line n/no-unpublished-require
 const which = require('which');
 
 module.exports = which.sync('yarn', { nothrow: true });

package/tests/helpers/mock-project.js

@@ -4,8 +4,6 @@ const Project = require('../../lib/models/project');
 const Instrumentation = require('../../lib/models/instrumentation');
 const MockUI = require('console-ui/mock');
 
-// eslint-disable-next-line node/no-unpublished-require
-
 class MockProject extends Project {
   constructor(options = {}) {
     let root = options.root || process.cwd();

package/tests/helpers/process-help-string.js

@@ -1,8 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-
-// eslint-disable-next-line node/no-unpublished-require
+// eslint-disable-next-line n/no-unpublished-require
 const stripAnsi = require('strip-ansi');
 
 module.exports = function (helpString) {

package/tests/helpers/proxy-server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const http = require('http');
-/* eslint-disable node/no-unpublished-require */
+// eslint-disable-next-line n/no-unpublished-require
 const WebSocketServer = require('websocket').server;
 
 class ProxyServer {