Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3d1c932

Browse files
committedJun 12, 2023
Move type tests to their own package so that the test-dependencies do not interfere with the peer requirements of the addon
1 parent 5875106 commit 3d1c932

File tree

9 files changed

+231
-85
lines changed

9 files changed

+231
-85
lines changed
 

‎.github/workflows/ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ jobs:
7373
ts-version:
7474
- 4.8
7575
- 4.9
76+
- 5.0
77+
- 5.1
7678
- next
7779

7880
steps:
@@ -82,4 +84,4 @@ jobs:
8284
working-directory: addon
8385
- name: test types
8486
run: pnpm test:types
85-
working-directory: addon
87+
working-directory: test-types

‎addon/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"lint:js": "eslint . --cache",
3535
"lint:js:fix": "eslint . --fix",
3636
"start": "rollup --config --watch",
37-
"test:types": "tsc --noEmit --project types",
3837
"prepack": "rollup --config"
3938
},
4039
"dependencies": {
@@ -52,8 +51,6 @@
5251
"@types/qunit": "^2.19.4",
5352
"@types/rsvp": "^4.0.4",
5453
"concurrently": "^8.0.1",
55-
"ember-cli-htmlbars": "^6.2.0",
56-
"ember-resolver": "^10.1.0",
5754
"ember-source": "^4.10.0",
5855
"eslint": "^8.35.0",
5956
"eslint-config-prettier": "^8.6.0",

‎addon/types/tsconfig.json

-11
This file was deleted.

‎pnpm-lock.yaml

+194-70
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
packages:
22
- addon
33
- test-app
4+
- test-types

‎test-types/package.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "test-types",
3+
"version": "0.0.0",
4+
"private": true,
5+
"scripts": {
6+
"test:types": "tsc --noEmit"
7+
},
8+
"dependencies": {
9+
"ember-qunit": "workspace:*"
10+
},
11+
"devDependencies": {
12+
"@babel/core": "^7.21.0",
13+
"@ember/string": "^3.1.1",
14+
"@ember/test-helpers": "^3.0.3",
15+
"@glimmer/component": "^1.1.2",
16+
"@tsconfig/ember": "^2.0.0",
17+
"@types/qunit": "^2.19.4",
18+
"ember-cli-htmlbars": "^6.2.0",
19+
"ember-resolver": "^10.1.0",
20+
"ember-source": "^5.0.0",
21+
"qunit": "^2.19.4",
22+
"typescript": "^4.9.5"
23+
},
24+
"volta": {
25+
"extends": "../package.json"
26+
}
27+
}
File renamed without changes.

‎test-types/tsconfig.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": "@tsconfig/ember",
3+
"include": ["src", "types"]
4+
}

‎test-types/types/index.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import "ember-source/types";
2+
import "ember-source/types/preview";

0 commit comments

Comments
 (0)
Please sign in to comment.