Skip to content

Commit e31db51

Browse files
Merge pull request #1482 from emberjs/inject-test-helpers-in-the-test-app
Resolve Error: @ember/test-helpers is trying to import from @ember/-internals but that is not one of its explicit dependencies
2 parents 5dec44c + c7e1e0a commit e31db51

File tree

4 files changed

+1085
-33
lines changed

4 files changed

+1085
-33
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ jobs:
120120
run: pnpm build
121121
- name: test
122122
working-directory: test-app
123-
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
123+
run: |
124+
pnpm _syncPnpm
125+
node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
124126
125127
types:
126128
runs-on: ubuntu-latest

addon/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
"start": "rollup --config --watch --no-watch.clearScreen",
4848
"test": "echo 'A v2 addon does not have tests, run tests in test-app'"
4949
},
50+
"peerDependencies": {
51+
"ember-source": ">= 4.0.0"
52+
},
5053
"dependencies": {
5154
"@ember/test-waiters": "^3.1.0",
5255
"@embroider/addon-shim": "^1.8.7",
@@ -94,6 +97,7 @@
9497
"version": 2,
9598
"type": "addon",
9699
"main": "addon-main.cjs",
97-
"app-js": {}
100+
"app-js": {},
101+
"externals": ["@glimmer/manager", "@ember/-internals"]
98102
}
99103
}

test-app/package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@
1818
"lint:hbs:fix": "ember-template-lint . --fix",
1919
"lint:js": "eslint . --cache",
2020
"lint:js:fix": "eslint . --fix",
21-
"start": "ember serve",
22-
"test": "ember test",
23-
"test:ember": "ember test"
21+
"start": "pnpm _syncPnpm && concurrently 'ember serve' 'pnpm _syncPnpm --watch' --names 'tests serve,tests sync deps'",
22+
"test": "pnpm _syncPnpm; ember test",
23+
"test:ember": "ember test",
24+
"_syncPnpm": "DEBUG=sync-pnpm pnpm sync-dependencies-meta-injected"
25+
},
26+
"dependenciesMeta": {
27+
"@ember/test-helpers": {
28+
"injected": true
29+
}
2430
},
2531
"devDependencies": {
2632
"@babel/eslint-parser": "^7.21.3",
@@ -59,6 +65,7 @@
5965
"eslint-plugin-qunit": "^7.3.4",
6066
"latest-version": "^5.0.0",
6167
"loader.js": "^4.7.0",
68+
"pnpm-sync-dependencies-meta-injected": "^0.0.14",
6269
"pretender": "^3.4.7",
6370
"prettier": "^2.8.7",
6471
"qunit": "^2.21.1",

0 commit comments

Comments
 (0)