Skip to content

Commit

Permalink
Allow @ember/test-helpers v4 as dependency (#523)
Browse files Browse the repository at this point in the history
* chore: allow test-helpers v4 peer

* chore: and the other references

* Update pnpm lock

* Force v4.0.2 of test-helpers

* Fix ci scripts

---------

Co-authored-by: Brad Overton <[email protected]>
  • Loading branch information
mkszepp and Techn1x authored Aug 27, 2024
1 parent 84768b0 commit 3ec9bc6
Show file tree
Hide file tree
Showing 6 changed files with 1,844 additions and 1,852 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: 'Install dependencies'
run: pnpm install --frozen-lockfile
Expand All @@ -40,17 +40,17 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -64,16 +64,16 @@ jobs:
needs: lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -104,17 +104,17 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v3
with:
version: 8

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: kategengler/[email protected]
with:
branch: dist
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: 'ember-power-calendar'
working-directory: 'ember-power-calendar'
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@babel/core": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@ember/test-helpers": "^4.0.2",
"@embroider/macros": "^1.16.4",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
Expand Down
4 changes: 2 additions & 2 deletions ember-power-calendar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@babel/runtime": "^7.24.7",
"@babel/plugin-transform-typescript": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@ember/test-helpers": "^3.3.0",
"@ember/test-helpers": "^4.0.2",
"@embroider/addon-dev": "^4.3.1",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
Expand Down Expand Up @@ -156,7 +156,7 @@
}
},
"peerDependencies": {
"@ember/test-helpers": "^2.9.4 || ^3.2.1",
"@ember/test-helpers": "^2.9.4 || ^3.2.1 || ^4.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-concurrency": "^4.0.2",
Expand Down
Loading

0 comments on commit 3ec9bc6

Please sign in to comment.