src: use v8::Isolate::GetDefaultLocale() to compute navigator.language

common.gypi

@@ -36,7 +36,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.13',
+    'v8_embedder_string': '-node.14',
 
     ##### V8 defaults for Node.js #####
 

deps/v8/include/v8-isolate.h

@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "cppgc/common.h"
@@ -1717,6 +1718,12 @@ class V8_EXPORT Isolate {
    */
   void LocaleConfigurationChangeNotification();
 
+  /**
+   * Returns the default locale in a string if Intl support is enabled.
+   * Otherwise returns an empty string.
+   */
+  std::string GetDefaultLocale();
+
   Isolate() = delete;
   ~Isolate() = delete;
   Isolate(const Isolate&) = delete;

deps/v8/src/api/api.cc

@@ -10768,6 +10768,17 @@ void v8::Isolate::LocaleConfigurationChangeNotification() {
 #endif  // V8_INTL_SUPPORT
 }
 
+std::string Isolate::GetDefaultLocale() {
+  i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(this);
+  ENTER_V8_NO_SCRIPT_NO_EXCEPTION(i_isolate);
+
+#ifdef V8_INTL_SUPPORT
+  return i_isolate->DefaultLocale();
+#else
+  return std::string();
+#endif
+}
+
 #if defined(V8_OS_WIN) && defined(V8_ENABLE_ETW_STACK_WALKING)
 void Isolate::SetFilterETWSessionByURLCallback(
     FilterETWSessionByURLCallback callback) {

lib/internal/navigator.js

@@ -30,7 +30,7 @@ const {
 } = require('internal/process/per_thread');
 
 const {
-  language,
+  getDefaultLocale,
 } = internalBinding('config');
 
 /**
@@ -104,7 +104,9 @@ class Navigator {
    * @return {string}
    */
   get language() {
-    return language;
+    // The default locale might be changed dynamically, so always invoke the
+    // binding.
+    return getDefaultLocale() || 'en-US';
   }
 
   /**

lib/internal/process/pre_execution.js

@@ -20,10 +20,6 @@ const {
   globalThis,
 } = primordials;
 
-const {
-  Intl,
-} = globalThis;
-
 const {
   getOptionValue,
   refreshOptions,
@@ -333,7 +329,6 @@ function setupNavigator() {
 
   // https://html.spec.whatwg.org/multipage/system-state.html#the-navigator-object
   exposeLazyInterfaces(globalThis, 'internal/navigator', ['Navigator']);
-  internalBinding('config').language = Intl?.Collator().resolvedOptions().locale || 'en-US';
   defineReplaceableLazyAttribute(globalThis, 'internal/navigator', ['navigator'], false);
 }
 

src/node_config.cc

@@ -2,19 +2,31 @@
 #include "memory_tracker.h"
 #include "node.h"
 #include "node_builtins.h"
+#include "node_external_reference.h"
 #include "node_i18n.h"
 #include "node_options.h"
 #include "util-inl.h"
 
 namespace node {
 
 using v8::Context;
+using v8::FunctionCallbackInfo;
 using v8::Isolate;
 using v8::Local;
 using v8::Number;
 using v8::Object;
 using v8::Value;
 
+void GetDefaultLocale(const FunctionCallbackInfo<Value>& args) {
+  Isolate* isolate = args.GetIsolate();
+  Local<Context> context = isolate->GetCurrentContext();
+  std::string locale = isolate->GetDefaultLocale();
+  Local<Value> result;
+  if (ToV8Value(context, locale).ToLocal(&result)) {
+    args.GetReturnValue().Set(result);
+  }
+}
+
 // The config binding is used to provide an internal view of compile time
 // config options that are required internally by lib/*.js code. This is an
 // alternative to dropping additional properties onto the process object as
@@ -23,7 +35,7 @@ using v8::Value;
 // Command line arguments are already accessible in the JS land via
 // require('internal/options').getOptionValue('--some-option'). Do not add them
 // here.
-static void Initialize(Local<Object> target,
+static void InitConfig(Local<Object> target,
                        Local<Value> unused,
                        Local<Context> context,
                        void* priv) {
@@ -76,8 +88,15 @@ static void Initialize(Local<Object> target,
 #endif  // NODE_NO_BROWSER_GLOBALS
 
   READONLY_PROPERTY(target, "bits", Number::New(isolate, 8 * sizeof(intptr_t)));
+
+  SetMethodNoSideEffect(context, target, "getDefaultLocale", GetDefaultLocale);
 }  // InitConfig
 
+void RegisterConfigExternalReferences(ExternalReferenceRegistry* registry) {
+  registry->Register(GetDefaultLocale);
+}
+
 }  // namespace node
 
-NODE_BINDING_CONTEXT_AWARE_INTERNAL(config, node::Initialize)
+NODE_BINDING_CONTEXT_AWARE_INTERNAL(config, node::InitConfig)
+NODE_BINDING_EXTERNAL_REFERENCE(config, node::RegisterConfigExternalReferences)

src/node_external_reference.h

@@ -139,6 +139,7 @@ class ExternalReferenceRegistry {
   V(buffer)                                                                    \
   V(builtins)                                                                  \
   V(cares_wrap)                                                                \
+  V(config)                                                                    \
   V(contextify)                                                                \
   V(credentials)                                                               \
   V(encoding_binding)                                                          \