Complete PnP to node_modules migration - Remove remaining pnpapi imports from keepkey-sdk getSpec.ts - Replace all pnpapi usage in keepkey-desktop build.ts with require.resolve - Remove pnpapi from external lists in esbuild configs - Fix Windows Electron packaging silent crash issue

Author: BitHighlander

packages/keepkey-desktop-app/scripts/build.ts

@@ -211,7 +211,7 @@ const runEsbuild = async (defines: Record<string, string>) => {
     bundle: true,
     absWorkingDir: rootPath,
     outdir: buildPath,
-    external: ['/public/*', 'electron', 'pnpapi'],
+    external: ['/public/*', 'electron'],
     loader: {
       '.png': 'file',
       '.svg': 'file',

packages/keepkey-desktop/scripts/build.ts

@@ -6,20 +6,23 @@ import { dirnamePlugin, workspacePlugin } from '@keepkey/common-esbuild-bits'
 import * as esbuild from 'esbuild'
 import * as fs from 'fs'
 import * as path from 'path'
-import * as pnpapi from 'pnpapi'
 
 process.env.NODE_ENV ??= 'production'
 const isDev = process.env.NODE_ENV === 'production'
 
 const workspacePath = path.resolve(__dirname, '..')
 const buildPath = path.join(workspacePath, 'build')
 const rootPath = path.normalize(path.join(workspacePath, '../..'))
-const appSource = path.join(
-  pnpapi.resolveToUnqualified('keepkey-desktop-app', workspacePath)!,
-  'build',
-)
+
+// Use require.resolve instead of pnpapi
+const appSourcePackage = require.resolve('keepkey-desktop-app/package.json', { paths: [workspacePath] })
+const appSource = path.join(path.dirname(appSourcePackage), 'build')
+
 const assetsSource = path.join(workspacePath, 'assets')
-const swaggerUiDistSource = pnpapi.resolveToUnqualified('swagger-ui-dist', workspacePath)!
+
+// Use require.resolve for swagger-ui-dist
+const swaggerUiDistSource = path.dirname(require.resolve('swagger-ui-dist/package.json', { paths: [workspacePath] }))
+
 const firmwareSource = path.join(rootPath, 'firmware')
 const executablesSource = path.join(rootPath, 'executables');
 const executablesPath = path.join(buildPath, 'executables');
@@ -112,31 +115,40 @@ const copyFirmware = async () => {
 const copyPrebuilds = async (packages: string[]) => {
   await Promise.all(
     packages.map(async x => {
-      const prebuildsSource = pnpapi.resolveToUnqualified(`${x}/prebuilds`, workspacePath)!
-      const targetPath = path.join(nativeModulesPath, x, 'prebuilds')
-      await fs.promises.mkdir(targetPath, { recursive: true })
-      await fs.promises.cp(prebuildsSource, targetPath, {
-        dereference: true,
-        recursive: true,
-      })
+      try {
+        const packagePath = require.resolve(`${x}/package.json`, { paths: [workspacePath] })
+        const prebuildsSource = path.join(path.dirname(packagePath), 'prebuilds')
+        const targetPath = path.join(nativeModulesPath, x, 'prebuilds')
+        await fs.promises.mkdir(targetPath, { recursive: true })
+        await fs.promises.cp(prebuildsSource, targetPath, {
+          dereference: true,
+          recursive: true,
+        })
+      } catch (error) {
+        console.warn(`Could not find prebuilds for ${x}`)
+      }
     }),
   )
 }
 
 const copyBindings = async (items: [source: string, target: string][]) => {
   await Promise.all(
     items.map(async ([source, target]) => {
-      const targetPath = pnpapi.resolveToUnqualified(source, workspacePath)!
-      if (
-        !(await fs.promises
-          .stat(targetPath)
-          .then(() => true)
-          .catch(() => false))
-      )
-        return
-
-      await fs.promises.mkdir(path.dirname(path.join(buildPath, target)), { recursive: true })
-      await fs.promises.copyFile(targetPath, path.join(buildPath, target))
+      try {
+        const targetPath = require.resolve(source, { paths: [workspacePath] })
+        if (
+          !(await fs.promises
+            .stat(targetPath)
+            .then(() => true)
+            .catch(() => false))
+        )
+          return
+
+        await fs.promises.mkdir(path.dirname(path.join(buildPath, target)), { recursive: true })
+        await fs.promises.copyFile(targetPath, path.join(buildPath, target))
+      } catch (error) {
+        console.warn(`Could not find binding ${source}`)
+      }
     }),
   )
 }
@@ -149,7 +161,7 @@ const runEsbuild = async (
     bundle: true,
     absWorkingDir: rootPath,
     outdir: buildPath,
-    external: ['/resources/*', 'electron', 'pnpapi'],
+    external: ['/resources/*', 'electron'],
     loader: {
       '.png': 'file',
       '.svg': 'file',
@@ -180,10 +192,10 @@ const runEsbuild = async (
 export const build = async () => {
   await sanitizeBuildDir()
 
-  const specPath = path.join(
-    pnpapi.resolveToUnqualified('keepkey-sdk-server', workspacePath)!,
-    'dist/swagger.json',
-  )
+  // Use require.resolve for keepkey-sdk-server
+  const sdkServerPackage = require.resolve('keepkey-sdk-server/package.json', { paths: [workspacePath] })
+  const specPath = path.join(path.dirname(sdkServerPackage), 'dist/swagger.json')
+  
   await fs.promises.copyFile(specPath, path.join(apiPath, 'swagger.json'))
 
   const esbuild = collectDefines().then(defines =>

packages/keepkey-sdk/scripts/getSpec.ts

@@ -2,12 +2,14 @@
 
 import * as fs from 'fs'
 import * as path from 'path'
-import * as pnpapi from 'pnpapi'
 
 const workspacePath = path.resolve(__dirname, '..')
 const buildPath = path.join(workspacePath, 'dist')
+
+// Use require.resolve instead of pnpapi
+const keepkeySdkServerPath = require.resolve('keepkey-sdk-server/package.json', { paths: [workspacePath] })
 const specPath = path.join(
-  pnpapi.resolveToUnqualified('keepkey-sdk-server', workspacePath)!,
+  path.dirname(keepkeySdkServerPath),
   'dist/swagger.json',
 )