nw-builder 4.2.4 → 4.2.6

package/package.json

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

package/src/bld/build.js

@@ -11,14 +11,13 @@ import { setWinConfig } from "./winCfg.js";
 /**
  * Generate NW build artifacts
  *
- * @param  {string | string[]}       files        Array of NW app files
- * @param  {string}                  nwDir        Directory to hold NW binaries
- * @param  {string}                  outDir       Directory to store build artifacts
- * @param  {"linux" | "osx" | "win"} platform     Platform is the operating system type
- * @param  {"zip" | boolean}         zip          Specify if the build artifacts are to be zipped
- * @param  {object}                  releaseInfo  NW version specific release information
- * @param  {object}                  app          Multi platform configuration options
- * @param  {string}                  nwPkg        NW.js manifest file
+ * @param  {string | string[]}       files     Array of NW app files
+ * @param  {string}                  nwDir     Directory to hold NW binaries
+ * @param  {string}                  outDir    Directory to store build artifacts
+ * @param  {"linux" | "osx" | "win"} platform  Platform is the operating system type
+ * @param  {"zip" | boolean}         zip       Specify if the build artifacts are to be zipped
+ * @param  {object}                  app       Multi platform configuration options
+ * @param  {string}                  nwPkg     NW.js manifest file
  * @return {Promise<undefined>}
  */
 export const build = async (
@@ -27,14 +26,13 @@ export const build = async (
   outDir,
   platform,
   zip,
-  releaseInfo,
   app,
   nwPkg
 ) => {
   log.debug(`Remove any files at ${outDir} directory`);
   await rm(outDir, { force: true, recursive: true });
   log.debug(`Copy ${nwDir} files to ${outDir} directory`);
-  await cp(nwDir, outDir, { recursive: true });
+  await cp(nwDir, outDir, { recursive: true, verbatimSymlinks: true });
 
   log.debug(`Copy files in srcDir to ${outDir} directory`);
 
@@ -88,7 +86,7 @@ export const build = async (
       await setWinConfig(app, outDir);
       break;
     case "osx":
-      await setOsxConfig(app, outDir, releaseInfo);
+      await setOsxConfig(app, outDir);
       break;
     default:
       break;

package/src/bld/osxCfg.js

@@ -9,18 +9,18 @@ import { log } from "../log.js";
 /**
  * OSX specific configuration steps
  *
- * @param  {object}             pkg     The srcDir/package.json as a JSON
+ * @param  {object}             app     Resource configuration options for MacOS
  * @param  {string}             outDir  The directory to hold build artifacts
  * @return {Promise<undefined>}
  */
-const setOsxConfig = async (pkg, outDir) => {
+const setOsxConfig = async (app, outDir) => {
   if (platform === "win32") {
     log.warn(
       "MacOS apps built on Windows platform do not preserve all file permissions. See #716"
     );
   }
   try {
-    const outApp = path.resolve(outDir, `${pkg.name}.app`);
+    const outApp = path.resolve(outDir, `${app.name}.app`);
     await fs.rename(path.resolve(outDir, "nwjs.app"), outApp);
 
     // Rename CFBundleDisplayName in Contents/Info.plist
@@ -28,7 +28,7 @@ const setOsxConfig = async (pkg, outDir) => {
     const contentsInfoPlistJson = plist.parse(
       await fs.readFile(contentsInfoPlistPath, "utf-8")
     );
-    contentsInfoPlistJson.CFBundleDisplayName = pkg.name;
+    contentsInfoPlistJson.CFBundleDisplayName = app.name;
     const contentsInfoPlist = plist.build(contentsInfoPlistJson);
     await fs.writeFile(contentsInfoPlistPath, contentsInfoPlist);
 
@@ -43,14 +43,14 @@ const setOsxConfig = async (pkg, outDir) => {
     );
     const newPlistStrings = contentsInfoPlistStrings.replace(
       /CFBundleGetInfoString = "nwjs /,
-      `CFBundleGetInfoString = "${pkg.name} `
+      `CFBundleGetInfoString = "${app.name} `
     );
     await fs.writeFile(contentsInfoPlistStringsPath, newPlistStrings);
 
     // Add product_string property to package.json
     // const packageJsonPath = path.resolve(outApp, "Contents/Resources/app.nw/package.json");
-    // pkg.product_string = pkg.name;
-    // await fs.writeFile(packageJsonPath, JSON.stringify(pkg, null, 4));
+    // app.product_string = app.name;
+    // await fs.writeFile(packageJsonPath, JSON.stringify(app, null, 4));
   } catch (error) {
     log.error(error);
   }

package/src/bld/winCfg.js

@@ -64,7 +64,7 @@ const setWinConfig = async (app, outDir) => {
     });
   } catch (error) {
     log.warn(
-      "Renaming EXE failed or unable to modify EXE. If it's the latter, ensure WINE is installed or build in Windows"
+      "Renaming EXE failed or unable to modify EXE. If it's the latter, ensure WINE is installed or build your application Windows platform"
     );
     log.error(error);
   }

package/src/index.js

@@ -195,7 +195,6 @@ const nwbuild = async (options) => {
         options.outDir,
         options.platform,
         options.zip,
-        releaseInfo,
         options.app,
         manifest
       );

package/src/util/parse.js

@@ -41,6 +41,7 @@ export const parse = async (options, pkg) => {
   options.zip = options.zip ?? false;
 
   options.app = options.app ?? {};
+  options.app.name = options.app.name ?? pkg.name;
 
   // TODO: move this out to
   if (options.platform === "linux") {