Repository: ember-cli/ember-cli
Pull request #9514 (2021-04-29 22:34:58)

[ENHANCEMENT] Use packager commands in `CONTRIBUTING.md` and `README.md` files in `app` and `addon` blueprints
* Updates all commands to match the scripts written to `package.json` by the blueprint
* Aligns the format for interpolating yarn vs npm to reduce duplication and simplify future updates

bertdeblock: Does [this issue](https://github.com/ember-cli/ember-cli/issues/8969) still exist when using `yarn start`? If so, I'm not sure if we should use it in favor of `ember s`?
elwayman02: Seems like the bug was fixed in Yarn 2, waiting for a backport to Yarn 1.
elwayman02: Windows tests seem to be inexplicably failing after I rebased today. Are they flaky?
rwjblue: > Seems like the bug was fixed in Yarn 2, waiting for a backport to Yarn 1. Do we make an explicit assumption or recommendation about which major version of Yarn people will use in their Ember projects?

We do not currently support yarn@2, and AFAIK yarn@1 is completely EOL'ed (no bugfixes being backported).


elwayman02: > > Seems like the bug was fixed in Yarn 2, waiting for a backport to Yarn 1. Do we make an explicit assumption or recommendation about which major version of Yarn people will use in their Ember projects?
> 
> We do not currently support yarn@2, and AFAIK yarn@1 is completely EOL'ed (no bugfixes being backported).

Is there an RFC to drop yarn support in Ember? It seems we should either support it (and document it) or not, but half support is generally not a great experience. 

To give a bit more context on this PR: Part of the reason I created it is that telling people to run `ember test` instead of `yarn test` can have entirely different outcomes for many projects. What if the author of an addon purposefully sets up `yarn test` to run with ember-exam, for example, or any number of other script modifications? I don't think that they should need to manually change the default documentation for a script that already existed, when all they did was modify the internals of the script. 

Putting the known yarn bug aside, this is still true for `npm test` as well. The default documentation should prompt people to use `npm test` and `npm start` commands so they don't need to learn new commands for every project they work on. The whole point of these standardized scripts is to allow maintainers to customize the scripts themselves while having a standard command that everyone can run in any project and get an expected output regardless of what's going on under the hood.

If our generated documentation says to run `ember test` and `ember serve` instead of `npm test`, `yarn test`, `npm start`, and `yarn start`, then we're undermining that industry standard and confusing people by making it seem that they need to know these special ember commands instead of interfacing with the project the way they would any other node project.

So, while I'm sympathetic to the fact that there is a bug in yarn, I would argue that it's a bug in *yarn*, not a bug on our side. Furthermore, it's a minor UX bug that doesn't cause anything to break. I'm open to the idea that we should drop support for Yarn (though that should be discussed in an RFC rather than here, of course), but I think if we're going to support a `--yarn` flag that allows people to purposefully *opt-in* to using yarn, then we should generate correct documentation as well. 
elwayman02: @rwjblue How would you like to move forward?
rwjblue: I actually think these changes are good and I've preferred using `yarn`/`npm` vs requiring everyone have a global `ember` binary for a while, but ultimately this changes how people are expected to interact with the project in a lot of ways. I think we need an RFC.
elwayman02: Isn't this PR just documenting scripts that have already been in place in Ember projects for years, though? I'd argue that this choice was already made a long time ago, and we just didn't document it fully. What practical decision do you think still needs to be discussed at this point?
rwjblue: > What practical decision do you think still needs to be discussed at this point?

The point I'm making is that this PR is effectively saying that the *default way* we expect people to interact with their app is via yarn scripts, not the `ember` global. That definitely is RFC worthy.

elwayman02: I would argue that it has been the de facto default for *years*, but I can see there is disagreement on that. Unfortunately, such an RFC is something I have neither the time nor motivation to write up, so unless someone else is going to volunteer to drive that discussion, this PR appears to be at an impasse.
bertdeblock: An issue in the RFC repo might be a good start?
elwayman02: > An issue in the RFCs repo might be a good start?

Go for it.
elwayman02: FWIW, the known yarn bug doesn't even exist on Windows; exiting a yarn script with ctrl-c works perfectly in my experience. So, we're basically holding off on documenting the primary way that most people interact with Ember's default scripts because of a bug that only occurs in *one* of the possible package managers (that isn't even the default) on *some* operating systems/terminal platforms. This really doesn't seem like a good tradeoff to me.
bertdeblock: @elwayman02 Are you still interested in pursuing this PR? Should we close if not?
elwayman02: I absolutely think we should still make this change. I've made my case for
it.

On Thu, Jun 16, 2022, 12:12 AM Bert De Block ***@***.***>
wrote:

> @elwayman02 <https://github.com/elwayman02> Are you still interested in
> pursuing this PR? Should we close if not?
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/ember-cli/ember-cli/pull/9514#issuecomment-1157315767>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAKDTKQRGHM2S2YRXCYBVUTVPLHVJANCNFSM4323FF4Q>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>

bertdeblock: There's more to it than just this PR though. Using the `ember` global is also what's used in the guides etc.
elwayman02: That sounds like a good follow-up change. We as a community need to start
teaching people how to use our tools in a way that is consistent with
industry standards and move past our history of having to build bespoke
tools for ourselves. NPM/Yarn provide a useful tooling abstraction, and
that is how we should teach it.

Frankly, the "ember" command should be an implementation detail, not the
top-level interface.

On Thu, Jun 16, 2022, 12:16 AM Bert De Block ***@***.***>
wrote:

> There's more to it than just this PR though. Using the ember global is
> also what's used in the guides etc.
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/ember-cli/ember-cli/pull/9514#issuecomment-1157319383>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAKDTKSJZ6H44VNXWHHNJL3VPLIGHANCNFSM4323FF4Q>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>

bertdeblock: I agree, but why not coordinate this via an RFC (issue) as suggested in this thread?
I think the learning team would also like to know about / weigh in on this.
elwayman02: I have not stood in the way of an RFC for those who believe it's necessary.
However, given the scope of the proposed change, that's not an investment
of time I'm prepared to make personally. It's a pretty straightforward
change, and I've already invested more time justifying it than it was
worth, to be quite honest. If more discussion is needed, I welcome people
to share their thoughts in whatever format they feel passionate about
pursuing.

On Thu, Jun 16, 2022, 1:48 AM Bert De Block ***@***.***>
wrote:

> I agree, but why not coordinate this via an RFC (issue) as suggested in
> this thread?
> I think the learning team would also like to know about / weigh in on this.
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/ember-cli/ember-cli/pull/9514#issuecomment-1157401091>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAKDTKUNAG5N47TT5GP2X63VPLS47ANCNFSM4323FF4Q>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>

NullVoxPopuli: this whole thread feels like a "too many cooks" problem :sweat_smile: 
bertdeblock: I've asked on Discord if the learning team would be okay with merging these changes:
https://discord.com/channels/480462759797063690/480777444203429888/987678229185835018
jenweber: Hello! Thanks for raising this. I consider this PR to be currently blocked, unless @rwjblue says otherwise. The core teams have a consensus-based decision making model, which we should lean on here to guide the next step.

An RFC would be beneficial, even if it was not required in the end. I can try to find a volunteer to write it, and therefore unblock this PR. This may feel like a small change but it does ripple through guides and API docs. 
NullVoxPopuli: > An RFC would be beneficial

To preface, I say this with all the love of Ember in the world....

This is a giant problem with this community. We cannot be doing RFCs for every little basic-AF change.

The fact that this RFC has already been _open for a year_ and had more discussion than an RFC would have is already a crime against humanity.

The resistance to basic contributions here is super alienating towards contributors, and is likely a big part of why our contributor count is so low.
jenweber: Good news, there are 3 volunteers to help with an RFC. Progress will be tracked in https://github.com/emberjs/rfcs/issues/827 and I've set a goal of 2 weeks to have a rough draft.

We have some rules of thumb about when something may need an RFC. They are outlined in the [RFCs readme](https://github.com/emberjs/rfcs/#when-you-need-to-follow-this-process). The third bullet point seems relevant. I understand the frustrations with the RFC process and do what I can to make it easier/faster to participate.
jenweber: Just an update - there's a draft of the RFC and it will be PR'd soon by the authors.
bertdeblock: @jenweber Would you be okay with already getting these changes in even though the RFC is still open? It seems everyone agrees we should do this?
jenweber: Good question. I don’t think it’s my call to make though. Let me follow up with the RFC authors and see if we can get those edits in ASAP
NullVoxPopuli: @elwayman02 any chance you have time to rebase? looks like tests are failing :see_no_evil: 

Patch:
diff --git a/blueprints/addon/files/CONTRIBUTING.md b/blueprints/addon/files/CONTRIBUTING.md
index b94a457f3..2dbfcea88 100644
--- a/blueprints/addon/files/CONTRIBUTING.md
+++ b/blueprints/addon/files/CONTRIBUTING.md
@@ -8,18 +8,18 @@
 
 ## Linting
 
-* `<% 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<% } %>`
+* `<%= invokeScriptPrefix %> lint`
+* `<%= invokeScriptPrefix %> lint:fix`
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `<%= invokeScriptPrefix %> test` – Runs the test suite on the current Ember version
+* `<%= invokeScriptPrefix %> test:ember <% if (npm) { %>-- <% } %>--server` – Runs the test suite in "watch mode"
+* `<%= invokeScriptPrefix %> test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `<%= invokeScriptPrefix %> start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/blueprints/addon/index.js b/blueprints/addon/index.js
index 07190d10f..16e53764b 100644
--- a/blueprints/addon/index.js
+++ b/blueprints/addon/index.js
@@ -171,6 +171,16 @@ module.exports = {
         outdent;
     }
 
+    let invokeScriptPrefix = 'npm run';
+
+    if (options.packageManager === 'yarn') {
+      invokeScriptPrefix = 'yarn';
+    }
+
+    if (options.packageManager === 'pnpm') {
+      invokeScriptPrefix = 'pnpm';
+    }
+
     return {
       addonDirectory: directoryForPackageName(addonName),
       name,
@@ -182,6 +192,8 @@ module.exports = {
       year: date.getFullYear(),
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
+      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      invokeScriptPrefix,
       welcome: options.welcome,
       blueprint: 'addon',
       blueprintOptions,
diff --git a/blueprints/app/files/README.md b/blueprints/app/files/README.md
index d1c71fcc9..f92a8bf1e 100644
--- a/blueprints/app/files/README.md
+++ b/blueprints/app/files/README.md
@@ -22,7 +22,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `<%= invokeScriptPrefix %> start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -32,18 +32,18 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `<%= invokeScriptPrefix %> test`
+* `<%= invokeScriptPrefix %> test:ember <% if (npm) { %>-- <% } %>--server`
 
 ### Linting
 
-* `<% 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<% } %>`
+* `<%= invokeScriptPrefix %> lint`
+* `<%= invokeScriptPrefix %> lint:fix`
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `<%= execBinPrefix %> ember build` (development)
+* `<%= invokeScriptPrefix %> build` (production)
 
 ### Deploying
 
diff --git a/blueprints/app/index.js b/blueprints/app/index.js
index 8ea8bcf19..090a74aeb 100644
--- a/blueprints/app/index.js
+++ b/blueprints/app/index.js
@@ -47,6 +47,19 @@ module.exports = {
         outdent;
     }
 
+    let invokeScriptPrefix = 'npm run';
+    let execBinPrefix = 'npm exec';
+
+    if (options.packageManager === 'yarn') {
+      invokeScriptPrefix = 'yarn';
+      execBinPrefix = 'yarn';
+    }
+
+    if (options.packageManager === 'pnpm') {
+      invokeScriptPrefix = 'pnpm';
+      execBinPrefix = 'pnpm';
+    }
+
     return {
       appDirectory: directoryForPackageName(name),
       name,
@@ -55,6 +68,9 @@ module.exports = {
       emberCLIVersion: require('../../package').version,
       yarn: options.packageManager === 'yarn',
       pnpm: options.packageManager === 'pnpm',
+      npm: options.packageManager !== 'yarn' && options.packageManager !== 'pnpm',
+      invokeScriptPrefix,
+      execBinPrefix,
       welcome: options.welcome,
       blueprint: 'app',
       blueprintOptions,


Test patch:
diff --git a/tests/fixtures/addon/defaults-travis/CONTRIBUTING.md b/tests/fixtures/addon/defaults-travis/CONTRIBUTING.md
index 9e8ee5f3d..18155e8fd 100644
--- a/tests/fixtures/addon/defaults-travis/CONTRIBUTING.md
+++ b/tests/fixtures/addon/defaults-travis/CONTRIBUTING.md
@@ -13,13 +13,13 @@
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `npm run test` – Runs the test suite on the current Ember version
+* `npm run test:ember -- --server` – Runs the test suite in "watch mode"
+* `npm run test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `npm start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/tests/fixtures/addon/defaults/CONTRIBUTING.md b/tests/fixtures/addon/defaults/CONTRIBUTING.md
index 9e8ee5f3d..708e27bef 100644
--- a/tests/fixtures/addon/defaults/CONTRIBUTING.md
+++ b/tests/fixtures/addon/defaults/CONTRIBUTING.md
@@ -13,13 +13,13 @@
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `npm run test` – Runs the test suite on the current Ember version
+* `npm run test:ember -- --server` – Runs the test suite in "watch mode"
+* `npm run test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `npm run start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/tests/fixtures/addon/pnpm/CONTRIBUTING.md b/tests/fixtures/addon/pnpm/CONTRIBUTING.md
index 14fd1f7f2..cc8b3cfb1 100644
--- a/tests/fixtures/addon/pnpm/CONTRIBUTING.md
+++ b/tests/fixtures/addon/pnpm/CONTRIBUTING.md
@@ -13,13 +13,13 @@
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `pnpm test` – Runs the test suite on the current Ember version
+* `pnpm test:ember --server` – Runs the test suite in "watch mode"
+* `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `pnpm start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/tests/fixtures/addon/yarn/CONTRIBUTING.md b/tests/fixtures/addon/yarn/CONTRIBUTING.md
index 1946c954f..2ddafe75c 100644
--- a/tests/fixtures/addon/yarn/CONTRIBUTING.md
+++ b/tests/fixtures/addon/yarn/CONTRIBUTING.md
@@ -13,13 +13,13 @@
 
 ## Running tests
 
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
+* `yarn test` – Runs the test suite on the current Ember version
+* `yarn test:ember --server` – Runs the test suite in "watch mode"
+* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-* `ember serve`
+* `yarn start`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
 For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/tests/fixtures/app/defaults/README.md b/tests/fixtures/app/defaults/README.md
index 4d5fd47cc..4704091ad 100644
--- a/tests/fixtures/app/defaults/README.md
+++ b/tests/fixtures/app/defaults/README.md
@@ -20,7 +20,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `npm run start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -30,8 +30,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `npm run test`
+* `npm run test:ember -- --server`
 
 ### Linting
 
@@ -40,8 +40,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `npm exec ember build` (development)
+* `npm run build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/npm-travis/README.md b/tests/fixtures/app/npm-travis/README.md
index 4d5fd47cc..185bbb082 100644
--- a/tests/fixtures/app/npm-travis/README.md
+++ b/tests/fixtures/app/npm-travis/README.md
@@ -20,7 +20,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `npm run start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -30,8 +30,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `npm run test`
+* `npm run test -- --server`
 
 ### Linting
 
@@ -40,8 +40,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `npm exec ember build` (development)
+* `npm run build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/npm/README.md b/tests/fixtures/app/npm/README.md
index 4d5fd47cc..4704091ad 100644
--- a/tests/fixtures/app/npm/README.md
+++ b/tests/fixtures/app/npm/README.md
@@ -20,7 +20,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `npm run start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -30,8 +30,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `npm run test`
+* `npm run test:ember -- --server`
 
 ### Linting
 
@@ -40,8 +40,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `npm exec ember build` (development)
+* `npm run build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/pnpm/README.md b/tests/fixtures/app/pnpm/README.md
index b1ac109f7..a06b8da32 100644
--- a/tests/fixtures/app/pnpm/README.md
+++ b/tests/fixtures/app/pnpm/README.md
@@ -21,7 +21,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `pnpm start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -31,8 +31,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `pnpm test`
+* `pnpm test:ember --server`
 
 ### Linting
 
@@ -41,8 +41,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `pnpm ember build` (development)
+* `pnpm build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/README.md b/tests/fixtures/app/with-blueprint-override-lint-fail/README.md
index 4d5fd47cc..d76a9b788 100644
--- a/tests/fixtures/app/with-blueprint-override-lint-fail/README.md
+++ b/tests/fixtures/app/with-blueprint-override-lint-fail/README.md
@@ -20,7 +20,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `npm start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -30,8 +30,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `npm run test:ember`
+* `npm run test:ember --server`
 
 ### Linting
 
@@ -40,8 +40,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `npm exec ember build` (development)
+* `npm run build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/yarn-travis/README.md b/tests/fixtures/app/yarn-travis/README.md
index 5147ed121..4b145a1fb 100644
--- a/tests/fixtures/app/yarn-travis/README.md
+++ b/tests/fixtures/app/yarn-travis/README.md
@@ -21,7 +21,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `yarn start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -31,8 +31,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `yarn test`
+* `yarn test --server`
 
 ### Linting
 
@@ -41,8 +41,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `yarn ember build` (development)
+* `yarn build` (production)
 
 ### Deploying
 
diff --git a/tests/fixtures/app/yarn/README.md b/tests/fixtures/app/yarn/README.md
index 5147ed121..05a78378b 100644
--- a/tests/fixtures/app/yarn/README.md
+++ b/tests/fixtures/app/yarn/README.md
@@ -21,7 +21,7 @@ You will need the following things properly installed on your computer.
 
 ## Running / Development
 
-* `ember serve`
+* `yarn start`
 * Visit your app at [http://localhost:4200](http://localhost:4200).
 * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
@@ -31,8 +31,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Running Tests
 
-* `ember test`
-* `ember test --server`
+* `yarn test`
+* `yarn test:ember --server`
 
 ### Linting
 
@@ -41,8 +41,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-* `ember build` (development)
-* `ember build --environment production` (production)
+* `yarn ember build` (development)
+* `yarn build` (production)
 
 ### Deploying