Skip to content

Commit fa8c7a4

Browse files
Merge pull request #1565 from emberjs/ember-7-compat
Ember 7 compat
2 parents 5fc32db + bd14a02 commit fa8c7a4

15 files changed

Lines changed: 6778 additions & 6844 deletions

File tree

.github/workflows/ci-build.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
cache: pnpm
2323
- name: Install Dependencies
24-
run: pnpm install
24+
run: pnpm install
2525
- run: pnpm lint
2626

2727
test:
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
cache: pnpm
3838
- name: Install Dependencies
39-
run: pnpm install
39+
run: pnpm install
4040
- run: |
4141
google-chrome --version
4242
@@ -58,11 +58,10 @@ jobs:
5858
with:
5959
cache: pnpm
6060
- name: Install Dependencies
61-
run: pnpm install
61+
run: pnpm install
6262
- run: pnpm build:docs
6363
- run: echo "If this fails, docs gen is out of sync. Please run 'pnpm build:docs'" && git diff --exit-code
6464

65-
6665
floating:
6766
name: "Floating Dependencies"
6867
runs-on: ubuntu-latest
@@ -107,7 +106,7 @@ jobs:
107106
- ember-canary
108107
- ember-default
109108
- embroider-safe
110-
- embroider-optimized
109+
- embroider-optimized
111110
- "@ember/test-waiters@v4"
112111

113112
steps:
@@ -117,7 +116,7 @@ jobs:
117116
with:
118117
cache: pnpm
119118
- name: Install Dependencies
120-
run: pnpm install
119+
run: pnpm install
121120
- name: Build addon
122121
working-directory: addon
123122
run: pnpm build
@@ -134,12 +133,10 @@ jobs:
134133
fail-fast: false
135134
matrix:
136135
ts-version:
137-
- 5.0
138-
- 5.1
139-
- 5.2
140-
- 5.3
141-
- 5.4
142-
- 5.5
136+
- 5.7
137+
- 5.8
138+
- 5.9
139+
- 6.0
143140
- next
144141

145142
steps:
@@ -149,7 +146,7 @@ jobs:
149146
with:
150147
cache: pnpm
151148
- name: Install Dependencies
152-
run: pnpm install
149+
run: pnpm install
153150
- name: Build types for addon
154151
working-directory: addon
155152
run: pnpm build
@@ -158,4 +155,4 @@ jobs:
158155
run: pnpm add --save-dev typescript@${{matrix.ts-version}}
159156
- name: public types
160157
working-directory: type-tests
161-
run: pnpm test
158+
run: pnpm test

addon/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"dependencies": {
5151
"@ember/test-waiters": "^3.1.0 || ^4.0.0",
5252
"@embroider/addon-shim": "^1.10.2",
53-
"@embroider/macros": "^1.16.5",
53+
"@embroider/macros": "^1.20.2",
5454
"@simple-dom/interface": "^1.4.0",
5555
"decorator-transforms": "^2.0.0",
5656
"dom-element-descriptors": "^0.5.0"
@@ -59,14 +59,14 @@
5959
"@babel/core": "^7.25.2",
6060
"@babel/plugin-transform-typescript": "^7.25.2",
6161
"@babel/runtime": "^7.24.4",
62+
"@ember/library-tsconfig": "^2.0.0",
6263
"@embroider/addon-dev": "^5.0.0",
6364
"@glint/template": "^1.4.0",
6465
"@rollup/plugin-babel": "^6.0.4",
65-
"@tsconfig/ember": "^3.0.6",
6666
"@types/rsvp": "^4.0.9",
6767
"@typescript-eslint/eslint-plugin": "^8.2.0",
6868
"@typescript-eslint/parser": "^8.2.0",
69-
"babel-plugin-ember-template-compilation": "^2.2.5",
69+
"babel-plugin-ember-template-compilation": "^4.0.0",
7070
"concurrently": "^8.2.2",
7171
"documentation": "^14.0.3",
7272
"ember-source": "^5.11.0",

0 commit comments

Comments
 (0)