Skip to content

Ember 7 compat #1200

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

Merged
NullVoxPopuli merged 23 commits into from
Apr 23, 2026
Merged

Ember 7 compat #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1dcc201
Update ember-cli-htmlbars to v7 for ember 7 compatibility
NullVoxPopuli Apr 9, 2026
6028088
Update lockfile and fix lints
NullVoxPopuli Apr 9, 2026
aa9de46
Re-roll lockfile, update Node to 24
NullVoxPopuli Apr 9, 2026
7a7f50e
Update ember-cli to 6.11, ember-source to 6.12, fix ember-try scenarios
NullVoxPopuli Apr 9, 2026
33d0ffb
Update ember-auto-import and embroider packages
NullVoxPopuli Apr 9, 2026
d7010d0
Override ember-cli-htmlbars to ^7.0.1 to fix transitive 6.3.0
NullVoxPopuli Apr 9, 2026
d49bf5b
Update @ember/test-helpers to v5, remove hasEmberVersion import
NullVoxPopuli Apr 9, 2026
759f7e6
Add full embroider build packages for ember-cli 6.11 compat
NullVoxPopuli Apr 9, 2026
f987d94
Restore addon/types that were accidentally removed
NullVoxPopuli Apr 9, 2026
5e633b1
Revert embroider direct deps, use classic build with ember-auto-import
NullVoxPopuli Apr 9, 2026
bcce050
Use ember-cli 5.12 / ember-source 5.12 as base versions
NullVoxPopuli Apr 10, 2026
d51fa4f
Fix lockfile: use ember-cli 5.12 / ember-source 5.12 as base versions
NullVoxPopuli Apr 10, 2026
971998a
Revert @ember/test-helpers to v3 — v5 breaks ember-auto-import webpack
NullVoxPopuli Apr 10, 2026
8ee6229
Restore addon/types
NullVoxPopuli Apr 10, 2026
af0cd3a
Keep @ember/test-helpers v3 and @ember/test-waiters v3
NullVoxPopuli Apr 10, 2026
074ecb1
Restore addon/types
NullVoxPopuli Apr 10, 2026
d9e28d8
Update @ember/test-helpers to v5 and @ember/test-waiters to v4
NullVoxPopuli Apr 10, 2026
0d19e53
Add pnpm build step before tests in all CI jobs
NullVoxPopuli Apr 10, 2026
08871a5
Fix CI: run build from addon/, remove from types job
NullVoxPopuli Apr 10, 2026
b158c4d
Add pnpm i -f after build to re-sync injected dependencies
NullVoxPopuli Apr 10, 2026
461146c
Add public-hoist-pattern for ember-source to .npmrc
NullVoxPopuli Apr 10, 2026
76a0a00
Remove dependency injection
NullVoxPopuli Apr 10, 2026
92eb08c
Fix deprecation
NullVoxPopuli Apr 11, 2026
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
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
branches:
- master
- main
- 'v*'
- "v*"
pull_request:
schedule:
- cron: '0 3 * * *' # daily, at 3am
- cron: "0 3 * * *" # daily, at 3am

concurrency:
group: ci-${{ github.head_ref || github.ref }}
Expand All @@ -22,6 +22,8 @@ jobs:

steps:
- uses: wyvox/action@v1
- run: pnpm build
working-directory: addon
- run: pnpm lint
- run: pnpm test:ember
working-directory: test-app
Expand All @@ -33,28 +35,31 @@ jobs:

steps:
- uses: wyvox/action@v1
- run: pnpm build
working-directory: addon
- run: pnpm lint
- run: pnpm test:ember
working-directory: test-app
- name: embroider test
run: node_modules/.bin/ember try:one embroider-optimized --skip-cleanup
working-directory: test-app


floating-dependencies:
name: 'Floating Dependencies'
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: wyvox/action@v1
with:
pnpm-args: '--no-lockfile'
pnpm-args: "--no-lockfile"
- run: pnpm build
working-directory: addon
- run: pnpm test:ember
working-directory: test-app

try-scenarios:
name: 'Try: ${{ matrix.ember-try-scenario }}'
name: "Try: ${{ matrix.ember-try-scenario }}"
runs-on: ubuntu-latest
timeout-minutes: 10

Expand All @@ -78,6 +83,8 @@ jobs:

steps:
- uses: wyvox/action@v1
- run: pnpm build
working-directory: addon
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
working-directory: test-app
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plan-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 24
cache: pnpm
- run: pnpm install --frozen-lockfile
- name: "Generate Explanation and Prep Changelogs"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 24
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
registry-url: 'https://registry.npmjs.org'
cache: pnpm
Expand Down
5 changes: 5 additions & 0 deletions .npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ auto-install-peers=false
resolve-peers-from-workspace-root=false
resolution-mode=highest
manage-package-manager-versions=false
public-hoist-pattern[]=ember-source
dedupe-injected-deps=true
sync-injected-deps-after-scripts[]=build
sync-injected-deps-after-scripts[]=prepare
inject-workspace-packages=true
9 changes: 4 additions & 5 deletions addon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,21 @@
"prepack": "rollup --config"
},
"dependencies": {
"@embroider/addon-shim": "^1.9.0",
"@embroider/macros": "^1.16.12",
"@embroider/addon-shim": "^1.10.2",
"qunit-theme-ember": "^1.0.0"
},
"devDependencies": {
"@babel/core": "^7.26.10",
"@babel/eslint-parser": "^7.27.0",
"@ember/test-helpers": "^3.0.3",
"@embroider/addon-dev": "^3.0.0",
"@ember/test-helpers": "^5.4.1",
"@embroider/addon-dev": "^3.2.0",
"@embroider/macros": "^1.20.2",
"@glimmer/component": "^2.0.0",
"@rollup/plugin-babel": "^5.3.0",
"@tsconfig/ember": "^2.0.0",
"@types/qunit": "^2.19.12",
"@types/rsvp": "^4.0.4",
"concurrently": "^9.1.2",
"ember-source": "^5.0.0",
Copy link
Copy Markdown

@evoactivity evoactivity Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be removed?

Copy link
Copy Markdown
Collaborator Author

@NullVoxPopuli NullVoxPopuli Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes because of macro / peer resolution

"eslint": "^8.52.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-disable-features": "^0.1.3",
Expand Down
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@
},
"packageManager": "pnpm@10.7.0",
"volta": {
"node": "^18.17.0",
"node": "^24.0.0",
"pnpm": "10.7.0"
},
"pnpm": {
"overrides": {
"ember-cli-htmlbars": "^7.0.1"
},
"peerDependencyRules": {
"ignoreMissing": [
"webpack"
Expand Down
Loading
Loading