Skip to content

Commit f84c442

Browse files
committed
Because @ember/test-helpers uses a macroCondition looking at ember-source, and declares a peerDependency, we must use depMeta*injected
1 parent 23aa201 commit f84c442

3 files changed

Lines changed: 43 additions & 5 deletions

File tree

.github/workflows/ci-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
- name: Build addon
4141
working-directory: addon
4242
run: pnpm build
43+
- run: pnpm i -f # sync injected dependencies
4344
- run: pnpm test
45+
working-directory: test-app
4446
- name: own types
4547
working-directory: addon
4648
run: pnpm tsc --noEmit
@@ -61,7 +63,9 @@ jobs:
6163
- name: Build addon
6264
working-directory: addon
6365
run: pnpm build
66+
- run: pnpm i -f # sync injected dependencies
6467
- name: Run Tests
68+
working-directory: test-app
6569
run: pnpm test
6670
- name: own types
6771
working-directory: addon
@@ -103,6 +107,7 @@ jobs:
103107
- name: Build addon
104108
working-directory: addon
105109
run: pnpm build
110+
- run: pnpm i -f # sync injected dependencies
106111
- name: test
107112
working-directory: test-app
108113
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup

pnpm-lock.yaml

Lines changed: 32 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app/package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@
2222
"test": "ember test",
2323
"test:ember": "ember test"
2424
},
25+
"dependenciesMeta": {
26+
"@ember/test-helpers": {
27+
"injected": true
28+
}
29+
},
2530
"devDependencies": {
2631
"@babel/eslint-parser": "^7.21.3",
2732
"@babel/plugin-proposal-decorators": "^7.21.0",
2833
"@ember/jquery": "^2.0.0",
2934
"@ember/optional-features": "^2.0.0",
3035
"@ember/string": "^3.0.1",
3136
"@ember/test-helpers": "workspace:*",
32-
"pretender": "^3.4.7",
3337
"@embroider/test-setup": "^4.0.0",
3438
"@glimmer/component": "^1.1.2",
3539
"@glimmer/tracking": "^1.1.2",
@@ -60,6 +64,7 @@
6064
"eslint-plugin-qunit": "^7.3.4",
6165
"latest-version": "^5.0.0",
6266
"loader.js": "^4.7.0",
67+
"pretender": "^3.4.7",
6368
"prettier": "^2.8.7",
6469
"qunit": "^2.21.1",
6570
"qunit-dom": "^3.2.0",

0 commit comments

Comments
 (0)