Actually use the typescript fixture. oops

Author: NullVoxPopuli

files/tsconfig.json

@@ -11,7 +11,6 @@
   "include": ["src/**/*", "tests/**/*", "unpublished-development-types/**/*"],
   "compilerOptions": {
     "rootDir": ".",
-    "types": ["ember-source/types", "vite/client", "@embroider/core/virtual"],
-    "paths": {}
+    "types": ["ember-source/types", "vite/client", "@embroider/core/virtual"]
   }
 }

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/src/components/template-import.gts

@@ -16,7 +16,7 @@ export default class TemplateImport extends Component<Signature> {
     <div ...attributes>
       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/tests/rendering/template-import-test.gts

@@ -10,6 +10,6 @@ module('Rendering | template-import', function(hooks) {
   test('it renders', async function(assert) {
     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!');
   })
 });

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

@@ -46,7 +46,11 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
       await execa({
         cwd: tmpDir,
       })`${localEmberCli} addon ${addonName} -b ${blueprintPath} --skip-npm --prefer-local true --${packageManager} --typescript`;
-      await execa({ cwd: addonDir })`${packageManager} install`;
+      // Have to use --force because NPM is *stricter* when you use tags in package.json
+      // than pnpm (in that tags don't match any specified stable version)
+      await execa({
+        cwd: addonDir,
+      })`${packageManager} install ${packageManager === 'npm' ? '--force' : ''}`;
     });
 
     it('was generated correctly', async () => {
@@ -65,11 +69,8 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
 
     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);
+        let addonFixture = fixturify.readSync('./fixtures/typescript');
+        fixturify.writeSync(addonDir, addonFixture);
 
         // It's important that we ensure that dist directory is empty for these tests,
         // troll-y things can happen with shared dists