Skip to content

Commit

Permalink
Merge pull request #1482 from emberjs/inject-test-helpers-in-the-test…
Browse files Browse the repository at this point in the history
…-app

Resolve Error: @ember/test-helpers is trying to import from @ember/-internals but that is not one of its explicit dependencies
  • Loading branch information
NullVoxPopuli authored Aug 22, 2024
2 parents 5dec44c + c7e1e0a commit e31db51
Show file tree
Hide file tree
Showing 4 changed files with 1,085 additions and 33 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ jobs:
run: pnpm build
- name: test
working-directory: test-app
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
run: |
pnpm _syncPnpm
node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
types:
runs-on: ubuntu-latest
Expand Down
6 changes: 5 additions & 1 deletion addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
"start": "rollup --config --watch --no-watch.clearScreen",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
},
"dependencies": {
"@ember/test-waiters": "^3.1.0",
"@embroider/addon-shim": "^1.8.7",
Expand Down Expand Up @@ -94,6 +97,7 @@
"version": 2,
"type": "addon",
"main": "addon-main.cjs",
"app-js": {}
"app-js": {},
"externals": ["@glimmer/manager", "@ember/-internals"]
}
}
13 changes: 10 additions & 3 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "ember test",
"test:ember": "ember test"
"start": "pnpm _syncPnpm && concurrently 'ember serve' 'pnpm _syncPnpm --watch' --names 'tests serve,tests sync deps'",
"test": "pnpm _syncPnpm; ember test",
"test:ember": "ember test",
"_syncPnpm": "DEBUG=sync-pnpm pnpm sync-dependencies-meta-injected"
},
"dependenciesMeta": {
"@ember/test-helpers": {
"injected": true
}
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
Expand Down Expand Up @@ -59,6 +65,7 @@
"eslint-plugin-qunit": "^7.3.4",
"latest-version": "^5.0.0",
"loader.js": "^4.7.0",
"pnpm-sync-dependencies-meta-injected": "^0.0.14",
"pretender": "^3.4.7",
"prettier": "^2.8.7",
"qunit": "^2.21.1",
Expand Down
Loading

0 comments on commit e31db51

Please sign in to comment.