fix link handling

Author: mydea

dev-packages/e2e-tests/lib/copyToTemp.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { readFileSync, writeFileSync } from 'fs';
 import { cp } from 'fs/promises';
-import { join } from 'path';
+import { isAbsolute, join } from 'path';
 
 export async function copyToTemp(originalPath: string, tmpDirPath: string): Promise<void> {
   // copy files to tmp dir
@@ -47,15 +47,22 @@ function fixPackageJson(cwd: string): void {
 
 function fixFileLinkDependencies(dependencyObj: Record<string, string>): void {
   for (const [key, value] of Object.entries(dependencyObj)) {
-    if (value.startsWith('link:')) {
-      const dirPath = value.replace('link:', '');
-
-      // We add a virtual dir to ensure that the relative depth is consistent
-      // dirPath is relative to ./../test-applications/xxx
-      const newPath = join(__dirname, 'virtual-dir/', dirPath);
+    const prefix = value.startsWith('link:') ? 'link:' : value.startsWith('file:') ? 'file:' : null;
+    if (!prefix) {
+      continue;
+    }
 
-      dependencyObj[key] = `link:${newPath}`;
-      console.log(`Fixed ${key} dependency to ${newPath}`);
+    const dirPath = value.slice(prefix.length);
+    if (isAbsolute(dirPath)) {
+      continue;
     }
+
+    // We add a virtual dir to ensure that the relative depth is consistent
+    // dirPath is relative to ./../test-applications/xxx
+    const newPath = join(__dirname, 'virtual-dir/', dirPath);
+    console.log({ key, value, newPath });
+
+    dependencyObj[key] = `${prefix}${newPath}`;
+    console.log(`Fixed ${key} dependency to ${newPath}`);
   }
 }

dev-packages/e2e-tests/lib/packedTarballUtils.ts

@@ -44,15 +44,6 @@ export function versionedTarballFilename(packageName: string, version: string):
   return `${npmPackBasename(packageName)}-${version}.tgz`;
 }
 
-/**
- * Relative POSIX path from `dev-packages/e2e-tests/packed/<symlink>` to
- * `packages/<pkgDir>/<versionedTarball>`.
- */
-export function relativeTarballPathFromPackedDir(packageDirName: string, packageName: string, version: string): string {
-  const file = versionedTarballFilename(packageName, version);
-  return path.posix.join('..', '..', '..', 'packages', packageDirName, file);
-}
-
 /**
  * npm pack tarball basename (without version and .tgz), e.g. `@sentry/core` -> `sentry-core`.
  */

dev-packages/e2e-tests/lib/syncPackedTarballSymlinks.ts

@@ -2,11 +2,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { sync as globSync } from 'glob';
-import {
-  packedSymlinkFilename,
-  relativeTarballPathFromPackedDir,
-  versionedTarballFilename,
-} from './packedTarballUtils';
+import { packedSymlinkFilename, versionedTarballFilename } from './packedTarballUtils';
 
 const e2eTestsRoot = path.resolve(__dirname, '..');
 const repositoryRoot = path.resolve(e2eTestsRoot, '../..');
@@ -46,7 +42,6 @@ export function syncPackedTarballSymlinks(): void {
     }
 
     const packageDir = path.dirname(packageJsonPath);
-    const packageDirName = path.basename(packageDir);
     const expectedTarball = path.join(packageDir, versionedTarballFilename(name, version));
 
     if (!fs.existsSync(expectedTarball)) {
@@ -55,9 +50,8 @@ export function syncPackedTarballSymlinks(): void {
 
     const linkName = packedSymlinkFilename(name);
     const linkPath = path.join(packedDir, linkName);
-    const target = relativeTarballPathFromPackedDir(packageDirName, name, version);
 
-    fs.symlinkSync(target, linkPath);
+    fs.symlinkSync(expectedTarball, linkPath);
     linked++;
   }