diff --git a/text/0831-standardize-use-npm-yarn.md b/text/0831-standardize-use-npm-yarn.md index 28e0c18866..dd083669d6 100644 --- a/text/0831-standardize-use-npm-yarn.md +++ b/text/0831-standardize-use-npm-yarn.md @@ -23,7 +23,8 @@ Relevant Team(s): Fill this in with the [team(s)](README.md#relevant-teams) to w RFC PR: Fill this in with the URL for the Proposal RFC PR --> -# +# Standardize use of scripts in package.json for common tasks + Standardize the use of yarn and npm scripts in the Ember experience ## Summary diff --git a/text/0907-pnpm-support.md b/text/0907-pnpm-support.md index 7a8b6c542a..1312def1be 100644 --- a/text/0907-pnpm-support.md +++ b/text/0907-pnpm-support.md @@ -1,14 +1,16 @@ --- -stage: ready-for-release +stage: released start-date: 2023-03-06T14:09:00.000Z -release-date: +release-date: 2023-09-21T00:00:00.000Z release-versions: + ember-cli: v5.3.0 teams: - cli - learning prs: accepted: 'https://github.com/emberjs/rfcs/pull/907' ready-for-release: 'https://github.com/emberjs/rfcs/pull/932' + released: 'https://github.com/emberjs/rfcs/pull/944' project-link: suite: --- @@ -72,20 +74,18 @@ The first one is the presence of a `pnpm-lock.yaml` file in the project root. The `pnpm-lock.yaml` file is generated by `pnpm` when you run `pnpm install` (or the shorter `pnpm i`), so we assume that its presence means the developer intends to use `pnpm` to manage their dependencies. -Alternatively you, you can force Ember CLI to use `pnpm` with the `--pnpm` flag, and symmetrically, -you can force Ember CLI to not use `pnpm` with the `--no-pnpm` flag. +Alternatively you, you can force Ember CLI to use `pnpm` with the `--pnpm` flag. To recap: - `ember install ember-resources` with `pnpm-lock.yaml` present will use `pnpm` - `ember install ember-resources` without `pnpm-lock.yaml` present will use npm - `ember install ember-resources --pnpm` will use `pnpm` -- `ember install ember-resources --no-pnpm` will use npm ### `ember init`, `ember new`, `ember addon` Since this triad of commands is generally ran before a project is set up, there is no `pnpm-lock.yaml` file presence to check. -This means we are left with the `--pnpm`/`--no-pnpm` pair of flags, that will also be added to these commands: +This means we are left with the `--pnpm` flag, which will also be added to these commands: - `ember new my-app` will use npm - `ember new my-app --pnpm` will use `pnpm`