Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow @ember/test-helpers v4 as dependency #525

Merged
merged 11 commits into from
Sep 9, 2024
Merged

Allow @ember/test-helpers v4 as dependency #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bd76e60
chore: allow test-helpers v4 peer
Techn1x Aug 26, 2024
396dcdd
chore: and the other references
Techn1x Aug 26, 2024
f0af597
Update pnpm lock
mkszepp Aug 27, 2024
13a04a4
Force v4.0.2 of test-helpers
mkszepp Aug 27, 2024
ace1184
Fix ci scripts
mkszepp Aug 27, 2024
05aef46
Try to fix ci
mkszepp Sep 9, 2024
23063f0
Try to fix ci
mkszepp Sep 9, 2024
4cc4879
Update embroider & test-helpers dependency
mkszepp Sep 9, 2024
1888cd4
Add injected for calendar
mkszepp Sep 9, 2024
24a383a
Revert changes (hold only inject)
mkszepp Sep 9, 2024
5a48ef7
Recover ci scripts
mkszepp Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,22 @@ 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

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Lint
run: pnpm --filter ember-power-calendar lint
Expand All @@ -40,20 +43,23 @@ 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

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter test-app test:ember
Expand All @@ -64,19 +70,22 @@ 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

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter test-app test:ember
Expand Down Expand Up @@ -104,20 +113,23 @@ 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

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
env:
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:

- name: 'Install dependencies'
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Lint
run: pnpm --filter docs lint
Expand All @@ -56,6 +59,9 @@ jobs:
- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter docs test:ember

Expand All @@ -80,6 +86,9 @@ jobs:

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter docs build
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/push-dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- uses: kategengler/[email protected]
with:
branch: dist
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: 'ember-power-calendar'
working-directory: 'ember-power-calendar'
9 changes: 7 additions & 2 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
},
"dependenciesMeta": {
"ember-power-calendar": {
"injected": true
}
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/macros": "^1.16.4",
"@ember/test-helpers": "^4.0.4",
"@embroider/macros": "^1.16.6",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand Down
10 changes: 5 additions & 5 deletions ember-power-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"dependencies": {
"@embroider/addon-shim": "^1.8.9",
"decorator-transforms": "^2.0.0",
"@embroider/util": "^1.13.1",
"@embroider/macros": "^1.16.4",
"@embroider/util": "^1.13.2",
"@embroider/macros": "^1.16.6",
"ember-assign-helper": "^0.5.0",
"ember-element-helper": "^0.8.6",
"ember-truth-helpers": "^4.0.3"
Expand All @@ -77,8 +77,8 @@
"@babel/runtime": "^7.24.7",
"@babel/plugin-transform-typescript": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@ember/test-helpers": "^3.3.0",
"@embroider/addon-dev": "^4.3.1",
"@ember/test-helpers": "^4.0.4",
"@embroider/addon-dev": "^5.0.0",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/environment-ember-template-imports": "^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.4",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-concurrency": "^4.0.2",
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"build:docs": "pnpm run --filter docs build",
"lint": "pnpm run --filter '*' lint",
"lint:fix": "pnpm run --filter '*' lint:fix",
"prepare": "pnpm run build",
"start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"start:addon": "pnpm run --filter ember-power-calendar start --no-watch.clearScreen",
"start:docs": "pnpm run --filter docs start --preserveWatchOutput",
Expand Down
Loading