fix: use basePath relative paths in the generated PW bundle

Otherwise workspace packages/files get included with the wrong path.

Author: sorccu

packages/cli/src/services/util.ts

@@ -234,7 +234,7 @@ export async function bundlePlayWrightProject (
         outputFile,
         browsers: pwConfigParsed.getBrowsers(),
         playwrightVersion,
-        relativePlaywrightConfigPath: path.relative(dir, filePath),
+        relativePlaywrightConfigPath: path.relative(Session.basePath!, filePath),
         cacheHash,
       })
     })
@@ -283,29 +283,45 @@ export async function loadPlaywrightProjectFiles (
   dir: string, pwConfigParsed: PlaywrightConfig, include: string[], archive: Archiver,
   lockFile: string,
 ) {
-  const ignoredFiles = ['**/node_modules/**', '.git/**']
   const parser = new Parser({
     workspace: Session.workspace,
   })
   const { files, errors } = await parser.getFilesAndDependencies(pwConfigParsed)
-  const mode = 0o755 // Default mode for files in the archive
   if (errors.length) {
     throw new Error(`Error loading playwright project files: ${errors.map((e: string) => e).join(', ')}`)
   }
+  const root = Session.basePath!
+  const prefix = path.relative(root, dir)
+  const fileOptions = {
+    mode: 0o755, // Default mode for files in the archive
+  }
   for (const file of files) {
-    const relativePath = path.relative(dir, file)
-    archive.file(file, { name: relativePath, mode })
+    archive.file(file, {
+      ...fileOptions,
+      name: path.relative(root, file),
+    })
   }
   const lockFileDirName = path.dirname(lockFile)
-  archive.file(lockFile, { name: path.basename(lockFile), mode })
-  archive.file(path.join(lockFileDirName, 'package.json'), { name: 'package.json', mode })
-  // handle workspaces
-  archive.glob('**/package.json', { cwd: path.join(dir, '/'), ignore: ignoredFiles }, { mode })
+  const packageJsonFile = path.join(lockFileDirName, 'package.json')
+  archive.file(lockFile, {
+    ...fileOptions,
+    name: path.relative(root, lockFile),
+  })
+  archive.file(packageJsonFile, {
+    ...fileOptions,
+    name: path.relative(root, packageJsonFile),
+  })
   for (const includePattern of include) {
-    archive.glob(includePattern, { cwd: path.join(dir, '/') }, { mode })
+    archive.glob(includePattern, { cwd: dir }, {
+      ...fileOptions,
+      prefix,
+    })
   }
   for (const filePath of extraFiles) {
-    archive.file(path.resolve(dir, filePath), { name: filePath, mode })
+    archive.file(path.resolve(root, filePath), {
+      ...fileOptions,
+      name: path.relative(root, filePath),
+    })
   }
 }