Skip to content

Commit ba644f7

Browse files
committed
Update to stable Glint
1 parent 4734db4 commit ba644f7

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

files/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@
4848
"@embroider/vite": "^1.1.5",
4949
"@eslint/js": "^9.17.0",
5050
"@glimmer/component": "^2.0.0",<% if (typescript) { %>
51-
"@glint/core": "^2.0.0-alpha.2",
52-
"@glint/environment-ember-loose": "^2.0.0-alpha.2",
53-
"@glint/environment-ember-template-imports": "^2.0.0-alpha.2",
54-
"@glint/template": "^1.6.0-alpha.1",
55-
"@glint/tsserver-plugin": "^2.0.0-alpha.2",<% } %>
51+
"@glint/ember-tsc": "^1.0.0",
52+
"@glint/template": "^1.6.0",
53+
"@glint/tsserver-plugin": "^2.0.0",<% } %>
5654
"@rollup/plugin-babel": "^6.0.4",<% if (typescript) { %>
5755
"@types/qunit": "^2.19.12",<% } %>
5856
"babel-plugin-ember-template-compilation": "^2.2.5",

files/rollup.config.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ export default {
6363
// Emit .d.ts declaration files
6464
addon.declarations(
6565
'declarations',
66-
`npx glint --declaration --project ${tsConfig}`,
66+
<% if (pnpm) { %>`pnpm ember-tsc --declaration --project ${tsConfig}`,
67+
<% } else if (npm) { %>`npm exec ember-tsc --declaration --project ${tsconfig}`,
68+
<% } else { %>`npx @glint/ember-tsc --declaration --project ${tsconfig}`,<% } %>
6769
),<% } %>
6870

6971
// addons are allowed to contain imports of .css files, which we want rollup

files/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"],
1212
"compilerOptions": {
1313
"rootDir": ".",
14-
"types": ["ember-source/types", "vite/client", "@embroider/core/virtual"]
14+
"types": ["ember-source/types", "vite/client", "@embroider/core/virtual", "@glint/ember-tsc/types"]
1515
}
1616
}

files/tsconfig.publish.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
*/
2626
"rootDir": "./src",
2727

28-
"types": ["ember-source/types"]
28+
"types": ["ember-source/types", "@glint/ember-tsc/types"]
2929
}
3030
}

0 commit comments

Comments
 (0)