Skip to content

Commit 029d14d

Browse files
Merge pull request #125 from ember-cli/nvp/glint2
Glint 2 (for `--typescript` projects)
2 parents 0d46c3c + 905b0d4 commit 029d14d

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

files/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"lint:hbs:fix": "ember-template-lint . --fix",
2323
"lint:js": "eslint . --cache",
2424
"lint:js:fix": "eslint . --fix<% if (typescript) { %>",
25-
"lint:types": "glint<% } %>",
25+
"lint:types": "ember-tsc --noEmit<% } %>",
2626
"start": "vite",
2727
"test": "vite build --mode development && ember test --path dist"
2828
},
@@ -50,10 +50,9 @@
5050
"@embroider/legacy-inspector-support": "^0.1.3",
5151
"@eslint/js": "^9.37.0",
5252
"@glimmer/component": "^2.0.0<% if (typescript) { %>",
53-
"@glint/core": "^1.5.2",
54-
"@glint/environment-ember-loose": "^1.5.2",
55-
"@glint/environment-ember-template-imports": "^1.5.2",
56-
"@glint/template": "^1.6.1<% } %>",
53+
"@glint/ember-tsc": "^1.0.4",
54+
"@glint/template": "^1.6.2",
55+
"@glint/tsserver-plugin": "^2.0.4<% } %>",
5756
"@rollup/plugin-babel": "^6.0.4<% if (typescript) { %>",
5857
"@types/qunit": "^2.19.13",
5958
"@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",

files/tsconfig.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"extends": "@ember/app-tsconfig",
33
"include": ["app", "tests", "types"],
4-
"glint": {
5-
"environment": ["ember-loose", "ember-template-imports"]
6-
},
74
"compilerOptions": {
85
"allowJs": true,
96
"paths": {
107
"<%= name %>/tests/*": ["./tests/*"],
118
"<%= name %>/*": ["./app/*"],
129
"*": ["./types/*"]
1310
},
14-
"types": ["ember-source/types", "@embroider/core/virtual", "vite/client"]
11+
"types": [
12+
"ember-source/types",
13+
"@embroider/core/virtual",
14+
"vite/client",
15+
"@glint/ember-tsc/types"
16+
]
1517
}
1618
}

tests/lint.test.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('linting & formatting', function () {
5656
it('glint passes', async function () {
5757
expect(
5858
JSON.parse(app.files['package.json']).scripts['lint:types'],
59-
).to.equal('glint');
59+
).to.equal('ember-tsc --noEmit');
6060

6161
let { exitCode, stdout } = await app.execa('pnpm', ['lint:types']);
6262

0 commit comments

Comments
 (0)