From b6abb11e72a5481238149c5c8f56576c93769088 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 16 Mar 2023 08:13:39 +0800
Subject: [PATCH] ui: support incremental UserContext

---
 packages/ui-default/entry.js                    | 1 +
 packages/ui-default/templates/layout/html5.html | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js
index edd988d30..a675ae082 100644
--- a/packages/ui-default/entry.js
+++ b/packages/ui-default/entry.js
@@ -48,6 +48,7 @@ const prefetch = Promise.all([
 
 document.addEventListener('DOMContentLoaded', async () => {
   Object.assign(window.UiContext, JSON.parse(window.UiContextNew));
+  Object.assign(window.UserContext, JSON.parse(window.UserContextNew));
   const [data, HydroExports] = await prefetch;
   Object.assign(window, { HydroExports });
   eval(data); // eslint-disable-line no-eval
diff --git a/packages/ui-default/templates/layout/html5.html b/packages/ui-default/templates/layout/html5.html
index eba4eb1c8..dc06df6fb 100644
--- a/packages/ui-default/templates/layout/html5.html
+++ b/packages/ui-default/templates/layout/html5.html
@@ -64,6 +64,7 @@
       var UserContext = '{{ UserContext|json|jsesc|safe }}';
     </script>
     {% set UiContext = Object.create(UiContext) %}
+    {% set UserContext = Object.create(UserContext) %}
     {% if process.env.DEV %}
       <script type="text/javascript" src="/resource/hash/lang-{{ _('__id') }}.js?version={{ global.Hydro.version['ui-default'] }}"></script>
       <script type="text/javascript" src="/hydro.js?version={{ global.Hydro.version['ui-default'] }}"></script>
@@ -75,7 +76,10 @@
   {% block body %}{% endblock %}
   {% block script %}{% endblock %}
   {% if not isIE(handler.request.headers['user-agent']) and not handler.session.legacy %}
-    <script>var UiContextNew = '{{ UiContext|json|jsesc|safe }}';</script>
+    <script>
+      var UiContextNew = '{{ UiContext|json|jsesc|safe }}';
+      var UserContextNew = '{{ UserContext|json|jsesc|safe }}';
+    </script>
   {% endif %}
 </body>
 </html>