@atom-js-org/cli 0.5.3-alpha.0 → 0.5.3-alpha.2

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.0",
+  "version": "0.5.3-alpha.2",
   "description": "CLI for running and building AtomJS desktop applications.",
   "bin": {
     "atom": "bin/atom.cjs"
@@ -14,7 +14,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=20.12"
+    "node": ">=24"
   },
   "dependencies": {
     "archiver": "7.0.1",

package/src/build.cjs

@@ -18,19 +18,36 @@ const {
   sanitizeFilename
 } = require('./utils.cjs');
 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'));
   }
 
-  const needsRemote = options.remote || target === 'all' || target !== host;
-  if (needsRemote) return remoteBuild(project, target);
-  return localBuild(project, host, options);
+  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.`);
+  }
+
+  return localBuild(project, target, options);
 }
 
 async function localBuild(project, target, options = {}) {
@@ -60,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);
@@ -107,14 +124,29 @@ 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: '0.5.2-alpha.0',
+      atomjsVersion: cliPackageVersion,
       target,
       productName,
       appId: project.config.appId,
       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));
@@ -188,11 +220,18 @@ async function vendorFramework(appDir, project, target) {
     '@atom-js-org/runtime': 'file:vendor/atomjs',
     electron: 'file:vendor/electron-compat'
   };
-  if (target !== 'macos' && process.env.ATOM_SKIP_WEBVIEW_CHECK !== '1') {
+  if (target === 'windows') {
+    pkg.dependencies['@webviewjs/webview'] = '0.4.0';
+    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'];
+    if (pkg.optionalDependencies) delete pkg.optionalDependencies['webview-nodejs'];
+  } else {
+    delete pkg.dependencies['webview-nodejs'];
+    delete pkg.dependencies['@webviewjs/webview'];
     if (pkg.optionalDependencies) delete pkg.optionalDependencies['webview-nodejs'];
-  } else if (pkg.optionalDependencies) {
-    delete pkg.optionalDependencies['webview-nodejs'];
   }
   pkg.overrides = { ...(pkg.overrides || {}), tar: '7.5.20' };
   delete pkg.devDependencies;
@@ -228,7 +267,12 @@ async function installProductionDependencies(appDir, skipInstall, target) {
     throw new Error('The AtomJS Electron compatibility facade was not installed in the staged application.');
   }
 
-  if (target !== 'macos') {
+  if (target === 'windows') {
+    const bindingPath = path.join(appDir, 'node_modules', '@webviewjs', 'webview');
+    if (!fs.existsSync(bindingPath)) {
+      throw new Error('@webviewjs/webview was not installed. Remove node_modules and package-lock.json, then retry the build.');
+    }
+  } else if (target === 'linux') {
     const bindingPath = path.join(appDir, 'node_modules', 'webview-nodejs');
     if (!fs.existsSync(bindingPath) && process.env.ATOM_SKIP_WEBVIEW_CHECK !== '1') {
       throw new Error('webview-nodejs was not installed. Run `atom doctor`, install the platform prerequisites, and retry the build.');
@@ -238,12 +282,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')
     });
   }
 
@@ -287,6 +334,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 }) {
@@ -455,6 +508,7 @@ process.chdir(appDir);
 process.env.ATOM_PROJECT_ROOT = appDir;
 process.env.ATOM_APP_NAME = productName;
 process.env.ATOM_APP_ID = appId;
+process.title = productName;
 process.env.ATOM_BUILD = '1';
 process.env.ATOM_EMBEDDED_RUNTIME = '1';
 process.env.ATOM_WINDOW_HOST_ENTRY = path.join(appDir, 'vendor', 'atomjs', 'src', 'runtime', 'window-host.mjs');
@@ -941,6 +995,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/doctor.cjs

@@ -7,7 +7,7 @@ const { loadProject, commandExists } = require('./utils.cjs');
 
 async function doctorCommand(options = {}) {
   const rows = [];
-  rows.push(check('Node.js >= 20.12', isNodeSupported(), process.version));
+  rows.push(check('Node.js >= 24', isNodeSupported(), process.version));
   rows.push(check('npm', commandExists(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['--version'])));
 
   if (process.platform === 'win32') {
@@ -31,6 +31,14 @@ async function doctorCommand(options = {}) {
 
   if (process.platform === 'darwin') {
     rows.push(check('macOS WKWebView backend', true, 'shared native Cocoa host; no osascript process'));
+  } else if (process.platform === 'win32') {
+    try {
+      const project = loadProject(options.project);
+      const binding = require.resolve('@webviewjs/webview/package.json', { paths: [project.root, process.cwd()] });
+      rows.push(check('Windows prebuilt WebView binding', true, path.dirname(binding)));
+    } catch {
+      rows.push(check('Windows prebuilt WebView binding', false, 'run npm install; CMake and Visual Studio are not required'));
+    }
   } else {
     try {
       const project = loadProject(options.project);
@@ -57,8 +65,8 @@ async function doctorCommand(options = {}) {
 }
 
 function isNodeSupported() {
-  const [major, minor] = process.versions.node.split('.').map(Number);
-  return major > 20 || (major === 20 && minor >= 12);
+  const [major] = process.versions.node.split('.').map(Number);
+  return major >= 24;
 }
 
 function check(name, ok, detail = '') {

package/src/init.cjs

@@ -3,6 +3,7 @@
 const fs = require('node:fs');
 const path = require('node:path');
 const fse = require('fs-extra');
+const cliPackageVersion = require('../package.json').version;
 
 async function initCommand(directory, options = {}) {
   const root = path.resolve(directory);
@@ -16,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,
@@ -25,19 +25,19 @@ 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: {
-      '@atom-js-org/runtime': '0.5.2-alpha.0',
-      electron: 'npm:@atom-js-org/electron@0.5.2-alpha.0'
-    },
-    optionalDependencies: {
-      'webview-nodejs': '0.5.0'
+      '@atom-js-org/runtime': cliPackageVersion,
+      electron: `npm:@atom-js-org/electron@${cliPackageVersion}`
     },
     devDependencies: {
-      '@atom-js-org/cli': '0.5.2-alpha.0'
+      '@atom-js-org/cli': cliPackageVersion
+    },
+    engines: {
+      node: '>=24'
     },
     overrides: {
       tar: '7.5.20'
@@ -80,9 +80,6 @@ async function initCommand(directory, options = {}) {
         deb: true,
         rpm: true
       }
-    },
-    github: {
-      workflow: 'atom-build.yml'
     }
   }, null, 2));
 
@@ -94,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');
@@ -209,7 +205,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
           cache: npm
       - run: choco install nsis -y
       - run: npm ci
@@ -229,7 +225,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
           cache: npm
       - run: npm ci
         working-directory: \${{ inputs.project }}
@@ -249,7 +245,7 @@ jobs:
       - run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.1-dev zenity rpm
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 24
           cache: npm
       - run: |
           sudo curl -L -o /usr/local/bin/appimagetool https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage

package/src/run.cjs

@@ -3,6 +3,7 @@
 const path = require('node:path');
 const fs = require('node:fs');
 const { spawn } = require('node:child_process');
+const { pathToFileURL } = require('node:url');
 const { loadProject, hostTarget } = require('./utils.cjs');
 const { ensureElectronCompatibility } = require('./electron-compat.cjs');
 
@@ -26,26 +27,16 @@ async function runDev(options) {
   const iconPath = project.config.icon
     ? path.resolve(project.root, project.config.icon)
     : null;
-  const child = spawn(process.execPath, [mainPath], {
-    cwd: project.root,
-    env: {
-      ...process.env,
-      ATOM_PROJECT_ROOT: project.root,
-      ATOM_APP_NAME: project.config.productName,
-      ATOM_APP_ID: project.config.appId,
-      ...(iconPath && fs.existsSync(iconPath) ? { ATOM_APP_ICON: iconPath } : {}),
-      ATOM_DEV: '1'
-    },
-    stdio: 'inherit'
-  });
-
-  await new Promise((resolve, reject) => {
-    child.once('error', reject);
-    child.once('exit', (code, signal) => {
-      if (code === 0 || signal === 'SIGTERM' || signal === 'SIGINT') resolve();
-      else reject(new Error(`Application exited with code ${code}`));
-    });
+  Object.assign(process.env, {
+    ATOM_PROJECT_ROOT: project.root,
+    ATOM_APP_NAME: project.config.productName,
+    ATOM_APP_ID: project.config.appId,
+    ...(iconPath && fs.existsSync(iconPath) ? { ATOM_APP_ICON: iconPath } : {}),
+    ATOM_DEV: '1'
   });
+  process.title = project.config.productName;
+  process.chdir(project.root);
+  await import(pathToFileURL(mainPath).href);
 }
 
 async function runBuild(options) {

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;
 }