Create a separate TypeScript project for the test scenarios

.eslintrc.js

@@ -47,7 +47,16 @@ module.exports = {
       },
     },
     {
-      files: ['test-packages/**/*.[jt]s', 'tests/scenarios/**/*.{js,ts}'],
+      files: ['test-packages/**/*.[jt]s'],
+      rules: {
+        'import/no-extraneous-dependencies': 'off',
+      },
+    },
+    {
+      files: ['tests/scenarios/**/*.ts'],
+      parserOptions: {
+        project: './tests/scenarios/tsconfig.json',
+      },
       rules: {
         'import/no-extraneous-dependencies': 'off',
       },

package.json

@@ -6,7 +6,7 @@
   },
   "scripts": {
     "clean": "git clean -x -f",
-    "compile": "tsc",
+    "compile": "tsc -b",
     "dev": "tsc -b --watch",
     "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
     "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
@@ -15,7 +15,7 @@
     "lint:prettier": "prettier . -c",
     "lint:prettier:fix": "prettier . -w",
     "lint:router-types": "cd packages/router && pnpm lint:types",
-    "prepare": "tsc && pnpm build-v2-addons",
+    "prepare": "tsc -b && pnpm build-v2-addons",
     "build-v2-addons": "concurrently 'pnpm:build-v2-addons:*'",
     "build-v2-addons:router": "cd packages/router && pnpm build",
     "test": "cd tests/scenarios && pnpm test"

packages/core/package.json

@@ -62,6 +62,7 @@
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.5",
     "@types/tmp": "^0.1.0",
+    "@types/qunit": "^2.11.1",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "^5.1.6"

packages/core/src/messages.ts

@@ -1,6 +1,10 @@
 import makeDebug from 'debug';
 import { format } from 'util';
 
+// @ts-expect-error
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type qunit from 'qunit';
+
 const todo = makeDebug('embroider:todo');
 const unsupported = makeDebug('embroider:unsupported');
 const debug = makeDebug('embroider:debug');

test-packages/support/package.json

@@ -33,6 +33,7 @@
     "@types/babel__traverse": "^7.18.5",
     "@types/fs-extra": "^9.0.12",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^10.5.2"
+    "@types/node": "^10.5.2",
+    "@types/qunit": "^2.11.1"
   }
 }

tests/scenarios/compat-plugin-hints-test.ts

@@ -8,13 +8,13 @@ import { join } from 'path';
 import QUnit from 'qunit';
 const { module: Qmodule, test } = QUnit;
 
-export function samplePlugin() {
-  return { visitor: {} };
-}
-
 appScenarios
   .map('compat-plugin-hints', app => {
-    app.files['ember-cli-build.js'] = `
+    app.mergeFiles({
+      'sample-plugin.js': `module.exports.samplePlugin = function samplePlugin() {
+        return { visitor: {} };
+      }`,
+      'ember-cli-build.js': `
       'use strict';
 
       const EmberApp = require('ember-cli/lib/broccoli/ember-app');
@@ -25,7 +25,7 @@ appScenarios
           babel: {
             plugins: [
               // deliberately non-serializable form
-              require("${__filename.replace(/\\/g, '/').replace(/\.ts$/, '.js')}").samplePlugin
+              require(__dirname + '/sample-plugin.js').samplePlugin
             ]
           }
         });
@@ -38,13 +38,14 @@ appScenarios
           ],
           pluginHints: [
             {
-              resolve: ["${__filename.replace(/\\/g, '/').replace(/\.ts$/, '.js')}"],
+              resolve: [__dirname + '/sample-plugin.js'],
               useMethod: 'samplePlugin',
             },
           ],
         });
       };
-      `;
+      `,
+    });
   })
   .forEachScenario(scenario => {
     Qmodule(scenario.name, function (hooks) {

tests/scenarios/router-test.ts

@@ -18,7 +18,7 @@ let routerApp = tsAppScenarios.map('router', project => {
 
         const EmberApp = require('ember-cli/lib/broccoli/ember-app');
         const { maybeEmbroider } = require('@embroider/test-setup');
-        
+
         module.exports = function (defaults) {
           let app = new EmberApp(defaults, {
             'ember-cli-babel': {
@@ -30,7 +30,7 @@ let routerApp = tsAppScenarios.map('router', project => {
               }
             }
           });
-        
+
           return maybeEmbroider(app, {
             staticAddonTestSupportTrees: true,
             staticAddonTrees: true,
@@ -219,7 +219,7 @@ let routerApp = tsAppScenarios.map('router', project => {
               );
             });
           });
-                  
+
           `,
       },
     },
@@ -234,7 +234,7 @@ routerApp.forEachScenario(scenario => {
     });
 
     test(`type checks`, async function (assert) {
-      let result = await app.execute('pnpm tsc');
+      let result = await app.execute('pnpm tsc -b');
       assert.equal(result.exitCode, 0, result.output);
     });
   });

tests/scenarios/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig-base",
+  "include": ["*.ts"],
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "./build"
+  }
+}

tests/scenarios/typescript-app-test.ts

@@ -86,7 +86,7 @@ typescriptApp.forEachScenario(scenario => {
     });
 
     test(`check types`, async function (assert) {
-      let result = await app.execute(`pnpm tsc`);
+      let result = await app.execute(`pnpm tsc -b`);
       assert.equal(result.exitCode, 0, result.output);
     });
   });

tsconfig-base.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es2019",
+    "module": "commonjs",
+    "declaration": true,
+    "typeRoots": ["types", "node_modules/@types"],
+    "esModuleInterop": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "allowUnreachableCode": false,
+    "strict": true,
+    "skipLibCheck": true,
+    "useUnknownInCatchVariables": false,
+  },
+}

tsconfig.json

@@ -1,27 +1,11 @@
 {
+  "extends": "./tsconfig-base",
   "include": [
     "./packages/*/src/**/*.ts",
     "./packages/*/tests/**/*.ts",
     "./test-packages/support/**/*.ts",
-    "./test-packages/release/src/**/*.ts",
-    "./tests/scenarios/**/*.ts"
+    "./test-packages/release/src/**/*.ts"
   ],
-  "compilerOptions": {
-    "target": "es2019",
-    "module": "commonjs",
-    "declaration": true,
-    "typeRoots": ["types", "node_modules/@types"],
-    "esModuleInterop": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "sourceMap": true,
-    "inlineSources": true,
-    "experimentalDecorators": true,
-    "allowUnreachableCode": false,
-    "strict": true,
-    "skipLibCheck": true,
-    "useUnknownInCatchVariables": false,
-  },
   "exclude": [
     "node_modules",
     "packages/*/tmp",