nw 0.86.0 → 0.87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw",
-  "version": "0.86.0",
+  "version": "0.87.0",
   "description": "An installer for nw.js",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   "scripts": {
     "postinstall": "node src/postinstall.js",
     "test": "vitest run",
-    "demo": "nw ./test/app"
+    "demo": "nw ./test/app --log-level=verbose"
   },
   "files": [
     "bin",
@@ -36,8 +36,7 @@
     "axios": "^1.6.8",
     "commander": "^12.0.0",
     "semver": "^7.5.4",
-    "tar": "^6.2.1",
-    "yargs": "^17.7.2",
+    "tar": "^7.0.1",
     "yauzl-promise": "^4.0.0"
   },
   "keywords": [
@@ -54,6 +53,6 @@
   ],
   "devDependencies": {
     "selenium-webdriver": "^4.18.1",
-    "vitest": "^1.4.0"
+    "vitest": "^1.5.0"
   }
 }

package/src/cli.js

@@ -17,7 +17,8 @@ async function cli() {
     .option('--platform <platform>')
     .option('--arch <arch>')
     .option('--cacheDir <cacheDir>')
-    .argument('<app>')
+    .argument('[app]')
+    .allowUnknownOption()
     .parse(process.argv);
 
   let options = program.opts();

package/src/decompress.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import stream from "node:stream";
 
-import tar from "tar";
+import * as tar from "tar";
 import yauzl from "yauzl-promise";
 
 import util from "./util.js";

package/src/index.js

@@ -1,5 +1,5 @@
 import get from './get.js';
-import run from './run';
+import run from './run.js';
 import util from './util.js';
 
 const { findpath } = util;

package/src/parse.js

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import process from 'node:process';
 
 import semver from 'semver';
@@ -56,7 +57,7 @@ export default async function parse(options) {
     options.platform = options.platform || util.PLATFORM_KV[process.env.npm_config_nwjs_platform || process.env.NWJS_PLATFORM || process.platform];
     options.arch = options.arch || util.ARCH_KV[process.env.npm_config_nwjs_process_arch || process.env.NWJS_ARCH || process.arch];
     options.downloadUrl = options.downloadUrl || process.env.npm_config_nwjs_urlbase || process.env.NWJS_URLBASE || 'https://dl.nwjs.io';
-    options.cacheDir = options.npm_config_nwjs_urlbase || process.env.npm_config_nwjs_cache_dir || process.env.NWJS_CACHE_DIR || '.';
+    options.cacheDir = options.npm_config_nwjs_urlbase || process.env.npm_config_nwjs_cache_dir || process.env.NWJS_CACHE_DIR || path.resolve('.', 'node_modules', 'nw');
     options.cache = options.cache || process.env.npm_config_nwjs_cache || process.env.NWJS_CACHE || true;
     options.ffmpeg = options.ffmpeg || process.env.npm_config_nwjs_ffmpeg || process.env.NWJS_FFMPEG || false;
     options.nativeAddon = options.nativeAddon || process.env.npm_config_nwjs_native_addon || process.env.NWJS_NATIVE_ADDON || false;

package/src/util.js

@@ -3,6 +3,8 @@ import path from 'node:path';
 import process from 'node:process';
 import url from 'node:url';
 
+import parse from './parse.js';
+
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 
 /**
@@ -43,10 +45,12 @@ const EXE_NAME = {
  * Get the platform dependant path of the NW.js or ChromeDriver binary.
  * 
  * @param {'nwjs' | 'chromedriver'} executable Path to NW.js or Chromedriver executable.
- * @return {string}
+ * @return {Promise<string>}
  */
-function findpath(executable = 'nwjs') {
-    const nwDir = path.resolve(__dirname, '..', 'nwjs');
+async function findpath(executable = 'nwjs', options = {}) {
+    options = await parse(options);
+    const nwDir = path.resolve(__dirname, '..', `nwjs${options.flavor === "sdk" ? "-sdk" : ""}-v${options.version}-${options.platform}-${options.arch}`);
+    
     /**
      * File path to executable.
      * 
@@ -54,18 +58,11 @@ function findpath(executable = 'nwjs') {
      */
     let binPath = '';
 
-    /**
-      * Host operating system
-      * 
-      * @type {NodeJS.Platform}
-      */
-    let hostOs = PLATFORM_KV[process.env.npm_config_nwjs_platform || process.env.NWJS_PLATFORM || process.platform];
-
     /**
      * Get the platform dependant path of the NW.js binary.
      */
     function findNwjs() {
-        binPath = path.resolve(nwDir, EXE_NAME[hostOs]);
+        binPath = path.resolve(nwDir, EXE_NAME[options.platform]);
     }
 
     /**