Transform by

.gitignore

@@ -37,6 +37,8 @@
 /*.swp
 /out
 /*.txt
+/*.msi
+/*.wixpdb
 
 # === Rules for artifacts of `./configure` ===
 /icu_config.gypi
@@ -58,6 +60,9 @@ _UpgradeReport_Files/
 *.wixobj
 /tools/msvs/genfiles/
 /npm.wxs
+/tools/msvs/msi/Release/
+/tools/msvs/msi/obj/
+/tools/msvs/msi/x64/
 # Exclude MSVS files used for .msi file generation
 !tools/msvs/msi/custom_actions.vcxproj
 !tools/msvs/msi/nodemsi.sln

BUILDING.md

@@ -84,12 +84,10 @@ will be updated to reflect those changes.
 
 ### Platform list
 
-Compiling and running Node.js is supported for a limited set of operating
-systems, architectures and libc versions. The table below lists the
-combinations that the core team has committed to supporting and the nature of
-that support as per the support tiers above. A list of
-[supported compile toolchains](#supported-toolchains) is also supplied for
-tier 1 platforms.
+Node.js compilation/execution support depends on operating system, architecture,
+and libc version. The table below lists the support tier for each supported
+combination. A list of [supported compile toolchains](#supported-toolchains) is
+also supplied for tier 1 platforms.
 
 **For production applications, run Node.js on supported platforms only.**
 

Makefile

@@ -842,6 +842,7 @@ endif
 endif
 endif
 endif
+endif
 ifeq ($(DESTCPU),x64)
 ARCH=x64
 else
@@ -871,7 +872,6 @@ endif
 endif
 endif
 endif
-endif
 
 # node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
 # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.

benchmark/buffers/buffer-bytelength.js

@@ -16,8 +16,8 @@ const chars = [
 ];
 
 function main({ n, len, encoding }) {
-  var strings = [];
-  var results = [ len * 16 ];
+  let strings = [];
+  let results = [ len * 16 ];
   if (encoding === 'buffer') {
     strings = [ Buffer.alloc(len * 16, 'a') ];
   } else {

benchmark/buffers/buffer-compare-instance-method.js

@@ -12,47 +12,46 @@ function main({ n, size, args }) {
   const b1 = Buffer.alloc(size, 'a');
   const b0Len = b0.length;
   const b1Len = b1.length;
-  var i;
 
   b1[size - 1] = 'b'.charCodeAt(0);
 
   switch (args) {
     case 2:
       b0.compare(b1, 0);
       bench.start();
-      for (i = 0; i < n; i++) {
+      for (let i = 0; i < n; i++) {
         b0.compare(b1, 0);
       }
       bench.end(n);
       break;
     case 3:
       b0.compare(b1, 0, b1Len);
       bench.start();
-      for (i = 0; i < n; i++) {
+      for (let i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len);
       }
       bench.end(n);
       break;
     case 4:
       b0.compare(b1, 0, b1Len, 0);
       bench.start();
-      for (i = 0; i < n; i++) {
+      for (let i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len, 0);
       }
       bench.end(n);
       break;
     case 5:
       b0.compare(b1, 0, b1Len, 0, b0Len);
       bench.start();
-      for (i = 0; i < n; i++) {
+      for (let i = 0; i < n; i++) {
         b0.compare(b1, 0, b1Len, 0, b0Len);
       }
       bench.end(n);
       break;
     default:
       b0.compare(b1);
       bench.start();
-      for (i = 0; i < n; i++) {
+      for (let i = 0; i < n; i++) {
         b0.compare(b1);
       }
       bench.end(n);

benchmark/buffers/buffer-hex.js

@@ -9,16 +9,15 @@ const bench = common.createBenchmark(main, {
 
 function main({ len, n }) {
   const buf = Buffer.alloc(len);
-  var i;
 
-  for (i = 0; i < buf.length; i++)
+  for (let i = 0; i < buf.length; i++)
     buf[i] = i & 0xff;
 
   const hex = buf.toString('hex');
 
   bench.start();
 
-  for (i = 0; i < n; i += 1)
+  for (let i = 0; i < n; i += 1)
     Buffer.from(hex, 'hex');
 
   bench.end(n);

benchmark/buffers/buffer-indexof.js

@@ -25,7 +25,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, search, encoding, type }) {
-  var aliceBuffer = fs.readFileSync(
+  let aliceBuffer = fs.readFileSync(
     path.resolve(__dirname, '../fixtures/alice.html')
   );
 

benchmark/buffers/buffer-iterate.js

@@ -29,23 +29,23 @@ function main({ size, type, method, n }) {
 }
 
 function benchFor(buffer, n) {
-  for (var k = 0; k < n; k++) {
-    for (var i = 0; i < buffer.length; i++) {
+  for (let k = 0; k < n; k++) {
+    for (let i = 0; i < buffer.length; i++) {
       assert(buffer[i] === 0);
     }
   }
 }
 
 function benchForOf(buffer, n) {
-  for (var k = 0; k < n; k++) {
+  for (let k = 0; k < n; k++) {
     for (const b of buffer) {
       assert(b === 0);
     }
   }
 }
 
 function benchIterator(buffer, n) {
-  for (var k = 0; k < n; k++) {
+  for (let k = 0; k < n; k++) {
     const iter = buffer[Symbol.iterator]();
     let cur = iter.next();
 

benchmark/buffers/buffer-swap.js

@@ -36,7 +36,7 @@ Buffer.prototype.htons = function htons() {
 Buffer.prototype.htonl = function htonl() {
   if (this.length % 4 !== 0)
     throw new RangeError();
-  for (var i = 0; i < this.length; i += 4) {
+  for (let i = 0; i < this.length; i += 4) {
     swap(this, i, i + 3);
     swap(this, i + 1, i + 2);
   }
@@ -66,7 +66,7 @@ function createBuffer(len, aligned) {
 function genMethod(method) {
   const fnString = `
       return function ${method}(n, buf) {
-        for (var i = 0; i <= n; i++)
+        for (let i = 0; i <= n; i++)
           buf.${method}();
       }`;
   return (new Function(fnString))();

benchmark/buffers/buffer-tostring.js

@@ -15,29 +15,28 @@ function main({ encoding, args, len, n }) {
   if (encoding.length === 0)
     encoding = undefined;
 
-  var i;
   switch (args) {
     case 1:
       bench.start();
-      for (i = 0; i < n; i += 1)
+      for (let i = 0; i < n; i += 1)
         buf.toString(encoding);
       bench.end(n);
       break;
     case 2:
       bench.start();
-      for (i = 0; i < n; i += 1)
+      for (let i = 0; i < n; i += 1)
         buf.toString(encoding, 0);
       bench.end(n);
       break;
     case 3:
       bench.start();
-      for (i = 0; i < n; i += 1)
+      for (let i = 0; i < n; i += 1)
         buf.toString(encoding, 0, len);
       bench.end(n);
       break;
     default:
       bench.start();
-      for (i = 0; i < n; i += 1)
+      for (let i = 0; i < n; i += 1)
         buf.toString();
       bench.end(n);
       break;

benchmark/buffers/buffer-write-string.js

@@ -15,21 +15,19 @@ function main({ len, n, encoding, args }) {
   let start = 0;
   const buf = Buffer.allocUnsafe(len);
 
-  var i;
-
   switch (args) {
     case 'offset':
       string = 'a'.repeat(Math.floor(len / 2));
       start = len - string.length;
       if (encoding) {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string, start, encoding);
         }
         bench.end(n);
       } else {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string, start);
         }
         bench.end(n);
@@ -39,13 +37,13 @@ function main({ len, n, encoding, args }) {
       string = 'a'.repeat(len);
       if (encoding) {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string, 0, buf.length, encoding);
         }
         bench.end(n);
       } else {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string, 0, buf.length);
         }
         bench.end(n);
@@ -55,13 +53,13 @@ function main({ len, n, encoding, args }) {
       string = 'a'.repeat(len);
       if (encoding) {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string, encoding);
         }
         bench.end(n);
       } else {
         bench.start();
-        for (i = 0; i < n; ++i) {
+        for (let i = 0; i < n; ++i) {
           buf.write(string);
         }
         bench.end(n);

common.gypi

@@ -73,9 +73,6 @@
     # TODO(refack): make v8-perfetto happen
     'v8_use_perfetto': 0,
 
-    'v8_enable_pointer_compression': 0,
-    'v8_enable_31bit_smis_on_64bit_arch': 0,
-
     ##### end V8 defaults #####
 
     'conditions': [
@@ -130,8 +127,8 @@
             'ldflags': [ '-Wl,-bbigtoc' ],
           }],
           ['OS == "android"', {
-            'cflags': [ '-fPIE' ],
-            'ldflags': [ '-fPIE', '-pie' ]
+            'cflags': [ '-fPIC' ],
+            'ldflags': [ '-fPIC' ]
           }],
         ],
         'msvs_settings': {
@@ -190,8 +187,8 @@
             ],
           },],
           ['OS == "android"', {
-            'cflags': [ '-fPIE' ],
-            'ldflags': [ '-fPIE', '-pie' ]
+            'cflags': [ '-fPIC' ],
+            'ldflags': [ '-fPIC' ]
           }],
         ],
         'msvs_settings': {

configure.py

@@ -346,6 +346,11 @@
     dest='trace_maps',
     help='Enable the --trace-maps flag in V8 (use at your own risk)')
 
+parser.add_option('--experimental-enable-pointer-compression',
+    action='store_true',
+    dest='enable_pointer_compression',
+    help='[Experimental] Enable V8 pointer compression (limits max heap to 4GB and breaks ABI compatibility)')
+
 parser.add_option('--v8-options',
     action='store',
     dest='v8_options',
@@ -445,6 +450,14 @@
         'the icu4c source archive. '
         'v%d.x or later recommended.' % icu_versions['minimum_icu'])
 
+intl_optgroup.add_option('--with-icu-default-data-dir',
+    action='store',
+    dest='with_icu_default_data_dir',
+    help='Path to the icuXXdt{lb}.dat file. If unspecified, ICU data will '
+         'only be read if the NODE_ICU_DATA environment variable or the '
+         '--icu-data-dir runtime argument is used. This option has effect '
+         'only when Node.js is built with --with-intl=small-icu.')
+
 parser.add_option('--with-ltcg',
     action='store_true',
     dest='with_ltcg',
@@ -1117,14 +1130,17 @@ def configure_node(o):
   o['variables']['node_shared'] = b(options.shared)
   node_module_version = getmoduleversion.get_version()
 
-  if sys.platform == 'darwin':
+  if options.dest_os == 'android':
+    shlib_suffix = 'so'
+  elif sys.platform == 'darwin':
     shlib_suffix = '%s.dylib'
   elif sys.platform.startswith('aix'):
     shlib_suffix = '%s.a'
   else:
     shlib_suffix = 'so.%s'
+  if '%s' in shlib_suffix:
+    shlib_suffix %= node_module_version
 
-  shlib_suffix %= node_module_version
   o['variables']['node_module_version'] = int(node_module_version)
   o['variables']['shlib_suffix'] = shlib_suffix
 
@@ -1192,6 +1208,8 @@ def configure_v8(o):
   o['variables']['v8_random_seed'] = 0  # Use a random seed for hash tables.
   o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks.
   o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
+  o['variables']['v8_enable_pointer_compression'] = 1 if options.enable_pointer_compression else 0
+  o['variables']['v8_enable_31bit_smis_on_64bit_arch'] = 1 if options.enable_pointer_compression else 0
   o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0
   o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
   o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
@@ -1384,6 +1402,7 @@ def write_config(data, name):
     locs.add('root')  # must have root
     o['variables']['icu_locales'] = ','.join(str(loc) for loc in locs)
     # We will check a bit later if we can use the canned deps/icu-small
+    o['variables']['icu_default_data'] = options.with_icu_default_data_dir or ''
   elif with_intl == 'full-icu':
     # full ICU
     o['variables']['v8_enable_i18n_support'] = 1

deps/npm/AUTHORS

@@ -672,3 +672,8 @@ Amal Hussein <amal@npmjs.com>
 Brett Zamir <brettz9@yahoo.com>
 Menelaos Kotsollaris <mkotsollaris@users.noreply.github.com>
 Mehdi Hasan Khan <mhasan@omicronlab.com>
+Craig Loewen <crloewen@microsoft.com>
+Fighting-Jack <574637316@qq.com>
+Bakel, Roel van <roel.vanbakel@oce.com>
+Charlie West-Toebe <38671683+Hoidberg@users.noreply.github.com>
+Richard Lau <riclau@uk.ibm.com>