Skip to content

Commit e96b8d6

Browse files
authored
Merge pull request #92 from ember-cli/ts
TS conversion
2 parents 5356d6b + 189b04f commit e96b8d6

17 files changed

+519
-356
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
cache: pnpm
2525
- run: pnpm install
2626
- run: pnpm lint
27+
- run: pnpm tsc
2728

2829
build:
2930
runs-on: ubuntu-latest
@@ -45,4 +46,5 @@ jobs:
4546
node-version: ${{ matrix.node-version }}
4647
cache: pnpm
4748
- run: pnpm install
49+
- run: pnpm tsc
4850
- run: pnpm test

eslint.config.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@ import js from '@eslint/js';
22
import prettier from 'eslint-plugin-prettier/recommended';
33
import node from 'eslint-plugin-n';
44
import globals from 'globals';
5+
import tsParser from '@typescript-eslint/parser';
56

67
export default [
78
js.configs.recommended,
89
prettier,
910
node.configs['flat/recommended-module'],
1011
{
1112
languageOptions: {
13+
parser: tsParser,
1214
ecmaVersion: 2022,
1315
sourceType: 'module',
1416
globals: {
@@ -20,14 +22,14 @@ export default [
2022
},
2123
},
2224
{
23-
files: ['tests/**/*.js'],
25+
files: ['tests/**/*.ts'],
2426
languageOptions: {
2527
globals: {
2628
...globals.jest,
2729
},
2830
},
2931
},
3032
{
31-
ignores: ['fixtures/**'],
33+
ignores: ['fixtures/**', 'dist/**'],
3234
},
3335
];

package.json

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
"Kris Selden <[email protected]>",
1717
"Robert Jackson <[email protected]>"
1818
],
19-
"main": "src/index.js",
19+
"main": "dist/src/index.js",
2020
"files": [
21-
"src/",
22-
"!src/tests"
21+
"dist/src/"
2322
],
2423
"scripts": {
2524
"changelog": "lerna-changelog",
@@ -28,7 +27,7 @@
2827
},
2928
"jest": {
3029
"testMatch": [
31-
"<rootDir>/tests/**/*-test.js"
30+
"<rootDir>/dist/tests/**/*-test.js"
3231
]
3332
},
3433
"dependencies": {
@@ -39,6 +38,12 @@
3938
"@babel/preset-env": "^7.24.4",
4039
"@eslint/js": "^9.0.0",
4140
"@release-it-plugins/lerna-changelog": "^6.1.0",
41+
"@types/babel__core": "^7.20.5",
42+
"@types/chai": "^4.3.14",
43+
"@types/jest": "^29.5.12",
44+
"@types/node": "^20.12.7",
45+
"@types/semver": "^7.5.8",
46+
"@typescript-eslint/parser": "^7.6.0",
4247
"chai": "^4.0.0",
4348
"code-equality-assertions": "^0.9.0",
4449
"eslint": "^9.0.0",
@@ -49,7 +54,8 @@
4954
"jest": "^29.7.0",
5055
"lerna-changelog": "^2.2.0",
5156
"prettier": "^3.2.5",
52-
"release-it": "^17.1.1"
57+
"release-it": "^17.1.1",
58+
"typescript": "^5.4.5"
5359
},
5460
"peerDependencies": {
5561
"@babel/core": "^7.0.0"

0 commit comments

Comments
 (0)