ember-cli 5.0.0 → 5.1.0

package/.github/workflows/ci.yml

@@ -86,6 +86,7 @@ jobs:
           - ENABLE_ALL_EXPERIMENTS
           - EMBROIDER
           - CLASSIC
+          - PNPM
 
     steps:
       - uses: actions/checkout@v3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # ember-cli Changelog
 
+## v5.1.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.0.0...v5.1.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.0.0...v5.1.0)
+
+#### Changelog
+
+- [#10300](https://github.com/ember-cli/ember-cli/pull/10300) [BUGFIX] Do not try to wire up Testem unless a test framework is detected [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+- [#10256](https://github.com/ember-cli/ember-cli/pull/10256) [ENHANCEMENT] Align `hbs` templates generated by `app` blueprint with Prettier defaults [@jelhan](https://github.com/jelhan)
+- [#10276](https://github.com/ember-cli/ember-cli/pull/10276) [BUGFIX] Widen peer dependency range for ember-source [@jrjohnson](https://github.com/jrjohnson)
+- [#10279](https://github.com/ember-cli/ember-cli/pull/10279) Updated ember-welcome-page to v7.0.2 [@ijlee2](https://github.com/ijlee2)
+- [#10287](https://github.com/ember-cli/ember-cli/pull/10287) Implementation of RFC 907 - pnpm support [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+Thank you to all who took the time to contribute!
+
 ## v5.0.0
 
 #### Blueprint Changes

package/blueprints/addon/files/.github/workflows/ci.yml

@@ -18,18 +18,21 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: NullVoxPopuli/action-setup-pnpm@v2
+        with:
+          node-version: 16<% } else { %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><% } %>
       - name: Lint
-        run: <%= yarn ? 'yarn' : 'npm run' %> lint
+        run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> lint
       - name: Run Tests
-        run: <%= yarn ? 'yarn' : 'npm run' %> test:ember
+        run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test:ember
 
   floating:
     name: "Floating Dependencies"
@@ -37,15 +40,19 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: NullVoxPopuli/action-setup-pnpm@v2
+        with:
+          node-version: 16
+          no-lockfile: true<% } else { %>
       - uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %>
+        run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %><% } %>
       - name: Run Tests
-        run: <%= yarn ? 'yarn' : 'npm run' %> test:ember
+        run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -66,13 +73,16 @@ jobs:
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: NullVoxPopuli/action-setup-pnpm@v2
+        with:
+          node-version: 16<% } else { %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><% } %>
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

package/blueprints/addon/files/CONTRIBUTING.md

@@ -4,12 +4,12 @@
 
 * `git clone <repository-url>`
 * `cd <%= addonDirectory %>`
-* `<% if (yarn) { %>yarn<% } else { %>npm<% } %> install`
+* `<% if (pnpm) { %>pnpm<% } else if (yarn) { %>yarn<% } else { %>npm<% } %> install`
 
 ## Linting
 
-* `<% if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
-* `<% if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
+* `<% if (pnpm) { %>pnpm lint<% } else if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
+* `<% if (pnpm) { %>pnpm lint:fix<% } else if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
 
 ## Running tests
 

package/blueprints/addon/files/addon-config/ember-try.js

@@ -5,7 +5,8 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
-    <% if (yarn) { %>useYarn: true,
+    <% if (pnpm) { %>usePnpm: true,
+    <% } else if (yarn) { %>useYarn: true,
     <% } %>scenarios: [
       {
         name: 'ember-lts-4.4',

package/blueprints/addon/index.js

@@ -130,7 +130,7 @@ module.exports = {
     let addonName = stringUtil.dasherize(addonRawName);
     let addonNamespace = stringUtil.classify(addonRawName);
 
-    let hasOptions = options.welcome || options.yarn || options.ciProvider;
+    let hasOptions = options.welcome || options.yarn || options.pnpm || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -141,6 +141,7 @@ module.exports = {
         [
           options.welcome && '"--welcome"',
           options.yarn && '"--yarn"',
+          options.pnpm && '"--pnpm"',
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
         ]
@@ -159,6 +160,7 @@ module.exports = {
       emberCLIVersion: require('../../package').version,
       year: date.getFullYear(),
       yarn: options.yarn,
+      pnpm: options.pnpm,
       welcome: options.welcome,
       blueprint: 'addon',
       blueprintOptions,
@@ -176,6 +178,10 @@ module.exports = {
 
     let addonFiles = walkSync(addonFilesPath, { ignore: [ignoredCITemplate] });
 
+    if (!options.pnpm) {
+      addonFiles = addonFiles.filter((file) => !file.endsWith('.npmrc'));
+    }
+
     return uniq(appFiles.concat(addonFiles));
   },
 

package/blueprints/app/files/.github/workflows/ci.yml

@@ -18,16 +18,17 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: NullVoxPopuli/action-setup-pnpm@v2<% } else { %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><% } %>
       - name: Lint
-        run: <%= yarn ? 'yarn' : 'npm run' %> lint
+        run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> lint
 
   test:
     name: "Test"
@@ -35,13 +36,14 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3<% if (pnpm) { %>
+      - uses: NullVoxPopuli/action-setup-pnpm@v2<% } else { %>
       - name: Install Node
         uses: actions/setup-node@v3
         with:
           node-version: 16
           cache: <%= yarn ? 'yarn' : 'npm' %>
       - name: Install Dependencies
-        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %><% } %>
       - name: Run Tests
-        run: <%= yarn ? 'yarn' : 'npm' %> test
+        run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %> test

package/blueprints/app/files/README.md

@@ -8,7 +8,8 @@ A short introduction of this app could easily go here.
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/)<% if (yarn) { %>
+* [Node.js](https://nodejs.org/)<% if (pnpm) { %>
+* [pnpm](https://pnpm.io/)<% } else if (yarn) { %>
 * [Yarn](https://yarnpkg.com/)<% } else { %> (with npm)<% } %>
 * [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
@@ -17,7 +18,7 @@ You will need the following things properly installed on your computer.
 
 * `git clone <repository-url>` this repository
 * `cd <%= appDirectory %>`
-* `<% if (yarn) { %>yarn<% } else { %>npm<% } %> install`
+* `<% if (pnpm) { %>pnpm<% } else if (yarn) { %>yarn<% } else { %>npm<% } %> install`
 
 ## Running / Development
 
@@ -36,8 +37,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Linting
 
-* `<% if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
-* `<% if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
+* `<% if (pnpm) { %>pnpm lint<% } else if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
+* `<% if (pnpm) { %>pnpm lint:fix<% } else if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
 
 ### Building
 

package/blueprints/app/files/app/templates/application.hbs

@@ -1,8 +1,8 @@
 {{page-title "<%= namespace %>"}}
 
-<% if (welcome) { %>{{!-- The following component displays Ember's default welcome message. --}}
+<% if (welcome) { %>{{! The following component displays Ember's default welcome message. }}
 <WelcomePage />
-{{!-- Feel free to remove this! --}}
+{{! Feel free to remove this! }}
 <% } else { %><h2 id="title">Welcome to Ember</h2>
 <% } %>
 {{outlet}}

package/blueprints/app/files/package.json

@@ -30,51 +30,51 @@
     "@babel/plugin-proposal-decorators": "^7.22.5",
     "<% } %>@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.0.3<% if (embroider) { %>",
-    "@embroider/compat": "^3.0.1",
-    "@embroider/core": "^3.0.1",
-    "@embroider/webpack": "^3.0.0<% } %>",
+    "@ember/test-helpers": "^3.1.0<% if (embroider) { %>",
+    "@embroider/compat": "^3.1.3",
+    "@embroider/core": "^3.1.1",
+    "@embroider/webpack": "^3.1.1<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2<% if (typescript) { %>",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9<% } %>",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.0",
     "ember-auto-import": "^2.6.3",
     "ember-cli": "~<%= emberCLIVersion %>",
-    "ember-cli-app-version": "^6.0.0",
+    "ember-cli-app-version": "^6.0.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-clean-css": "^2.0.0",
-    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %>",
-    "ember-data": "~5.0.0",
+    "ember-data": "~5.1.0",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^7.0.0",
-    "ember-resolver": "^10.1.0",
-    "ember-source": "~5.0.0",
-    "ember-template-lint": "^5.10.1<% if (welcome) { %>",
+    "ember-resolver": "^10.1.1",
+    "ember-source": "~5.1.1",
+    "ember-template-lint": "^5.11.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^8.42.0",
+    "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.8.0",
-    "eslint-plugin-n": "^16.0.0",
+    "eslint-plugin-ember": "^11.9.0",
+    "eslint-plugin-n": "^16.0.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-qunit": "^7.3.4",
+    "eslint-plugin-qunit": "^8.0.0",
     "loader.js": "^4.7.0",
     "prettier": "^2.8.8",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "stylelint": "^15.7.0",
+    "stylelint": "^15.9.0",
     "stylelint-config-standard": "^33.0.0",
     "stylelint-prettier": "^3.0.0",
     "tracked-built-ins": "^3.1.1",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.1"
   },
   "engines": {
     "node": "16.* || >= 18"

package/blueprints/app/index.js

@@ -26,7 +26,7 @@ module.exports = {
     let namespace = stringUtil.classify(rawName);
     let embroider = isExperimentEnabled('EMBROIDER') || options.embroider;
 
-    let hasOptions = !options.welcome || options.yarn || embroider || options.ciProvider;
+    let hasOptions = !options.welcome || options.yarn || options.pnpm || embroider || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -37,6 +37,7 @@ module.exports = {
         [
           !options.welcome && '"--no-welcome"',
           options.yarn && '"--yarn"',
+          options.pnpm && '"--pnpm"',
           embroider && '"--embroider"',
           options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
           options.typescript && `"--typescript"`,
@@ -53,6 +54,7 @@ module.exports = {
       namespace,
       emberCLIVersion: require('../../package').version,
       yarn: options.yarn,
+      pnpm: options.pnpm,
       welcome: options.welcome,
       blueprint: 'app',
       blueprintOptions,

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": "5.0.0-release-023da4aaef"
+        "version": "5.1.0-release-e8820d9d4e"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -290,6 +290,13 @@
             "fors": {},
             "namespaces": {}
         },
+        "lib/utilities/get-package-manager-from-flags.js": {
+            "name": "lib/utilities/get-package-manager-from-flags.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
         "lib/utilities/insert-into-file.js": {
             "name": "lib/utilities/insert-into-file.js",
             "modules": {},
@@ -306,6 +313,13 @@
             "fors": {},
             "namespaces": {}
         },
+        "lib/utilities/is-pnpm-project.js": {
+            "name": "lib/utilities/is-pnpm-project.js",
+            "modules": {},
+            "classes": {},
+            "fors": {},
+            "namespaces": {}
+        },
         "lib/utilities/is-yarn-project.js": {
             "name": "lib/utilities/is-yarn-project.js",
             "modules": {},
@@ -6405,6 +6419,28 @@
             "class": "WindowsSymlinkChecker",
             "module": "ember-cli"
         },
+        {
+            "file": "lib/utilities/get-package-manager-from-flags.js",
+            "line": 3,
+            "description": "Returns the package manager, given an object where folks can *technically*\npass --pnpm --yarn --npm. But using multiple package managers at the\nsame time is not supported (by anything).\n\nThis function defines the priority of package managers, if multiple are present.",
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "getPackageManagerFromFlags",
+            "params": [
+                {
+                    "name": "}",
+                    "description": "options",
+                    "type": " pnpm?: boolean; yarn?: boolean; packageManager?: 'pnpm' | 'yarn' | 'npm'"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "'pnpm' | 'yarn' | 'npm' | undefined"
+            },
+            "class": "WindowsSymlinkChecker",
+            "module": "ember-cli"
+        },
         {
             "file": "lib/utilities/insert-into-file.js",
             "line": 6,
@@ -6435,6 +6471,28 @@
             "class": "WindowsSymlinkChecker",
             "module": "ember-cli"
         },
+        {
+            "file": "lib/utilities/is-pnpm-project.js",
+            "line": 5,
+            "description": "Returns true if and only if the given directory has a pnpm-lock.yaml file or is a child of a\npnpm workspace root.",
+            "access": "private",
+            "tagname": "",
+            "itemtype": "method",
+            "name": "isPnpmProject",
+            "params": [
+                {
+                    "name": "thePath",
+                    "description": "",
+                    "type": "String"
+                }
+            ],
+            "return": {
+                "description": "",
+                "type": "Promise<boolean>"
+            },
+            "class": "WindowsSymlinkChecker",
+            "module": "is-lazy-engine"
+        },
         {
             "file": "lib/utilities/is-yarn-project.js",
             "line": 6,

package/lib/broccoli/test-support-suffix.js

@@ -1,6 +1,6 @@
 runningTests = true;
 
-if (window.Testem) {
+if (typeof Testem !== 'undefined' && (typeof QUnit !== 'undefined' || typeof Mocha !== 'undefined')) {
   window.Testem.hookIntoTestFramework();
 }
 

package/lib/commands/addon.js

@@ -14,6 +14,7 @@ module.exports = NewCommand.extend({
     { name: 'skip-npm', type: Boolean, default: false, aliases: ['sn'] },
     { name: 'skip-git', type: Boolean, default: false, aliases: ['sg'] },
     { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
+    { name: 'pnpm', type: Boolean, default: false },
     { name: 'directory', type: String, aliases: ['dir'] },
     {
       name: 'lang',

package/lib/commands/init.js

@@ -9,6 +9,8 @@ const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
 const isYarnProject = require('../utilities/is-yarn-project');
 const getLangArg = require('../../lib/utilities/get-lang-arg');
+const { isExperimentEnabled } = require('../experiments');
+const { getPackageManagerFromFlags } = require('../utilities/get-package-manager-from-flags');
 
 module.exports = Command.extend({
   name: 'init',
@@ -28,6 +30,7 @@ module.exports = Command.extend({
       description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.',
     },
     { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
+    { name: 'pnpm', type: Boolean, default: false },
     { name: 'name', type: String, default: '', aliases: ['n'] },
     {
       name: 'lang',
@@ -98,15 +101,13 @@ module.exports = Command.extend({
 
     await this.runTask('InstallBlueprint', blueprintOpts);
 
-    if (!commandOptions.skipNpm) {
-      let packageManager =
-        commandOptions.yarn === true
-          ? 'yarn'
-          : // supported for legacy reasons
-          commandOptions.yarn === false
-          ? 'npm'
-          : undefined;
+    if (commandOptions.pnpm && !isExperimentEnabled('PNPM')) {
+      throw new Error(`--pnpm support is not enabled by default. Please prefix your command with EMBER_CLI_PNPM=true`);
+    }
 
+    let packageManager = getPackageManagerFromFlags(commandOptions);
+
+    if (!commandOptions.skipNpm) {
       await this.runTask('NpmInstall', {
         verbose: commandOptions.verbose,
         packageManager,
@@ -125,8 +126,7 @@ module.exports = Command.extend({
     this.ui.writeLine('');
     const command = `cd ${projectName}`;
     this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(command)}`);
-    const packageManager = commandOptions.yarn ? 'yarn' : 'npm';
-    this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(`${packageManager} start`)}`);
+    this.ui.writeLine(`  ${chalk.gray('$')} ${chalk.cyan(`${packageManager ?? 'npm'} start`)}`);
     this.ui.writeLine('');
     this.ui.writeLine('Happy coding!');
   },

package/lib/commands/new.js

@@ -7,6 +7,7 @@ const SilentError = require('silent-error');
 const isValidProjectName = require('../utilities/valid-project-name');
 const normalizeBlueprint = require('../utilities/normalize-blueprint-option');
 const mergeBlueprintOptions = require('../utilities/merge-blueprint-options');
+const { isExperimentEnabled } = require('../experiments');
 
 module.exports = Command.extend({
   name: 'new',
@@ -26,6 +27,7 @@ module.exports = Command.extend({
       description: 'Installs and uses {{ember-welcome-page}}. Use --no-welcome to skip it.',
     },
     { name: 'yarn', type: Boolean }, // no default means use yarn if the blueprint has a yarn.lock
+    { name: 'pnpm', type: Boolean, default: false },
     { name: 'directory', type: String, aliases: ['dir'] },
     {
       name: 'lang',
@@ -74,6 +76,7 @@ module.exports = Command.extend({
 
       if (answers.packageManager) {
         commandOptions.yarn = answers.packageManager === 'yarn';
+        commandOptions.pnpm = answers.packageManager === 'pnpm';
       }
 
       if (answers.ciProvider) {
@@ -89,6 +92,10 @@ module.exports = Command.extend({
       commandOptions.skipGit = true;
     }
 
+    if (commandOptions.pnpm && !isExperimentEnabled('PNPM')) {
+      throw new Error(`--pnpm support is not enabled by default. Please prefix your command with EMBER_CLI_PNPM=true`);
+    }
+
     if (projectName === '.') {
       let blueprintName = commandOptions.blueprint === 'app' ? 'application' : commandOptions.blueprint;
       message = `Trying to generate an ${blueprintName} structure in this directory? Use \`ember init\` instead.`;

package/lib/experiments/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC']);
+const availableExperiments = Object.freeze(['EMBROIDER', 'CLASSIC', 'PNPM']);
 
 const deprecatedExperiments = Object.freeze([]);
 const enabledExperiments = Object.freeze([]);

package/lib/tasks/addon-install.js

@@ -4,6 +4,7 @@ const Task = require('../models/task');
 const SilentError = require('silent-error');
 const { merge } = require('ember-cli-lodash-subset');
 const getPackageBaseName = require('../utilities/get-package-base-name');
+const { getPackageManagerFromFlags } = require('../utilities/get-package-manager-from-flags');
 
 class AddonInstallTask extends Task {
   constructor(options) {
@@ -35,14 +36,7 @@ class AddonInstallTask extends Task {
 
     ui.startProgress(chalk.green('Installing addon package'), chalk.green('.'));
 
-    let packageManager =
-      commandOptions.packageManager ||
-      (commandOptions.yarn === true
-        ? 'yarn'
-        : // supported for legacy reasons
-        commandOptions.yarn === false
-        ? 'npm'
-        : undefined);
+    let packageManager = getPackageManagerFromFlags(commandOptions);
 
     return npmInstall
       .run({

package/lib/tasks/interactive-new.js

@@ -87,6 +87,10 @@ class InteractiveNewTask extends Task {
             name: 'NPM',
             value: 'npm',
           },
+          {
+            name: 'pnpm',
+            value: 'pnpm',
+          },
           {
             name: 'Yarn',
             value: 'yarn',

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

@@ -0,0 +1,38 @@
+'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

@@ -0,0 +1,27 @@
+'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/lint-fix.js

@@ -2,6 +2,7 @@
 
 const execa = require('../utilities/execa');
 const isYarnProject = require('../utilities/is-yarn-project');
+const isPnpmProject = require('../utilities/is-pnpm-project');
 const prependEmoji = require('../utilities/prepend-emoji');
 
 async function run(project) {
@@ -21,7 +22,9 @@ async function run(project) {
 
   let cwd = process.cwd();
 
-  if (isYarnProject(project.root)) {
+  if (await isPnpmProject(project.root)) {
+    await execa('pnpm', [lintFixScriptName], { cwd });
+  } else if (isYarnProject(project.root)) {
     await execa('yarn', [lintFixScriptName], { cwd });
   } else {
     await execa('npm', ['run', lintFixScriptName], { cwd });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.21.4",
+    "@pnpm/find-workspace-dir": "^6.0.1",
     "broccoli": "^3.5.2",
     "broccoli-builder": "^0.18.14",
     "broccoli-concat": "^4.2.5",