Add monorepo packageDir param to startApp e2e util

Author: rmarscher

e2e/monorepo.spec.ts

@@ -1,81 +1,23 @@
-import { debugChildProcess, getFreePort, terminate, test } from './utils.js';
-import { fileURLToPath } from 'node:url';
-import { cp, mkdtemp } from 'node:fs/promises';
-import { exec, execSync } from 'node:child_process';
 import { expect } from '@playwright/test';
-import waitPort from 'wait-port';
-import { join } from 'node:path';
-import { tmpdir } from 'node:os';
-import { createRequire } from 'node:module';
 
-let standaloneDir: string;
-let standaloneAppDir: string;
-const appRelativePath = '/packages/waku-project';
-const exampleDir = fileURLToPath(
-  new URL('./fixtures/monorepo', import.meta.url),
-);
-const wakuDir = fileURLToPath(new URL('../packages/waku', import.meta.url));
-const { version } = createRequire(import.meta.url)(
-  join(wakuDir, 'package.json'),
-);
+import { test, prepareStandaloneSetup } from './utils.js';
 
-async function start() {
-  const port = await getFreePort();
-  const cp = exec(
-    `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} start --port ${port}`,
-    { cwd: standaloneDir },
-  );
-  debugChildProcess(cp, fileURLToPath(import.meta.url), [
-    /ExperimentalWarning: Custom ESM Loaders is an experimental feature and might change at any time/,
-  ]);
+const startApp = prepareStandaloneSetup('monorepo');
 
-  await waitPort({ port });
-  return [port, cp.pid] as const;
-}
-
-test.describe('monorepo', async () => {
-  test.beforeEach(async () => {
-    // GitHub Action on Windows doesn't support mkdtemp on global temp dir,
-    // Which will cause files in `src` folder to be empty.
-    // I don't know why
-    const tmpDir = process.env.TEMP_DIR ? process.env.TEMP_DIR : tmpdir();
-    standaloneDir = await mkdtemp(join(tmpDir, 'waku-monorepo-'));
-    standaloneAppDir = join(standaloneDir, appRelativePath);
-    await cp(exampleDir, standaloneDir, {
-      filter: (src) => {
-        return !src.includes('node_modules') && !src.includes('dist');
-      },
-      recursive: true,
-    });
-
-    // FIXME we need to `npm install` in the monorepo but
-    // how do we copy in the local version of waku or link
-    // it in a way that will accurately match what happens
-    // with the npm published version.
-    execSync(`pnpm pack --pack-destination ${standaloneDir}`, {
-      cwd: wakuDir,
-      stdio: 'inherit',
+for (const mode of ['DEV', 'PRD'] as const) {
+  test.describe(`monorepo: ${mode}`, () => {
+    let port: number;
+    let stopApp: () => Promise<void>;
+    test.beforeAll(async () => {
+      ({ port, stopApp } = await startApp(mode, "packages/waku-project"));
     });
-    const name = `waku-${version}.tgz`;
-    execSync(`npm install ${join(standaloneDir, name)}`, {
-      cwd: standaloneDir,
-      stdio: 'inherit',
+    test.afterAll(async () => {
+      await stopApp();
     });
-    execSync(
-      `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build`,
-      {
-        cwd: standaloneAppDir,
-        stdio: 'inherit',
-      },
-    );
-  });
 
-  test.describe('renders', () => {
-    test(`the home page`, async ({ page }) => {
-      const [port, pid] = await start();
+    test('renders the home page', async ({ page }) => {
       await page.goto(`http://localhost:${port}`);
       await expect(page.getByTestId('header')).toHaveText('Waku');
-      await terminate(pid!);
     });
   });
-});
+}

e2e/utils.ts

@@ -151,7 +151,7 @@ export const prepareStandaloneSetup = (fixtureName: string) => {
   const tmpDir = process.env.TEMP_DIR || tmpdir();
   let standaloneDir: string | undefined;
   let built = false;
-  const startApp = async (mode: 'DEV' | 'PRD' | 'STATIC') => {
+  const startApp = async (mode: 'DEV' | 'PRD' | 'STATIC', packageDir = '') => {
     if (!standaloneDir) {
       standaloneDir = mkdtempSync(join(tmpDir, fixtureName));
       cpSync(fixtureDir, standaloneDir, {
@@ -170,10 +170,10 @@ export const prepareStandaloneSetup = (fixtureName: string) => {
       );
     }
     if (mode !== 'DEV' && !built) {
-      rmSync(`${standaloneDir}/dist`, { recursive: true, force: true });
+      rmSync(`${standaloneDir}${packageDir}/dist`, { recursive: true, force: true });
       execSync(
         `node ${join(standaloneDir, './node_modules/waku/dist/cli.js')} build`,
-        { cwd: standaloneDir },
+        { cwd: join(standaloneDir, packageDir) },
       );
       built = true;
     }
@@ -190,7 +190,7 @@ export const prepareStandaloneSetup = (fixtureName: string) => {
         cmd = `node ${join(standaloneDir, './node_modules/serve/build/main.js')} dist/public -p ${port}`;
         break;
     }
-    const cp = exec(cmd, { cwd: standaloneDir });
+    const cp = exec(cmd, { cwd: join(standaloneDir, packageDir) });
     debugChildProcess(cp, fileURLToPath(import.meta.url), [
       /ExperimentalWarning: Custom ESM Loaders is an experimental feature and might change at any time/,
     ]);