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
19 changes: 17 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,38 @@ jobs:
fail-fast: true
matrix:
typescript-scenario:
- typescript@5.5
- typescript@5.6
- typescript@5.7
- typescript@5.8
- typescript@5.9
- typescript@6.0
- typescript@next

steps:
- uses: actions/checkout@v6
- uses: wyvox/action-setup-pnpm@v3
- uses: ./.github/actions/download-built-package
- name: 'Change TS to ${{ matrix.typescript-scenario }}'
run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
if: matrix.typescript-scenario != 'typescript@next'
# A bare typescript@6.0 keeps the @typescript/typescript6 alias, so name the npm package
run: 'pnpm add --save-dev "typescript@npm:${{ matrix.typescript-scenario }}"'
working-directory: ./test-app
- name: 'Type checking'
if: matrix.typescript-scenario != 'typescript@next'
run: |
pnpm --filter test-app exec tsc -v;
pnpm --filter test-app exec ember-tsc --version;
pnpm --filter test-app exec ember-tsc --noEmit;
# TypeScript 7 checks .gts through ember-content-mapper, not ember-tsc
- name: 'Change TS to the latest TypeScript 7 nightly'
if: matrix.typescript-scenario == 'typescript@next'
run: 'pnpm add --save-dev "@typescript/native@npm:typescript@next"'
working-directory: ./test-app
- name: 'Type checking (TypeScript 7)'
if: matrix.typescript-scenario == 'typescript@next'
run: |
pnpm --filter test-app exec tsc -v;
pnpm --filter test-app exec tsc --noEmit --runExternalCode;


default_tests:
Expand Down
4 changes: 2 additions & 2 deletions docs-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"docs:watch": "typedoc --options ./typedoc.config.json --watch"
},
"devDependencies": {
"typedoc": "^0.28.17",
"typedoc": "^0.28.20",
"typedoc-github-wiki-theme": "^2.1.0",
"typedoc-gitlab-wiki-theme": "^2.1.0",
"typedoc-plugin-markdown": "^4.10.0",
"typedoc-plugin-markdown-pages": "^0.3.0",
"typedoc-plugin-mdn-links": "^5.1.1",
"typescript": "~5.9.3"
"typescript": "npm:@typescript/typescript6@^6.0.2"
}
}
10 changes: 6 additions & 4 deletions docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"lint:types": "ember-tsc --noEmit",
"lint:types": "tsc --noEmit --runExternalCode",
"start": "vite",
"test": "pnpm test:ember",
"test:ember": "pnpm build:test && pnpm dist:ember:test",
Expand All @@ -46,21 +46,23 @@
"@embroider/macros": "^1.19.7",
"@embroider/vite": "^1.5.2",
"@glimmer/component": "^2.0.0",
"@glint/ember-tsc": "^1.1.1",
"@glint/template": "1.7.4",
"@glint/ember-tsc": "^1.11.4",
"@glint/template": "1.9.0",
"@html-next/vertical-collection": "^5.0.2",
"@rollup/plugin-babel": "^6.1.0",
"@tailwindcss/typography": "^0.5.19",
"@tsconfig/ember": "^3.0.12",
"@types/dompurify": "^3.2.0",
"@types/qunit": "^2.19.13",
"@types/rsvp": "^4.0.9",
"@typescript/native": "npm:typescript@7.1.0-dev.20260922.1",
"autoprefixer": "^10.4.24",
"concurrently": "^9.2.1",
"cssnano": "^7.1.2",
"decorator-transforms": "^2.3.1",
"ember-auto-import": "^2.12.0",
"ember-cli": "~6.11.0",
"ember-content-mapper": "^0.3.1",
"ember-eslint": "^0.6.1",
"ember-page-title": "^9.0.3",
"ember-qunit": "^9.0.4",
Expand All @@ -76,7 +78,7 @@
"qunit": "^2.25.0",
"qunit-dom": "^3.5.0",
"tailwindcss": "^3.4.17",
"typescript": "~5.9.3",
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vite": "7.3.5"
},
"ember": {
Expand Down
13 changes: 7 additions & 6 deletions docs-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,17 @@

// stylistic
"noPropertyAccessFromIndexSignature": false,

// 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": ".",
"types": [
"vite/client",
"@embroider/core/virtual",
"ember-source/types",
"kolay/virtual"
]
}
},
"contentMappers": [
{
"package": "ember-content-mapper",
"extensions": [".gts", ".gjs"]
}
]
}
Loading
Loading