Skip to content

Adopt latest glint setup (ember-tsc) and pin TypeScript to 6.x #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NullVoxPopuli merged 3 commits into from
Jul 19, 2026
Merged

Adopt latest glint setup (ember-tsc) and pin TypeScript to 6.x #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1084515
chore: adopt latest glint setup (ember-tsc) and pin TypeScript to 6.x
Copilot Jul 19, 2026
0680c9a
ci: also test typescript 5.9 in matrix
Copilot Jul 19, 2026
8205158
chore: silence TS `baseUrl` deprecation warning
Copilot Jul 19, 2026
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
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ jobs:
fail-fast: true
matrix:
typescript-scenario:
- typescript@5.4
- typescript@5.5
- typescript@5.6
- typescript@5.7

@NullVoxPopuli NullVoxPopuli Jul 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot we should still test typescript 5.9 as well

Copilot AI Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added typescript@5.9 back to the matrix alongside typescript@6.0 in 0680c9a.

- typescript@5.9
- typescript@6.0

steps:
- uses: actions/checkout@v4
Expand Down
32 changes: 6 additions & 26 deletions docs-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"lint:types": "ember-tsc --noEmit",
"start": "concurrently 'ember serve' 'pnpm sync-pnpm --watch' --names 'docs-app serve,docs-app sync built package'",
"test:ember": "ember test",
"_syncPnpm": "pnpm sync-pnpm"
Expand All @@ -39,33 +39,13 @@
"@embroider/webpack": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/environment-ember-template-imports": "^1.4.0",
"@glint/template": "^1.4.0",
"@glint/ember-tsc": "^1.0.3",
"@glint/template": "^1.6.1",
"@glint/tsserver-plugin": "^2.0.0",
"@tailwindcss/typography": "^0.5.7",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.1",
"@ember/app-tsconfig": "^1.0.0",
"@types/ember-qunit": "^6.0.0",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.2",
"@types/ember__array": "^4.0.2",
"@types/ember__component": "^4.0.10",
"@types/ember__controller": "^4.0.1",
"@types/ember__debug": "^4.0.1",
"@types/ember__destroyable": "^4.0.0",
"@types/ember__engine": "^4.0.2",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.4",
"@types/ember__owner": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.11",
"@types/ember__runloop": "^4.0.1",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.0.9",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.1",
"@types/qunit": "^2.19.3",
"@types/rsvp": "^4.0.4",
"autoprefixer": "^10.4.12",
Expand Down Expand Up @@ -100,7 +80,7 @@
"qunit-dom": "^3.0.0",
"sync-pnpm": "workspace:*",
"tailwindcss": "^3.1.8",
"typescript": "^5.0.0",
"typescript": "~6.0.0",
"webpack": "^5.75.0"
},
"engines": {
Expand Down
7 changes: 3 additions & 4 deletions docs-app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"glint": {
"environment": ["ember-loose", "ember-template-imports"]
},
"extends": "@ember/app-tsconfig",
"compilerOptions": {
"ignoreDeprecations": "6.0",
"types": ["ember-source/types", "@glint/ember-tsc/types"],
"noEmitOnError": false,

// The combination of `baseUrl` with `paths` allows Ember's classic package
Expand Down
5 changes: 1 addition & 4 deletions docs-app/types/glint-registry.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import '@glint/environment-ember-loose';
import '@glint/environment-ember-template-imports';

// Types from libraries
import type OSSDocs from '@crowdstrike/ember-oss-docs/template-registry';
import type { HelperLike, ModifierLike } from '@glint/template';
Expand All @@ -16,7 +13,7 @@ declare module '@ember/modifier' {
}>;
}

declare module '@glint/environment-ember-loose/registry' {
declare module '@glint/template/registry' {
export default interface Registry extends OSSDocs {
ThemeSwitcher: typeof ThemeSwitcher;
FeatureCard: typeof FeatureCard;
Expand Down
4 changes: 1 addition & 3 deletions docs/typescript/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,9 @@ This addon is written in TypeScript, and strives to give TypeScript users a firs
All the components, which are `<HeadlessForm>` as well as those [yielded from it](./usage), have strict Glint types. In case you are already using _strict mode templates_ via [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports), you only need to import the component and you are ready to go. For the more likely case of using classic `.hbs` templates, Glint requires a template registry to be set up, that declares a mapping of component _names_ to their types. This addon follows the [recommendations for Glint-enabled addons](https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons#using-glint-enabled-addons), so add the addon's provided registry to your app's own registry as follows:

```ts
import '@glint/environment-ember-loose';

import type HeadlessFormRegistry from 'ember-headless-form/template-registry';

declare module '@glint/environment-ember-loose/registry' {
declare module '@glint/template/registry' {
export default interface Registry extends HeadlessFormRegistry {
// your app's own entries here...
}
Expand Down
12 changes: 0 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,5 @@
"packageManager": "pnpm@10.30.0",
"engines": {
"node": "^24.0.0"
},
"pnpm": {
"peerDependencyRules": {
"ignore-notes": {
"@babel/core": "See https://github.com/embroider-build/addon-blueprint/pull/77",
"ember-cli-htmlbars": "required by ember-tracked-storage-polyfill and tracked-built-ins: solution convert to babel plugin?"
},
"ignoreMissing": [
"ember-cli-htmlbars",
"@babel/core"
]
}
}
}
29 changes: 6 additions & 23 deletions packages/changeset/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"lint:types": "ember-tsc --noEmit",
"start": "rollup --config --watch",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'"
},
Expand All @@ -42,27 +42,10 @@
"@universal-ember/form": "workspace:^1",
"@embroider/addon-dev": "^7.0.0",
"@glimmer/component": "^1.1.2",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.0",
"@types/ember__object": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__application": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@glint/ember-tsc": "^1.0.3",
"@glint/template": "^1.6.1",
"@glint/tsserver-plugin": "^2.0.0",
"@ember/library-tsconfig": "^1.0.0",
"concurrently": "^9.0.0",
"ember-changeset": "^4.0.0",
"ember-template-lint": "^4.0.0",
Expand All @@ -72,7 +55,7 @@
"rollup": "^4.0.0",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-ts": "^3.0.2",
"typescript": "^5.0.0",
"typescript": "~6.0.0",
"validated-changeset": "^1.3.4",
"webpack": "^5.75.0"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/changeset/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/library-tsconfig",
"include": ["src/**/*", "unpublished-development-types/**/*"],
"glint": {
"environment": "ember-loose"
"compilerOptions": {
"ignoreDeprecations": "6.0",
"types": ["ember-source/types", "@glint/ember-tsc/types"]
}
}
4 changes: 1 addition & 3 deletions packages/changeset/unpublished-development-types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Add any types here that you need for local development only.
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!

import '@glint/environment-ember-loose';

declare module '@glint/environment-ember-loose/registry' {
declare module '@glint/template/registry' {
// Remove this once entries have been added! 👇
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export default interface Registry {
Expand Down
32 changes: 6 additions & 26 deletions packages/ember-headless-form/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"lint:types": "ember-tsc --noEmit",
"lint:prettier": "prettier -c .",
"lint:prettier:fix": "prettier -w .",
"start": "rollup --config --watch",
Expand Down Expand Up @@ -48,30 +48,10 @@
"@embroider/addon-dev": "^7.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/environment-ember-template-imports": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.0",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__helper": "^4.0.1",
"@types/ember__modifier": "^4.0.3",
"@types/ember__object": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@glint/ember-tsc": "^1.0.3",
"@glint/template": "^1.6.1",
"@glint/tsserver-plugin": "^2.0.0",
"@ember/library-tsconfig": "^1.0.0",
"concurrently": "^9.0.0",
"ember-source": "^5.0.0",
"ember-template-imports": "^3.4.1",
Expand All @@ -82,7 +62,7 @@
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-glimmer-template-tag": "^0.4.0",
"rollup-plugin-ts": "^3.2.0",
"typescript": "^5.0.0",
"typescript": "~6.0.0",
"webpack": "^5.75.0"
},
"publishConfig": {
Expand Down
7 changes: 4 additions & 3 deletions packages/ember-headless-form/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/library-tsconfig",
"include": ["src/**/*", "unpublished-development-types/**/*"],
"glint": {
"environment": ["ember-loose", "ember-template-imports"]
"compilerOptions": {
"ignoreDeprecations": "6.0",
"types": ["ember-source/types", "@glint/ember-tsc/types"]
}
}
4 changes: 1 addition & 3 deletions packages/ember-headless-form/unpublished-development-types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// Add any types here that you need for local development only.
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!

import '@glint/environment-ember-loose';

import type HeadlessFormRegistry from '../src/template-registry';

declare module '@glint/environment-ember-loose/registry' {
declare module '@glint/template/registry' {
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export default interface Registry extends HeadlessFormRegistry {
// Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
Expand Down
29 changes: 6 additions & 23 deletions packages/yup/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"lint:types": "ember-tsc --noEmit",
"start": "rollup --config --watch",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'"
},
Expand All @@ -42,27 +42,10 @@
"@universal-ember/form": "workspace:^1",
"@embroider/addon-dev": "^7.0.0",
"@glimmer/component": "^1.1.2",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
"@glint/template": "^1.4.0",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.0",
"@types/ember__object": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__application": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@glint/ember-tsc": "^1.0.3",
"@glint/template": "^1.6.1",
"@glint/tsserver-plugin": "^2.0.0",
"@ember/library-tsconfig": "^1.0.0",
"concurrently": "^9.0.0",
"ember-template-lint": "^4.0.0",
"ember-source": "~5.12.0",
Expand All @@ -71,7 +54,7 @@
"rollup": "^4.0.0",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-ts": "^3.0.2",
"typescript": "^5.0.0",
"typescript": "~6.0.0",
"yup": "^1.0.0",
"webpack": "^5.75.0"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/yup/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/library-tsconfig",
"include": ["src/**/*", "unpublished-development-types/**/*"],
"glint": {
"environment": "ember-loose"
"compilerOptions": {
"ignoreDeprecations": "6.0",
"types": ["ember-source/types", "@glint/ember-tsc/types"]
}
}
4 changes: 1 addition & 3 deletions packages/yup/unpublished-development-types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Add any types here that you need for local development only.
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!

import '@glint/environment-ember-loose';

declare module '@glint/environment-ember-loose/registry' {
declare module '@glint/template/registry' {
// Remove this once entries have been added! 👇
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export default interface Registry {
Expand Down
Loading
Loading