bare-build 0.1.0 → 0.2.0

package/CMakeLists.txt

@@ -5,9 +5,7 @@ find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_build C)
 
-set(bare_version "1.24.3")
-
-fetch_package("github:holepunchto/bare@${bare_version}")
+fetch_package("github:holepunchto/bare@1.24.3")
 fetch_package("github:holepunchto/libpath")
 
 add_executable(bare_build)
@@ -49,6 +47,10 @@ target_link_libraries(
 )
 
 if(WIN32)
+  file(READ "package.json" pkg)
+
+  string(JSON version GET "${pkg}" version)
+
   file(READ "lib/runtime.manifest" manifest)
 
   string(CONFIGURE "${manifest}" manifest)
@@ -70,4 +72,4 @@ endif()
 
 bare_target(target)
 
-install(TARGETS bare_build DESTINATION ${target})
+install(TARGETS bare_build RUNTIME DESTINATION ${target})

package/README.md

@@ -11,11 +11,13 @@ npm i [-g] bare-build
 ```js
 const build = require('bare-build')
 
-await build('/path/to/app.js', {
-  target: ['darwin-arm64', 'darwinx64'],
+for await (const resource of build('/path/to/app.js', {
+  target: ['darwin-arm64', 'darwin-x64'],
   icon: 'icon.icns',
   identifier: 'com.example.App'
-})
+})) {
+  console.log(resource)
+}
 ```
 
 ```console
@@ -28,7 +30,7 @@ bare-build \
 
 ## API
 
-#### `await build(entry[, options])`
+#### `for await (const resource of build(entry[, options]))`
 
 Options include:
 

package/bin.js

@@ -56,7 +56,7 @@ const cmd = command(
     if (version) return console.log(`v${pkg.version}`)
 
     try {
-      await build(entry, {
+      for await (const _ of build(entry, {
         name,
         author,
         description,
@@ -76,7 +76,8 @@ const cmd = command(
         subjectName,
         thumbprint,
         key
-      })
+      })) {
+      }
     } catch (err) {
       if (err) console.error(err)
       process.exitCode = 1

package/index.js

@@ -5,11 +5,7 @@ const id = require('bare-bundle-id')
 const pack = require('bare-pack')
 const fs = require('bare-pack/fs')
 
-const apple = require('./lib/platform/apple')
-const linux = require('./lib/platform/linux')
-const windows = require('./lib/platform/windows')
-
-module.exports = async function build(entry, opts = {}) {
+module.exports = async function* build(entry, opts = {}) {
   const { base = '.', target = [], hosts = target } = opts
 
   let pkg
@@ -45,15 +41,15 @@ module.exports = async function build(entry, opts = {}) {
       case 'ios-arm64':
       case 'ios-arm64-simulator':
       case 'ios-x64-simulator':
-        platform = apple
+        platform = require('./lib/platform/apple')
         break
       case 'linux-arm64':
       case 'linux-x64':
-        platform = linux
+        platform = require('./lib/platform/linux')
         break
       case 'win32-arm64':
       case 'win32-x64':
-        platform = windows
+        platform = require('./lib/platform/windows')
         break
       default:
         throw new Error(`Unknown host '${host}'`)
@@ -70,6 +66,6 @@ module.exports = async function build(entry, opts = {}) {
   }
 
   for (const [platform, hosts] of groups) {
-    await platform(base, pkg, bundle, { ...opts, hosts })
+    yield* platform(base, pkg, bundle, { ...opts, hosts })
   }
 }

package/lib/fs.js

@@ -29,6 +29,14 @@ exports.cp = async function cp(src, dest) {
   }
 }
 
+exports.chmod = async function chmod(name, mode) {
+  return new Promise((resolve, reject) => {
+    fs.chmod(name, mode, (err) => {
+      err ? reject(err) : resolve()
+    })
+  })
+}
+
 exports.copyFile = async function copyFile(src, dest) {
   return new Promise((resolve, reject) => {
     fs.copyFile(src, dest, (err) => {
@@ -45,6 +53,14 @@ exports.writeFile = async function writeFile(name, data) {
   })
 }
 
+exports.readFile = async function readFile(name) {
+  return new Promise((resolve) => {
+    fs.readFile(name, (err, data) => {
+      resolve(err ? null : data)
+    })
+  })
+}
+
 exports.symlink = async function symlink(target, path) {
   await exports.rm(path)
 

package/lib/platform/apple/create-app.js

@@ -1,15 +1,21 @@
 const path = require('path')
 const link = require('bare-link')
 const unpack = require('bare-unpack')
+const { MachO } = require('bare-lief')
 const fs = require('../../fs')
-const run = require('../../run')
 const prebuilds = require('../../prebuilds')
 const sign = require('./sign')
 const toIdentifier = require('./to-identifier')
 
 // https://developer.apple.com/documentation/bundleresources/placing-content-in-a-bundle
-module.exports = async function createApp(base, pkg, bundle, hosts, out, opts = {}) {
-  const { name = pkg.name, version = pkg.version, icon } = opts
+module.exports = async function* createApp(base, pkg, bundle, hosts, out, opts = {}) {
+  const {
+    name = pkg.name,
+    version = pkg.version,
+    icon,
+    identity,
+    applicationIdentity = identity
+  } = opts
 
   const isMac = hosts.some((host) => host.startsWith('darwin'))
 
@@ -22,11 +28,9 @@ module.exports = async function createApp(base, pkg, bundle, hosts, out, opts =
   const resources = isMac ? path.join(main, 'Resources') : main
   await fs.makeDir(resources)
 
-  const frameworks = path.join(main, 'Frameworks')
+  const assets = path.join(resources, 'app')
 
-  for await (const resource of link(base, { hosts, out: frameworks })) {
-    await sign(resource, opts)
-  }
+  const frameworks = path.join(main, 'Frameworks')
 
   const executable = isMac ? path.join(main, 'MacOS', name) : path.join(main, name)
 
@@ -34,17 +38,30 @@ module.exports = async function createApp(base, pkg, bundle, hosts, out, opts =
     await fs.makeDir(path.join(main, 'MacOS'))
   }
 
-  const assets = path.join(resources, 'app')
+  yield* link(base, { ...opts, hosts, identity: applicationIdentity, out: frameworks })
 
   const inputs = hosts.map((host) => prebuilds[host]())
 
-  await run('lipo', ['-create', '-output', executable, ...inputs])
+  const binaries = []
 
+  for (const input of inputs) binaries.push(new MachO.FatBinary(await fs.readFile(input)))
+
+  const fat = MachO.FatBinary.merge(binaries)
+
+  fat.toDisk(executable)
+  await fs.chmod(executable, 0o755)
   await sign(executable, opts)
+  yield executable
+
+  const info = path.join(main, 'Info.plist')
+  await fs.writeFile(info, createPropertyList(isMac, name, version, opts))
+  yield info
 
-  await fs.writeFile(path.join(main, 'Info.plist'), createPropertyList(isMac, name, version, opts))
+  const pkgInfo = path.join(main, 'PkgInfo')
+  await fs.writeFile(pkgInfo, 'APPL????')
+  yield pkgInfo
 
-  await fs.writeFile(path.join(main, 'PkgInfo'), 'APPL????')
+  const unpacked = []
 
   bundle = await unpack(bundle, { files: false, assets: true }, async (key) => {
     const target = path.join(assets, key)
@@ -54,16 +71,25 @@ module.exports = async function createApp(base, pkg, bundle, hosts, out, opts =
 
     await sign(target, opts)
 
+    unpacked.push(target)
+
     return '/../app' + key
   })
 
-  await fs.writeFile(path.join(resources, 'app.bundle'), bundle.toBuffer())
+  yield* unpacked
 
-  await sign(path.join(resources, 'app.bundle'), opts)
+  const appBundle = path.join(resources, 'app.bundle')
+  await fs.writeFile(appBundle, bundle.toBuffer())
+  await sign(appBundle, opts)
+  yield appBundle
 
-  await fs.cp(path.resolve(icon), path.join(resources, 'app' + path.extname(icon)))
+  const appIcon = path.join(resources, 'app' + path.extname(icon))
+  await fs.cp(path.resolve(icon), appIcon)
+  await sign(appIcon, opts)
+  yield appIcon
 
-  await sign(path.join(resources, 'app' + path.extname(icon)), opts)
+  await sign(app, opts)
+  yield app
 
   return app
 }
@@ -78,6 +104,8 @@ function createPropertyList(isMac, name, version, opts = {}) {
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+  <key>CFBundleDisplayName</key>
+  <string>${name}</string>
   <key>CFBundleIdentifier</key>
   <string>${identifier}</string>
   <key>CFBundleVersion</key>

package/lib/platform/apple/create-package-component.js

@@ -1,8 +1,9 @@
 const path = require('path')
+const fs = require('../../fs')
 const run = require('../../run')
 const toIdentifier = require('./to-identifier')
 
-module.exports = async function createPackageComponent(pkg, root, id, opts = {}) {
+module.exports = async function* createPackageComponent(pkg, root, id, opts = {}) {
   if (typeof id === 'object' && id !== null) {
     opts = id
     id = null
@@ -50,8 +51,7 @@ module.exports = async function createPackageComponent(pkg, root, id, opts = {})
 
   await run('pkgbuild', args, { cwd })
 
-  return {
-    identifier,
-    name
-  }
+  yield component
+
+  return component
 }

package/lib/platform/apple/create-package.js

@@ -2,7 +2,7 @@ const path = require('path')
 const fs = require('../../fs')
 const run = require('../../run')
 
-module.exports = async function createPackage(pkg, root, components, out, opts = {}) {
+module.exports = async function* createPackage(pkg, root, components, out, opts = {}) {
   const {
     name = pkg.name,
     version = pkg.version,
@@ -12,6 +12,8 @@ module.exports = async function createPackage(pkg, root, components, out, opts =
     keychain
   } = opts
 
+  await fs.makeDir(out)
+
   const cwd = path.resolve(root, '..')
 
   const distribution = path.join(cwd, 'distribution.xml')
@@ -32,6 +34,8 @@ module.exports = async function createPackage(pkg, root, components, out, opts =
 
   await run('productbuild', args, { cwd })
 
+  yield package
+
   return package
 }
 
@@ -42,8 +46,8 @@ function createDistribution(name, version, components) {
 <installer-gui-script minSpecVersion="1">
   <title>${name}</title>
 ${components.map(
-  ({ identifier, name }) => `\
-  <pkg-ref id="${identifier}">${name}</pkg-ref>
+  (component, i) => `\
+  <pkg-ref id="${i}">${component}</pkg-ref>
 `
 )}
   <choices-outline>
@@ -51,8 +55,8 @@ ${components.map(
   </choices-outline>
   <choice id="app" title="${name}">
 ${components.map(
-  ({ identifier }) => `\
-    <pkg-ref id="${identifier}"/>
+  (_, i) => `\
+    <pkg-ref id="${i}"/>
 `
 )}
   </choice>

package/lib/platform/apple/sign.js

@@ -21,5 +21,7 @@ module.exports = async function sign(resource, opts = {}) {
     args.push(resource)
 
     await run('codesign', args)
+  } else {
+    await run('codesign', ['--timestamp=none', '--force', '--sign', '-', resource])
   }
 }

package/lib/platform/apple.js

@@ -4,7 +4,7 @@ const createApp = require('./apple/create-app')
 const createPackage = require('./apple/create-package')
 const createPackageComponent = require('./apple/create-package-component')
 
-module.exports = async function build(base, pkg, bundle, opts = {}) {
+module.exports = async function* apple(base, pkg, bundle, opts = {}) {
   const { hosts = [], package = false, out = '.' } = opts
 
   const archs = new Map([
@@ -53,9 +53,9 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
 
         root = path.join(out, 'root')
 
-        await createApp(base, pkg, bundle, hosts, path.join(root, 'Applications'), opts)
+        yield* createApp(base, pkg, bundle, hosts, path.join(root, 'Applications'), opts)
       } else {
-        const app = await createApp(
+        const app = yield* createApp(
           base,
           pkg,
           bundle,
@@ -69,10 +69,10 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
         continue
       }
 
-      const components = [await createPackageComponent(pkg, root, opts)]
+      const components = [yield* createPackageComponent(pkg, root, opts)]
 
       result.push(
-        await createPackage(
+        yield* createPackage(
           pkg,
           root,
           components,

package/lib/platform/linux/create-app-dir.js

@@ -5,7 +5,7 @@ const fs = require('../../fs')
 const prebuilds = require('../../prebuilds')
 
 // https://docs.appimage.org/packaging-guide/manual.html#creating-an-appdir-manually
-module.exports = async function createAppDir(base, pkg, bundle, host, out, opts = {}) {
+module.exports = async function* createAppDir(base, pkg, bundle, host, out, opts = {}) {
   const { name = pkg.name, icon } = opts
 
   const app = path.resolve(out, name + '.AppDir')
@@ -15,55 +15,68 @@ module.exports = async function createAppDir(base, pkg, bundle, host, out, opts
   const bin = path.join(usr, 'bin')
   await fs.makeDir(bin)
 
-  const executable = path.join(bin, toIdentifier(name))
-
-  await fs.copyFile(prebuilds[host](), executable)
-
-  await fs.symlink(path.join('usr', 'bin', toIdentifier(name)), path.join(app, 'AppRun'))
-
   const share = path.join(usr, 'share')
 
   const applications = path.join(share, 'applications')
   await fs.makeDir(applications)
 
+  const icons = path.join(share, 'icons')
+  await fs.makeDir(icons)
+
   const data = path.join(share, toIdentifier(name))
   await fs.makeDir(data)
 
   const assets = path.join(data, 'app')
 
-  for await (const _ of link(base, { hosts: [host], out: usr })) {
-    continue
-  }
-
-  await fs.writeFile(path.join(applications, name + '.desktop'), createDesktopEntry(name))
+  await fs.symlink(path.join('usr', 'bin', toIdentifier(name)), path.join(app, 'AppRun'))
 
   await fs.symlink(
     path.join('usr', 'share', 'applications', name + '.desktop'),
     path.join(app, name + '.desktop')
   )
 
+  await fs.symlink(
+    path.join('usr', 'share', 'icons', name + path.extname(icon)),
+    path.join(app, name + path.extname(icon))
+  )
+
+  await fs.symlink(name + path.extname(icon), path.join(app, '.DirIcon'))
+
+  yield* link(base, { ...opts, hosts: [host], out: usr })
+
+  const executable = path.join(bin, toIdentifier(name))
+  await fs.copyFile(prebuilds[host](), executable)
+  await fs.chmod(executable, 0o755)
+  yield executable
+
+  const desktopEntry = path.join(applications, name + '.desktop')
+  await fs.writeFile(desktopEntry, createDesktopEntry(name))
+  yield desktopEntry
+
+  const unpacked = []
+
   bundle = await unpack(bundle, { files: false, assets: true }, async (key) => {
     const target = path.join(assets, key)
 
     await fs.makeDir(path.dirname(target))
     await fs.writeFile(target, bundle.read(key))
 
+    unpacked.push(target)
+
     return '/../app' + key
   })
 
-  await fs.writeFile(path.join(data, 'app.bundle'), bundle.toBuffer())
+  yield* unpacked
 
-  const icons = path.join(share, 'icons')
-  await fs.makeDir(icons)
+  const appBundle = path.join(data, 'app.bundle')
+  await fs.writeFile(appBundle, bundle.toBuffer())
+  yield appBundle
 
-  await fs.cp(path.resolve(icon), path.join(icons, name + path.extname(icon)))
-
-  await fs.symlink(
-    path.join('usr', 'share', 'icons', name + path.extname(icon)),
-    path.join(app, name + path.extname(icon))
-  )
+  const appIcon = path.join(icons, name + path.extname(icon))
+  await fs.cp(path.resolve(icon), appIcon)
+  yield appIcon
 
-  await fs.symlink(name + path.extname(icon), path.join(app, '.DirIcon'))
+  yield app
 
   return app
 }

package/lib/platform/linux/create-app-image.js

@@ -1,20 +1,16 @@
 const path = require('path')
-const run = require('../../run')
-const appimagetool = require('../../appimagetool')
 
 // https://docs.appimage.org/packaging-guide/manual.html#creating-an-appimage-from-the-appdir
-module.exports = async function createAppImage(pkg, appDir, out, opts = {}) {
+module.exports = async function* createAppImage(pkg, appDir, out, opts = {}) {
+  const createAppImage = require('bare-app-image') // Optional
+
   const { name = pkg.name, sign = false, key } = opts
 
   const appImage = path.resolve(out, name + '.AppImage')
 
-  const args = [appDir]
-
-  if (sign) args.push('--sign', '--sign-key', key)
-
-  args.push(appImage)
+  await createAppImage(appDir, appImage, { sign, key, compression: 'zstd' })
 
-  await run(appimagetool, args)
+  yield appImage
 
   return appImage
 }

package/lib/platform/linux.js

@@ -3,7 +3,7 @@ const fs = require('../fs')
 const createAppDir = require('./linux/create-app-dir')
 const createAppImage = require('./linux/create-app-image')
 
-module.exports = async function build(base, pkg, bundle, opts = {}) {
+module.exports = exports = async function* linux(base, pkg, bundle, opts = {}) {
   const { hosts = [], package = false, out = '.' } = opts
 
   const archs = new Map()
@@ -37,9 +37,9 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
 
         temp.push(out)
 
-        appDir = await createAppDir(base, pkg, bundle, host, out, opts)
+        appDir = yield* createAppDir(base, pkg, bundle, host, out, opts)
       } else {
-        appDir = await createAppDir(
+        appDir = yield* createAppDir(
           base,
           pkg,
           bundle,
@@ -54,7 +54,7 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
       }
 
       result.push(
-        await createAppImage(
+        yield* createAppImage(
           pkg,
           appDir,
           archs.size === 1 ? path.resolve(out) : path.resolve(out, arch),
@@ -68,3 +68,5 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
     for (const dir of temp) await fs.rm(dir)
   }
 }
+
+exports.sign = async function sign() {}

package/lib/platform/windows/create-msix-content-directory.js

@@ -5,7 +5,7 @@ const fs = require('../../fs')
 const prebuilds = require('../../prebuilds')
 const sign = require('./sign')
 
-module.exports = async function createMSIXContentDirectory(
+module.exports = async function* createMSIXContentDirectory(
   base,
   pkg,
   bundle,
@@ -20,20 +20,22 @@ module.exports = async function createMSIXContentDirectory(
   const bin = path.join(app, 'App')
   await fs.makeDir(bin)
 
-  const executable = path.join(bin, name + '.exe')
-
-  await fs.copyFile(prebuilds[host](), executable)
-
-  await sign(executable, opts)
-
   const resources = path.join(app, 'Resources')
   await fs.makeDir(resources)
 
+  const icons = path.join(app, 'Assets')
+  await fs.makeDir(icons)
+
   const assets = path.join(resources, 'app')
 
-  for await (const resource of link(base, { hosts: [host], out: bin })) {
-    await sign(resource, opts)
-  }
+  yield* link(base, { ...opts, hosts: [host], out: bin })
+
+  const executable = path.join(bin, name + '.exe')
+  await fs.copyFile(prebuilds[host](), executable)
+  await sign(executable, opts)
+  yield executable
+
+  const unpacked = []
 
   bundle = await unpack(bundle, { files: false, assets: true }, async (key) => {
     const target = path.join(assets, key)
@@ -41,17 +43,24 @@ module.exports = async function createMSIXContentDirectory(
     await fs.makeDir(path.dirname(target))
     await fs.writeFile(target, bundle.read(key))
 
+    unpacked.push(target)
+
     return '/../app' + key
   })
 
-  await fs.writeFile(path.join(resources, 'app.bundle'), bundle.toBuffer())
+  const appBundle = path.join(resources, 'app.bundle')
+  await fs.writeFile(appBundle, bundle.toBuffer())
+  yield appBundle
 
-  await fs.writeFile(path.join(app, 'AppxManifest.xml'), createAppxManifest(pkg, host, opts))
+  const appManifest = path.join(app, 'AppxManifest.xml')
+  await fs.writeFile(appManifest, createAppxManifest(pkg, host, opts))
+  yield appManifest
 
-  const icons = path.join(app, 'Assets')
-  await fs.makeDir(icons)
+  const appIcon = path.join(icons, name + path.extname(icon))
+  await fs.cp(path.resolve(icon), appIcon)
+  yield appIcon
 
-  await fs.cp(path.resolve(icon), path.join(icons, name + path.extname(icon)))
+  yield app
 
   return app
 }

package/lib/platform/windows/create-msix.js

@@ -1,17 +1,18 @@
 const path = require('path')
 const fs = require('../../fs')
+const run = require('../../run')
 const sign = require('./sign')
 
-module.exports = async function createMSIX(pkg, contentDirectory, out, opts = {}) {
+module.exports = async function* createMSIX(pkg, contentDirectory, out, opts = {}) {
   const { name = pkg.name } = opts
 
   const msix = path.resolve(out, name + '.msix')
-
   await fs.rm(msix)
 
   await run('makeappx', ['pack', '/d', contentDirectory, '/p', msix])
 
   await sign(msix, opts)
+  yield msix
 
   return msix
 }

package/lib/platform/windows.js

@@ -3,7 +3,7 @@ const fs = require('../fs')
 const createMSIX = require('./windows/create-msix')
 const createMSIXContentDirectory = require('./windows/create-msix-content-directory')
 
-module.exports = async function build(base, pkg, bundle, opts = {}) {
+module.exports = async function* windows(base, pkg, bundle, opts = {}) {
   const { hosts = [], package = false, out = '.' } = opts
 
   const archs = new Map()
@@ -37,9 +37,9 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
 
         temp.push(out)
 
-        contentDirectory = await createMSIXContentDirectory(base, pkg, bundle, host, out, opts)
+        contentDirectory = yield* createMSIXContentDirectory(base, pkg, bundle, host, out, opts)
       } else {
-        contentDirectory = await createMSIXContentDirectory(
+        contentDirectory = yield* createMSIXContentDirectory(
           base,
           pkg,
           bundle,
@@ -54,7 +54,7 @@ module.exports = async function build(base, pkg, bundle, opts = {}) {
       }
 
       result.push(
-        await createMSIX(
+        yield* createMSIX(
           pkg,
           contentDirectory,
           archs.size === 1 ? path.resolve(out) : path.resolve(out, arch)

package/lib/prebuilds.js

@@ -1,49 +1,37 @@
-const fs = require('fs')
-
 require.asset = require('require-asset')
 
 exports['darwin-x64'] = () => {
-  return executable(require.asset('../prebuilds/darwin-x64/bare', __filename))
+  return require.asset('../prebuilds/darwin-x64/bare', __filename)
 }
 
 exports['darwin-arm64'] = () => {
-  return executable(require.asset('../prebuilds/darwin-arm64/bare', __filename))
+  return require.asset('../prebuilds/darwin-arm64/bare', __filename)
 }
 
 exports['ios-arm64'] = () => {
-  return executable(require.asset('../prebuilds/ios-arm64/bare', __filename))
+  return require.asset('../prebuilds/ios-arm64/bare', __filename)
 }
 
 exports['ios-arm64-simulator'] = () => {
-  return executable(require.asset('../prebuilds/ios-arm64-simulator/bare', __filename))
+  return require.asset('../prebuilds/ios-arm64-simulator/bare', __filename)
 }
 
 exports['ios-x64-simulator'] = () => {
-  return executable(require.asset('../prebuilds/ios-x64-simulator/bare', __filename))
+  return require.asset('../prebuilds/ios-x64-simulator/bare', __filename)
 }
 
 exports['linux-x64'] = () => {
-  return executable(require.asset('../prebuilds/linux-x64/bare', __filename))
+  return require.asset('../prebuilds/linux-x64/bare', __filename)
 }
 
 exports['linux-arm64'] = () => {
-  return executable(require.asset('../prebuilds/linux-arm64/bare', __filename))
+  return require.asset('../prebuilds/linux-arm64/bare', __filename)
 }
 
 exports['win32-x64'] = () => {
-  return executable(require.asset('../prebuilds/win32-x64/bare.exe', __filename))
+  return require.asset('../prebuilds/win32-x64/bare.exe', __filename)
 }
 
 exports['win32-arm64'] = () => {
-  return executable(require.asset('../prebuilds/win32-arm64/bare.exe', __filename))
-}
-
-function executable(file) {
-  try {
-    fs.accessSync(file, fs.constants.X_OK)
-  } catch {
-    fs.chmodSync(file, 0o755)
-  }
-
-  return file
+  return require.asset('../prebuilds/win32-arm64/bare.exe', __filename)
 }

package/lib/runtime.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="to.holepunch.bare" version="${bare_version}.0" />
+  <assemblyIdentity type="win32" name="to.holepunch.bare" version="${version}.0" />
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>

package/package.json

@@ -1,18 +1,12 @@
 {
   "name": "bare-build",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Application builder for Bare",
   "exports": {
     "./package": "./package.json",
     ".": "./index.js"
   },
   "imports": {
-    "#appimagetool": {
-      "linux": {
-        "arm64": "./prebuilds/linux-arm64/appimagetool.AppImage",
-        "x64": "./prebuilds/linux-x64/appimagetool.AppImage"
-      }
-    },
     "child_process": {
       "bare": "bare-subprocess",
       "default": "child_process"
@@ -60,7 +54,8 @@
   "dependencies": {
     "bare-bundle-id": "^1.0.2",
     "bare-fs": "^4.5.1",
-    "bare-link": "^2.0.0",
+    "bare-lief": "^0.0.2",
+    "bare-link": "^2.1.0",
     "bare-module-traverse": "^1.8.1",
     "bare-os": "^3.6.2",
     "bare-pack": "^1.5.1",
@@ -71,6 +66,9 @@
     "paparam": "^1.8.0",
     "require-asset": "^1.1.0"
   },
+  "optionalDependencies": {
+    "bare-app-image": "^0.0.0"
+  },
   "devDependencies": {
     "brittle": "^3.18.0",
     "cmake-bare": "^1.6.5",

package/lib/appimagetool.js

@@ -1,17 +0,0 @@
-const fs = require('fs')
-
-require.asset = require('require-asset')
-
-try {
-  const appimagetool = require.asset('#appimagetool', __filename)
-
-  try {
-    fs.accessSync(appimagetool, fs.constants.X_OK)
-  } catch {
-    fs.chmodSync(appimagetool, 0o755)
-  }
-
-  module.exports = appimagetool
-} catch {
-  module.exports = null
-}