Skip to content

Commit 6412439

Browse files
Merge pull request #544 from universal-ember/all-glint-v2
Glint v2 everywhere
2 parents 9a8f3b6 + ab1455a commit 6412439

File tree

5 files changed

+82
-451
lines changed

5 files changed

+82
-451
lines changed

docs-app/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"lint:hbs:fix": "pnpm -w exec lint hbs:fix",
2121
"lint:prettier:fix": "pnpm -w exec lint prettier:fix",
2222
"lint:prettier": "pnpm -w exec lint prettier",
23-
"lint:types": "glint",
23+
"lint:types": "ember-tsc --noEmit",
2424
"start": "pnpm vite",
2525
"test": "vite build --mode test && ember test --path dist",
2626
"test:ember": "vite build --mode test && ember test --path dist"
@@ -68,10 +68,9 @@
6868
"@embroider/vite": "^1.3.6",
6969
"@fontsource/lexend": "^5.2.11",
7070
"@glimmer/component": "^2.0.0",
71-
"@glint/core": "1.5.2",
72-
"@glint/environment-ember-loose": "1.5.2",
73-
"@glint/environment-ember-template-imports": "1.5.2",
74-
"@glint/template": "1.5.2",
71+
"@glint/ember-tsc": "^1.0.3",
72+
"@glint/template": "^1.6.1",
73+
"@glint/tsserver-plugin": "^2.0.3",
7574
"@nullvoxpopuli/eslint-configs": "^5.3.4",
7675
"@rollup/plugin-babel": "^6.1.0",
7776
"@tailwindcss/typography": "^0.5.15",

docs-app/tsconfig.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
22
"extends": "@ember/app-tsconfig",
33
"include": ["app", "tests", "types"],
4-
"glint": {
5-
"environment": ["ember-loose", "ember-template-imports"]
6-
},
74
"compilerOptions": {
85
"paths": {
96
"docs-app/tests/*": ["./tests/*"],
107
"docs-app/*": ["./app/*"],
118
"*": ["./types/*"]
129
},
13-
"types": ["ember-source/types", "kolay/virtual", "@embroider/core/virtual"]
10+
"types": [
11+
"ember-source/types",
12+
"kolay/virtual",
13+
"@embroider/core/virtual",
14+
"@glint/ember-tsc/types"
15+
]
1416
}
1517
}

ember-primitives/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"include": ["src/**/*"],
44
"compilerOptions": {
55
"rootDir": "./src",
6-
"types": ["ember-source/types"]
6+
"types": ["ember-source/types", "@glint/ember-tsc/types"]
77
}
88
}

0 commit comments

Comments
 (0)