nw-builder 4.10.0 → 4.11.1

package/README.md

@@ -286,6 +286,7 @@ This object defines additional properties used for building for a specific platf
 | CFBundleVersion | `string` | The version of the build that identifies an iteration of the bundle. |
 | CFBundleShortVersionString | `string` | The release or version number of the bundle. |
 | NSHumanReadableCopyright | `string` | A human-readable copyright notice for the bundle. |
+| NSLocalNetworkUsageDescription | `string` | A human-readable description of why the application needs access to the local network. |
 
 
 ## Guides
@@ -375,7 +376,6 @@ nwbuild({
 ### Features
 
 - feat(get): support canary releases
-- feat(bld): rename MacOS Helper apps
 - feat(pkg): add `AppImage` installer
 - feat(pkg): add `NSIS` installer
 - feat(pkg): add `DMG` installer
@@ -389,7 +389,6 @@ nwbuild({
 - chore: annotate file paths as `fs.PathLike` instead of `string`.
 - chore(bld): factor out core build step
 - chore(bld): factor out linux config
-- chore(bld): factor out macos config
 - chore(bld): factor out windows config
 - chore(bld): factor out native addon
 - chore(bld): factor out compressing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.10.0",
+  "version": "4.11.1",
   "description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
   "keywords": [
     "NW.js",
@@ -47,33 +47,34 @@
     "test": "vitest run --coverage",
     "test:cov": "vitest --coverage.enabled true",
     "demo:bld": "node ./tests/fixtures/demo.js",
-    "demo:exe": "./tests/fixtures/out/nwapp.app/Contents/MacOS/nwapp"
+    "demo:exe": "./tests/fixtures/out/nwapp.app/Contents/MacOS/nwapp",
+    "demo:cli": "nwbuild --mode run ./src ./app/**"
   },
   "devDependencies": {
-    "@eslint/js": "^9.9.1",
-    "@vitest/coverage-v8": "^2.0.5",
+    "@eslint/js": "^9.11.1",
+    "@vitest/coverage-v8": "^2.1.1",
     "base-volta-off-of-nwjs": "^1.0.5",
-    "eslint": "^9.9.1",
-    "eslint-plugin-jsdoc": "^50.2.2",
-    "globals": "^15.9.0",
-    "nw": "^0.91.0",
-    "selenium-webdriver": "^4.23.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-jsdoc": "^50.3.1",
+    "globals": "^15.10.0",
+    "nw": "^0.92.0",
+    "selenium-webdriver": "^4.25.0",
     "vitest": "^2.0.4"
   },
   "dependencies": {
     "archiver": "^7.0.1",
-    "axios": "^1.7.5",
+    "axios": "^1.7.7",
+    "commander": "^12.1.0",
     "glob": "^11.0.0",
     "node-gyp": "^10.2.0",
     "plist": "^3.1.0",
     "resedit": "^2.0.2",
     "semver": "^7.6.3",
     "tar": "^7.4.3",
-    "yargs": "^17.7.2",
     "yauzl-promise": "^4.0.0"
   },
   "volta": {
-    "node": "22.2.0",
+    "node": "22.7.0",
     "npm": "10.8.2"
   }
 }

package/src/bld/osx.js

@@ -5,6 +5,23 @@ import process from 'node:process';
 
 import plist from 'plist';
 
+/**
+ * Function to update Helper App Plist Files
+ * @param {string} plistPath             - Path to Helper App Plist File
+ * @param {string} helperName            - Helper App Name
+ * @param {string} helperId              - Helper App ID
+ * @param {string} appCFBundleIdentifier - options.app.CFBundleIdentifier
+ */
+async function updateHelperPlist (plistPath, helperName, helperId, appCFBundleIdentifier) {
+  const plistFullPath = path.resolve(plistPath, 'Contents/Info.plist');
+  const plistJson = plist.parse(await fs.promises.readFile(plistFullPath, 'utf-8'));
+  plistJson.CFBundleDisplayName = helperName;
+  plistJson.CFBundleName = helperName;
+  plistJson.CFBundleExecutable = helperName;
+  plistJson.CFBundleIdentifier = `${appCFBundleIdentifier}.${helperId}`;
+  await fs.promises.writeFile(plistFullPath, plist.build(plistJson));
+}
+
 /**
  *
  * @param {object} options              - Options.
@@ -40,111 +57,6 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
      */
     const outApp = path.resolve(outDir, `${app.name}.app`);
 
-    const nwjsHelperAlertsAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      'nwjs Helper (Alerts).app',
-    );
-    const HelperAlertsAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      `${app.name} Helper (Alerts).app`,
-    );
-
-    const nwjsHelperGpuAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      'nwjs Helper (GPU).app',
-    );
-    const HelperGpuAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      `${app.name} Helper (GPU).app`,
-    );
-
-    const nwjsHelperPluginAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      'nwjs Helper (Plugin).app',
-    );
-    const HelperPluginAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      `${app.name} Helper (Plugin).app`,
-    );
-
-    const nwjsHelperRendererAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      'nwjs Helper (Renderer).app',
-    );
-    const HelperRendererAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      `${app.name} Helper (Renderer).app`,
-    );
-
-    const nwjsHelperAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      'nwjs Helper.app',
-    );
-    const HelperAppPath = path.resolve(
-      outApp,
-      'Contents',
-      'Frameworks',
-      'nwjs Framework.framework',
-      'Versions',
-      chromiumVersion,
-      'Helpers',
-      `${app.name} Helper.app`,
-    );
-
     /* Rename `nwjs.app` to `${app.name}.app` */
     await fs.promises.rename(nwjsApp, outApp);
 
@@ -154,65 +66,40 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
       path.resolve(outApp, 'Contents', 'MacOS', app.name),
     );
 
-    /* Rename Helper (Alert) */
-    await fs.promises.rename(
-      nwjsHelperAlertsAppPath,
-      HelperAlertsAppPath,
-    );
-
-    /* Rename Helper (GPU) */
-    await fs.promises.rename(
-      nwjsHelperGpuAppPath,
-      HelperGpuAppPath,
-    );
-
-    /* Rename Helper (Plugin) */
-    await fs.promises.rename(
-      nwjsHelperPluginAppPath,
-      HelperPluginAppPath,
-    );
-
-    /* Rename Helper (Renderer) */
-    await fs.promises.rename(
-      nwjsHelperRendererAppPath,
-      HelperRendererAppPath,
-    );
-
-    /* Rename Helper */
-    await fs.promises.rename(
-      nwjsHelperAppPath,
-      HelperAppPath,
-    );
-
-    /* Rename `nwjs Helper (Alerts)/Contents/MacOS/nwjs Helper (Alerts)` to `${app.name} Helper (Alerts)/Contents/MacOS/${app.name} Helper (Alerts)` */
-    await fs.promises.rename(
-      path.resolve(HelperAlertsAppPath, 'Contents', 'MacOS', 'nwjs Helper (Alerts)'),
-      path.resolve(HelperAlertsAppPath, 'Contents', 'MacOS', `${app.name} Helper (Alerts)`),
-    );
-
-    /* Rename `${app.name} Helper (GPU)/Contents/MacOS/nwjs Helper (GPU)` to `${app.name} Helper (GPU)/Contents/MacOS/${app.name} Helper (GPU)` */
-    await fs.promises.rename(
-      path.resolve(HelperGpuAppPath, 'Contents', 'MacOS', 'nwjs Helper (GPU)'),
-      path.resolve(HelperGpuAppPath, 'Contents', 'MacOS', `${app.name} Helper (GPU)`),
-    );
-
-    /* Rename `${app.name} Helper (Plugin)/Contents/MacOS/nwjs Helper (Plugin)` to `${app.name} Helper (Plugin)/Contents/MacOS/${app.name} Helper (Plugin)` */
-    await fs.promises.rename(
-      path.resolve(HelperPluginAppPath, 'Contents', 'MacOS', 'nwjs Helper (Plugin)'),
-      path.resolve(HelperPluginAppPath, 'Contents', 'MacOS', `${app.name} Helper (Plugin)`),
-    );
-
-    /* Rename `${app.name} Helper (Renderer)/Contents/MacOS/nwjs Helper (Renderer)` to `${app.name} Helper (Renderer)/Contents/MacOS/${app.name} Helper (Renderer)` */
-    await fs.promises.rename(
-      path.resolve(HelperRendererAppPath, 'Contents', 'MacOS', 'nwjs Helper (Renderer)'),
-      path.resolve(HelperRendererAppPath, 'Contents', 'MacOS', `${app.name} Helper (Renderer)`),
-    );
-
-    /* Rename `${app.name} Helper/Contents/MacOS/nwjs Helper` to `${app.name} Helper/Contents/MacOS/${app.name} Helper` */
-    await fs.promises.rename(
-      path.resolve(HelperAppPath, 'Contents', 'MacOS', 'nwjs Helper'),
-      path.resolve(HelperAppPath, 'Contents', 'MacOS', `${app.name} Helper`),
-    );
+    /* Rename all Helper apps */
+    const helperBaseDir = path.resolve(
+      outApp,
+      'Contents/Frameworks/nwjs Framework.framework/Versions',
+      chromiumVersion,
+      'Helpers/'
+    );
+
+    const helperApps = [
+      { name: 'nwjs Helper (Alerts).app', id: 'helper.alert' },
+      { name: 'nwjs Helper (GPU).app', id: 'helper.gpu' },
+      { name: 'nwjs Helper (Plugin).app', id: 'helper.plugin' },
+      { name: 'nwjs Helper (Renderer).app', id: 'helper.renderer' },
+      { name: 'nwjs Helper.app', id: 'helper' },
+    ];
+
+    for (const helperApp of helperApps) {
+      const newHelperAppName = helperApp.name.replace(/^nwjs/, app.name);
+      const oldPath = path.resolve(helperBaseDir, helperApp.name);
+      const newPath = path.resolve(helperBaseDir, newHelperAppName);
+
+      // Rename Helper base directory
+      await fs.promises.rename(oldPath, newPath);
+
+      // Rename Helper sub-directory
+      const helperBaseName = helperApp.name.replace(/.app$/, '');
+      const subPathBase = path.resolve(newPath, 'Contents/MacOS/');
+      const oldSubPath = path.resolve(subPathBase, helperBaseName);
+      const newSubPath = path.resolve(subPathBase, helperBaseName.replace(/^nwjs/, app.name));
+      await fs.promises.rename(oldSubPath, newSubPath);
+
+      // Update Helper Plist file
+      await updateHelperPlist(newPath, newHelperAppName.replace(/.app$/, ''), helperApp.id, app.CFBundleIdentifier);
+    }
 
     /* Replace default icon with user defined icon if specified. */
     if (app.icon !== undefined) {
@@ -226,7 +113,7 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
      * Path to `nwjs.app/Contents/Info.plist`
      * @type {string}
      */
-    const ContentsInfoPlistPath = path.resolve(
+    const contentsInfoPlistPath = path.resolve(
       outApp,
       'Contents',
       'Info.plist'
@@ -236,7 +123,7 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
      * Path to `nwjs.app/Contents/Resources/en.lproj/InfoPlist.settings`
      * @type {string}
      */
-    const ContentsResourcesEnLprojInfoPlistStringsPath = path.resolve(
+    const contentsResourcesEnLprojInfoPlistStringsPath = path.resolve(
       outApp,
       'Contents',
       'Resources',
@@ -248,144 +135,40 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
      * JSON from `nwjs.app/Contents/Info.plist`
      * @type {object}
      */
-    const ContentsInfoPlistJson = plist.parse(
-      await fs.promises.readFile(
-        ContentsInfoPlistPath,
-        'utf-8'
-      )
-    );
-
-    /**
-     * JSON from `${app.name} Helper.app (Alerts)/Contents/Info.plist`
-     * @type {object}
-     */
-    const HelperAlertsAppJson = plist.parse(
-      await fs.promises.readFile(
-        path.resolve(
-          HelperAlertsAppPath,
-          'Contents',
-          'Info.plist'
-        ),
-        'utf-8'
-      )
-    );
-
-    /**
-     * JSON from `${app.name} Helper (GPU).app/Contents/Info.plist`
-     * @type {object}
-     */
-    const HelperGpuAppJson = plist.parse(
-      await fs.promises.readFile(
-        path.resolve(
-          HelperGpuAppPath,
-          'Contents',
-          'Info.plist'
-        ),
-        'utf-8'
-      )
-    );
-
-    /**
-     * JSON from `${app.name} Helper (Plugin).app/Contents/Info.plist`
-     * @type {object}
-     */
-    const HelperPluginAppJson = plist.parse(
-      await fs.promises.readFile(
-        path.resolve(
-          HelperPluginAppPath,
-          'Contents',
-          'Info.plist'
-        ),
-        'utf-8'
-      )
-    );
-
-    /**
-     * JSON from `${app.name} Helper (Renderer).app/Contents/Info.plist`
-     * @type {object}
-     */
-    const HelperRendererAppJson = plist.parse(
-      await fs.promises.readFile(
-        path.resolve(
-          HelperRendererAppPath,
-          'Contents',
-          'Info.plist'
-        ),
-        'utf-8'
-      )
-    );
-
-    /**
-     * JSON from `${app.name} Helper.app/Contents/Info.plist`
-     * @type {object}
-     */
-    const HelperAppJson = plist.parse(
+    const contentsInfoPlistJson = plist.parse(
       await fs.promises.readFile(
-        path.resolve(
-          HelperAppPath,
-          'Contents',
-          'Info.plist'
-        ),
+        contentsInfoPlistPath,
         'utf-8'
       )
     );
 
     /* Update Plist with user defined values. */
-    ContentsInfoPlistJson.LSApplicationCategoryType = app.LSApplicationCategoryType;
-    ContentsInfoPlistJson.CFBundleIdentifier = app.CFBundleIdentifier;
-    ContentsInfoPlistJson.CFBundleName = app.CFBundleName;
-    ContentsInfoPlistJson.CFBundleDisplayName = app.CFBundleDisplayName;
-    ContentsInfoPlistJson.CFBundleSpokenName = app.CFBundleSpokenName;
-    ContentsInfoPlistJson.CFBundleVersion = app.CFBundleVersion;
-    ContentsInfoPlistJson.CFBundleShortVersionString = app.CFBundleShortVersionString;
-    ContentsInfoPlistJson.CFBundleExecutable = app.name;
+    contentsInfoPlistJson.LSApplicationCategoryType = app.LSApplicationCategoryType;
+    contentsInfoPlistJson.CFBundleIdentifier = app.CFBundleIdentifier;
+    contentsInfoPlistJson.CFBundleName = app.CFBundleName;
+    contentsInfoPlistJson.CFBundleDisplayName = app.CFBundleDisplayName;
+    contentsInfoPlistJson.CFBundleSpokenName = app.CFBundleSpokenName;
+    contentsInfoPlistJson.CFBundleVersion = app.CFBundleVersion;
+    contentsInfoPlistJson.CFBundleShortVersionString = app.CFBundleShortVersionString;
+    contentsInfoPlistJson.CFBundleExecutable = app.name;
+    contentsInfoPlistJson.NSLocalNetworkUsageDescription = app.NSLocalNetworkUsageDescription;
 
     /* Remove properties that were not updated by the user. */
-    Object.keys(ContentsInfoPlistJson).forEach((option) => {
-      if (ContentsInfoPlistJson[option] === undefined) {
-        delete ContentsInfoPlistJson[option];
+    Object.keys(contentsInfoPlistJson).forEach((option) => {
+      if (contentsInfoPlistJson[option] === undefined) {
+        delete contentsInfoPlistJson[option];
       }
     });
 
-    /* Update Helper (Alerts) app's Plist values. */
-    HelperAlertsAppJson.CFBundleDisplayName = `${app.name} Helper (Alerts)`;
-    HelperAlertsAppJson.CFBundleName = `${app.name} Helper (Alerts)`;
-    HelperAlertsAppJson.CFBundleExecutable = `${app.name} Helper (Alerts)`;
-    HelperAlertsAppJson.CFBundleIdentifier = `${app.CFBundleIdentifier}.helper.alert`;
-
-    /* Update Helper (GPU) app's Plist values. */
-    HelperGpuAppJson.CFBundleDisplayName = `${app.name} Helper (GPU)`;
-    HelperGpuAppJson.CFBundleName = `${app.name} Helper (GPU)`;
-    HelperGpuAppJson.CFBundleExecutable = `${app.name} Helper (GPU)`;
-    HelperGpuAppJson.CFBundleIdentifier = `${app.CFBundleIdentifier}.helper.gpu`;
-
-    /* Update Helper (Plugin) app's Plist values. */
-    HelperPluginAppJson.CFBundleDisplayName = `${app.name} Helper (Plugin)`;
-  HelperPluginAppJson.CFBundleName = `${app.name} Helper (Plugin)`;
-    HelperPluginAppJson.CFBundleExecutable = `${app.name} Helper (Plugin)`;
-    HelperPluginAppJson.CFBundleIdentifier = `${app.CFBundleIdentifier}.helper.plugin`;
-
-    /* Update Helper (Renderer) app's Plist values. */
-    HelperRendererAppJson.CFBundleDisplayName = `${app.name} Helper (Renderer)`;
-    HelperRendererAppJson.CFBundleName = `${app.name} Helper (Renderer)`;
-    HelperRendererAppJson.CFBundleExecutable = `${app.name} Helper (Renderer)`;
-    HelperRendererAppJson.CFBundleIdentifier = `${app.CFBundleIdentifier}.helper.renderer`;
-
-    /* Update Helper app's Plist values. */
-    HelperAppJson.CFBundleDisplayName = `${app.name} Helper`;
-    HelperAppJson.CFBundleName = `${app.name} Helper`;
-    HelperAppJson.CFBundleExecutable = `${app.name} Helper`;
-    HelperAppJson.CFBundleIdentifier = `${app.CFBundleIdentifier}.helper`;
-
     /**
      * Data from `nwjs.app/Contents/Resources/en.lproj/InfoPlist.settings`
      * @type {string[]}
      */
-    const ContentsResourcesEnLprojInfoPlistStringsArray = (await fs.promises.readFile(
-      ContentsResourcesEnLprojInfoPlistStringsPath,
+    const contentsResourcesEnLprojInfoPlistStringsArray = (await fs.promises.readFile(
+      contentsResourcesEnLprojInfoPlistStringsPath,
       'utf-8',
     )).split('\n');
-    ContentsResourcesEnLprojInfoPlistStringsArray.forEach((line, idx, arr) => {
+    contentsResourcesEnLprojInfoPlistStringsArray.forEach((line, idx, arr) => {
       if (line.includes('NSHumanReadableCopyright')) {
         arr[idx] =
           `NSHumanReadableCopyright = "${app.NSHumanReadableCopyright}";`;
@@ -394,32 +177,13 @@ export default async function setOsxConfig({ app, outDir, releaseInfo }) {
 
     /* Write the updated values to their config files. */
     await fs.promises.writeFile(
-      ContentsInfoPlistPath,
-      plist.build(ContentsInfoPlistJson));
-    await fs.promises.writeFile(
-      ContentsResourcesEnLprojInfoPlistStringsPath,
-      ContentsResourcesEnLprojInfoPlistStringsArray.toString().replace(/,/g, '\n'),
-    );
+      contentsInfoPlistPath,
+      plist.build(contentsInfoPlistJson));
     await fs.promises.writeFile(
-      path.resolve(HelperAlertsAppPath, 'Contents', 'Info.plist'),
-      plist.build(HelperAlertsAppJson)
-    );
-    await fs.promises.writeFile(
-      path.resolve(HelperGpuAppPath, 'Contents', 'Info.plist'),
-      plist.build(HelperGpuAppJson)
-    );
-    await fs.promises.writeFile(
-      path.resolve(HelperPluginAppPath, 'Contents', 'Info.plist'),
-      plist.build(HelperPluginAppJson)
-    );
-    await fs.promises.writeFile(
-      path.resolve(HelperRendererAppPath, 'Contents', 'Info.plist'),
-      plist.build(HelperRendererAppJson)
-    );
-    await fs.promises.writeFile(
-      path.resolve(HelperAppPath, 'Contents', 'Info.plist'),
-      plist.build(HelperAppJson)
+      contentsResourcesEnLprojInfoPlistStringsPath,
+      contentsResourcesEnLprojInfoPlistStringsArray.toString().replace(/,/g, '\n'),
     );
+
   } catch (error) {
     console.error(error);
   }

package/src/bld.js

@@ -44,17 +44,18 @@ import setOsxConfig from './bld/osx.js';
 /**
  * References:
  * https://developer.apple.com/documentation/bundleresources/information_property_list
- * @typedef  {object} OsxRc                       OSX resource configuration options
- * @property {string} name                        The name of the application
- * @property {string} icon                        The path to the icon file. It should be a .icns file.
- * @property {string} LSApplicationCategoryType   The category that best describes your app for the App Store.
- * @property {string} CFBundleIdentifier          A unique identifier for a bundle usually in reverse DNS format.
- * @property {string} CFBundleName                A user-visible short name for the bundle.
- * @property {string} CFBundleDisplayName         The user-visible name for the bundle.
- * @property {string} CFBundleSpokenName          A replacement for the app name in text-to-speech operations.
- * @property {string} CFBundleVersion             The version of the build that identifies an iteration of the bundle.
- * @property {string} CFBundleShortVersionString  The release or version number of the bundle.
- * @property {string} NSHumanReadableCopyright    A human-readable copyright notice for the bundle.
+ * @typedef  {object} OsxRc                           OSX resource configuration options
+ * @property {string} name                            The name of the application
+ * @property {string} icon                            The path to the icon file. It should be a .icns file.
+ * @property {string} LSApplicationCategoryType       The category that best describes your app for the App Store.
+ * @property {string} CFBundleIdentifier              A unique identifier for a bundle usually in reverse DNS format.
+ * @property {string} CFBundleName                    A user-visible short name for the bundle.
+ * @property {string} CFBundleDisplayName             The user-visible name for the bundle.
+ * @property {string} CFBundleSpokenName              A replacement for the app name in text-to-speech operations.
+ * @property {string} CFBundleVersion                 The version of the build that identifies an iteration of the bundle.
+ * @property {string} CFBundleShortVersionString      The release or version number of the bundle.
+ * @property {string} NSHumanReadableCopyright        A human-readable copyright notice for the bundle.
+ * @property {string} NSLocalNetworkUsageDescription  A human-readable description of why the application needs access to the local network.
  */
 
 /**

package/src/cli.js

@@ -1,95 +1,32 @@
 #!/usr/bin/env node
 
-import process from 'node:process';
-
-import yargs from 'yargs/yargs';
-import * as yargs_helpers from 'yargs/helpers';
+import { program } from 'commander';
 
 import nwbuild from './index.js';
 
-const cli = yargs(yargs_helpers.hideBin(process.argv))
-  .version(false)
-  .command('[srcDir] [options]')
-  .option('mode', {
-    type: 'string',
-    description: '`get`, `run` or `build` application',
-    choices: ['get', 'run', 'build']
-  })
-  .option('version', {
-    type: 'string',
-    description: 'NW.js version',
-  })
-  .option('flavor', {
-    type: 'string',
-    description: 'NW.js build flavor',
-    choices: ['normal', 'sdk']
-  })
-  .option('platform', {
-    type: 'string',
-    description: 'NW.js supported platform',
-    choices: ['linux', 'osx', 'win']
-  })
-  .option('arch', {
-    type: 'string',
-    description: 'NW.js supported architecture',
-    choices: ['ia32', 'x64', 'arm64']
-  })
-  .option('downloadUrl', {
-    type: 'string',
-    description: 'NW.js download server',
-  })
-  .option('manifestUrl', {
-    type: 'string',
-    description: 'NW.js version info',
-  })
-  .option('cacheDir', {
-    type: 'string',
-    description: 'Cache NW.js binaries',
-  })
-  .option('outDir', {
-    type: 'string',
-    description: 'NW.js build artifacts',
-  })
-  .option('app', {
-    type: 'object',
-    description: 'Platform specific app metadata. Refer to docs for more info',
-  })
-  .option('cache', {
-    type: 'boolean',
-    description: 'Flag to enable/disable caching',
-  })
-  .option('ffmpeg', {
-    type: 'boolean',
-    description: 'Flag to enable/disable downloading community ffmpeg',
-  })
-  .option('glob', {
-    type: 'boolean',
-    description: 'Flag to enable/disable globbing',
-  })
-  .option('logLevel', {
-    type: 'string',
-    description: 'Specify log level',
-    choices: ['error', 'warn', 'info', 'debug']
-  })
-  .option('zip', {
-    type: 'string',
-    description: 'Flag to enable/disable compression',
-    choices: ['zip', 'tar', 'tgz']
-  })
-  .option('managedManifest', {
-    type: 'string',
-    description: 'Managed manifest mode',
-  })
-  .option('nodeAddon', {
-    type: 'string',
-    description: 'Download NW.js Node headers',
-    choices: [false, 'gyp']
-  })
-  .strictOptions()
-  .parse();
+program
+  .option('--mode', 'get, run or build mode')
+  .option('--version', 'NW.js version')
+  .option('--flavor', 'NW.js build flavor')
+  .option('--platform', 'NW.js supported platform')
+  .option('--arch', 'NW.js supported architecture')
+  .option('--downloadUrl', 'NW.js download server')
+  .option('--manifestUrl', 'NW.js version info')
+  .option('--cacheDir', 'Cache NW.js binaries')
+  .option('--outDir', 'NW.js build artifacts')
+  .option('--app', 'Platform specific app metadata. Refer to docs for more info')
+  .option('--cache', 'Flag to enable/disable caching')
+  .option('--ffmpeg', 'Flag to enable/disable downloading community ffmpeg')
+  .option('--glob', 'Flag to enable/disable globbing')
+  .option('--logLevel', 'Specify log level')
+  .option('--zip', 'Flag to enable/disable compression')
+  .option('--managedManifest', 'Managed manifest mode')
+  .option('--nodeAddon', 'Download NW.js Node headers');
+
+program.parse();
 
 nwbuild({
-  ...cli,
-  srcDir: cli._.join(' '),
+  ...program.opts(),
+  srcDir: program.args.join(' '),
   cli: true,
 });

package/src/index.d.ts

@@ -39,6 +39,8 @@ export interface Options<P extends SupportedPlatform = SupportedPlatform> {
     glob?: boolean,
     /** Specified log level. */
     logLevel?: "error" | "warn" | "info" | "debug",
+	/** Managed manifest */
+	managedManifest?: boolean | string | object,
 }
 
 /** Platform-specific application options */
@@ -167,6 +169,8 @@ export interface OsxAppOptions {
     CFBundleShortVersionString?: string,
     /** A human-readable copyright notice for the bundle. */
     NSHumanReadableCopyright?: string,
+    /** A human-readable description of why the application needs access to the local network. */
+    NSLocalNetworkUsageDescription?: string,
 }
 
 /**

package/src/util.js

@@ -263,6 +263,8 @@ export const parse = async (options, pkg) => {
       options.app.CFBundleShortVersionString ?? pkg.version;
     options.app.NSHumanReadableCopyright =
       options.app.NSHumanReadableCopyright ?? undefined;
+    options.app.NSLocalNetworkUsageDescription =
+      options.app.NSLocalNetworkUsageDescription ?? undefined;
   }
 
   return { ...options };