nw-builder 4.0.8 → 4.0.10

package/README.md

@@ -32,7 +32,6 @@ Module usage
 import nwbuild from "nw-builder";
 
 nwbuild({
-  // Globing does not matter since a process is spawned against the nwapp directory
   srcDir: "./nwapp/**/*",
   mode: "run",
   version: "latest",
@@ -43,7 +42,7 @@ nwbuild({
 CLI usage
 
 ```shell
-nwbuild ./nwapp --mode=run --version=latest --flavor=sdk
+nwbuild ./nwapp/**/* --mode=run --version=latest --flavor=sdk
 ```
 
 package.json usage
@@ -84,7 +83,7 @@ nwbuild({
 CLI usage
 
 ```shell
-nwbuild ./nwapp --mode=build --version=latest --flavor=normal --platform=linux --arch=x64 --outDir=./out
+nwbuild ./nwapp/**/* --mode=build --version=latest --flavor=normal --platform=linux --arch=x64 --outDir=./out
 ```
 
 package.json usage
@@ -302,7 +301,7 @@ The final code should look like this.
 const { nwbuild } = require("nw-builder");
 
 await nwbuild({
-  srcDir: "./nwapp",
+  srcDir: "./nwapp/**/*",
   mode: "build",
   version: "latest",
   flavor: "normal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
   "keywords": [
     "NW.js",
@@ -21,7 +21,6 @@
   "files": [
     "./src",
     "./LICENSE"
-
   ],
   "homepage": "https://github.com/nwutils/nw-builder",
   "repository": {
@@ -29,13 +28,13 @@
     "url": "https://github.com/nwutils/nw-builder.git"
   },
   "scripts": {
-    "format": "prettier --write \"./**/*.{js,cjs,md}\"",
+    "format": "prettier --write \"./**/*.{css,html,js,json,md}\"",
     "lint": "eslint ./src",
     "docs": "jsdoc ./src/nwbuild.js -d docs",
     "test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "test:e2e": "cd ./test/e2e && node bld.js",
-    "demo:cli": "cd ./test/e2e && node cli.js",
-    "demo:nix": "cd ./test/e2e && node nix.js",
+    "test:e2e": "cd ./test/e2e && node bld.js && node run.js",
+    "demo:cli": "cd ./test/e2e && nwbuild ./nwapp/* ./nwapp/**/* --mode=build --version=latest --flavor=normal --platform=linux --arch=x64 --outDir=./build/cli",
+    "demo:nix": "cd test/e2e && node nix.js",
     "demo:osx": "cd ./test/e2e && node osx.js",
     "demo:win": "cd ./test/e2e && node win.js"
   },

package/src/bld/package.js

@@ -1,5 +1,5 @@
+import { sep } from "node:path";
 import { cp, rm } from "node:fs/promises";
-import { basename } from "node:path";
 
 import { log } from "../log.js";
 
@@ -34,13 +34,13 @@ const packager = async (
   log.debug(`Copy ${nwDir} files to ${outDir} directory`);
   await cp(nwDir, outDir, { recursive: true });
 
-  for (const file of files) {
+  for (let file of files) {
     log.debug(`Copy ${file} file to ${outDir} directory`);
     await cp(
       file,
       `${outDir}/${
         platform !== "osx" ? "package.nw" : "nwjs.app/Contents/Resources/app.nw"
-      }/${basename(file)}`,
+      }/${file.split(sep).splice(2).join(sep)}`,
       {
         recursive: true,
       },

package/src/cli.js

@@ -37,4 +37,5 @@ const cli = yargs(hideBin(process.argv))
 nwbuild({
   ...cli,
   srcDir: cli._.join(" "),
+  cli: true,
 });

package/src/get/decompress.js

@@ -12,20 +12,20 @@ const decompress = (platform, outDir) => {
           C: `${outDir}`,
         })
         .then(() => {
-          resolve(0);
+          resolve();
         })
-        .catch(() => {
-          reject(1);
+        .catch((error) => {
+          reject(error);
         });
     } else {
       extract(path.resolve(`${outDir}/nw.zip`), {
         dir: path.resolve(`${outDir}`),
       })
         .then(() => {
-          resolve(0);
+          resolve();
         })
-        .catch(() => {
-          reject(1);
+        .catch((error) => {
+          reject(error);
         });
     }
   });

package/src/get/remove.js

@@ -6,7 +6,7 @@ const remove = (platform, outDir) => {
       `${outDir}/nw.${platform === "linux" ? "tar.gz" : "zip"}`,
       (error) => {
         if (error) {
-          reject(1);
+          reject(error);
         }
       },
     );

package/src/nwbuild.js

@@ -69,6 +69,7 @@ import { log } from "./log.js";
  * @property {App}                          app                                       Multi platform configuration options
  * @property {boolean}                      [cache=true]                              If true the existing cache is used. Otherwise it removes and redownloads it.
  * @property {boolean}                      [zip=false]                               If true the outDir directory is zipped
+ * @property {boolean}                      [cli=false]                               If true the CLI is used to glob srcDir and parse other options
  */
 
 /**
@@ -158,7 +159,7 @@ const nwbuild = async (options) => {
     }
   } catch (error) {
     log.error(error);
-    return error;
+    throw error;
   }
 };
 

package/src/run/execute.js

@@ -20,6 +20,15 @@ const execute = (srcDir, nwPath, argv) => {
       windowsHide: true,
     });
 
+    nwProcess.on("nw_app_running", () => {
+      log.debug("Kill NW process after confirming that it runs in CI.");
+      nwProcess.kill("SIGKILL");
+    });
+
+    if (process.env.NODE_ENV !== "production") {
+      nwProcess.emit("nw_app_running");
+    }
+
     nwProcess.on("close", () => {
       resolve();
     });

package/src/util/options.js

@@ -16,21 +16,27 @@ export const getOptions = async (opts) => {
   let nwPkg;
   const patterns = opts.srcDir.split(" ");
 
-  for (const pattern of patterns) {
-    let contents = await glob(pattern);
-    files.push(...contents);
-    // Try to find the first instance of the package.json
-    for (const content of contents) {
-      if (basename(content) === "package.json" && nwPkg === undefined) {
-        nwPkg = JSON.parse(await readFile(content));
-      }
+  // If the cli option is not true, then the srcDir glob patterns have not been parsed
+  if (opts.cli !== true) {
+    for (const pattern of patterns) {
+      let contents = await glob(pattern);
+      files.push(...contents);
     }
+  } else {
+    files = [...patterns];
+  }
 
-    if (nwPkg === undefined) {
-      throw new Error("package.json not found in srcDir file glob patterns.");
+  // Try to find the first instance of the package.json
+  for (const file of files) {
+    if (basename(file) === "package.json" && nwPkg === undefined) {
+      nwPkg = JSON.parse(await readFile(file));
     }
   }
 
+  if (nwPkg === undefined) {
+    throw new Error("package.json not found in srcDir file glob patterns.");
+  }
+
   if (files.length === 0) {
     throw new Error(`The globbing pattern ${opts.srcDir} is invalid.`);
   }