Make the typescript tests more similar to the default tests

Author: NullVoxPopuli

files/package.json

@@ -38,7 +38,7 @@
     "@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",

files/rollup.config.mjs

@@ -63,7 +63,10 @@ export default {
     addon.gjs(),<% if (typescript) { %>
 
     // Emit .d.ts declaration files
-    addon.declarations('declarations', `<%= packageManager %> exec glint --declaration --project ${configs.ts}`),<% } %>
+    addon.declarations(
+      'declarations',
+      `<%= packageManager %> exec glint --declaration --project ${configs.ts}`
+    ),<% } %>
 
     // 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

@@ -8,7 +8,7 @@
   "glint": {
     "environment": ["ember-loose", "ember-template-imports"]
   },
-  "include": ["src", "tests", "unpublished-development-types"],
+  "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"],
   "compilerOptions": {
     "rootDir": ".",
     "types": [

files/tsconfig.publish.json

@@ -1,6 +1,6 @@
 {
   "extends": "@ember/library-tsconfig",
-  "include": ["src", "unpublished-development-types"],
+  "include": ["src/**/*", "unpublished-development-types/**/*"],
   "glint": {
     "environment": ["ember-loose", "ember-template-imports"]
   },

tests/fixtures/typescript/tests/unit/ember-types-test.ts

@@ -1,8 +1,12 @@
 import { tracked, cached } from '@glimmer/tracking';
 import Component from '@glimmer/component';
 import Route from '@ember/routing/route';
-import { uniqueId } from '@ember/utils';
+import { isPresent } from '@ember/utils';
 
-export const everythingHasTypes = {
-  tracked, cached, Component, Route, uniqueId
-}
+console.log({
+  tracked,
+  cached,
+  Component,
+  Route,
+  isPresent,
+});

tests/smoke-tests/--typescript.test.ts

@@ -1,100 +1,95 @@
-import path from 'node:path';
-
+import path, { join } from 'node:path';
+import tmp from 'tmp-promise';
+import fs from 'node:fs/promises';
+import fixturify from 'fixturify';
 import { execa } from 'execa';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
+import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
-import {
-  AddonHelper,
-  assertGeneratedCorrectly,
-  dirContents,
-  SUPPORTED_PACKAGE_MANAGERS,
-} from '../helpers.js';
+import { assertGeneratedCorrectly, dirContents, SUPPORTED_PACKAGE_MANAGERS } from '../helpers.js';
+const blueprintPath = path.join(__dirname, '../..');
+let localEmberCli = require.resolve('ember-cli/bin/ember');
 
 for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
   describe(`--typescript with ${packageManager}`, () => {
-    let distDir = '';
-    let declarationsDir = '';
-    let helper = new AddonHelper({
-      packageManager,
-      args: ['--typescript'],
-      scenario: 'typescript',
-    });
+    let tmpDir: string;
+    let addonDir: string;
+    let addonName = 'my-addon';
 
     beforeAll(async () => {
-      await helper.setup();
-      await helper.installDeps();
-
-      distDir = path.join(helper.projectRoot, 'dist');
-      declarationsDir = path.join(helper.projectRoot, 'declarations');
+      tmpDir = (await tmp.dir()).path;
+      addonDir = join(tmpDir, addonName);
+      await execa({
+        cwd: tmpDir,
+      })`${localEmberCli} addon ${addonName} -b ${blueprintPath} --skip-npm --skip-git --prefer-local true --${packageManager} --typescript`;
+      await execa({ cwd: addonDir })`${packageManager} install`;
     });
 
     it('was generated correctly', async () => {
-      await helper.build();
-
       assertGeneratedCorrectly({
-        projectRoot: helper.projectRoot,
+        projectRoot: addonDir,
         packageManager,
         typeScript: true,
       });
     });
 
     // Tests are additive, so when running them in order, we want to check linting
     // before we add files from fixtures
-    it('lints all pass', async () => {
-      let { exitCode } = await helper.run('lint');
+    it('lints pass', async () => {
+      let { exitCode } = await execa({ cwd: addonDir })`pnpm lint`;
 
       expect(exitCode).toEqual(0);
     });
 
-    it('build and test', async () => {
-      // Copy over fixtures
-      await helper.fixtures.use('./src');
-      await helper.fixtures.use('./tests');
-      // Sync fixture with project's lint / formatting configuration
-      // (controlled by ember-cli)
-      //
-      // Ensure that we have no lint errors.
-      // It's important to keep this along with the tests,
-      // so that we can have confidence that the lints aren't destructively changing
-      // the files in a way that would break consumers
-      await helper.run('lint:fix');
-
-      let buildResult = await helper.build();
-
-      expect(buildResult.exitCode).toEqual(0);
-
-      let distContents = await dirContents(distDir);
-      let declarationsContents = await dirContents(declarationsDir);
-
-      expect(distContents).toMatchInlineSnapshot(`
-        [
-          "_app_",
-          "components",
-          "index.js",
-          "index.js.map",
-          "services",
-          "template-registry.js",
-          "template-registry.js.map",
-        ]
-      `);
-
-      expect(declarationsContents).toMatchInlineSnapshot(`
-        [
-          "components",
-          "index.d.ts",
-          "index.d.ts.map",
-          "services",
-          "template-registry.d.ts",
-          "template-registry.d.ts.map",
-        ]
-      `);
-
-      let testResult = await helper.run('test');
-
-      expect(testResult.exitCode).toEqual(0);
-      expect(testResult.stdout).to.include('# tests 5');
-      expect(testResult.stdout).to.include('# pass  5');
-      expect(testResult.stdout).to.include('# fail  0');
+    describe('with fixture', () => {
+      beforeEach(async () => {
+        let addonFixture = fixturify.readSync('./fixtures/addon');
+        fixturify.writeSync(join(addonDir, 'src'), addonFixture);
+
+        let testFixture = fixturify.readSync('./fixtures/rendering-tests');
+        fixturify.writeSync(join(addonDir, 'tests/rendering'), testFixture);
+
+        // It's important that we ensure that dist directory is empty for these tests,
+        // troll-y things can happen with shared dists
+        await fs.rm(join(addonDir, 'dist'), { recursive: true, force: true });
+      });
+
+      it('lint:fix', async () => {
+        let { exitCode } = await execa({ cwd: addonDir })`${packageManager} run lint:fix`;
+
+        expect(exitCode).toEqual(0);
+      });
+
+      it('build', async () => {
+        let buildResult = await execa({ cwd: addonDir })`${packageManager} run build`;
+
+        expect(buildResult.exitCode).toEqual(0);
+
+        let dist = await dirContents(join(addonDir, 'dist'));
+        let declarations = await dirContents(join(addonDir, 'dist'));
+
+        expect({ dist, declarations }).to.deep.equal({
+          dist: ['_app_', 'components', 'index.js', 'index.js.map'],
+          declarations: [
+            'components',
+            'index.d.ts',
+            'index.d.ts.map',
+            'services',
+            'template-registry.d.ts',
+            'template-registry.d.ts.map',
+          ],
+        });
+      });
+
+      it('test', async () => {
+        let testResult = await execa({ cwd: addonDir })`${packageManager} run test`;
+
+        expect(testResult.exitCode).toEqual(0);
+
+        expect(testResult.exitCode).toEqual(0);
+        expect(testResult.stdout).to.include('# tests 5');
+        expect(testResult.stdout).to.include('# pass  5');
+        expect(testResult.stdout).to.include('# fail  0');
+      });
     });
   });
 }