ember-cli 4.11.0-beta.0 → 4.11.1-beta.0

package/lib/broccoli/default-packager.js

@@ -557,10 +557,7 @@ module.exports = class DefaultPackager {
       };
 
       let stylesAndVendor = callAddonsPreprocessTreeHook(this.project, 'css', tree);
-      stylesAndVendor = this._debugTree(stylesAndVendor, 'mu-layout:addonsPreprocessTree:css');
-
       let preprocessedStyles = preprocessCss(stylesAndVendor, '/app/styles', '/assets', options);
-      preprocessedStyles = this._debugTree(preprocessedStyles, 'mu-layout:preprocess:css');
 
       let vendorStyles = [];
       for (let outputFile in this.styleOutputFiles) {

package/lib/commands/addon.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const SilentError = require('silent-error');
 const NewCommand = require('./new');
 
 module.exports = NewCommand.extend({
@@ -30,4 +31,16 @@ module.exports = NewCommand.extend({
   ],
 
   anonymousOptions: ['<addon-name>'],
+
+  run(commandOptions, commandArguments) {
+    let addonName = commandArguments[0];
+
+    if (addonName) {
+      return this._super(commandOptions, commandArguments);
+    }
+
+    return Promise.reject(
+      new SilentError('The `ember addon` command requires a name to be specified. For more details, run `ember help`.')
+    );
+  },
 });

package/lib/commands/new.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const fs = require('fs-extra');
 const chalk = require('chalk');
 const Command = require('../models/command');
 const Project = require('../models/project');
@@ -115,7 +114,7 @@ module.exports = Command.extend({
       project: Project.nullProject(this.ui, this.cli),
     });
 
-    let opts = await this.runTask('CreateAndStepIntoDirectory', {
+    await this.runTask('CreateAndStepIntoDirectory', {
       projectName,
       directoryName: commandOptions.directory,
       dryRun: commandOptions.dryRun,
@@ -123,17 +122,6 @@ module.exports = Command.extend({
 
     initCommand.project.root = process.cwd();
 
-    try {
-      let response = await initCommand.run(commandOptions, rawArgs);
-      return response;
-    } catch (err) {
-      let { initialDirectory, projectDirectory } = opts;
-
-      process.chdir(initialDirectory);
-      await fs.remove(projectDirectory);
-
-      console.log(chalk.red(`Error creating new application. Removing generated directory \`./${projectDirectory}\``));
-      throw err;
-    }
+    return await initCommand.run(commandOptions, rawArgs);
   },
 });

package/lib/commands/test.js

@@ -10,8 +10,6 @@ const fs = require('fs');
 const temp = require('temp');
 temp.track();
 
-require('express').static.mime.define({ 'application/wasm': ['wasm'] });
-
 let defaultPort = 7357;
 
 module.exports = Command.extend({
@@ -81,6 +79,9 @@ module.exports = Command.extend({
   init() {
     this._super.apply(this, arguments);
 
+    // Make sure Testem supports the Wasm MIME type:
+    require('express').static.mime.define({ 'application/wasm': ['wasm'] });
+
     this.Builder = this.Builder || Builder;
     this.Watcher = this.Watcher || Watcher;
 

package/lib/models/blueprint.js

@@ -23,7 +23,6 @@ const EOL = require('os').EOL;
 const bowEpParser = require('bower-endpoint-parser');
 const logger = require('heimdalljs-logger')('ember-cli:blueprint');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const { removeTypes } = require('remove-types');
 const isAddon = require('../utilities/is-addon');
 const { deprecate } = require('../debug');
 
@@ -532,6 +531,7 @@ let Blueprint = CoreObject.extend({
   async convertToJS(fileInfo) {
     let rendered = await fileInfo.render();
 
+    const { removeTypes } = require('remove-types');
     const transformed = await removeTypes(rendered);
 
     fileInfo.rendered = transformed;
@@ -1508,23 +1508,6 @@ let Blueprint = CoreObject.extend({
 Blueprint.lookup = function (name, options) {
   options = options || {};
 
-  if (name.includes(path.sep)) {
-    let blueprintPath = path.resolve(name);
-    let isNameAPath = Boolean(blueprintPath);
-
-    if (isNameAPath) {
-      if (Blueprint._existsSync(blueprintPath)) {
-        return Blueprint.load(blueprintPath, options.blueprintOptions);
-      }
-
-      if (!options.ignoreMissing) {
-        throw new SilentError(`Unknown blueprint: ${name}`);
-      }
-
-      return;
-    }
-  }
-
   let lookupPaths = generateLookupPaths(options.paths);
 
   let lookupPath;
@@ -1536,6 +1519,15 @@ Blueprint.lookup = function (name, options) {
     }
   }
 
+  // Check if `name` itself is a path to a blueprint:
+  if (name.includes(path.sep)) {
+    let blueprintPath = path.resolve(name);
+
+    if (Blueprint._existsSync(blueprintPath)) {
+      return Blueprint.load(blueprintPath, options.blueprintOptions);
+    }
+  }
+
   if (!options.ignoreMissing) {
     throw new SilentError(`Unknown blueprint: ${name}`);
   }

package/lib/tasks/interactive-new.js

@@ -1,9 +1,5 @@
 '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');
 
@@ -11,6 +7,8 @@ const DEFAULT_LOCALE = 'en-US';
 
 class InteractiveNewTask extends Task {
   async run(newCommandOptions, _testAnswers) {
+    const inquirer = require('inquirer');
+
     let prompt = inquirer.createPromptModule();
     let questions = await this.getQuestions(newCommandOptions);
     let answers = await prompt(questions, _testAnswers);
@@ -24,6 +22,8 @@ class InteractiveNewTask extends Task {
   }
 
   async getQuestions(newCommandOptions = {}) {
+    const { isLangCode } = require('is-language-code');
+
     return [
       {
         name: 'blueprint',
@@ -145,6 +145,8 @@ class InteractiveNewTask extends Task {
   }
 
   getUserLocale() {
+    const osLocale = require('os-locale');
+
     return osLocale();
   }
 }

package/lib/tasks/npm-task.js

@@ -25,8 +25,6 @@ class NpmTask extends Task {
 
     // The command to run: can be 'install' or 'uninstall'
     this.command = '';
-
-    this.versionConstraints = '3 || 4 || 5 || 6 || 7 || 8';
   }
 
   get packageManagerOutputName() {
@@ -115,24 +113,6 @@ class NpmTask extends Task {
       let version = result.stdout;
       logger.info('npm --version: %s', version);
 
-      let ok = semver.satisfies(version, this.versionConstraints);
-      if (!ok) {
-        logger.warn('npm --version is outside of version constraint: %s', this.versionConstraints);
-
-        let below = semver.ltr(version, this.versionConstraints);
-        if (below) {
-          throw new SilentError(
-            'Ember CLI is now using the global npm, but your npm version is outdated.\n' +
-              'Please update your global npm version by running: npm install -g npm'
-          );
-        }
-
-        this.ui.writeWarnLine(
-          'Ember CLI is using the global npm, but your npm version has not yet been ' +
-            'verified to work with the current Ember CLI release.'
-        );
-      }
-
       return { name: 'npm', version };
     } catch (error) {
       logger.error('npm --version failed: %s', error);

package/lib/tasks/transforms/amd/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const shimAmd = require('./amd-shim');
-
 class AmdTransformAddon {
   /**
    * This addon is used to register a custom AMD transform for app and addons to use.
@@ -15,6 +13,8 @@ class AmdTransformAddon {
   }
 
   importTransforms() {
+    const shimAmd = require('./amd-shim');
+
     return {
       amd: {
         transform: (tree, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.11.0-beta.0",
+  "version": "4.11.1-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -37,8 +37,8 @@
     "test:slow": "node --unhandled-rejections=strict tests/runner slow"
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-modules-amd": "^7.19.6",
+    "@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",
@@ -74,7 +74,6 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-preprocess-registry": "^3.3.0",
     "ember-cli-string-utils": "^1.1.0",
-    "ember-source-channel-url": "^3.0.0",
     "ensure-posix-path": "^1.1.1",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
@@ -83,11 +82,11 @@
     "find-up": "^5.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fixturify-project": "^2.1.1",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "fs-tree-diff": "^2.0.1",
     "get-caller-file": "^2.0.5",
     "git-repo-info": "^2.1.1",
-    "glob": "^8.0.3",
+    "glob": "^8.1.0",
     "heimdalljs": "^0.2.6",
     "heimdalljs-fs-monitor": "^1.1.1",
     "heimdalljs-graph": "^1.0.0",
@@ -103,7 +102,7 @@
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-terminal": "^0.4.0",
-    "minimatch": "^5.1.0",
+    "minimatch": "^7.4.1",
     "morgan": "^1.10.0",
     "nopt": "^3.0.6",
     "npm-package-arg": "^10.1.0",
@@ -116,7 +115,7 @@
     "remove-types": "^1.0.0",
     "resolve": "^1.22.1",
     "resolve-package-path": "^4.0.3",
-    "safe-stable-stringify": "^2.3.1",
+    "safe-stable-stringify": "^2.4.2",
     "sane": "^5.0.1",
     "semver": "^7.3.5",
     "silent-error": "^1.1.1",
@@ -126,15 +125,14 @@
     "testem": "^3.10.1",
     "tiny-lr": "^2.0.0",
     "tree-sync": "^2.1.0",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "walk-sync": "^3.0.0",
     "watch-detector": "^1.0.2",
-    "workerpool": "^6.3.1",
+    "workerpool": "^6.4.0",
     "yam": "^1.0.0"
   },
   "devDependencies": {
-    "@ember/edition-utils": "^1.2.0",
-    "@octokit/rest": "^19.0.5",
+    "@octokit/rest": "^19.0.7",
     "broccoli-plugin": "^4.0.3",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.3.7",
@@ -143,14 +141,14 @@
     "chai-jest-snapshot": "^2.0.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-internal-test-helpers": "^0.9.1",
-    "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.35.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-prettier": "^4.2.1",
-    "fixturify": "^2.1.0",
-    "jsdom": "^20.0.3",
+    "fixturify": "^3.0.0",
+    "jsdom": "^21.1.0",
     "latest-version": "^5.1.0",
     "mocha": "^10.0.0",
     "nock": "^13.2.9",
@@ -163,7 +161,7 @@
     "testdouble": "^3.16.6",
     "tmp": "^0.2.1",
     "websocket": "^1.0.32",
-    "which": "2.0.2",
+    "which": "3.0.0",
     "yuidoc-ember-cli-theme": "^1.0.4",
     "yuidocjs": "0.10.2"
   },
@@ -186,5 +184,9 @@
       "tokenRef": "GITHUB_AUTH"
     }
   },
-  "trackingCode": "UA-49225444-1"
+  "trackingCode": "UA-49225444-1",
+  "volta": {
+    "node": "14.21.3",
+    "yarn": "1.22.19"
+  }
 }

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

@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line n/no-unpublished-require
-const expect = require('chai').expect;
+const { expect } = require('chai');
 const semver = require('semver');
 
 module.exports = function assertVersionLock(_deps) {

package/lib/commands/uninstall-npm.js

@@ -1,19 +0,0 @@
-'use strict';
-
-const Command = require('../models/command');
-const SilentError = require('silent-error');
-
-module.exports = Command.extend({
-  name: 'uninstall:npm',
-  description: 'Npm package uninstall are now managed by the user.',
-  works: 'insideProject',
-  skipHelp: true,
-
-  anonymousOptions: ['<package-names...>'],
-
-  run() {
-    let err = 'This command has been removed. Please use `npm uninstall ';
-    err += '<packageName> --save-dev` instead.';
-    return Promise.reject(new SilentError(err));
-  },
-});