@atom-js-org/cli 0.5.3-alpha.1 → 0.5.3-alpha.3

package/README.md

@@ -8,9 +8,9 @@ atom run build
 atom build windows
 atom build macos
 atom build linux
-atom build all
+atom build current --local
 ```
 
-`atom.config.json` controls artifact names, Windows EXE/NSIS branding, macOS app/DMG metadata and Linux AppImage/DEB/RPM output. New projects include default PNG and ICO assets that can be replaced directly.
+`atom.config.json` controls artifact names, Windows EXE/NSIS branding, macOS app/DMG metadata and Linux AppImage/DEB/RPM output. New projects include default PNG and ICO assets that can be replaced directly. Builds are local-first and do not require GitHub Actions; run the target build on the matching operating system.
 
 Project: https://github.com/Atom-js-org/atom

package/bin/atom.cjs

@@ -25,10 +25,10 @@ program
 program
   .command('build')
   .description('Build an AtomJS project')
-  .argument('<target>', 'windows, macos, linux, or all')
+  .argument('<target>', 'current, windows, macos, linux, or all')
   .option('-p, --project <path>', 'project directory', process.cwd())
-  .option('--local', 'never use the remote build workflow')
-  .option('--remote', 'always use the remote build workflow')
+  .option('--local', 'build on this machine (default; kept for compatibility)')
+  .option('--remote', 'deprecated: remote GitHub Actions builds are disabled')
   .option('--skip-install', 'reuse staged node_modules when possible')
   .action(async (target, options) => buildCommand(target, options));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atom-js-org/cli",
-  "version": "0.5.3-alpha.1",
+  "version": "0.5.3-alpha.3",
   "description": "CLI for running and building AtomJS desktop applications.",
   "bin": {
     "atom": "bin/atom.cjs"

package/src/build.cjs

@@ -21,17 +21,33 @@ const { resolveElectronCompatibilityRoot } = require('./electron-compat.cjs');
 const cliPackageVersion = require('../package.json').version;
 
 async function buildCommand(targetInput, options = {}) {
-  const target = validateTarget(targetInput);
+  const requestedTarget = validateTarget(targetInput);
   const project = loadProject(options.project);
   const host = hostTarget();
+  const target = requestedTarget === 'current' ? host : requestedTarget;
 
-  if (options.local && (target === 'all' || target !== host)) {
-    throw new Error(`A local ${host} machine cannot produce a complete '${target}' release. Remove --local to use GitHub Actions.`);
+  if (options.remote) {
+    throw new Error([
+      'Remote GitHub Actions builds are disabled.',
+      'Build locally on the matching operating system instead:',
+      '  Windows: atom build windows --local',
+      '  macOS:   atom build macos --local',
+      '  Linux:   atom build linux --local'
+    ].join('\n'));
+  }
+
+  if (target === 'all') {
+    throw new Error([
+      "'atom build all' cannot safely cross-build native WebView applications.",
+      'Run the matching local build command once on each operating system.'
+    ].join('\n'));
+  }
+
+  if (target !== host) {
+    throw new Error(`Local target mismatch: this machine is ${host}, but '${target}' was requested. Build that target on a ${target} machine.`);
   }
 
-  const needsRemote = options.remote || target === 'all' || target !== host;
-  if (needsRemote) return remoteBuild(project, target);
-  return localBuild(project, host, options);
+  return localBuild(project, target, options);
 }
 
 async function localBuild(project, target, options = {}) {
@@ -61,8 +77,8 @@ async function localBuild(project, target, options = {}) {
     await vendorFramework(stagedApp, project, target);
     await installProductionDependencies(stagedApp, options.skipInstall, target);
 
-    console.log('Embedding application code and production dependencies into the executable...');
-    await createApplicationPayload(stagedApp, payloadPath);
+    console.log('Embedding application code, assets and production dependencies into the executable...');
+    const payloadSummary = await createApplicationPayload(stagedApp, payloadPath);
 
     const executableName = target === 'windows' ? `${productName}.exe` : productName;
     const executablePath = path.join(unpacked, executableName);
@@ -108,6 +124,15 @@ async function localBuild(project, target, options = {}) {
       outputs = await packageLinux({ project, buildRoot, unpacked, executableName, productName });
     }
 
+    const inventoryPath = path.join(buildRoot, 'packed-files.json');
+    await fs.promises.writeFile(inventoryPath, JSON.stringify({
+      format: 1,
+      fileCount: payloadSummary.fileCount,
+      sourceBytes: payloadSummary.sourceBytes,
+      compressedBytes: payloadSummary.compressedBytes,
+      files: payloadSummary.paths
+    }, null, 2));
+
     const manifest = {
       atomjsVersion: cliPackageVersion,
       target,
@@ -116,6 +141,12 @@ async function localBuild(project, target, options = {}) {
       createdAt: new Date().toISOString(),
       run: path.relative(buildRoot, runPath),
       unpacked: path.relative(buildRoot, unpackedPath),
+      payload: {
+        fileCount: payloadSummary.fileCount,
+        sourceBytes: payloadSummary.sourceBytes,
+        compressedBytes: payloadSummary.compressedBytes,
+        inventory: path.basename(inventoryPath)
+      },
       outputs: outputs.map((file) => path.relative(buildRoot, file))
     };
     await fs.promises.writeFile(path.join(buildRoot, 'manifest.json'), JSON.stringify(manifest, null, 2));
@@ -191,15 +222,18 @@ async function vendorFramework(appDir, project, target) {
   };
   if (target === 'windows') {
     pkg.dependencies['@webviewjs/webview'] = '0.4.0';
+    pkg.dependencies.koffi = '3.1.2';
     delete pkg.dependencies['webview-nodejs'];
     if (pkg.optionalDependencies) delete pkg.optionalDependencies['webview-nodejs'];
   } else if (target === 'linux' && process.env.ATOM_SKIP_WEBVIEW_CHECK !== '1') {
     pkg.dependencies['webview-nodejs'] = '0.5.0';
     delete pkg.dependencies['@webviewjs/webview'];
+    delete pkg.dependencies.koffi;
     if (pkg.optionalDependencies) delete pkg.optionalDependencies['webview-nodejs'];
   } else {
     delete pkg.dependencies['webview-nodejs'];
     delete pkg.dependencies['@webviewjs/webview'];
+    delete pkg.dependencies.koffi;
     if (pkg.optionalDependencies) delete pkg.optionalDependencies['webview-nodejs'];
   }
   pkg.overrides = { ...(pkg.overrides || {}), tar: '7.5.20' };
@@ -241,6 +275,15 @@ async function installProductionDependencies(appDir, skipInstall, target) {
     if (!fs.existsSync(bindingPath)) {
       throw new Error('@webviewjs/webview was not installed. Remove node_modules and package-lock.json, then retry the build.');
     }
+    const nativeDragPath = path.join(appDir, 'node_modules', 'koffi');
+    if (!fs.existsSync(nativeDragPath)) {
+      throw new Error('koffi was not installed. AtomJS requires its prebuilt Win32 FFI package for native window movement.');
+    }
+    try {
+      await run(process.execPath, ['-e', "require('koffi');"], { cwd: appDir });
+    } catch (error) {
+      throw new Error(`The prebuilt Koffi package could not load for this Windows architecture: ${error.message}`);
+    }
   } else if (target === 'linux') {
     const bindingPath = path.join(appDir, 'node_modules', 'webview-nodejs');
     if (!fs.existsSync(bindingPath) && process.env.ATOM_SKIP_WEBVIEW_CHECK !== '1') {
@@ -251,12 +294,15 @@ async function installProductionDependencies(appDir, skipInstall, target) {
 
 async function createApplicationPayload(appDir, outputPath) {
   const files = [];
+  let sourceBytes = 0;
 
   async function addFile(source, relative, stat) {
+    const data = await fs.promises.readFile(source);
+    sourceBytes += data.length;
     files.push({
       path: relative.split(path.sep).join('/'),
       mode: stat.mode & 0o777,
-      data: (await fs.promises.readFile(source)).toString('base64')
+      data: data.toString('base64')
     });
   }
 
@@ -300,6 +346,12 @@ async function createApplicationPayload(appDir, outputPath) {
   const payload = Buffer.from(JSON.stringify({ format: 1, files }));
   const compressed = require('node:zlib').gzipSync(payload, { level: 9 });
   await fs.promises.writeFile(outputPath, compressed);
+  return {
+    fileCount: files.length,
+    sourceBytes,
+    compressedBytes: compressed.length,
+    paths: files.map((entry) => entry.path)
+  };
 }
 
 async function createSeaLauncher({ executablePath, appDir, target, productName, appId, project = null, payloadPath = null }) {
@@ -955,6 +1007,8 @@ async function packageMacOS({ project, buildRoot, unpacked, executableName, prod
 <key>CFBundleName</key><string>${xml(bundleName)}</string>
 <key>CFBundleDisplayName</key><string>${xml(productName)}</string>
 <key>CFBundlePackageType</key><string>APPL</string>
+<key>LSUIElement</key><true/>
+<key>LSMultipleInstancesProhibited</key><true/>
 <key>CFBundleShortVersionString</key><string>${xml(version)}</string>
 <key>CFBundleVersion</key><string>${xml(bundleVersion)}</string>
 <key>LSMinimumSystemVersion</key><string>${xml(config.minimumSystemVersion)}</string>

package/src/init.cjs

@@ -17,7 +17,6 @@ async function initCommand(directory, options = {}) {
   const productName = humanize(packageName);
 
   await fse.ensureDir(path.join(root, 'src'));
-  await fse.ensureDir(path.join(root, '.github', 'workflows'));
 
   await fs.promises.writeFile(path.join(root, 'package.json'), JSON.stringify({
     name: packageName,
@@ -26,8 +25,8 @@ async function initCommand(directory, options = {}) {
     main: 'src/main.js',
     scripts: {
       dev: 'atom run dev',
-      build: 'atom build all',
-      'build:current': `atom build ${hostTarget()}`,
+      build: 'atom build current --local',
+      'build:current': 'atom build current --local',
       start: 'atom run build'
     },
     dependencies: {
@@ -81,9 +80,6 @@ async function initCommand(directory, options = {}) {
         deb: true,
         rpm: true
       }
-    },
-    github: {
-      workflow: 'atom-build.yml'
     }
   }, null, 2));
 
@@ -95,7 +91,6 @@ async function initCommand(directory, options = {}) {
   await fs.promises.writeFile(path.join(root, 'src', 'index.html'), htmlTemplate(productName));
   await fs.promises.writeFile(path.join(root, 'src', 'renderer.js'), rendererTemplate());
   await fs.promises.writeFile(path.join(root, '.gitignore'), 'node_modules/\nbuild/\n.atom/\n');
-  await fs.promises.writeFile(path.join(root, '.github', 'workflows', 'atom-build.yml'), workflowTemplate());
 
   console.log(`Created AtomJS project in ${root}`);
   console.log('Next: npm install && npm run dev');

package/src/utils.cjs

@@ -4,7 +4,7 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { spawn, spawnSync } = require('node:child_process');
 
-const TARGETS = new Set(['windows', 'macos', 'linux', 'all']);
+const TARGETS = new Set(['current', 'windows', 'macos', 'linux', 'all']);
 
 function hostTarget() {
   if (process.platform === 'win32') return 'windows';
@@ -169,7 +169,7 @@ function commandExists(command, args = ['--version']) {
 function validateTarget(target) {
   const normalized = String(target).toLowerCase();
   if (!TARGETS.has(normalized)) {
-    throw new Error(`Unknown build target '${target}'. Use windows, macos, linux, or all.`);
+    throw new Error(`Unknown build target '${target}'. Use current, windows, macos, linux, or all.`);
   }
   return normalized;
 }