ember-cli 5.3.0 → 5.4.0

package/lib/tasks/server/livereload-server.js

@@ -49,12 +49,11 @@ function readSSLandCert(sslKey, sslCert) {
 const DEFAULT_PREFIX = '/';
 
 module.exports = class LiveReloadServer {
-  constructor({ app, watcher, ui, project, analytics, httpServer }) {
+  constructor({ app, watcher, ui, project, httpServer }) {
     this.app = app;
     this.watcher = watcher;
     this.ui = ui;
     this.project = project;
-    this.analytics = analytics;
     this.httpServer = httpServer;
     this.liveReloadPrefix = DEFAULT_PREFIX;
   }
@@ -224,11 +223,6 @@ module.exports = class LiveReloadServer {
           files,
         },
       });
-
-      this.analytics.track({
-        name: 'broccoli watcher',
-        message: 'live-reload',
-      });
     }
   }
 
@@ -238,10 +232,5 @@ module.exports = class LiveReloadServer {
         files: ['LiveReload files'],
       },
     });
-
-    this.analytics.track({
-      name: 'express server',
-      message: 'live-reload',
-    });
   }
 };

package/lib/utilities/get-lang-arg.js

@@ -153,17 +153,16 @@ As examples, the parser behavior would likely affect the following usages:
   2. `ember new app-name --lang`
 
 In this context, the unintended parser behavior is that `langArg` will be
-assingned to the String that immediately follows `--lang` in the command. If
+assigned to the String that immediately follows `--lang` in the command. If
 `--lang` is the last explicitly defined part of the command (as in the second
 example above), the first of any any `hidden` options pushed onto the command
-after the initial parse (e.g. `--disable-analytics`, `--no-watcher`) will be
+after the initial parse (e.g. `--no-watcher`) will be
 used when assigning `langArg`.
 
 In the above examples, `langArg` would likely be assigned as follows:
   1. `ember new app-name --lang --skip-npm => `langArg='--skip-npm'`
-  2. `ember new app-name --lang` => `langArg='--disable-analytics'`
 
-The workaround impelemented herein is to check whether or not the value of
+The workaround implemented herein is to check whether or not the value of
 `langArg` starts with a hyphen. The rationale for this approach is based on
 the following underlying assumptions:
   - ALL CLI options start with (at least one) hyphen

package/lib/utilities/lint-fix.js

@@ -1,8 +1,7 @@
 'use strict';
 
 const execa = require('../utilities/execa');
-const isYarnProject = require('../utilities/is-yarn-project');
-const isPnpmProject = require('../utilities/is-pnpm-project');
+const { isPnpmProject, isYarnProject } = require('../utilities/package-managers');
 const prependEmoji = require('../utilities/prepend-emoji');
 
 async function run(project) {

package/lib/utilities/package-managers.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const fs = require('fs');
+
+async function determineInstallCommand(projectRoot) {
+  if (await isPnpmProject(projectRoot)) {
+    return 'pnpm install';
+  } else if (isYarnProject(projectRoot)) {
+    return 'yarn install';
+  } else {
+    return 'npm install';
+  }
+}
+
+async function isPnpmProject(projectRoot) {
+  if (fs.existsSync(`${projectRoot}/pnpm-lock.yaml`)) {
+    return true;
+  }
+
+  const { findWorkspaceDir } = await import('@pnpm/find-workspace-dir');
+
+  if (await findWorkspaceDir(projectRoot)) {
+    return true;
+  }
+
+  return false;
+}
+
+function isYarnProject(projectRoot) {
+  if (fs.existsSync(`${projectRoot}/yarn.lock`)) {
+    return true;
+  }
+
+  const findWorkspaceRoot = require('find-yarn-workspace-root');
+
+  if (findWorkspaceRoot(projectRoot)) {
+    return true;
+  }
+
+  return false;
+}
+
+module.exports = {
+  determineInstallCommand,
+  isPnpmProject,
+  isYarnProject,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.3.0",
+  "version": "5.4.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,7 +37,6 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.22.10",
     "@pnpm/find-workspace-dir": "^6.0.2",
     "broccoli": "^3.5.2",
     "broccoli-builder": "^0.18.14",
@@ -91,7 +90,6 @@
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
     "isbinaryfile": "^5.0.0",
-    "leek": "0.0.24",
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-terminal": "^0.4.0",
@@ -118,7 +116,6 @@
     "testem": "^3.10.1",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
-    "uuid": "^9.0.0",
     "walk-sync": "^3.0.0",
     "watch-detector": "^1.0.2",
     "workerpool": "^6.4.0",
@@ -159,7 +156,7 @@
     "yuidocjs": "0.10.2"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -174,9 +171,8 @@
       "tokenRef": "GITHUB_AUTH"
     }
   },
-  "trackingCode": "UA-49225444-1",
   "volta": {
-    "node": "16.19.1",
+    "node": "18.12.0",
     "yarn": "1.22.19"
   }
 }

package/tests/helpers/acceptance.js

@@ -34,7 +34,7 @@ function handleResult(result) {
 function applyCommand(command, name /*, ...flags*/) {
   let flags = [].slice.call(arguments, 2, arguments.length);
   let binaryPath = path.resolve(path.join(__dirname, '..', '..', 'bin', 'ember'));
-  let args = [binaryPath, command, name, '--disable-analytics', '--watcher=node', '--skip-git', runCommandOptions];
+  let args = [binaryPath, command, name, '--watcher=node', '--skip-git', runCommandOptions];
 
   flags.forEach(function (flag) {
     args.splice(2, 0, flag);

package/tests/helpers/ember.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const MockUI = require('console-ui/mock');
-const MockAnalytics = require('./mock-analytics');
 const cli = require('../../lib/cli');
 const MockProcess = require('./mock-process');
 const path = require('path');
@@ -59,11 +58,10 @@ module.exports = function ember(args, options) {
     delete require.cache[path.join(process.cwd(), 'testem.js')];
   }
 
-  args.push('--disable-analytics');
   args.push('--watcher=node');
 
   if (!options || options.skipGit !== false) {
-    args.push('--skipGit');
+    args.push('--skip-git');
   }
 
   // Most tests don't npm install so let's disable lint fixing by default
@@ -79,7 +77,6 @@ module.exports = function ember(args, options) {
     outputStream,
     errorLog,
     cliArgs: args,
-    Leek: MockAnalytics,
     UI: ui,
     testing: true,
     disableDependencyChecker,

package/lib/utilities/get-package-manager-from-flags.js

@@ -1,38 +0,0 @@
-'use strict';
-
-/**
- * Returns the package manager, given an object where folks can *technically*
- * pass --pnpm --yarn --npm. But using multiple package managers at the
- * same time is not supported (by anything).
- *
- * This function defines the priority of package managers, if multiple are present.
- *
- * @private
- * @method getPackageManagerFromFlags
- * @param {{ pnpm?: boolean; yarn?: boolean; packageManager?: 'pnpm' | 'yarn' | 'npm' }} options
- * @return {'pnpm' | 'yarn' | 'npm' | undefined}
- */
-function getPackageManagerFromFlags(options) {
-  let { pnpm, yarn, packageManager } = options;
-
-  if (packageManager) {
-    return packageManager;
-  }
-
-  if (pnpm) {
-    return 'pnpm';
-  }
-
-  if (yarn) {
-    return 'yarn';
-  }
-
-  // supported for legacy reasons
-  if (yarn === false) {
-    return 'npm';
-  }
-
-  return undefined;
-}
-
-module.exports = { getPackageManagerFromFlags };

package/lib/utilities/is-pnpm-project.js

@@ -1,27 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-
-/**
- * Returns true if and only if the given directory has a pnpm-lock.yaml file or is a child of a
- * pnpm workspace root.
- * @private
- * @method isPnpmProject
- * @param {string} thePath
- * @return {Promise<boolean>}
- */
-async function isPnpmProject(thePath) {
-  if (fs.existsSync(`${thePath}/pnpm-lock.yaml`)) {
-    return true;
-  }
-
-  const { findWorkspaceDir } = await import('@pnpm/find-workspace-dir');
-
-  if (await findWorkspaceDir(thePath)) {
-    return true;
-  }
-
-  return false;
-}
-
-module.exports = isPnpmProject;

package/lib/utilities/is-yarn-project.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const findWorkspaceRoot = require('find-yarn-workspace-root');
-
-/**
- * Returns true if and only if the given directory has a yarn.lock file or is a child of a
- * yarn workspace root.
- * @private
- * @method isYarnProject
- * @param {string} thePath
- * @return {boolean}
- */
-function isYarnProject(thePath) {
-  if (fs.existsSync(`${thePath}/yarn.lock`)) {
-    return true;
-  }
-
-  if (findWorkspaceRoot(thePath)) {
-    return true;
-  }
-
-  return false;
-}
-
-module.exports = isYarnProject;

package/tests/helpers/mock-analytics.js

@@ -1,23 +0,0 @@
-'use strict';
-
-class MockAnalytics {
-  constructor() {
-    this.tracks = [];
-    this.trackTimings = [];
-    this.trackErrors = [];
-  }
-
-  track(arg) {
-    this.tracks.push(arg);
-  }
-
-  trackTiming(arg) {
-    this.trackTimings.push(arg);
-  }
-
-  trackError(arg) {
-    this.trackErrors.push(arg);
-  }
-}
-
-module.exports = MockAnalytics;