Merge pull request #15 from bluesky-social/d/pnpm

Update fingerprint-native script to better support pnpm

Author: ds-boyce

build/fingerprint-native/index.js

@@ -125609,15 +125609,26 @@ const github_1 = __nccwpck_require__(95438);
 const fingerprint_1 = __nccwpck_require__(3596);
 const fs_1 = __nccwpck_require__(57147);
 const { readFile, stat } = fs_1.promises;
+const packageManagerName = (field) => {
+    if (typeof field === 'string')
+        return field;
+    if (Array.isArray(field))
+        return packageManagerName(field[0]);
+    if (typeof field === 'object' && field !== null) {
+        return field.name;
+    }
+    return undefined;
+};
 const detectPackageManager = async () => {
     try {
         const pkg = JSON.parse(await readFile('package.json', 'utf8'));
-        const field = pkg.packageManager;
-        if (field?.startsWith('pnpm@'))
+        const name = packageManagerName(pkg.packageManager) ??
+            packageManagerName(pkg.devEngines?.packageManager);
+        if (name?.startsWith('pnpm'))
             return 'pnpm';
-        if (field?.startsWith('npm@'))
+        if (name?.startsWith('npm'))
             return 'npm';
-        if (field?.startsWith('yarn@'))
+        if (name?.startsWith('yarn'))
             return 'yarn';
     }
     catch {
@@ -125642,16 +125653,21 @@ const detectPackageManager = async () => {
 };
 const runInstall = async (pm) => {
     if (pm === 'pnpm') {
-        await (0, exec_1.exec)('corepack enable');
+        await (0, exec_1.exec)('npm install -g pnpm@11.5.3'); // > 10.21.0 will defer to `packageMananger` version.
         await (0, exec_1.exec)('pnpm install --frozen-lockfile');
     }
     else if (pm === 'npm') {
         await (0, exec_1.exec)('npm ci');
     }
     else {
-        await (0, exec_1.exec)('yarn install');
+        await (0, exec_1.exec)('yarn install --frozen-lockfile');
     }
 };
+const fingerprintCommand = (pm) => {
+    if (pm === 'pnpm')
+        return 'pnpm dlx @expo/fingerprint .';
+    return 'npx @expo/fingerprint .';
+};
 let info = {
     currentCommit: undefined,
     previousCommit: undefined,
@@ -125729,10 +125745,14 @@ const getPrevFP = async () => {
         }
         info.previousCommit = stdout.trim();
     }
+    if (!info.previousCommit) {
+        (0, core_1.setFailed)('Previous commit not found. Aborting.');
+        return false;
+    }
     await checkoutCommit(info.previousCommit);
     const pm = await detectPackageManager();
     await runInstall(pm);
-    const { stdout } = await (0, exec_1.getExecOutput)(`npx @expo/fingerprint .`);
+    const { stdout } = await (0, exec_1.getExecOutput)(fingerprintCommand(pm));
     info.previousFingerprint = JSON.parse(stdout.trim());
     return true;
 };

src/fingerprint-native/index.ts

@@ -9,13 +9,24 @@ const {readFile, stat} = promises
 
 type PackageManager = 'yarn' | 'pnpm' | 'npm'
 
+const packageManagerName = (field: unknown): string | undefined => {
+  if (typeof field === 'string') return field
+  if (Array.isArray(field)) return packageManagerName(field[0])
+  if (typeof field === 'object' && field != null) {
+    return (field as {name?: string}).name
+  }
+  return undefined
+}
+
 const detectPackageManager = async (): Promise<PackageManager> => {
   try {
     const pkg = JSON.parse(await readFile('package.json', 'utf8'))
-    const field: string | undefined = pkg.packageManager
-    if (field?.startsWith('pnpm@')) return 'pnpm'
-    if (field?.startsWith('npm@')) return 'npm'
-    if (field?.startsWith('yarn@')) return 'yarn'
+    const name =
+      packageManagerName(pkg.packageManager) ??
+      packageManagerName(pkg.devEngines?.packageManager)
+    if (name?.startsWith('pnpm')) return 'pnpm'
+    if (name?.startsWith('npm')) return 'npm'
+    if (name?.startsWith('yarn')) return 'yarn'
   } catch {
     // fall through
   }
@@ -37,15 +48,20 @@ const detectPackageManager = async (): Promise<PackageManager> => {
 
 const runInstall = async (pm: PackageManager) => {
   if (pm === 'pnpm') {
-    await exec('corepack enable')
+    await exec('npm install -g pnpm@11.5.3') // > 10.21.0 will defer to `packageManager` version.
     await exec('pnpm install --frozen-lockfile')
   } else if (pm === 'npm') {
     await exec('npm ci')
   } else {
-    await exec('yarn install')
+    await exec('yarn install --frozen-lockfile')
   }
 }
 
+const fingerprintCommand = (pm: PackageManager): string => {
+  if (pm === 'pnpm') return 'pnpm dlx @expo/fingerprint .'
+  return 'npx @expo/fingerprint .'
+}
+
 type Info = {
   currentCommit?: string
   previousCommit?: string
@@ -152,11 +168,15 @@ const getPrevFP = async () => {
     info.previousCommit = stdout.trim()
   }
 
+  if (!info.previousCommit) {
+    setFailed('Previous commit not found. Aborting.')
+    return false
+  }
   await checkoutCommit(info.previousCommit)
   const pm = await detectPackageManager()
   await runInstall(pm)
 
-  const {stdout} = await getExecOutput(`npx @expo/fingerprint .`)
+  const {stdout} = await getExecOutput(fingerprintCommand(pm))
 
   info.previousFingerprint = JSON.parse(stdout.trim())
   return true

tsconfig.json

@@ -2,13 +2,14 @@
   "compilerOptions": {
     "jsx": "react-jsx",
     "module": "CommonJS",
-    "moduleResolution": "node",
+    "skipLibCheck": true,
     "types": ["node"],
     "paths": {
       "#fingerprint-native/*": ["./src/fingerprint-native*"],
       "#fingerprint-native-post/*": ["./src/fingerprint-native-post*"]
     },
-    "outDir": "./build",
+    "rootDir": "./src/fingerprint-native",
+    "outDir": "./build"
   },
   "exclude": ["build", "node_modules"]
 }