nw-builder 4.17.3 → 4.17.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.17.3",
+  "version": "4.17.5",
   "description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
   "keywords": [
     "NW.js",

package/src/bld.js

@@ -131,13 +131,15 @@ async function bld({
   await fs.promises.cp(nwDir, outDir, { recursive: true, verbatimSymlinks: true });
 
   const files = await util.globFiles({ srcDir, glob });
-  let manifest = await util.getNodeManifest({ srcDir, glob });
 
-  /* Set `product_string` in manifest for MacOS. This is used in renaming the Helper apps. */
-  if (platform === 'osx') {
-    manifest.json.product_string = app.name;
-    await fs.promises.writeFile(manifest.path, JSON.stringify(manifest.json, null, 2));
-  }
+  const nwProjectDir = path.resolve(
+    outDir,
+    platform !== 'osx'
+      ? 'package.nw'
+      : 'nwjs.app/Contents/Resources/app.nw',
+  );
+
+  await fs.promises.mkdir(nwProjectDir, { recursive: true });
 
   if (glob) {
     for (let file of files) {
@@ -148,10 +150,7 @@ async function bld({
       await fs.promises.cp(
         file,
         path.resolve(
-          outDir,
-          platform !== 'osx'
-            ? 'package.nw'
-            : 'nwjs.app/Contents/Resources/app.nw',
+          nwProjectDir,
           file,
         ),
         { recursive: true, force: true },
@@ -161,23 +160,26 @@ async function bld({
     await fs.promises.cp(
       files,
       path.resolve(
-        outDir,
-        platform !== 'osx'
-          ? 'package.nw'
-          : 'nwjs.app/Contents/Resources/app.nw',
+        nwProjectDir,
       ),
       { recursive: true, verbatimSymlinks: true },
     );
   }
 
-  // const nodeVersion = releaseInfo.components.node;
+  const builtManifest = JSON.parse(await fs.promises.readFile(path.resolve(nwProjectDir, 'package.json'), 'utf8'));
+
+  /* Set `product_string` in manifest for MacOS. This is used in renaming the Helper apps. */
+  if (platform === 'osx') {
+    builtManifest.product_string = app.name;
+    await fs.promises.writeFile(path.resolve(nwProjectDir, 'package.json'), JSON.stringify(builtManifest, null, 2));
+  }
 
   if (
     managedManifest === true ||
     typeof managedManifest === 'object' ||
     typeof managedManifest === 'string'
   ) {
-    await manageManifest({ nwPkg: manifest.json, managedManifest, outDir, platform });
+    await manageManifest({ nwPkg: builtManifest, managedManifest, outDir, platform });
   }
 
   if (platform === 'linux') {

package/src/util.js

@@ -539,7 +539,7 @@ export const validate = async (options, releaseInfo) => {
     if (typeof options.app.NSHumanReadableCopyright !== 'string') {
       throw new Error('Expected options.app.NSHumanReadableCopyright to be a string. Got ' + options.app.NSHumanReadableCopyright);
     }
-    if (typeof options.app.NSLocalNetworkUsageDescription !== 'string') {
+    if (options.app.NSLocalNetworkUsageDescription && typeof options.app.NSLocalNetworkUsageDescription !== 'string') {
       throw new Error('Expected options.app.NSLocalNetworkUsageDescription to be a string. Got ' + options.app.NSLocalNetworkUsageDescription);
     }
   } else {