port modulo logic lol

Author: lforst

packages/e2e-tests/lib/buildApp.ts

@@ -37,6 +37,7 @@ export async function buildApp(appDir: string, recipeInstance: RecipeInstance, e
       env: {
         ...process.env,
         ...env,
+
         YARN_CACHE_FOLDER: tempYarnCache, // Use a separate yarn cache for each build commmand because multiple yarn commands running at the same time may corrupt the cache
       } as unknown as NodeJS.ProcessEnv,
     });

packages/e2e-tests/lib/constructRecipeInstances.ts

@@ -4,10 +4,7 @@ import type { Recipe, RecipeInput, RecipeInstance } from './types';
 
 export function constructRecipeInstances(recipePaths: string[]): RecipeInstance[] {
   const recipes = buildRecipes(recipePaths);
-  let reservedPortCount = 0;
-  const recipeInstances: RecipeInstance[] = [];
-
-  const basePort = 3001;
+  const recipeInstances: Omit<RecipeInstance, 'portModulo' | 'portGap'>[] = [];
 
   recipes.forEach(recipe => {
     recipe.versions.forEach(version => {
@@ -21,13 +18,11 @@ export function constructRecipeInstances(recipePaths: string[]): RecipeInstance[
         label: `${recipe.testApplicationName}${dependencyOverridesInformationString}`,
         recipe,
         dependencyOverrides,
-        port: basePort + reservedPortCount,
       });
-      reservedPortCount++;
     });
   });
 
-  return recipeInstances;
+  return recipeInstances.map((instance, i) => ({ ...instance, portModulo: i, portGap: recipeInstances.length }));
 }
 
 function buildRecipes(recipePaths: string[]): Recipe[] {

packages/e2e-tests/lib/runTestApp.ts

@@ -15,7 +15,7 @@ export async function buildAndTestApp(
   recipeInstance: RecipeInstance,
   envVarsToInject: Record<string, string | undefined>,
 ): Promise<RecipeTestResult> {
-  const { recipe, port } = recipeInstance;
+  const { recipe, portModulo, portGap } = recipeInstance;
   const recipeDirname = path.dirname(recipe.path);
 
   const targetDir = path.join(TMP_DIR, `${recipe.testApplicationName}-${tmpDirCount++}`);
@@ -24,7 +24,8 @@ export async function buildAndTestApp(
 
   const env: Env = {
     ...envVarsToInject,
-    PORT: port.toString(),
+    PORT_MODULO: portModulo.toString(),
+    PORT_GAP: portGap.toString(),
   };
 
   try {

packages/e2e-tests/lib/types.ts

@@ -37,7 +37,8 @@ export interface RecipeInstance {
   label: string;
   recipe: Recipe;
   dependencyOverrides?: DependencyOverrides;
-  port: number;
+  portModulo: number;
+  portGap: number;
 }
 
 export interface RecipeTestResult extends RecipeInstance {

packages/e2e-tests/test-applications/create-next-app/playwright.config.ts

@@ -60,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: process.env.TEST_MODE === 'prod' ? 'yarn start' : 'yarn dev',
-    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
+    port: 3000 + Number(process.env.PORT_MODULO ?? 0),
   },
 };
 

packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts

@@ -7,7 +7,7 @@ if (!testEnv) {
   throw new Error('No test env defined');
 }
 
-const port = process.env.PORT ? parseInt(process.env.PORT) : 3000;
+const port = 3000 + Number(process.env.PORT_MODULO ?? 0);
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -60,7 +60,7 @@ const config: PlaywrightTestConfig = {
     },
     {
       command: 'yarn ts-node-script start-event-proxy.ts',
-      port: 27496,
+      port: 3000 + Number(process.env.PORT_MODULO ?? 0) + Number(process.env.PORT_GAP ?? 0),
     },
   ],
 };

packages/e2e-tests/test-applications/node-express-app/playwright.config.ts

@@ -58,7 +58,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
+    port: 3000 + Number(process.env.PORT_MODULO ?? 0),
   },
 };
 

packages/e2e-tests/test-applications/node-express-app/src/app.ts

@@ -17,7 +17,7 @@ Sentry.init({
 });
 
 const app = express();
-const port = process.env.PORT ? parseInt(process.env.PORT) : 3000;
+const port = 3000 + Number(process.env.PORT_MODULO ?? 0);
 
 app.use(Sentry.Handlers.requestHandler());
 app.use(Sentry.Handlers.tracingHandler());

packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts

@@ -60,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
+    port: 3000 + Number(process.env.PORT_MODULO ?? 0),
   },
 };
 

packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts

@@ -60,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
+    port: 3000 + Number(process.env.PORT_MODULO ?? 0),
   },
 };