Skip to content

Commit

Permalink
Merge pull request #612 from san650/pnpm-latest
Browse files Browse the repository at this point in the history
upgrade to pnpm@7.29.3
  • Loading branch information
ro0gr authored Mar 24, 2023
2 parents e9908c8 + 8bf43b5 commit 1c7af41
Show file tree
Hide file tree
Showing 8 changed files with 1,700 additions and 1,855 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- uses: pnpm/action-setup@v2.2.2
with:
version: 7.5.2
version: 7.29.3
run_install: false

- name: Install dependencies
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- uses: pnpm/action-setup@v2.2.2
with:
version: 7.5.2
version: 7.29.3
run_install: false

- name: Install Dependencies
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:

- uses: pnpm/action-setup@v2.2.2
with:
version: 7.5.2
version: 7.29.3
run_install: false

- name: Install Dependencies
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

- uses: pnpm/action-setup@v2.2.2
with:
version: 7.5.2
version: 7.29.3
run_install: false

- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
strict-peer-dependencies=false
auto-install-peers=true
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ Inside any of the packages you can run:
## Running tests

- `cd addon && pnpm start` – Builds the addon in "watch mode" so changes picked up by test app.
- `cd test-app && ember test` – Runs the test suite on the current Ember version
- `cd test-app && ember test --server` – Runs the test suite in "watch mode"
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test --server` – Runs the test suite in "watch mode"
- `cd test-app && ember try:each` – Runs the test suite against multiple Ember versions

During development, if you'd like test app to pick up changes in the addon, make sure to run both
`cd addon && pnpm start` and `cd test-app && ember test --server` in different terminals.

## Running the test application

- `cd test-app && ember serve`
During development, if you'd like test app to pick up changes in the addon, make sure to run
`pnpm start` from the project root directory.

- `pnpm start` - enable "watch mode" for addon directory and serve tests
- Visit the test application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
"url": "https://github.com/san650/ember-cli-page-object.git"
},
"scripts": {
"prepare": "cd addon && npm run build",
"test": "cd test-app && npm run test:ember"
"prepare": "pnpm --filter ember-cli-page-object build",
"test": "pnpm --filter test-app test:ember",
"start": "pnpm run -r --parallel start",
"lint": "pnpm -r lint",
"lint:fix": "pnpm -r lint:fix"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
"volta": {
"node": "14.18.3",
"pnpm": "7.5.2"
"pnpm": "7.29.3"
}
}
Loading

0 comments on commit 1c7af41

Please sign in to comment.