nw 0.81.0-3-sdk → 0.81.0-4

package/bin/{nw → nw.js}

@@ -1,9 +1,12 @@
 #!/usr/bin/env node
 
-var fs = require('fs');
-var path = require('path');
-var spawn = require('child_process').spawn;
-var bin = require('../lib/findpath.js')();
+const { spawn } = require('node:child_process');
+const fs = require('node:fs');
+const path = require('node:path');
+const process = require('node:process');
+
+const { copyAssets } = require('../lib/app_assets.js');
+const findpath = require('../lib/findpath.js').findpath;
 
 function run() {
   // Rename nw.js's own package.json as workaround for https://github.com/nwjs/nw.js/issues/1503
@@ -16,7 +19,7 @@ function run() {
   }
 
   // copy over any asset files (icons, etc) specified via CLI args:
-  require('../lib/app_assets').copyAssets(process.platform, bin);
+  copyAssets(process.platform, findpath());
 
   // Normalize cli args
   var args = process.argv.slice(2);
@@ -28,7 +31,7 @@ function run() {
   }
 
   // Spawn node-webkit
-  var nw = spawn(bin, args, { stdio: 'inherit' });
+  var nw = spawn(findpath(), args, { stdio: 'inherit' });
   nw.on('close', function() {
     process.nextTick(function() {
       process.exit(0);
@@ -45,7 +48,7 @@ function run() {
   }, 1000);
 }
 
-if (!fs.existsSync(bin)) {
+if (!fs.existsSync(findpath())) {
   console.log('nw.js appears to have failed to download and extract. Attempting to download and extract again...');
   var child = spawn(process.execPath, [path.resolve(__dirname, '..', 'scripts', 'install.js')], { stdio: 'inherit' });
   child.on('close', run);

package/lib/{findpath.mjs → findpath.js}

@@ -1,7 +1,5 @@
-import { dirname } from 'node:path';
-import { env, platform } from 'node:process';
-import { join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+const { env, platform } = require('node:process');
+const { join, resolve } = require('node:path');
 
 /**
  * Get the platform dependant path of the NW.js or ChromeDriver binary.
@@ -9,8 +7,7 @@ import { fileURLToPath } from 'node:url';
  * @param {'nwjs' | 'chromedriver'} executable Path to NW.js or Chromedriver executable.
  * @return {string}
  */
-export default function findpath(executable = 'nwjs') {
-  const __dirname = dirname(fileURLToPath(import.meta.url));
+function findpath(executable = 'nwjs') {
   const nwDir = resolve(__dirname, '..', 'nwjs');
   /**
    * File path to executable.
@@ -56,3 +53,5 @@ export default function findpath(executable = 'nwjs') {
 
   return binPath;
 }
+
+module.exports = { findpath };

package/lib/{install.mjs → install.js}

@@ -1,17 +1,19 @@
-import { createWriteStream, existsSync } from 'node:fs';
-import { rename, rm } from 'node:fs/promises';
-import { get } from 'node:https';
-import { dirname, resolve } from 'node:path';
-import { arch, env, platform, exit } from 'node:process';
-import { fileURLToPath, URL } from 'node:url';
+const { createWriteStream, existsSync } = require('node:fs');
+const { rename, rm } = require('node:fs/promises');
+const { get } = require('node:https');
+const { resolve } = require('node:path');
+const { arch, env, platform, exit } = require('node:process');
+const { URL } = require('node:url');
 
-import compressing from 'compressing';
-import progress from 'cli-progress';
-import semver from 'semver';
+const compressing = require('compressing');
+const progress = require('cli-progress');
+const semver = require('semver');
 
-import nodeManifest from '../package.json' assert { type: 'json' };
+const nodeManifest = require('../package.json');
 
-await install();
+install()
+  .then(() => {})
+  .catch((error) => console.error(error));
 
 async function install() {
 
@@ -27,8 +29,6 @@ async function install() {
     arm64: 'arm64',
   };
 
-  const __dirname = dirname(fileURLToPath(import.meta.url));
-
   /**
    * URL to download or get binaries from.
    * 

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "nw",
-  "version": "0.81.0-3-sdk",
+  "version": "0.81.0-4",
   "description": "A installer for nw.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/nwjs/npm-installer.git"
   },
-  "main": "lib/findpath.mjs",
+  "main": "lib/findpath.js",
   "bin": {
-    "nw": "bin/nw"
+    "nw": "bin/nw.js"
   },
   "scripts": {
-    "postinstall": "node lib/install.mjs",
-    "test": "node --test-reporter=spec --test test/index.mjs"
+    "postinstall": "node lib/install.js",
+    "test": "node --test-reporter=spec --test test/index.js",
+    "dry-run": "nw ./test/app"
   },
   "files": [
     "lib",
@@ -47,4 +48,4 @@
     "desktop",
     "application"
   ]
-}
+}