ember-cli 4.12.0 → 4.13.0-beta.0

package/lib/tasks/npm-task.js

@@ -211,21 +211,6 @@ class NpmTask extends Task {
       } else {
         let args = this.toNpmArgs(this.command, options);
         await this.npm(args);
-
-        // as of 2018-10-09 npm 5 and 6 _break_ the hierarchy of `node_modules`
-        // after a `npm install foo` (deletes files/folders other than
-        // what was directly installed) in some circumstances, see:
-        //
-        // * https://github.com/npm/npm/issues/16853
-        // * https://github.com/npm/npm/issues/17379
-        //
-        // this ensures that we run a full `npm install` **after** any `npm
-        // install foo` runs to ensure that we have a fully functional
-        // node_modules hierarchy
-        let npmVersion = this.packageManager.version;
-        if (npmVersion && semver.lt(npmVersion, '5.7.1')) {
-          await this.npm(['install']);
-        }
       }
     } finally {
       ui.stopProgress();

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

@@ -251,7 +251,6 @@ class ExpressServerTask extends Task {
     const config = this.project.config(options.environment);
     const middlewareOptions = Object.assign({}, options, {
       rootURL: config.rootURL,
-      baseURL: config.baseURL || '/',
     });
 
     await liveReloadServer.setupMiddleware(this.startOptions);

package/lib/tasks/server/middleware/broccoli-watcher/index.js

@@ -27,20 +27,20 @@ class WatcherAddon {
       autoIndex: false, // disable directory listings
     });
 
-    let baseURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL || options.baseURL);
+    let rootURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL);
 
-    logger.info('serverMiddleware: baseURL: %s', baseURL);
+    logger.info('serverMiddleware: rootURL: %s', rootURL);
 
     app.use((req, res, next) => {
       let oldURL = req.url;
       let url = req.serveUrl || req.url;
       logger.info('serving: %s', url);
 
-      let actualPrefix = req.url.slice(0, baseURL.length - 1); // Don't care
-      let expectedPrefix = baseURL.slice(0, baseURL.length - 1); // about last slash
+      let actualPrefix = req.url.slice(0, rootURL.length - 1); // Don't care
+      let expectedPrefix = rootURL.slice(0, rootURL.length - 1); // about last slash
 
       if (actualPrefix === expectedPrefix) {
-        let urlToBeServed = url.slice(actualPrefix.length); // Remove baseURL prefix
+        let urlToBeServed = url.slice(actualPrefix.length); // Remove rootURL prefix
         req.url = urlToBeServed;
         logger.info('serving: (prefix stripped) %s, was: %s', urlToBeServed, url);
 

package/lib/tasks/server/middleware/history-support/index.js

@@ -44,8 +44,7 @@ class HistorySupportAddon {
     let app = config.app;
     let options = config.options;
     let watcher = options.watcher;
-
-    let baseURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL || options.baseURL);
+    let rootURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL);
 
     app.use(async (req, _, next) => {
       try {
@@ -60,7 +59,7 @@ class HistorySupportAddon {
         }
 
         if (this.shouldHandleRequest(req, options)) {
-          let assetPath = req.path.slice(baseURL.length);
+          let assetPath = req.path.slice(rootURL.length);
           let isFile = false;
 
           try {
@@ -69,7 +68,7 @@ class HistorySupportAddon {
             /* ignore */
           }
           if (!isFile) {
-            req.serveUrl = `${baseURL}index.html`;
+            req.serveUrl = `${rootURL}index.html`;
           }
         }
       } finally {
@@ -87,9 +86,9 @@ class HistorySupportAddon {
     if (!hasHTMLHeader) {
       return false;
     }
-    let baseURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL || options.baseURL);
-    let baseURLRegexp = new RegExp(`^${baseURL}`);
-    return baseURLRegexp.test(req.path);
+    let rootURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL);
+    let rootURLRegexp = new RegExp(`^${rootURL}`);
+    return rootURLRegexp.test(req.path);
   }
 }
 

package/lib/tasks/server/middleware/testem-url-rewriter/index.js

@@ -16,16 +16,6 @@ class TestemUrlRewriterAddon {
     let config = this.project.config(env);
     logger.info('config.rootURL = %s', config.rootURL);
 
-    this.project.ui.writeDeprecateLine(
-      'Using the `baseURL` setting is deprecated, use `rootURL` instead.',
-      !(!('rootURL' in config) && config.baseURL)
-    );
-
-    this.project.ui.writeWarnLine(
-      'The `baseURL` and `rootURL` settings should not be used at the same time.',
-      !('rootURL' in config && config.baseURL)
-    );
-
     let rootURL = cleanBaseURL(config.rootURL) || '/';
     logger.info('rootURL = %s', rootURL);
 

package/lib/tasks/server/middleware/tests-server/index.js

@@ -8,7 +8,7 @@ const logger = require('heimdalljs-logger')('ember-cli:test-server');
 module.exports = class TestsServerAddon {
   /**
    * This addon is used to serve the QUnit or Mocha test runner
-   * at `baseURL + '/tests'`.
+   * at `rootURL + '/tests'`.
    *
    * @class TestsServerAddon
    * @constructor
@@ -22,9 +22,8 @@ module.exports = class TestsServerAddon {
     let app = config.app;
     let options = config.options;
     let watcher = options.watcher;
-
-    let baseURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL || options.baseURL);
-    let testsPath = `${baseURL}tests`;
+    let rootURL = options.rootURL === '' ? '/' : cleanBaseURL(options.rootURL);
+    let testsPath = `${rootURL}tests`;
 
     app.use(async (req, _, next) => {
       let results;
@@ -42,7 +41,7 @@ module.exports = class TestsServerAddon {
       }
 
       if (watcherSuccess) {
-        rewriteRequestUrlIfBasePageIsNeeded(req, testsPath, baseURL, results.directory);
+        rewriteRequestUrlIfBasePageIsNeeded(req, testsPath, rootURL, results.directory);
       }
 
       next();
@@ -54,7 +53,7 @@ module.exports = class TestsServerAddon {
   }
 };
 
-function rewriteRequestUrlIfBasePageIsNeeded(req, testsPath, baseURL, directory) {
+function rewriteRequestUrlIfBasePageIsNeeded(req, testsPath, rootURL, directory) {
   let acceptHeaders = req.headers.accept || [];
   let hasHTMLHeader = acceptHeaders.indexOf('text/html') !== -1;
   let hasWildcardHeader = acceptHeaders.indexOf('*/*') !== -1;
@@ -64,12 +63,12 @@ function rewriteRequestUrlIfBasePageIsNeeded(req, testsPath, baseURL, directory)
   logger.info('isForTests: %o', isForTests);
 
   if (isForTests && (hasHTMLHeader || hasWildcardHeader) && req.method === 'GET') {
-    let assetPath = req.path.slice(baseURL.length);
+    let assetPath = req.path.slice(rootURL.length);
     let filePath = path.join(directory, assetPath);
 
     if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
-      // N.B., `baseURL` will end with a slash as it went through `cleanBaseURL`
-      let newURL = `${baseURL}tests/index.html`;
+      // N.B., `rootURL` will end with a slash as it went through `cleanBaseURL`
+      let newURL = `${rootURL}tests/index.html`;
       logger.info('url: %s resolved to path: %s which is not a file. Assuming %s instead', req.path, filePath, newURL);
       req.url = newURL;
     }

package/lib/utilities/ember-app-utils.js

@@ -34,24 +34,6 @@ function convertObjectToString(env) {
   return JSON.stringify(env || {});
 }
 
-/**
- * Returns the <base> tag for index.html.
- *
- * @method calculateBaseTag
- * @param {String} baseURL
- * @param {String} locationType 'history', 'none' or 'hash'.
- * @return {String} Base tag or an empty string
- */
-function calculateBaseTag(baseURL, locationType) {
-  let normalizedBaseUrl = cleanBaseURL(baseURL);
-
-  if (locationType === 'hash') {
-    return '';
-  }
-
-  return normalizedBaseUrl ? `<base href="${normalizedBaseUrl}" />` : '';
-}
-
 /**
  * Returns the content for a specific type (section) for index.html.
  *
@@ -90,8 +72,6 @@ function contentFor(config, match, type, options) {
 
   switch (type) {
     case 'head':
-      content.push(calculateBaseTag(config.baseURL, config.locationType));
-
       if (options.storeConfigInMeta) {
         content.push(
           `<meta name="${config.modulePrefix}/config/environment" content="${encodeURIComponent(
@@ -195,4 +175,4 @@ function configReplacePatterns(options) {
   ];
 }
 
-module.exports = { normalizeUrl, convertObjectToString, calculateBaseTag, contentFor, configReplacePatterns };
+module.exports = { normalizeUrl, convertObjectToString, contentFor, configReplacePatterns };

package/lib/utilities/get-serve-url.js

@@ -4,7 +4,7 @@ const cleanBaseURL = require('clean-base-url');
 
 module.exports = function (options, project) {
   let config = project.config(options.environment);
+  let rootURL = config.rootURL === '' ? '/' : cleanBaseURL(config.rootURL || '/');
 
-  let baseURL = config.rootURL === '' ? '/' : cleanBaseURL(config.rootURL || config.baseURL || '/');
-  return `http${options.ssl ? 's' : ''}://${options.host || 'localhost'}:${options.port}${baseURL}`;
+  return `http${options.ssl ? 's' : ''}://${options.host || 'localhost'}:${options.port}${rootURL}`;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.12.0",
+  "version": "4.13.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,15 +37,8 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.21.0",
-    "@babel/plugin-transform-modules-amd": "^7.20.11",
-    "amd-name-resolver": "^1.3.1",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "bower-config": "^1.4.3",
-    "bower-endpoint-parser": "0.2.2",
+    "@babel/core": "^7.21.4",
     "broccoli": "^3.5.2",
-    "broccoli-amd-funnel": "^2.0.1",
-    "broccoli-babel-transpiler": "^7.8.1",
     "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^4.2.5",
     "broccoli-config-loader": "^1.0.1",
@@ -82,7 +75,7 @@
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^11.1.0",
+    "fs-extra": "^11.1.1",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
@@ -93,7 +86,7 @@
     "heimdalljs-logger": "^0.1.10",
     "http-proxy": "^1.18.1",
     "inflection": "^2.0.1",
-    "inquirer": "^8.2.1",
+    "inquirer": "^9.1.5",
     "is-git-url": "^1.0.0",
     "is-language-code": "^3.1.0",
     "isbinaryfile": "^5.0.0",
@@ -102,7 +95,7 @@
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^7.4.1",
+    "minimatch": "^7.4.3",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
     "npm-package-arg": "^10.1.0",
@@ -141,20 +134,20 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.35.0",
+    "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-chai-expect": "^3.0.0",
     "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-n": "^15.3.0",
+    "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-prettier": "^4.2.1",
     "fixturify": "^3.0.0",
-    "jsdom": "^21.1.0",
+    "jsdom": "^21.1.1",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
-    "nock": "^13.2.9",
+    "nock": "^13.3.0",
     "nyc": "^15.1.0",
-    "prettier": "2.8.2",
-    "release-it": "^15.6.0",
+    "prettier": "2.8.7",
+    "release-it": "^15.10.0",
     "rimraf": "^3.0.2",
     "strip-ansi": "^6.0.0",
     "supertest": "^6.3.1",
@@ -166,15 +159,12 @@
     "yuidocjs": "0.10.2"
   },
   "engines": {
-    "node": ">= 14"
+    "node": ">= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "release-it": {
-    "hooks": {
-      "after:release": "node ./dev/update-output-repos.js"
-    },
     "git": {
       "tagName": "v${version}"
     },
@@ -186,7 +176,7 @@
   },
   "trackingCode": "UA-49225444-1",
   "volta": {
-    "node": "14.21.3",
+    "node": "16.19.1",
     "yarn": "1.22.19"
   }
 }

package/tests/helpers/acceptance.js

@@ -64,9 +64,7 @@ function createTestTargets(projectName, options) {
   options = options || {};
   options.command = options.command || 'new';
 
-  return applyCommand(options.command, projectName, '--skip-npm', '--skip-bower', `--directory=${outputDir}`).catch(
-    handleResult
-  );
+  return applyCommand(options.command, projectName, '--skip-npm', `--directory=${outputDir}`).catch(handleResult);
 }
 
 /**

package/tests/helpers/command-generator.js

@@ -9,8 +9,8 @@ const execa = require('../../lib/utilities/execa');
  * Usage:
  *
  * ```
- * var bower = new CommandGenerator(require.resolve('bower/bin/bower'));
- * bower.invoke('install', 'ember');
+ * let npm = new CommandGenerator('npm');
+ * npm.invoke('install', 'ember-source', '--save-dev');
  * ```
  *
  * @private

package/tests/helpers/default-packager.js

@@ -10,7 +10,6 @@ const assert = require('assert');
 const DEFAULT_ADDON_MODULES = {
   'ember-cli-foobar': '^1.0.0',
 };
-const DEFAULT_BOWER_COMPONENTS = {};
 
 const DEFAULT_NODE_MODULES = {
   'broccoli-asset-rev': {
@@ -72,9 +71,6 @@ const DEFAULT_VENDOR = {
     'loader.js': 'W',
   },
   ember: {
-    jquery: {
-      'jquery.js': 'window.$ = function() {}',
-    },
     'ember.js': 'window.Ember = {};',
     'ember.debug.js': 'window.Ember = {};',
   },
@@ -151,7 +147,7 @@ const DEFAULT_SOURCE = {
 
 /*
  * Generates an object that represents an unpackaged Ember application tree,
- * including application source, addons, vendor, bower (empty) and node.js files.
+ * including application source, addons, vendor and node.js files.
  *
  * @param {String} name The name of the app
  * @param {Object} options Customize output object
@@ -162,14 +158,12 @@ function getDefaultUnpackagedDist(name, options) {
   options = options || {};
 
   const addonModules = Object.assign({}, DEFAULT_ADDON_MODULES, options.addonModules);
-  const bowerComponents = options.bowerComponents || DEFAULT_BOWER_COMPONENTS;
   const nodeModules = options.nodeModules || DEFAULT_NODE_MODULES;
   const application = Object.assign({}, DEFAULT_SOURCE, options.source);
   const vendor = Object.assign({}, DEFAULT_VENDOR, options.vendor);
 
   return {
     'addon-modules': addonModules,
-    bower_components: bowerComponents,
     node_modules: nodeModules,
     [name]: application,
     vendor,
@@ -209,8 +203,8 @@ function validateDefaultPackagedDist(name, obj) {
 }
 
 /*
- * Generates an object that represents a "dependency" on the disk. Could be used
- * both for generating bower and node dependencies.
+ * Generates an object that represents a "dependency" on the disk.
+ * Could be used for generating node dependencies.
  *
  * ```javascript
  * getDependencyFor('moment', {

package/tests/helpers/init-app.js

@@ -3,7 +3,7 @@
 const ember = require('./ember');
 
 function initApp() {
-  return ember(['init', '--name=my-app', '--skip-npm', '--skip-bower']);
+  return ember(['init', '--name=my-app', '--skip-npm']);
 }
 
 module.exports = initApp;

package/tests/helpers/mock-project.js

@@ -38,7 +38,7 @@ class MockProject extends Project {
   config() {
     return (
       this._config || {
-        baseURL: '/',
+        rootURL: '/',
         locationType: 'history',
       }
     );

package/tests/helpers/package-cache.js

@@ -22,18 +22,6 @@ cases where we use this.
 */
 let DEPENDENCY_KEYS = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];
 
-/**
- * The `bower` command helper.
- *
- * @private
- * @method bower
- * @param {String} subcommand The subcommand to be passed into bower.
- * @param {String} [...arguments] Arguments to be passed into the bower subcommand.
- * @param {Object} [options={}] The options passed into child_process.spawnSync.
- *   (https://nodejs.org/api/child_process.html#child_process_child_process_spawnsync_command_args_options)
- */
-let bower = new CommandGenerator('bower');
-
 /**
  * The `npm` command helper.
  *
@@ -61,7 +49,6 @@ let yarn = new CommandGenerator('yarn');
 // This lookup exists to make it possible to look the commands up based upon context.
 let originals;
 let commands = {
-  bower,
   npm,
   yarn,
 };
@@ -69,17 +56,14 @@ let commands = {
 // The definition list of translation terms.
 let lookups = {
   manifest: {
-    bower: 'bower.json',
     npm: 'package.json',
     yarn: 'package.json',
   },
   path: {
-    bower: 'bower_components',
     npm: 'node_modules',
     yarn: 'node_modules',
   },
   upgrade: {
-    bower: 'update',
     npm: 'install',
     yarn: 'upgrade',
   },
@@ -92,7 +76,7 @@ let lookups = {
  *
  * @private
  * @method translate
- * @param {String} type Either 'bower', 'npm', or 'yarn'.
+ * @param {String} type Either 'npm' or 'yarn'.
  * @param {String} lookup Either 'manifest', 'path', or 'upgrade'.
  */
 function translate(type, lookup) {
@@ -217,7 +201,6 @@ function translate(type, lookup) {
  * is "best effort" only. Be sure to review upstream behavior to identify if you
  * rely on those features for your code to function:
  *
- * - [bower](https://github.com/bower/bower/blob/master/lib/commands/link.js)
  * - [npm](https://github.com/npm/npm/blob/latest/lib/link.js)
  * - [yarn](https://github.com/yarnpkg/yarn/blob/master/src/cli/commands/link.js)
  *
@@ -570,7 +553,7 @@ module.exports = class PackageCache {
   }
 
   _canUpgrade(label, type) {
-    return type === 'bower' || (type === 'yarn' && fs.existsSync(path.join(this.dirs[label], 'yarn.lock')));
+    return type === 'yarn' && fs.existsSync(path.join(this.dirs[label], 'yarn.lock'));
   }
 
   // PUBLIC API BELOW

package/blueprints/server/files/server/.jshintrc

@@ -1,3 +0,0 @@
-{
-  "node": true
-}

package/blueprints/vendor-shim/files/vendor/shims/__name__.js

@@ -1,12 +0,0 @@
-(function() {
-  function vendorModule() {
-    'use strict';
-
-    return {
-      'default': self['<%= name %>'],
-      __esModule: true,
-    };
-  }
-
-  define('<%= name %>', [], vendorModule);
-})();

package/blueprints/vendor-shim/index.js

@@ -1,30 +0,0 @@
-'use strict';
-
-const stringUtil = require('ember-cli-string-utils');
-const { deprecate } = require('../../lib/debug');
-
-module.exports = {
-  description: 'Generates an ES6 module shim for global libraries.',
-
-  beforeInstall() {
-    deprecate('The `vendor-shim` blueprint is deprecated. Please use `ember-auto-import` instead.', false, {
-      for: 'ember-cli',
-      id: 'ember-cli.vendor-shim-blueprint',
-      since: {
-        available: '4.6.0',
-        enabled: '4.6.0',
-      },
-      until: '5.0.0',
-    });
-  },
-
-  locals(options) {
-    let entity = options.entity;
-    let rawName = entity.name;
-    let name = stringUtil.dasherize(rawName);
-
-    return {
-      name,
-    };
-  },
-};

package/lib/broccoli/babel-process-modules-only.js

@@ -1,18 +0,0 @@
-'use strict';
-
-module.exports = function processModulesOnly(tree, annotation) {
-  const ResolveModulePaths = require('amd-name-resolver/relative-module-paths');
-
-  let options = {
-    plugins: [
-      [require.resolve('babel-plugin-module-resolver'), { resolvePath: ResolveModulePaths.resolveRelativeModulePath }],
-      [require.resolve('@babel/plugin-transform-modules-amd'), { noInterop: true }],
-    ],
-    moduleIds: true,
-    getModuleId: ResolveModulePaths.getRelativeModulePath,
-    annotation,
-  };
-
-  const Babel = require('broccoli-babel-transpiler');
-  return new Babel(tree, options);
-};

package/lib/models/installation-checker.js

@@ -1,87 +0,0 @@
-'use strict';
-
-const logger = require('heimdalljs-logger')('ember-cli:installation-checker');
-const fs = require('fs-extra');
-const path = require('path');
-const SilentError = require('silent-error');
-
-class InstallationChecker {
-  constructor(options) {
-    this.project = options.project;
-  }
-
-  /**
-   * Check if npm and bower installation directories are present,
-   * and raise an error message with instructions on how to proceed.
-   *
-   * If some of these package managers aren't being used in the project
-   * we just ignore them. Their usage is considered by checking the
-   * presence of your manifest files: package.json for npm and bower.json for bower.
-   *
-   * @method checkInstallations
-   */
-  checkInstallations() {
-    let commands = [];
-
-    if (this.usingNpm() && this.npmDependenciesNotPresent()) {
-      logger.info('npm dependencies not installed');
-      const command = this.usingYarn() ? '`yarn`' : '`npm install`';
-      commands.push(command);
-    }
-
-    if (this.usingBower() && this.bowerDependenciesNotPresent()) {
-      logger.info('bower dependencies not installed');
-      commands.push('`bower install`');
-    }
-    if (commands.length) {
-      let commandText = commands.join(' and ');
-      throw new SilentError(`No dependencies installed. Run ${commandText} to install missing dependencies.`);
-    }
-  }
-
-  hasBowerDeps() {
-    return hasDependencies(readJSON(path.join(this.project.root, 'bower.json')));
-  }
-
-  usingBower() {
-    return fs.existsSync(path.join(this.project.root, 'bower.json')) && this.hasBowerDeps();
-  }
-
-  bowerDependenciesNotPresent() {
-    return !fs.existsSync(this.project._bowerDirectory);
-  }
-
-  hasNpmDeps() {
-    return hasDependencies(readJSON(path.join(this.project.root, 'package.json')));
-  }
-
-  usingNpm() {
-    return this.fileExistsInRoot('package.json') && this.hasNpmDeps();
-  }
-
-  usingYarn() {
-    return this.fileExistsInRoot('yarn.lock') && this.hasNpmDeps();
-  }
-
-  fileExistsInRoot(fileName) {
-    return fs.existsSync(path.join(this.project.root, fileName));
-  }
-
-  npmDependenciesNotPresent() {
-    return !this.project.hasDependencies();
-  }
-}
-
-module.exports = InstallationChecker;
-
-function hasDependencies(pkg) {
-  return (pkg.dependencies && pkg.dependencies.length) || (pkg.devDependencies && pkg.devDependencies.length);
-}
-
-function readJSON(path) {
-  try {
-    return fs.readJsonSync(path);
-  } catch (e) {
-    throw new SilentError(`InstallationChecker: Unable to parse: ${path}`);
-  }
-}