ember-cli 6.10.0-alpha.1 → 6.11.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # ember-cli Changelog
 
+## Release (2026-01-08)
+
+* ember-cli 6.11.0-alpha.1 (minor)
+* @ember-tooling/classic-build-addon-blueprint 6.11.0-alpha.1 (minor)
+* @ember-tooling/classic-build-app-blueprint 6.11.0-alpha.1 (minor)
+* @ember-tooling/blueprint-model 0.6.0 (minor)
+
+#### :rocket: Enhancement
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona))
+  * [#10917](https://github.com/ember-cli/ember-cli/pull/10917) Prepare 6.10-beta ([@mansona](https://github.com/mansona))
+* `ember-cli`
+  * [#10906](https://github.com/ember-cli/ember-cli/pull/10906) Even more dependency updates ([@bertdeblock](https://github.com/bertdeblock))
+  * [#10892](https://github.com/ember-cli/ember-cli/pull/10892) More dependency updates ([@bertdeblock](https://github.com/bertdeblock))
+* `ember-cli`, `@ember-tooling/blueprint-model`
+  * [#10890](https://github.com/ember-cli/ember-cli/pull/10890) Update various dependencies ([@bertdeblock](https://github.com/bertdeblock))
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`
+  * [#10887](https://github.com/ember-cli/ember-cli/pull/10887) Update `chalk` dependency to latest ([@bertdeblock](https://github.com/bertdeblock))
+
+#### :bug: Bug Fix
+* `ember-cli`
+  * [#10888](https://github.com/ember-cli/ember-cli/pull/10888) Upgrade broccoli ([@kategengler](https://github.com/kategengler))
+  * [#10886](https://github.com/ember-cli/ember-cli/pull/10886) Update required Node version to v20.19.0 ([@bertdeblock](https://github.com/bertdeblock))
+  * [#10860](https://github.com/ember-cli/ember-cli/pull/10860) [BUGFIX release]: Enter the WatchDetector branch of the build command when EMBROIDER_PREBUILD is present ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :memo: Documentation
+* `ember-cli`
+  * [#10874](https://github.com/ember-cli/ember-cli/pull/10874) Update RELEASE.md ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`
+  * [#10883](https://github.com/ember-cli/ember-cli/pull/10883) Prepare Beta Release ([@mansona](https://github.com/mansona))
+* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`
+  * [#10891](https://github.com/ember-cli/ember-cli/pull/10891) Update `prettier` + setup ([@bertdeblock](https://github.com/bertdeblock))
+
+#### Committers: 4
+- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Katie Gengler ([@kategengler](https://github.com/kategengler))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
 ## Release (2025-12-10)
 
 * ember-cli 6.10.0-alpha.1 (minor)

package/CONTRIBUTING.md

@@ -4,7 +4,6 @@ There are many ways to contribute to the project, you can fix issues,
 improve documentation or work on any of the features on the
 [wish list](https://github.com/ember-cli/ember-cli/wiki/Wish-List).
 
-
 # Development
 
 Start by cloning the Git project to your local hard drive:
@@ -33,7 +32,6 @@ npm link ember-cli
 Read the official [npm-link documentation](https://docs.npmjs.com/cli/link.html)
 for more information.
 
-
 ## Run the test suite
 
 ```
@@ -44,12 +42,14 @@ will run ESLint and the "fast" subset of the test suite. Run
 `pnpm run test:all` for the full test suite which will currently take quite a
 few minutes due to heavy IO and network usage.
 
-To run a single test 
+To run a single test
+
 ```
 pnpm mocha --fgrep "ember new adds ember-welcome-page by default"
 ```
 
 To get help with mocha, run
+
 ```
 pnpm mocha --help
 ```
@@ -58,8 +58,6 @@ ember-cli is using [Mocha](https://mochajs.org/) for its internal tests. If
 you want to run a specific subset of tests have a look at their
 [documentation](https://mochajs.org/#exclusive-tests).
 
-
-
 ## Update fixtures
 
 ### `ember new`
@@ -115,21 +113,21 @@ there is a bug and the faster we'll be able to take action.
 
 Be sure to include (At the very least):
 
-* OS
-* npm version
-* ember version
-* clear steps to reproduction
+- OS
+- npm version
+- ember version
+- clear steps to reproduction
 
 And ideally
 
-* an isolated demonstration of this issue as a github repo
+- an isolated demonstration of this issue as a github repo
 
 ## Requesting a Feature
 
 Feature requests are handled via https://github.com/ember-cli/rfcs
 
-* issues are eargley stage requests/proposals
-* rfcs as pull requests are for fleshing out details
+- issues are eargley stage requests/proposals
+- rfcs as pull requests are for fleshing out details
 
 1. Search Issues for similar feature requests. It's possible somebody has
    already asked for this feature or provided a pull request that we're still
@@ -156,10 +154,9 @@ We love pull requests. Here's a quick guide:
 1. Fork the repo.
 
 2. Ensure you have the development requirements:
-
-   * node (latest LTS recommended) -- *do not install node using sudo*
-   * npm (3.x)
-   * google chrome
+   - node (latest LTS recommended) -- _do not install node using sudo_
+   - npm (3.x)
+   - google chrome
 
 3. Run the tests. We only take pull requests with passing tests, and it's great
    to know that you have a clean slate: `npm install && npm run test:all`.
@@ -172,19 +169,18 @@ We love pull requests. Here's a quick guide:
 
 6. Commit your changes. If your pull request fixes an issue specify it in the
    commit message. Here's an example: `git commit - m "Close #52  Fix
-   generators"`
+generators"`
 
 7. Push to your fork and submit a pull request. In the pull-request title,
    please prefix it with one of our tags: BUGFIX, FEATURE, ENHANCEMENT or
    INTERNAL
-
-   * FEATURE and ENHANCEMENT tags are for things that users are interested in.
+   - FEATURE and ENHANCEMENT tags are for things that users are interested in.
      Avoid super technical talk. Craft a concise description of the change.
      - FEATURE tag is a standalone new addition, an example of this would be
        adding a new command
      - ENHANCEMENT tag is an improvement on an existing feature
-   * BUGFIX tag is a link to a bug + a link to a patch.
-   * INTERNAL tag is an internal log of changes.
+   - BUGFIX tag is a link to a bug + a link to a patch.
+   - INTERNAL tag is an internal log of changes.
 
    In the description, please provide us with some explanation of why you made
    the changes you made. For new features make sure to explain a standard use
@@ -201,16 +197,16 @@ give the ticket a review.
 Some things that will increase the chance that your pull request is accepted,
 taken straight from the Ruby on Rails guide:
 
-* Use Node idioms and helpers.
-* Include tests that fail without your code, and pass with it.
-* Update the documentation, the surrounding one, examples elsewhere, guides,
+- Use Node idioms and helpers.
+- Include tests that fail without your code, and pass with it.
+- Update the documentation, the surrounding one, examples elsewhere, guides,
   whatever is affected by your contribution.
 
 #### Syntax
 
-* Two spaces, no tabs.
-* No trailing whitespace. Blank lines should not have any space.
-* Follow the conventions you see used in the source already.
+- Two spaces, no tabs.
+- No trailing whitespace. Blank lines should not have any space.
+- Follow the conventions you see used in the source already.
 
 #### Inline Documentation Guidelines
 
@@ -234,11 +230,11 @@ at: https://github.com/ember-learn/cli-guides
 
 #### Code Words
 
-* `thisPropertyName`
-* `Global.Class.attribute`
-* `thisFunction()`
-* `Global.CONSTANT_NAME`
-* `true`, `false`, `null`, `undefined` (when referring to programming values)
+- `thisPropertyName`
+- `Global.Class.attribute`
+- `thisFunction()`
+- `Global.CONSTANT_NAME`
+- `true`, `false`, `null`, `undefined` (when referring to programming values)
 
 And in case we didn't emphasize it enough: **we love tests!**
 
@@ -248,8 +244,8 @@ Testing is done with mocha. You can invoke the tests by running `npm test` or `n
 with a test, write your test and add `.only` to it's `describe` or `it` block. E.g.
 
 ```javascript
-describe.only("My new feature", function() {
-  it("is neat", function() {
+describe.only("My new feature", function () {
+  it("is neat", function () {
     //...
   });
 });

package/README.md

@@ -1,5 +1,4 @@
-ember-cli
-==============================================================================
+# ember-cli
 
 [![Latest npm release][npm-badge]][npm-badge-url]
 [![GitHub Actions CI][github-actions-badge]][github-actions-ci-url]
@@ -18,9 +17,7 @@ ember-cli
 
 The Ember.js command line utility.
 
-
-Features
-------------------------------------------------------------------------------
+## Features
 
 - Asset build pipeline using [Broccoli.js](https://broccoli.build/)
 - ES6 transpilation using [Babel](https://babeljs.io/)
@@ -31,16 +28,13 @@ Features
   [Testem](https://github.com/testem/testem)
 - Powerful addon system for extensibility
 
-
-Installation
-------------------------------------------------------------------------------
+## Installation
 
 ```
 npm install -g ember-cli
 ```
 
-Usage
-------------------------------------------------------------------------------
+## Usage
 
 After installation the `ember` CLI tool will be available to you. It is the
 entrypoint for all the functionality mentioned above.
@@ -49,26 +43,20 @@ You can call `ember <command> --help` to find out more about [all of the
 following commands](https://cli.emberjs.com/release/basic-use/cli-commands/) or visit <https://cli.emberjs.com/release/> to read
 the in-depth documentation.
 
+## Documentation
 
-Documentation
-------------------------------------------------------------------------------
 Please refer to the [CLI guides](https://cli.emberjs.com/release/) for help using Ember CLI.
 
-Contributing
-------------------------------------------------------------------------------
-Please see the [contributing guidelines](https://github.com/ember-cli/ember-cli/blob/master/CONTRIBUTING.md)
+## Contributing
 
+Please see the [contributing guidelines](https://github.com/ember-cli/ember-cli/blob/master/CONTRIBUTING.md)
 
-Community
-------------------------------------------------------------------------------
+## Community
 
 - Discord: [Get your invite](https://discord.gg/emberjs)
 - Issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
 - Documentation: [cli.emberjs.com](https://cli.emberjs.com/release/)
 
-
-
-License
-------------------------------------------------------------------------------
+## License
 
 This project is licensed under the [MIT License](LICENSE).

package/RELEASE.md

@@ -2,9 +2,9 @@
 
 `ember-cli` follows the same channel based release process that Ember does:
 
-* `release` - This branch represents the `latest` dist-tag on NPM
-* `beta` - This branch represents the `beta` dist-tag on NPM
-* `master` - The branch represents the `alpha` dist-tag on NPM
+- `release` - This branch represents the `latest` dist-tag on NPM
+- `beta` - This branch represents the `beta` dist-tag on NPM
+- `master` - The branch represents the `alpha` dist-tag on NPM
 
 Most changes should be made as a PR that targets the `master` branch and then makes their way through `beta` and `release` over the course of 12 weeks as part of the Ember release train. Generally speaking we do not backport functional changes to `beta` or `release` but we can if needs be.
 
@@ -30,7 +30,6 @@ This makes sure that you are starting from a "clean slate" before doing any othe
 
 You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=is%3Apr+is%3Aopen+Prepare) to find any outstanding `Prepare Release` branches.
 
-
 ### Initial Stable Release from the `release` branch
 
 - fetch latest from origin `git fetch`
@@ -45,7 +44,7 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
   - make sure to not update the version in the package.json during this step, this will be release-plan's job
   - make sure to not update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job
   - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release.
-- Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta. 
+- Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta.
 
   ```
   node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data=<whatever version was in the beta>
@@ -99,17 +98,19 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - Merge the `Prepare Beta Release` when you are ready to release the next beta version
 - Check the `Release Beta` GitHub action to make sure the release succeeded
 
-
 ### Alpha release from the `master` branch
 
 - fetch latest from origin `git fetch`
 - create a new branch to merge `beta` into `master` e.g. `git checkout --no-track -b merge-beta origin/master`
 - merge beta into this new branch e.g. `git merge origin/beta --no-ff`
   - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts
+  - make sure to not update the version in the package.json during this step, that step comes later
   - make sure to not update the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step.
+  - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies. On master they always use the latest and don't use semver.
   - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release
   - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release
   - **make sure to not update the CHANGELOG.md file** in this step.
+  - **make sure not to delete any package files** they exist on master but not on either the release or beta branches
   - commit this merge
 - manually update the version in `package.json` to be the next alpha.
   - e.g. if the current alpha is `"version": "6.6.0-alpha.3",` update it to be `"version": "6.7.0-alpha.0",`
@@ -119,10 +120,12 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - Update blueprint dependencies to alpha
 
   ```
-  node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=latest
+  node ./dev/update-blueprint-dependencies.js --ember-source=alpha --ember-data=<whatever version is in the package.json>
   ```
 
+- note: ember-data (aka warp-drive) should only ever be updated on master as a separate PR. It is no longer part of the release process
 - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@alpha`
+- make sure the app-blueprint still has a `~` after the above step
 - commit this update `git commit -am "update blueprint dependencies to alpha"`
 - push and open a PR targeting `master` with a PR title like `Prepare 6.6-alpha`
 - mark this PR as an `enchancement` if the next alpha is a minor release
@@ -132,7 +135,6 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i
 - Merge the `Prepare Alpha Release` when you are ready to release the next alpha version
 - Check the `Release Alpha` GitHub action to make sure the release succeeded
 
-
 ## Changelog updates
 
 `release-plan` is designed to automatically generate a Changelog that includes the titles of every PR that was merged since the last release. As we would like to make use of this auto-generated Changelog we need to make sure that PRs are named correctly and the Changelog included in the "Prepare Release" PRs are what we were expecting.
@@ -143,7 +145,6 @@ If you want to change the content of the Changelog then you should update the PR
 
 Now that we're using release-plan for all releases, patch releases have become super easy! Every time you merge a PR to any branch that is being released with `release-plan` a new `Prepare Release` PR will be created. When you merge this `Prepare Release` branch it will automatically release the new Patch version.
 
-
 ## Post-release Automation
 
 There is a GitHub Actions workflow, https://github.com/ember-cli/ember-cli/actions/workflows/sync-output-repos.yml that pushes various invocations of the blueprint generator to "output repos".
@@ -161,6 +162,7 @@ Both of these have a git-tag per release version
 Multiple editors could be supported, but right now, we only "customize" for stackblitz.
 
 https://github.com/ember-cli/editor-output/
+
 - [a branch for each scenario + release version](https://github.com/ember-cli/editor-output/branches/active)
   - `${editorName}-{addon,app}-output{-'typescript'?}{-version}`
   - and the "latest release" (non beta) will not have a version at the end

package/bin/ember

@@ -19,9 +19,9 @@ logger.info('Resolving "ember-cli" from %j...', basedir);
 var projectLocalCli;
 try {
   projectLocalCli = resolve.sync('ember-cli', {
-    basedir: basedir
+    basedir: basedir,
   });
-} catch(ignored) {}
+} catch (ignored) {}
 
 logger.info('Resolved "ember-cli" to %j', projectLocalCli);
 
@@ -35,14 +35,17 @@ cli({
   cliArgs: process.argv.slice(2),
   inputStream: process.stdin,
   outputStream: process.stdout,
-  errorStream: process.stderr
-}).then(function(result) {
-  var exit = require('exit');
-  var exitCode = typeof result === 'object' ? result.exitCode : result;
-
-  logger.info('Quitting "ember-cli" with exit code: %j', exitCode);
-  exit(exitCode);
-}, function(err) {
-  console.log(err);
-  process.exit(-1);
-});
+  errorStream: process.stderr,
+}).then(
+  function (result) {
+    var exit = require('exit');
+    var exitCode = typeof result === 'object' ? result.exitCode : result;
+
+    logger.info('Quitting "ember-cli" with exit code: %j', exitCode);
+    exit(exitCode);
+  },
+  function (err) {
+    console.log(err);
+    process.exit(-1);
+  }
+);

package/blueprints/addon-import/index.js

@@ -2,7 +2,7 @@
 
 const stringUtil = require('ember-cli-string-utils');
 const path = require('path');
-const inflector = require('inflection');
+const { pluralize } = require('inflection');
 const SilentError = require('silent-error');
 
 module.exports = {
@@ -26,7 +26,7 @@ module.exports = {
         if (options.pod && options.hasPathToken) {
           return path.join(options.podPath, options.dasherizedModuleName);
         }
-        return inflector.pluralize(options.locals.blueprintName);
+        return pluralize(options.locals.blueprintName);
       },
       __root__(options) {
         if (options.inRepoAddon) {
@@ -45,11 +45,11 @@ module.exports = {
     let addonName = stringUtil.dasherize(addonRawName);
     let fileName = stringUtil.dasherize(options.entity.name);
     let blueprintName = options.originBlueprintName;
-    let modulePathSegments = [addonName, inflector.pluralize(options.originBlueprintName), fileName];
+    let modulePathSegments = [addonName, pluralize(options.originBlueprintName), fileName];
 
     if (/-addon/.test(blueprintName)) {
       blueprintName = blueprintName.substr(0, blueprintName.indexOf('-addon'));
-      modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
+      modulePathSegments = [addonName, pluralize(blueprintName), fileName];
     }
 
     if (options.pod) {

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": "6.10.0-alpha.1-master-51bed22cb7"
+        "version": "6.11.0-alpha.1-master-677dd6d3b4"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -5516,7 +5516,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 232,
+            "line": 235,
             "description": "Indicates whether the host is running on battery power.  This can cause\nperformance degredation.",
             "access": "private",
             "tagname": "",
@@ -5538,7 +5538,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 266,
+            "line": 269,
             "description": "Determines the amount of swap/virtual memory currently in use.",
             "access": "private",
             "tagname": "",
@@ -5560,7 +5560,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 297,
+            "line": 300,
             "description": "Determines the total amount of memory available to the host, as from\n`os.totalmem`.",
             "access": "private",
             "tagname": "",
@@ -5575,7 +5575,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 309,
+            "line": 312,
             "description": "Determines the amount of memory currently being used by the current Node\nprocess, as from `process.memoryUsage`.",
             "access": "private",
             "tagname": "",
@@ -5590,7 +5590,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 322,
+            "line": 325,
             "description": "Determines the number of logical processors available to the host, as from\n`os.cpus`.",
             "access": "private",
             "tagname": "",
@@ -5605,7 +5605,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 334,
+            "line": 337,
             "description": "Determines the average processor load across the system.  This is\nexpressed as a fractional number between 0 and the number of logical\nprocessors.",
             "access": "private",
             "tagname": "",
@@ -5627,7 +5627,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 358,
+            "line": 361,
             "description": "Gets the speed of the host's processors.\n\nIf more than one processor is found, the average of their speeds is taken.",
             "access": "private",
             "tagname": "",
@@ -5642,7 +5642,7 @@
         },
         {
             "file": "lib/models/hardware-info.js",
-            "line": 373,
+            "line": 376,
             "description": "Determines the time since the host was started, as from `os.uptime`.",
             "access": "private",
             "tagname": "",

package/lib/broccoli/ember-app.js

@@ -6,7 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const p = require('ember-cli-preprocess-registry/preprocessors');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const resolve = require('resolve');
 
 const { assert } = require('../debug');

package/lib/commands/generate.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const Command = require('../models/command');
 const Blueprint = require('../models/blueprint');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');

package/lib/commands/init.js

@@ -4,7 +4,7 @@ const clone = require('lodash/clone');
 const merge = require('lodash/merge');
 const Command = require('../models/command');
 const SilentError = require('silent-error');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const isValidProjectName = require('../utilities/valid-project-name');
 const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');

package/lib/commands/new.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const Command = require('../models/command');
 const Project = require('../models/project');
 const SilentError = require('silent-error');

package/lib/commands/test.js

@@ -90,9 +90,6 @@ module.exports = Command.extend({
       this.availableOptions = this.availableOptions.concat(ClassicOptions);
     }
 
-    // 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/commands/unknown.js

@@ -2,7 +2,7 @@
 
 const Command = require('../models/command');
 const SilentError = require('silent-error');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 
 module.exports = Command.extend({
   skipHelp: true,

package/lib/debug/deprecate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const semver = require('semver');
 const assert = require('./assert');
 const emberCLIVersion = require('../../package').version;

package/lib/models/asset-size-printer.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const path = require('path');
 const walkSync = require('walk-sync');
-const workerpool = require('workerpool');
+const { pool: workerPool } = require('workerpool');
 
 module.exports = class AssetPrinterSize {
   constructor(options) {
@@ -52,7 +52,7 @@ module.exports = class AssetPrinterSize {
     let testFileRegex = /(test-(loader|support))|(testem)/i;
 
     // create a dedicated worker
-    const pool = workerpool.pool(`${__dirname}/worker.js`);
+    const pool = workerPool(`${__dirname}/worker.js`);
 
     try {
       let assets = files

package/lib/models/blueprint.js

@@ -4,15 +4,15 @@
 @module ember-cli
 */
 const FileInfo = require('@ember-tooling/blueprint-model/utilities/file-info');
-const chalk = require('chalk');
+const { default: chalk } = require('chalk');
 const MarkdownColor = require('../utilities/markdown-color');
 const sequence = require('../utilities/sequence');
 const printCommand = require('../utilities/print-command');
 const insertIntoFile = require('../utilities/insert-into-file');
 const cleanRemove = require('../utilities/clean-remove');
 const fs = require('fs-extra');
-const inflector = require('inflection');
-const minimatch = require('minimatch');
+const { pluralize } = require('inflection');
+const { minimatch } = require('minimatch');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 const merge = require('lodash/merge');
@@ -547,7 +547,7 @@ let Blueprint = CoreObject.extend({
       let strippedCode = code;
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
-        const templateTag = substringBytes(code, match.range.start, match.range.end);
+        const templateTag = substringBytes(code, match.range.startByte, match.range.endByte);
         if (match.type === 'class-member') {
           strippedCode = strippedCode.replace(templateTag, replacementClassMember(i));
         } else {
@@ -562,7 +562,7 @@ let Blueprint = CoreObject.extend({
       let transformedWithTemplateTag = transformed;
       for (let i = 0; i < templateTagMatches.length; i++) {
         const match = templateTagMatches[i];
-        const templateTag = substringBytes(code, match.range.start, match.range.end);
+        const templateTag = substringBytes(code, match.range.startByte, match.range.endByte);
         if (match.type === 'class-member') {
           transformedWithTemplateTag = transformedWithTemplateTag.replace(replacementClassMember(i), templateTag);
         } else {
@@ -745,7 +745,7 @@ let Blueprint = CoreObject.extend({
         if (options.pod && options.hasPathToken) {
           return path.join(options.podPath, options.dasherizedModuleName);
         }
-        return inflector.pluralize(blueprintName);
+        return pluralize(blueprintName);
       },
       __root__(options) {
         if (options.inRepoAddon) {