Run tests with latest Ember CLI

Use canary version of ember-cli on master branch, until we ge get a stable/beta release on npm, which includes better support of `--typescript` ([PR](ember-cli/ember-cli#10283)). Cleans up previous weirdness.

Author: simonihmig

tests/cli.test.ts

@@ -26,7 +26,7 @@ describe('ember addon <the addon> -b <this blueprint>', () => {
     let result = await execa(
       'ember',
       ['addon', name, '-b', blueprintPath, '--skip-npm', '--skip-git', ...args],
-      { ...options, env: { ...options.env, EMBER_CLI_PNPM: 'true' } }
+      { ...options, env: { ...options.env, EMBER_CLI_PNPM: 'true' }, preferLocal: true }
     );
 
     // Light work-around for an upstream `@babel/core` peer issue
@@ -133,91 +133,65 @@ describe('ember addon <the addon> -b <this blueprint>', () => {
         expect(exitCode).toEqual(0);
       });
     });
-  });
-
-  describe('--typescript', () => {
-    let cwd = '';
-    let tmpDir = '';
-    let distDir = '';
-    let distTypesDir = '';
 
-    beforeAll(async () => {
-      tmpDir = await createTmp();
+    describe('--typescript', () => {
+      let cwd = '';
+      let tmpDir = '';
+      let distDir = '';
 
-      /**
-       * We can't use yarn here, because it does the wrong thing with the types from
-       * test-helpers:
-       *
-       * [!] (plugin Typescript) TS2688: Cannot find type definition file for 'ember__test-helpers'.
-       *     The file is in the program because:
-       *       Entry point for implicit type library 'ember__test-helpers'
-       */
-      let { name } = await createAddon({
-        args: ['--typescript', '--pnpm=true', '--skip-npm'],
-        options: { cwd: tmpDir },
-      });
+      beforeAll(async () => {
+        tmpDir = await createTmp();
 
-      cwd = path.join(tmpDir, name);
-      distDir = path.join(cwd, name, 'dist');
-      distTypesDir = path.join(cwd, name, 'declarations');
-
-      // Remove because ember-cli ignores --skip-npm.
-      // At present, ember-cli installs `ember-cli-typescript`, which then
-      // further installs other things. This chaining of relying on the package-manager
-      // makes doing anything statically, and with *any* package manager, hard.
-      // Additionally, this behavior makes setting up the v2 addon blueprint,
-      // and testing with it *extremely* slow.
-      await fse.rm(path.join(cwd, 'yarn.lock'), { force: true });
-      await fse.rm(path.join(cwd, 'node_modules'), { recursive: true, force: true });
-      await fse.rm(path.join(cwd, name, 'node_modules'), { recursive: true, force: true });
-      await fse.rm(path.join(cwd, 'test-app', 'node_modules'), { recursive: true, force: true });
-      await install({ cwd, packageManager: 'pnpm', skipPrepare: true });
-    });
+        let { name } = await createAddon({
+          args: ['--typescript', `--${packageManager}=true`, '--skip-npm'],
+          options: { cwd: tmpDir },
+        });
 
-    afterAll(async () => {
-      await fs.rm(tmpDir, { recursive: true, force: true });
-    });
+        cwd = path.join(tmpDir, name);
+        distDir = path.join(cwd, name, 'dist');
 
-    it('was generated correctly', async () => {
-      await runScript({ cwd, script: 'build', packageManager: 'pnpm' });
+        await install({ cwd, packageManager, skipPrepare: true });
+      });
 
-      assertGeneratedCorrectly({ projectRoot: cwd });
-    });
+      afterAll(async () => {
+        await fs.rm(tmpDir, { recursive: true, force: true });
+      });
 
-    it('builds the addon', async () => {
-      let { exitCode } = await runScript({ cwd, script: 'build', packageManager: 'pnpm' });
+      it('was generated correctly', async () => {
+        await runScript({ cwd, script: 'build', packageManager: 'pnpm' });
 
-      expect(exitCode).toEqual(0);
+        assertGeneratedCorrectly({ projectRoot: cwd });
+      });
 
-      let contents = await dirContents(distDir);
+      it('builds the addon', async () => {
+        let { exitCode } = await runScript({ cwd, script: 'build', packageManager: 'pnpm' });
 
-      expect(contents).to.deep.equal([
-        'index.js',
-        'index.js.map',
-        'template-registry.js',
-        'template-registry.js.map',
-      ]);
+        expect(exitCode).toEqual(0);
 
-      let typesContents = await dirContents(distTypesDir);
+        let contents = await dirContents(distDir);
 
-      expect(typesContents).to.deep.equal([
-        'index.d.ts',
-        'index.d.ts.map',
-        'template-registry.d.ts',
-        'template-registry.d.ts.map',
-      ]);
-    });
+        expect(contents).to.deep.equal([
+          'index.d.ts',
+          'index.d.ts.map',
+          'index.js',
+          'index.js.map',
+          'template-registry.d.ts',
+          'template-registry.js',
+          'template-registry.js.map',
+        ]);
+      });
 
-    it('runs tests', async () => {
-      let { exitCode } = await runScript({ cwd, script: 'test', packageManager: 'pnpm' });
+      it('runs tests', async () => {
+        let { exitCode } = await runScript({ cwd, script: 'test', packageManager: 'pnpm' });
 
-      expect(exitCode).toEqual(0);
-    });
+        expect(exitCode).toEqual(0);
+      });
 
-    it('lints all pass', async () => {
-      let { exitCode } = await runScript({ cwd, script: 'lint', packageManager: 'pnpm' });
+      it('lints all pass', async () => {
+        let { exitCode } = await runScript({ cwd, script: 'lint', packageManager: 'pnpm' });
 
-      expect(exitCode).toEqual(0);
+        expect(exitCode).toEqual(0);
+      });
     });
   });
 

tests/package.json

@@ -9,7 +9,7 @@
     "@types/fs-extra": "^9.0.13",
     "@vitest/ui": "^0.18.0",
     "c8": "^7.11.3",
-    "ember-cli": "^4.9.2",
+    "ember-cli": "ember-cli/ember-cli#master",
     "execa": "^6.1.0",
     "fixturify": "^3.0.0",
     "fs-extra": "^10.0.0",