bare-build 0.0.0 → 0.0.1

package/bin.js

@@ -13,11 +13,12 @@ const cmd = command(
   flag('--author <name>', 'The name of the application author'),
   flag('--description <text>', 'The description of the application'),
   flag('--icon|-i <path>', 'The application icon'),
+  flag('--identifier <id>', 'The unique application identifier'),
   flag('--target|-t <host>', 'The host to target').multiple(),
   flag('--out|-o <dir>', 'The output directory'),
   async (cmd) => {
     const { entry } = cmd.args
-    const { version, name, author, description, icon, target, out } = cmd.flags
+    const { version, name, author, description, icon, identifier, target, out } = cmd.flags
 
     if (version) return console.log(`v${pkg.version}`)
 
@@ -27,6 +28,7 @@ const cmd = command(
         author,
         description,
         icon,
+        identifier,
         target,
         out
       })

package/index.js

@@ -12,6 +12,8 @@ const windows = require('./lib/platform/windows')
 module.exports = async function build(entry, opts = {}) {
   const { base = path.resolve('.'), target = [], hosts = target } = opts
 
+  const pkg = require(path.join(base, 'package.json'))
+
   let bundle = await pack(
     pathToFileURL(entry),
     {
@@ -63,6 +65,6 @@ module.exports = async function build(entry, opts = {}) {
   }
 
   for (const [platform, hosts] of groups) {
-    await platform(base, bundle, { ...opts, hosts })
+    await platform(base, pkg, bundle, { ...opts, hosts })
   }
 }

package/lib/appimagetool.js

@@ -0,0 +1,17 @@
+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
+}

package/lib/fs.js

@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+const os = require('os')
 
 exports.rm = async function rm(name) {
   return new Promise((resolve, reject) => {
@@ -61,3 +62,19 @@ exports.makeDir = async function makeDir(name) {
     })
   })
 }
+
+exports.tempDir = async function tempDir() {
+  const name = Math.random().toString(16).slice(2)
+
+  return new Promise((resolve, reject) => {
+    fs.realpath(os.tmpdir(), (err, dir) => {
+      if (err) return reject(err)
+
+      dir = path.join(dir, `bare-build-${name}`)
+
+      fs.mkdir(dir, { recursive: true }, (err) => {
+        err ? reject(err) : resolve(dir)
+      })
+    })
+  })
+}

package/lib/platform/apple.js

@@ -5,7 +5,7 @@ const fs = require('../fs')
 const run = require('../run')
 const prebuilds = require('../prebuilds')
 
-module.exports = async function build(base, bundle, opts = {}) {
+module.exports = async function build(base, pkg, bundle, opts = {}) {
   const { hosts = [], out = path.resolve('.') } = opts
 
   const archs = new Map([
@@ -44,7 +44,7 @@ module.exports = async function build(base, bundle, opts = {}) {
 
   for (const [os, hosts] of archs) {
     apps.push(
-      await app(os, base, bundle, hosts, {
+      await app(base, pkg, bundle, hosts, {
         ...opts,
         out: archs.size === 1 ? out : path.join(out, os)
       })
@@ -55,10 +55,10 @@ module.exports = async function build(base, bundle, opts = {}) {
 }
 
 // https://developer.apple.com/documentation/bundleresources/placing-content-in-a-bundle
-async function app(os, base, bundle, hosts, opts = {}) {
-  const isMac = os === 'macos'
+async function app(base, pkg, bundle, hosts, opts = {}) {
+  const isMac = hosts.some((host) => host.startsWith('darwin'))
 
-  const { name = 'App', version = '1.0.0', icon, out = path.resolve('.') } = opts
+  const { name = pkg.name, version = pkg.version, icon, out = path.resolve('.') } = opts
 
   const app = path.join(out, `${name}.app`)
   await fs.makeDir(app)
@@ -85,7 +85,7 @@ async function app(os, base, bundle, hosts, opts = {}) {
 
   await run('lipo', ['-create', '-output', executable, ...inputs])
 
-  await fs.writeFile(path.join(main, 'Info.plist'), plist(os, name, version))
+  await fs.writeFile(path.join(main, 'Info.plist'), plist(isMac, name, version, opts))
 
   await fs.writeFile(path.join(main, 'PkgInfo'), 'APPL????')
 
@@ -100,16 +100,13 @@ async function app(os, base, bundle, hosts, opts = {}) {
 
   await fs.writeFile(path.join(resources, 'app.bundle'), bundle.toBuffer())
 
-  if (icon) await fs.cp(path.resolve(icon), path.join(resources, 'app' + path.extname(icon)))
+  await fs.cp(path.resolve(icon), path.join(resources, 'app' + path.extname(icon)))
 
   return app
 }
 
-// https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleidentifier
-const invalidBundleIdentifierCharacter = /[^A-Za-z0-9.-]/g
-
-function plist(os, name, version) {
-  const isMac = os === 'macos'
+function plist(isMac, name, version, opts = {}) {
+  const { identifier = toIdentifier(name) } = opts
 
   version = version.match(/^\d+(\.\d+){0,2}/).at(0)
 
@@ -119,7 +116,7 @@ function plist(os, name, version) {
 <plist version="1.0">
 <dict>
   <key>CFBundleIdentifier</key>
-  <string>${name.replace(invalidBundleIdentifierCharacter, '-')}.${version}</string>
+  <string>${identifier}</string>
   <key>CFBundleVersion</key>
   <string>${version}</string>
   <key>CFBundleShortVersionString</key>
@@ -138,3 +135,10 @@ function plist(os, name, version) {
 </plist>
 `
 }
+
+// https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleidentifier
+const invalidBundleIdentifierCharacter = /[^A-Za-z0-9.-]/g
+
+function toIdentifier(input) {
+  return input.replace(invalidBundleIdentifierCharacter, '')
+}

package/lib/platform/linux.js

@@ -2,9 +2,11 @@ const path = require('path')
 const link = require('bare-link')
 const unpack = require('bare-unpack')
 const fs = require('../fs')
+const run = require('../run')
 const prebuilds = require('../prebuilds')
+const appimagetool = require('../appimagetool')
 
-module.exports = async function build(base, bundle, opts = {}) {
+module.exports = async function build(base, pkg, bundle, opts = {}) {
   const { hosts = [], out = path.resolve('.') } = opts
 
   const archs = new Map()
@@ -30,7 +32,7 @@ module.exports = async function build(base, bundle, opts = {}) {
 
   for (const [arch, host] of archs) {
     result.push(
-      await appDir(base, bundle, host, {
+      await appImage(pkg, await appDir(base, pkg, bundle, host, opts), {
         ...opts,
         out: archs.size === 1 ? out : path.join(out, arch)
       })
@@ -41,8 +43,10 @@ module.exports = async function build(base, bundle, opts = {}) {
 }
 
 // https://docs.appimage.org/reference/appdir.html
-async function appDir(base, bundle, host, opts = {}) {
-  const { name = 'App', icon, out = path.resolve('.') } = opts
+async function appDir(base, pkg, bundle, host, opts = {}) {
+  const { name = pkg.name, icon } = opts
+
+  const out = await fs.tempDir()
 
   const app = path.join(out, name + '.AppDir')
 
@@ -87,23 +91,31 @@ async function appDir(base, bundle, host, opts = {}) {
 
   await fs.writeFile(path.join(data, 'app.bundle'), bundle.toBuffer())
 
-  if (icon) {
-    const icons = path.join(share, 'icons')
-    await fs.makeDir(icons)
+  const icons = path.join(share, 'icons')
+  await fs.makeDir(icons)
 
-    await fs.cp(path.resolve(icon), path.join(icons, name + path.extname(icon)))
+  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))
-    )
+  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'))
-  }
+  await fs.symlink(name + path.extname(icon), path.join(app, '.DirIcon'))
 
   return app
 }
 
+async function appImage(pkg, appDir, opts = {}) {
+  const { name = pkg.name, out = path.resolve('.') } = opts
+
+  const appImage = path.join(out, name + '.AppImage')
+
+  await run(appimagetool, [appDir, appImage])
+
+  return appImage
+}
+
 function desktop(name) {
   return `\
 [Desktop Entry]

package/lib/platform/windows.js

@@ -2,9 +2,10 @@ const path = require('path')
 const link = require('bare-link')
 const unpack = require('bare-unpack')
 const fs = require('../fs')
+const run = require('../run')
 const prebuilds = require('../prebuilds')
 
-module.exports = async function build(base, bundle, opts = {}) {
+module.exports = async function build(base, pkg, bundle, opts = {}) {
   const { hosts = [], out = path.resolve('.') } = opts
 
   const archs = new Map()
@@ -30,8 +31,9 @@ module.exports = async function build(base, bundle, opts = {}) {
 
   for (const [arch, host] of archs) {
     result.push(
-      await appx(base, bundle, host, {
+      await appx(base, pkg, bundle, {
         ...opts,
+        host,
         out: archs.size === 1 ? out : path.join(out, arch)
       })
     )
@@ -40,10 +42,12 @@ module.exports = async function build(base, bundle, opts = {}) {
   return result
 }
 
-async function appx(base, bundle, host, opts = {}) {
-  const { name = 'App', icon, out = path.resolve('.') } = opts
+async function appx(base, pkg, bundle, opts = {}) {
+  const { name = pkg.name, icon, host, out = path.resolve('.') } = opts
 
-  const app = path.join(out, name)
+  const tmp = await fs.tempDir()
+
+  const app = path.join(tmp, name)
 
   const bin = path.join(app, 'App')
   await fs.makeDir(bin)
@@ -70,7 +74,7 @@ async function appx(base, bundle, host, opts = {}) {
 
   await fs.writeFile(path.join(resources, 'app.bundle'), bundle.toBuffer())
 
-  await fs.writeFile(path.join(app, 'AppxManifest.xml'), appxManifest(host, opts))
+  await fs.writeFile(path.join(app, 'AppxManifest.xml'), appxManifest(pkg, host, opts))
 
   if (icon) {
     const icons = path.join(app, 'Assets')
@@ -79,10 +83,30 @@ async function appx(base, bundle, host, opts = {}) {
     await fs.cp(path.resolve(icon), path.join(icons, name + path.extname(icon)))
   }
 
-  return app
+  const appx = path.join(out, name + '.msix')
+
+  await fs.rm(appx)
+
+  await run('makeappx', ['pack', '/d', app, '/p', appx])
+
+  return appx
 }
 
-function appxManifest(host, opts = {}) {
+// https://learn.microsoft.com/en-us/windows/msix/package/unsigned-package
+const unsignedSubject = 'CN=AppModelSamples, OID.2.25.311729368913984317654407730594956997722=1'
+
+function appxManifest(pkg, host, opts = {}) {
+  let {
+    name = pkg.name,
+    identifier = toIdentifier(name),
+    version = pkg.version,
+    description = pkg.description,
+    author = pkg.author,
+    language = 'en-US',
+    icon,
+    subject = unsignedSubject
+  } = opts
+
   let arch
 
   switch (host) {
@@ -94,17 +118,9 @@ function appxManifest(host, opts = {}) {
       break
   }
 
-  const {
-    name = 'App',
-    identifier = name.replace(/[^a-z0-9.-]+/gi, ''),
-    version = '1.0.0',
-    description = '',
-    author = '',
-    language = 'en-US',
+  version = version.match(/^\d+(\.\d+){0,2}/).at(0)
 
-    // https://learn.microsoft.com/en-us/windows/msix/package/unsigned-package
-    publisher = 'CN=AppModelSamples, OID.2.25.311729368913984317654407730594956997722=1'
-  } = opts
+  const logo = `Assets\\${name}${path.extname(icon)}`
 
   return `\
 <?xml version="1.0" encoding="utf-8"?>
@@ -117,66 +133,36 @@ function appxManifest(host, opts = {}) {
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   IgnorableNamespaces="rescap desktop6 virtualization"
 >
-  <Identity
-    Name="${identifier}"
-    Version="${version}.0"
-    Publisher="${publisher}"
-    ProcessorArchitecture="${arch}"
-  />
+  <Identity Name="${identifier}" Version="${version}.0" Publisher="${subject}" ProcessorArchitecture="${arch}" />
   <Properties>
     <DisplayName>${name}</DisplayName>
     <PublisherDisplayName>${author}</PublisherDisplayName>
     <Description>${description}</Description>
-    <Logo>Assets\\${name}.png</Logo>
-
+    <Logo>${logo}</Logo>
     <desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
     <desktop6:FileSystemWriteVirtualization>disabled</desktop6:FileSystemWriteVirtualization>
   </Properties>
-
   <Resources>
     <Resource Language="${language}" />
   </Resources>
-
   <Dependencies>
-    <TargetDeviceFamily
-      Name="Windows.Desktop"
-      MinVersion="10.0.19045.0"
-      MaxVersionTested="10.0.22621.0"
-    />
-    <PackageDependency
-      Name="Microsoft.WindowsAppRuntime.1.4"
-      MinVersion="4000.1049.117.0"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    />
-    <PackageDependency
-      Name="Microsoft.VCLibs.140.00"
-      MinVersion="14.0.30704.0"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19045.0" MaxVersionTested="10.0.22621.0" />
+    <PackageDependency Name="Microsoft.WindowsAppRuntime.1.4" MinVersion="4000.1049.117.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+    <PackageDependency Name="Microsoft.VCLibs.140.00" MinVersion="14.0.30704.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
-
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
   </Capabilities>
-
   <Applications>
-    <Application
-      Id="App"
-      Executable="App\\${name}.exe"
-      EntryPoint="Windows.FullTrustApplication"
-      uap10:RuntimeBehavior="packagedClassicApp"
-      uap10:TrustLevel="mediumIL"
-    >
-      <uap:VisualElements
-        DisplayName="${name}"
-        Description="${description}"
-        Square150x150Logo="Assets\\${name}.png"
-        Square44x44Logo="Assets\\${name}.png"
-        BackgroundColor="transparent"
-      />
+    <Application Id="App" Executable="App\\${name}.exe" EntryPoint="Windows.FullTrustApplication" uap10:RuntimeBehavior="packagedClassicApp" uap10:TrustLevel="mediumIL">
+      <uap:VisualElements DisplayName="${name}" Description="${description}" Square150x150Logo="${logo}" Square44x44Logo="${logo}" BackgroundColor="transparent" />
     </Application>
   </Applications>
 </Package>
 `
 }
+
+function toIdentifier(input) {
+  return input.replace(/[^a-z0-9.-]+/gi, '')
+}

package/lib/runtime.c

@@ -81,6 +81,8 @@ main(int argc, char *argv[]) {
   err = path_join(
 #if defined(BARE_PLATFORM_DARWIN) || defined(BARE_PLATFORM_WIN32)
     (const char *[]) {bin, "..", "..", "Resources", "app.bundle", NULL},
+#elif defined(BARE_PLATFORM_IOS)
+    (const char *[]) {bin, "..", "app.bundle", NULL},
 #elif defined(BARE_PLATFORM_LINUX)
     (const char *[]) {bin, "..", "..", "share", &bin[dir], "app.bundle", NULL},
 #endif

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "bare-build",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "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"
@@ -15,6 +21,10 @@
       "bare": "bare-fs",
       "default": "fs"
     },
+    "os": {
+      "bare": "bare-os",
+      "default": "os"
+    },
     "path": {
       "bare": "bare-path",
       "default": "path"
@@ -52,6 +62,7 @@
     "bare-fs": "^4.5.1",
     "bare-link": "^1.5.5",
     "bare-module-traverse": "^1.8.1",
+    "bare-os": "^3.6.2",
     "bare-pack": "^1.5.1",
     "bare-path": "^3.0.0",
     "bare-subprocess": "^5.1.5",