Merge pull request #556 from nodejs/master

Choose two branches to see what’s changed

.github/workflows/commit-lint.yml

@@ -1,4 +1,4 @@
-name: First commit message adheres to guidelines at https://goo.gl/p2fr5Q
+name: First commit message adheres to guidelines
 
 on: [pull_request]
 

doc/api/crypto.md

@@ -54,8 +54,8 @@ try {
 
 When using the lexical ESM `import` keyword, the error can only be
 caught if a handler for `process.on('uncaughtException')` is registered
-_before_ any attempt to load the module is made -- using, for instance,
-a preload module.
+_before_ any attempt to load the module is made (using, for instance,
+a preload module).
 
 When using ESM, if there is a chance that the code may be run on a build
 of Node.js where crypto support is not enabled, consider using the

doc/contributing/strategic-initiatives.md

@@ -13,6 +13,7 @@ agenda to ensure they are active and have the support they need.
 | QUIC / HTTP3              | [James M Snell][jasnell]    | <https://github.com/nodejs/quic>                                                             |
 | Startup performance       | [Joyee Cheung][joyeecheung] | <https://github.com/nodejs/node/issues/35711>                                                |
 | V8 Currency               | [Michaël Zasso][targos]     |                                                                                              |
+| Next-10                   | [Michael Dawson][mhdawson]  | <https://github.com/nodejs/next-10>                                                          |
 
 <details>
 <summary>List of completed initiatives</summary>
@@ -38,5 +39,6 @@ agenda to ensure they are active and have the support they need.
 [aduh95]: https://github.com/aduh95
 [jasnell]: https://github.com/jasnell
 [joyeecheung]: https://github.com/joyeecheung
+[mhdawson]: https://github.com/mhdawson
 [mmarchini]: https://github.com/mmarchini
 [targos]: https://github.com/targos

test/parallel/test-process-env-tz.js

@@ -31,19 +31,19 @@ if (date.toString().includes('(Central European Time)') ||
   common.skip('tzdata too old');
 }
 
-assert.strictEqual(
-  date.toString().replace('Central European Summer Time', 'CEST'),
-  'Sat Apr 14 2018 14:34:56 GMT+0200 (CEST)');
+assert.match(
+  date.toString(),
+  /^Sat Apr 14 2018 14:34:56 GMT\+0200 \(.+\)$/);
 
 process.env.TZ = 'Europe/London';
-assert.strictEqual(
-  date.toString().replace('British Summer Time', 'BST'),
-  'Sat Apr 14 2018 13:34:56 GMT+0100 (BST)');
+assert.match(
+  date.toString(),
+  /^Sat Apr 14 2018 13:34:56 GMT\+0100 \(.+\)$/);
 
 process.env.TZ = 'Etc/UTC';
-assert.strictEqual(
-  date.toString().replace('Coordinated Universal Time', 'UTC'),
-  'Sat Apr 14 2018 12:34:56 GMT+0000 (UTC)');
+assert.match(
+  date.toString(),
+  /^Sat Apr 14 2018 12:34:56 GMT\+0000 \(.+\)$/);
 
 // Just check that deleting the environment variable doesn't crash the process.
 // We can't really check the result of date.toString() because we don't know