Fix conflicts for embed tests (#7311)

* Fix conflicts for embed tests

* Update pr.yml

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>

apps/web/package.json

@@ -13,6 +13,7 @@
     "type-check": "tsc --pretty --noEmit",
     "build": "next build",
     "start": "next start",
+    "start:bg": "next start &",
     "lint": "eslint . --ignore-path .gitignore",
     "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
     "lint:report": "eslint . --format json --output-file ../../lint-results/web.json",

packages/embeds/embed-core/package.json

@@ -14,13 +14,13 @@
     "embed-dev": "yarn workspace @calcom/embed-core dev",
     "embed-web-start": "yarn workspace @calcom/web start",
     "__build": "yarn tailwind && vite build && tsc --emitDeclarationOnly --declarationDir dist && cp -r ../../../apps/web/public/embed ./dist/",
-    "__dev": "yarn tailwind && vite build --mode development",
+    "__dev": "vite build --mode development",
     "build": "NEXT_PUBLIC_EMBED_FINGER_PRINT=$(git rev-parse --short HEAD) yarn __build",
     "build-preview": "PREVIEW_BUILD=1 yarn __build ",
     "vite": "vite",
     "tailwind": "yarn tailwindcss -i ./src/styles.css -o ./src/tailwind.generated.css",
     "buildWatchAndServer": "run-p '__dev' 'vite --port 3100 --strict-port --open'",
-    "dev": "yarn tailwind && run-p 'tailwind --watch' 'buildWatchAndServer'",
+    "dev": "run-p 'tailwind --watch' 'buildWatchAndServer'",
     "dev-real": "vite dev --port 3100",
     "type-check": "tsc --pretty --noEmit",
     "lint": "eslint --ext .ts,.js src",

packages/embeds/embed-core/playwright/config/playwright.config.ts

@@ -33,7 +33,7 @@ const config: PlaywrightTestConfig = {
   },
   webServer: {
     // Run servers in parallel as Playwright doesn't support two different webserver commands at the moment See https://github.com/microsoft/playwright/issues/8206
-    command: "yarn run-p 'embed-dev' 'embed-web-start'",
+    command: "yarn embed-dev",
     port: 3100,
     timeout: 60_000,
     reuseExistingServer: !CI,

packages/embeds/embed-react/playwright/config/playwright.config.ts

@@ -1,4 +1,4 @@
-import { PlaywrightTestConfig, devices } from "@playwright/test";
+import type { PlaywrightTestConfig } from "@playwright/test";
 import path from "path";
 
 //TODO: Move the common config to embed-playwright-config and let core and react use the base. Along with config there would be base fixtures and expect custom matchers as well.
@@ -19,8 +19,8 @@ const projects = baseConfig.projects?.map((project) => {
 const config: PlaywrightTestConfig = {
   ...baseConfig,
   webServer: {
-    command: "yarn run-p 'embed-dev' 'embed-web-start'",
-    port: 3000,
+    command: "yarn run-p embed-dev",
+    port: 3101,
     timeout: 60_000,
     reuseExistingServer: !process.env.CI,
   },

turbo.json

@@ -47,6 +47,12 @@
       "outputs": []
     },
     "@calcom/web#start": {
+      "cache": false,
+      "persistent": true,
+      "dependsOn": ["@calcom/prisma#db-deploy"],
+      "outputs": []
+    },
+    "@calcom/web#start:bg": {
       "cache": false,
       "dependsOn": ["@calcom/prisma#db-deploy"],
       "outputs": []
@@ -153,6 +159,7 @@
         "@calcom/prisma#db-seed",
         "@calcom/web#build",
         "^build",
+        "@calcom/web#start:bg",
         "^embed-tests-update-snapshots:ci"
       ]
     },