Update to v10.15.1

Author: kylecarbs

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- 8.15.0
+- 10.15.1
 cache:
   directories:
     - /home/travis/.ccache/

lib/node

@@ -1,131 +1,136 @@
-diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
-index 0e9c36c4fc..66367e51ce 100644
---- a/lib/internal/bootstrap_node.js
-+++ b/lib/internal/bootstrap_node.js
-@@ -118,13 +118,16 @@
-         'ExperimentalWarning', undefined);
-     }
- 
-+	if (NativeModule.exists('_third_party_main')) {
-+		NativeModule.require('_third_party_main');
-+	}
- 
-     // There are various modes that Node can run in. The most common two
+diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
+index 885546c5d6..f1287bb191 100644
+--- a/lib/internal/bootstrap/node.js
++++ b/lib/internal/bootstrap/node.js
+@@ -215,11 +215,16 @@
      // are running from a script and running the REPL - but there are a few
      // others like the debugger or running --eval arguments. Here we decide
-     // which mode we run in.
- 
--    if (NativeModule.exists('_third_party_main')) {
-+    if (NativeModule.exists('_third_party_main_invalid')) {
+ 	// which mode we run in.
++
++    if (NativeModule.exists('_third_party_main')) {
++	  NativeModule.require('_third_party_main');
++    }
++
+     if (internalBinding('worker').getEnvMessagePort() !== undefined) {
+       // This means we are in a Worker context, and any script execution
+       // will be directed by the worker module.
+       NativeModule.require('internal/worker').setupChild(evalScript);
+-    } else if (NativeModule.exists('_third_party_main')) {
++    } else if (NativeModule.exists('_third_party_main_invalid')) {
        // To allow people to extend Node in different ways, this hook allows
        // one to drop a file lib/_third_party_main.js into the build
        // directory which will be executed instead of Node's normal loading.
-diff --git a/lib/module.js b/lib/module.js
-index 642e5cb1f1..3d298fbf01 100644
---- a/lib/module.js
-+++ b/lib/module.js
-@@ -36,6 +36,9 @@ const {
- } = process.binding('fs');
- const preserveSymlinks = !!process.binding('config').preserveSymlinks;
- const experimentalModules = !!process.binding('config').experimentalModules;
+diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
+index fb3770b729..eb65385afe 100644
+--- a/lib/internal/modules/cjs/loader.js
++++ b/lib/internal/modules/cjs/loader.js
+@@ -44,6 +44,9 @@ const { getOptionValue } = require('internal/options');
+ const preserveSymlinks = getOptionValue('--preserve-symlinks');
+ const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
+ const experimentalModules = getOptionValue('--experimental-modules');
 +const nbin = require('nbin');
 +const os = require('os');
 +const zlib = require('zlib');
 
- const errors = require('internal/errors');
- 
-@@ -54,7 +57,8 @@ function stat(filename) {
+ const {
+   ERR_INVALID_ARG_TYPE,
+@@ -87,7 +90,8 @@ function stat(filename) {
      const result = cache.get(filename);
      if (result !== undefined) return result;
    }
 -  const result = internalModuleStat(filename);
-+	const s = nbin.statSync(filename);
-+	const result = s.isDirectory ? 1 : s.isFile ? 0 : internalModuleStat(filename);
++  const s = nbin.statSync(filename);
++  const result = s.isDirectory ? 1 : s.isFile ? 0 : internalModuleStat(filename);
    if (cache !== null) cache.set(filename, result);
    return result;
  }
-@@ -115,8 +119,13 @@ function readPackage(requestPath) {
+@@ -154,8 +158,13 @@ function readPackage(requestPath) {
    if (entry)
      return entry;
 
-+	let json;
++  let json;
    const jsonPath = path.resolve(requestPath, 'package.json');
--  const json = internalModuleReadFile(path._makeLong(jsonPath));
-+	if (nbin.existsSync(jsonPath)) {
-+		json = nbin.readFileSync(jsonPath, 'utf8');
-+	} else {
-+		json = internalModuleReadFile(path._makeLong(jsonPath));
-+	}
+-  const json = internalModuleReadJSON(path.toNamespacedPath(jsonPath));
++  if (nbin.existsSync(jsonPath)) {
++    json = nbin.readFileSync(jsonPath, 'utf8');
++  } else {
++    json = internalModuleReadJSON(path.toNamespacedPath(jsonPath));
++  }
 
    if (json === undefined) {
      return false;
-@@ -161,6 +170,9 @@ function tryFile(requestPath, isMain) {
+@@ -199,6 +208,9 @@ function tryFile(requestPath, isMain) {
  }
 
  function toRealPath(requestPath) {
-+	if (nbin.existsSync(requestPath)) {
-+		return requestPath;
-+	}
++  if (nbin.existsSync(requestPath)) {
++    return requestPath;
++  }
    return fs.realpathSync(requestPath, {
      [internalFS.realpathCacheKey]: realpathCache
    });
-@@ -660,14 +672,29 @@ Module.prototype._compile = function(content, filename) {
+@@ -696,14 +708,29 @@ Module.prototype._compile = function(content, filename) {
 
  // Native extension for .js
  Module._extensions['.js'] = function(module, filename) {
 -  var content = fs.readFileSync(filename, 'utf8');
-+	let content;
-+	if (nbin.existsSync(filename)) {
-+		content = nbin.readFileSync(filename, 'utf8');
-+	} else {
-+		content = fs.readFileSync(filename, 'utf8');
-+	}
-   module._compile(internalModule.stripBOM(content), filename);
++  let content;
++  if (nbin.existsSync(filename)) {
++    content = nbin.readFileSync(filename, 'utf8');
++  } else {
++    content = fs.readFileSync(filename, 'utf8');
++  }
+   module._compile(stripBOM(content), filename);
  };
 
 +// Native extension for .gz
 +Module._extensions['.gz'] = function(module, filename) {
-+	const content = zlib.gunzipSync(nbin.readFileSync(filename)).toString("utf8");
-+	module._compile(internalModule.stripBOM(content), filename);
++  const content = zlib.gunzipSync(nbin.readFileSync(filename)).toString("utf8");
++  module._compile(stripBOM(content), filename);
 +};
 
  // Native extension for .json
  Module._extensions['.json'] = function(module, filename) {
 -  var content = fs.readFileSync(filename, 'utf8');
-+	let content;
-+	if (nbin.existsSync(filename)) {
-+		content = nbin.readFileSync(filename, 'utf8');
-+	} else {
-+		content = fs.readFileSync(filename, 'utf8');
-+	}
++  let content;
++  if (nbin.existsSync(filename)) {
++    content = nbin.readFileSync(filename, 'utf8');
++  } else {
++    content = fs.readFileSync(filename, 'utf8');
++  }
    try {
-     module.exports = JSON.parse(internalModule.stripBOM(content));
+     module.exports = JSON.parse(stripBOM(content));
    } catch (err) {
-@@ -679,6 +706,11 @@ Module._extensions['.json'] = function(module, filename) {
+@@ -715,7 +742,14 @@ Module._extensions['.json'] = function(module, filename) {
 
- //Native extension for .node
+ // Native extension for .node
  Module._extensions['.node'] = function(module, filename) {
-+	if (nbin.existsSync(filename)) {
-+		const tmpFile = path.join(os.tmpdir(), `.nbin-${path.basename(filename)}`);
-+		fs.writeFileSync(tmpFile, nbin.readFileSync(filename));
-+		filename = tmpFile;
-+	}
-   return process.dlopen(module, path._makeLong(filename));
+-  return process.dlopen(module, path.toNamespacedPath(filename));
++  let isInternal = false;
++  if (nbin.existsSync(filename)) {
++    const tmpFile = path.join(os.tmpdir(), `.nbin-${path.basename(filename)}`);
++    fs.writeFileSync(tmpFile, nbin.readFileSync(filename));
++	filename = tmpFile;
++	isInternal = true;
++  }
++  return process.dlopen(module, isInternal ? filename : path.toNamespacedPath(filename));
  };
 
+ if (experimentalModules) {
 diff --git a/src/node.cc b/src/node.cc
-index 3d791f04ad..d6ae74884c 100644
+index 9fb5ab3b8e..d2c9ab3bc3 100644
 --- a/src/node.cc
 +++ b/src/node.cc
-@@ -3813,6 +3813,11 @@ void ProcessArgv(int* argc,
-                  int* exec_argc,
-                  const char*** exec_argv,
-                  bool is_env = false) {
+@@ -2439,6 +2439,12 @@ void ProcessArgv(std::vector<std::string>* args,
+   std::vector<std::string> v8_args;
+   std::vector<std::string> errors{};
+ 
 +  if (!getenv("NBIN_BYPASS") && !is_env) {
-+	  *exec_argc = 0;
++    // *exec_argc = 0;
 +
-+	  return;
++    return;
 +  }
-   // Parse a few arguments which are specific to Node.
-   int v8_argc;
-   const char** v8_argv;
++
+   {
+     // TODO(addaleax): The mutex here should ideally be held during the
+     // entire function, but that doesn't play well with the exit() calls below.

node.patch

@@ -2,4 +2,4 @@
 
 cd "$(dirname "$0")"
 cd ../lib/node
-git diff -w -- lib/module.js lib/internal/bootstrap_node.js src/node.cc --unified=0 > ../../node.patch
+git diff -w -- lib/internal/modules/cjs/loader.js lib/internal/bootstrap/node.js src/node.cc --unified=0 > ../../node.patch

scripts/patch_gen.sh

@@ -2,5 +2,5 @@
 
 cd "$(dirname "$0")"
 cd ..
-rm lib/node/test/fixtures/packages/invalid/package.json
+rm lib/node/test/fixtures/packages/unparseable/package.json
 npm run test

scripts/test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd "$(dirname "$0")"
-NODE_VERSION=8.15.0
+NODE_VERSION=10.15.1
 PACKAGE_VERSION=$(cat ../package.json \
   | grep version \
   | head -1 \

scripts/vars.sh

@@ -44,9 +44,13 @@ if (process.platform === "linux") {
 			mainFile,
 		});
 		bin.writeModule(path.join(__dirname, "../../node_modules", "node-pty"));
-		bin.writeFile(mainFile, Buffer.from(`require("node-pty");`));
+		bin.writeFile(mainFile, Buffer.from(`require("node-pty");console.log("hi");`));
 		const resp = await runBinary(bin);
-		expect(resp.stderr.toString().trim().length).toEqual(0);
+		const stderr = resp.stderr.toString().trim();
+		if (stderr.length > 0) {
+			console.error(stderr);
+		}
+		expect(stderr.length).toEqual(0);
 	});
 }
 

src/api/bundler.test.ts

@@ -163,7 +163,7 @@ export class Binary implements nbin.Binary {
 		if (currentArchitecture === "x64") {
 			currentArchitecture = "x86_64";
 		}
-		const nodeVersion = "8.15.0";
+		const nodeVersion = "10.15.1";
 		const packageJson = require("../../package.json");
 		const packageVersion = packageJson.version;
 		const binName = `${packageVersion}/node-${nodeVersion}-${currentPlatform}-${currentArchitecture}`;