pear-electron 1.4.5 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-electron",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Pear User-Interface Library for Electron",
   "main": "index.js",
   "bin": "bin.js",
@@ -19,7 +19,7 @@
   ],
   "pear": {
     "name": "pear-electron",
-    "bootstrap": "pear://0.2625.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
+    "bootstrap": "pear://0.2627.yceb7sjhgfzsnza7oc38hy3oxu9dhnywi3mzxdm9ubc48kjnxqgo",
     "stage": {
       "skipWarmup": "true",
       "only": [

package/runtime.js

@@ -17,10 +17,10 @@ const run = require('pear-api/cmd/run')
 const pear = require('pear-api/cmd')
 const pkg = require('./package.json')
 
-const bin = () => {
-  const name = Pear.config.name[0].toUpperCase() + Pear.config.name.slice(1)
-  const app = isMac ? name + ' Runtime.app' : Pear.config.name + '-runtime-app'
-  const exe = isWindows ? name + 'Runtime.exe' : (isMac ? 'Contents/MacOS/' + name + ' Runtime' : Pear.config.name + '-runtime')
+const bin = (name = Pear.config.name) => {
+  const formatedName = name[0].toUpperCase() + name.slice(1)
+  const app = isMac ? formatedName + ' Runtime.app' : name + '-runtime-app'
+  const exe = isWindows ? formatedName + 'Runtime.exe' : (isMac ? 'Contents/MacOS/' + formatedName + ' Runtime' : name + '-runtime')
   return isWindows ? 'bin\\' + app + '\\' + exe : (isMac ? 'bin/' + app + '/' + exe : 'bin/' + app + '/' + exe)
 }
 
@@ -70,14 +70,14 @@ class PearElectron {
   async #asset (opts, force = false) {
     const output = outputter('asset', this.#outs())
     const json = false
-    const bootstrap = opts.bootstrap ?? pkg.pear.bootstrap
-    const executable = opts.bootstrap ? bin() : BIN
+    const bootstrap = opts.bootstrap?.link ?? opts.bootstrap ?? pkg.pear.bootstrap
+    const executable = opts.bootstrap ? bin(opts.bootstrap.name) : BIN
     const stream = Pear.asset(bootstrap, {
       only: ['/boot.bundle', '/by-arch/' + require.addon.host, '/prebuilds/' + require.addon.host],
       force
     })
     const asset = await output(json, stream)
-    if (asset === null) throw new Error('Failed to determine runtime asset from sidecar')
+    if (asset === null || !asset?.path) throw new Error('Failed to determine runtime asset from sidecar')
     return path.join(asset.path, 'by-arch', require.addon.host, executable)
   }