Skip to content

Commit

Permalink
Merge pull request #73 from SergeAstapov/fix-missing-pnpm-flags
Browse files Browse the repository at this point in the history
add pnpm condition to yarn/npm branches in blueprint files
  • Loading branch information
simonihmig authored Nov 10, 2022
2 parents 69d6b35 + 746edfc commit bce3820
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
14 changes: 7 additions & 7 deletions files/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@

* `git clone <repository-url>`
* `cd <%= addonName %>`
* `<% if (yarn) { %>yarn<% } else { %>npm<% } %> install`
* `<% if (yarn) { %>yarn<% } else if (pnpm) { %>pnpm<% } else { %>npm<% } %> install`

## Linting

* `<% if (yarn) { %>yarn lint<% } else { %>npm run lint<% } %>`
* `<% if (yarn) { %>yarn lint:fix<% } else { %>npm run lint:fix<% } %>`
* `<% if (yarn) { %>yarn lint<% } else if (pnpm) { %>pnpm lint<% } else { %>npm run lint<% } %>`
* `<% if (yarn) { %>yarn lint:fix<% } else if (pnpm) { %>pnpm lint:fix<% } else { %>npm run lint:fix<% } %>`

## Building the addon

* `cd <%= addonInfo.location %>`
* `<% if (yarn) { %>yarn<% } else { %>npm<% } %> build`
* `<% if (yarn) { %>yarn<% } else if (pnpm) { %>pnpm<% } else { %>npm<% } %> build`

## Running tests

* `cd <%= testAppInfo.location %>`
* `<% if (yarn) { %>yarn test<% } else { %>npm run test<% } %>` – Runs the test suite on the current Ember version
* `<% if (yarn) { %>yarn test:watch<% } else { %>npm run test:watch<% } %>` – Runs the test suite in "watch mode"
* `<% if (yarn) { %>yarn test<% } else if (pnpm) { %>pnpm test<% } else { %>npm run test<% } %>` – Runs the test suite on the current Ember version
* `<% if (yarn) { %>yarn test:watch<% } else if (pnpm) { %>pnpm test:watch<% } else { %>npm run test:watch<% } %>` – Runs the test suite in "watch mode"

## Running the test application

* `cd <%= testAppInfo.location %>`
* `<% if (yarn) { %>yarn start<% } else { %>npm run start<% } %>`
* `<% if (yarn) { %>yarn start<% } else if (pnpm) { %>pnpm start<% } else { %>npm run start<% } %>`
* Visit the test 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/).
1 change: 1 addition & 0 deletions files/gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ node_modules/
# misc
/.env*
/.pnp*
/.pnpm-debug.log
/.sass-cache
.eslintcache
/connect.lock
Expand Down
1 change: 1 addition & 0 deletions files/test-app-overrides/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
module.exports = async function () {
return {
<% if (yarn) { %>useYarn: true,
<% } else if (pnpm) { %>usePnpm: true,
<% } %>scenarios: [
{
name: 'ember-lts-3.28',
Expand Down

0 comments on commit bce3820

Please sign in to comment.