Fix TS support, allowing type-checking in tests

files/babel.config.cjs

@@ -1,3 +1,8 @@
+/**
+ * This babel.config is not used for publishing.
+ * It's only for the local editing experience
+ * (and linting)
+ */
 const { buildMacros } = require('@embroider/macros/babel');
 
 const {
@@ -12,11 +17,14 @@ const isCompat = Boolean(process.env.ENABLE_COMPAT_BUILD);
 
 module.exports = {
   plugins: [<% if (typescript) { %>
-    ['@babel/plugin-transform-typescript', {
-      allExtensions: true,
-      allowDeclareFields: true,
-      onlyRemoveTypeImports: true,
-    }],<% } %>
+    [
+      '@babel/plugin-transform-typescript',
+      {
+        allExtensions: true,
+        allowDeclareFields: true,
+        onlyRemoveTypeImports: true,
+      },
+    ],<% } %>
     [
       'babel-plugin-ember-template-compilation',
       {

files/babel.publish.config.cjs

@@ -1,3 +1,8 @@
+/**
+ * This babel.config is only used for publishing.
+ *
+ * For local dev experience, see the babel.config
+ */
 module.exports = {
   plugins: [<% if (typescript) { %>
     [

files/package.json

@@ -38,19 +38,22 @@
     "@babel/plugin-transform-typescript": "^7.25.2",<% } %>
     "@babel/runtime": "^7.25.6",
     "@ember/test-helpers": "^5.2.1",
-    "@embroider/addon-dev": "^8.0.1",
+    "@embroider/addon-dev": "^8.1.0",
     "@embroider/core": "^4.1.0",
     "@embroider/compat": "^4.1.0",
     "@embroider/macros": "^1.18.0",
     "@embroider/vite": "^1.1.5",
     "@eslint/js": "^9.17.0",
     "@glimmer/component": "^2.0.0",<% if (typescript) { %>
-    "@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/core": "^2.0.0-alpha.2",
+    "@glint/environment-ember-loose": "^2.0.0-alpha.2",
+    "@glint/environment-ember-template-imports": "^2.0.0-alpha.2",
+    "@glint/tsserver-plugin": "^2.0.0-alpha.2",
+    "@glint/template": "^1.6.0-alpha.1",
+    "@ember/app-tsconfig": "^1.0.0",
     "@ember/library-tsconfig": "^1.0.0",<% } %>
-    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-babel": "^6.0.4",<% if (typescript) { %>
+    "@types/qunit": "^2.19.12",<% } %>
     "babel-plugin-ember-template-compilation": "^2.2.5",
     "concurrently": "^9.0.1",
     "ember-qunit": "^9.0.2",
@@ -70,7 +73,7 @@
     "rollup": "^4.22.5",
     "testem": "^3.15.1",<% if (typescript) { %>
     "typescript-eslint": "^8.19.1",
-    "typescript": "~5.6.0",<% } %>
+    "typescript": "~5.8.3",<% } %>
     "vite": "^6.2.4"
   },
   "ember": {

files/rollup.config.mjs

@@ -8,6 +8,10 @@ const addon = new Addon({
   destDir: 'dist',
 });
 
+const rootDirectory = dirname(fileURLToPath(import.meta.url));
+const babelConfig = resolve(rootDirectory, './babel.publish.config.cjs');<% if (typescript) { %>
+const tsConfig = resolve(rootDirectory, './tsconfig.publish.json');<% } %>
+
 export default {
   // This provides defaults that work well alongside `publicEntrypoints` below.
   // You can augment this if you need to.
@@ -47,10 +51,7 @@ export default {
     babel({
       extensions: ['.js', '.gjs'<% if (typescript) { %>, '.ts', '.gts'<% } %>],
       babelHelpers: 'bundled',
-      configFile: resolve(
-        dirname(fileURLToPath(import.meta.url)),
-        './babel.publish.config.cjs',
-      ),
+      configFile: babelConfig,
     }),
 
     // Ensure that standalone .hbs files are properly integrated as Javascript.
@@ -60,7 +61,10 @@ export default {
     addon.gjs(),<% if (typescript) { %>
 
     // Emit .d.ts declaration files
-    addon.declarations('declarations'),<% } %>
+    addon.declarations(
+      'declarations',
+      `npx glint --declaration --project ${tsConfig}`,
+    ),<% } %>
 
     // addons are allowed to contain imports of .css files, which we want rollup
     // to leave alone and keep in the published output.

files/tsconfig.json

@@ -1,25 +1,16 @@
+/**
+ * This tsconfig is not used for publishing.
+ * It's only for the local editing experience
+ * (and linting)
+ */
 {
-  "extends": "@ember/library-tsconfig",
-  "include": ["src/**/*", "unpublished-development-types/**/*"],
+  "extends": "@ember/app-tsconfig",
   "glint": {
     "environment": ["ember-loose", "ember-template-imports"]
   },
+  "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"],
   "compilerOptions": {
-    "allowJs": true,
-    "declarationDir": "declarations",
-
-    /**
-      https://www.typescriptlang.org/tsconfig#rootDir
-      "Default: The longest common path of all non-declaration input files."
-
-      Because we want our declarations' structure to match our rollup output,
-      we need this "rootDir" to match the "srcDir" in the rollup.config.mjs.
-
-      This way, we can have simpler `package.json#exports` that matches
-      imports to files on disk
-    */
-    "rootDir": "./src",
-
-    "types": ["ember-source/types"]
+    "rootDir": ".",
+    "types": ["ember-source/types", "vite/client", "@embroider/core/virtual"]
   }
 }

files/tsconfig.publish.json

@@ -0,0 +1,30 @@
+/**
+ * This tsconfig is only used for publishing.
+ *
+ * For local dev experience, see the tsconfig.json
+ */
+{
+  "extends": "@ember/library-tsconfig",
+  "include": ["./src/**/*", "./unpublished-development-types/**/*"],
+  "glint": {
+    "environment": ["ember-loose", "ember-template-imports"]
+  },
+  "compilerOptions": {
+    "allowJs": true,
+    "declarationDir": "declarations",
+
+    /**
+      https://www.typescriptlang.org/tsconfig#rootDir
+      "Default: The longest common path of all non-declaration input files."
+
+      Because we want our declarations' structure to match our rollup output,
+      we need this "rootDir" to match the "srcDir" in the rollup.config.mjs.
+
+      This way, we can have simpler `package.json#exports` that matches
+      imports to files on disk
+    */
+    "rootDir": "./src",
+
+    "types": ["ember-source/types"]
+  }
+}

tests/fixtures/typescript/my-addon/src/components/template-import.gts → tests/fixtures/typescript/src/components/template-import.gts

@@ -1,5 +1,4 @@
 import Component from '@glimmer/component';
-import TemplateOnly from './template-only.ts';
 import AnotherGts from './another-gts.gts'; // N.B. relative imports inside a v2 addon should have explicit file extensions (this is consistent with how node treats ES modules)
 import { on } from '@ember/modifier';
 import { action } from '@ember/object';
@@ -15,9 +14,9 @@ interface Signature {
 export default class TemplateImport extends Component<Signature> {
   <template>
     <div ...attributes>
-      Hello from a GTS file but also <TemplateOnly /> and <AnotherGts />
+      Hello from a GTS file but also <AnotherGts />
 
-      <button {{on "click" (fn this.saySomething @saying)}}></button>
+      <button {{on "click" (fn this.saySomething @saying)}} type="button"></button>
     </div>
   </template>
 

tests/fixtures/typescript/test-app/tests/rendering/template-import-test.ts → tests/fixtures/typescript/tests/rendering/template-import-test.gts

@@ -1,14 +1,15 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
+
+import TemplateImport from '#src/components/template-import.gts'; 
 
 module('Rendering | template-import', function(hooks) {
   setupRenderingTest(hooks);
 
   test('it renders', async function(assert) {
-    await render(hbs`<TemplateImport @saying="what" />`);
+    await render(<template><TemplateImport @saying="what" /></template>);
 
-    assert.dom().hasText('Hello from a GTS file but also Hello from a template-only component and Hello from another GTS file!');
+    assert.dom().hasText('Hello from a GTS file but also Hello from another GTS file!');
   })
 });