Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ jobs:
fail-fast: false
matrix:
typescript-scenario:
- typescript@5.0
- typescript@5.1
- typescript@5.2
- typescript@5.3
- typescript@5.7
- typescript@5.8
- typescript@5.9
- typescript@6.0
- typescript@next

steps:
Expand Down
4 changes: 2 additions & 2 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@ember/library-tsconfig": "^2.0.0",
"@embroider/addon-dev": "^4.1.3",
"@glint/core": "^1.5.2",
"@glint/environment-ember-loose": "^1.5.2",
"@glint/environment-ember-template-imports": "^1.5.2",
"@glint/template": "^1.5.2",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.3",
"@types/rsvp": "^4.0.8",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
Expand All @@ -94,7 +94,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^3.1.1",
"rollup": "^4.9.1",
"typescript": "^5.3.3"
"typescript": "^6.0.2"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
32 changes: 2 additions & 30 deletions addon/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/library-tsconfig",
"include": [
"src/**/*",
"unpublished-development-types/**/*"
Expand All @@ -8,35 +8,7 @@
"environment": ["ember-loose", "ember-template-imports"]
},
"compilerOptions": {

/**
https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions

We want our tooling to know how to resolve our custom files so the appropriate plugins
can do the proper transformations on those files.
*/
"allowImportingTsExtensions": true,
"allowJs": true,
"declarationDir": "declarations",

/**
https://www.typescriptlang.org/tsconfig#rootDir
"Default: The longest common path of all non-declaration input files."

Because we want our declarations' structure to match our rollup output,
we need this "rootDir" to match the "srcDir" in the rollup.config.mjs.

This way, we can have simpler `package.json#exports` that matches
imports to files on disk
*/
"rootDir": "./src",

/**
https://www.typescriptlang.org/tsconfig#verbatimModuleSyntax

We don't want to include types dependencies in our compiled output, so tell TypeScript
to enforce using `import type` instead of `import` for Types.
*/
"verbatimModuleSyntax": true
"rootDir": "./src"
}
}
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@ember/app-tsconfig": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
Expand All @@ -40,7 +41,6 @@
"@glint/environment-ember-loose": "^1.5.2",
"@glint/environment-ember-template-imports": "^1.5.2",
"@glint/template": "^1.5.2",
"@tsconfig/ember": "^3.0.3",
"@types/qunit": "^2.19.9",
"@types/rsvp": "^4.0.8",
"@typescript-eslint/eslint-plugin": "^6.16.0",
Expand All @@ -63,7 +63,7 @@
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.5.0",
"ember-source": "~6.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-imports": "^4.0.0",
"ember-template-lint": "^6.1.0",
Expand All @@ -81,7 +81,7 @@
"qunit": "^2.16.0",
"sass": "^1.43.3",
"standard-version": "^9.3.2",
"typescript": "^5.3.3",
"typescript": "^6.0.2",
"webpack": "^5.0.0"
},
"engines": {
Expand Down
9 changes: 1 addition & 8 deletions docs/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/app-tsconfig",
"compilerOptions": {
// The combination of `baseUrl` with `paths` allows Ember's classic package
// layout, which is not resolvable with the Node resolution algorithm, to
// work with TypeScript.
"baseUrl": ".",
"allowJs": true,
// older glimmer doesn't have correct imports
// needs "import type"
"verbatimModuleSyntax": false,
"paths": {
"docs/tests/*": ["tests/*"],
"docs/*": ["app/*"],
Expand Down
Loading
Loading