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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atom-js-org/cli",
-  "version": "0.5.2-alpha.0",
+  "version": "0.5.3-alpha.1",
   "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,6 +18,7 @@ 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);
@@ -108,7 +109,7 @@ async function localBuild(project, target, options = {}) {
     }
 
     const manifest = {
-      atomjsVersion: '0.5.2-alpha.0',
+      atomjsVersion: cliPackageVersion,
       target,
       productName,
       appId: project.config.appId,
@@ -188,11 +189,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 +236,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.');
@@ -455,6 +468,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');

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);
@@ -30,14 +31,14 @@ async function initCommand(directory, options = {}) {
       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'
@@ -209,7 +210,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 +230,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 +250,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) {