Load JS modules as needed

mesop/examples/web_component/code_mirror_editor/code_mirror_editor_app.py

@@ -20,7 +20,11 @@ class State:
       "https://cdnjs.cloudflare.com",
       "*.fonts.gstatic.com",
     ],
-    allowed_script_srcs=["https://cdnjs.cloudflare.com", "*.fonts.gstatic.com"],
+    allowed_script_srcs=[
+      "https://cdnjs.cloudflare.com",
+      "*.fonts.gstatic.com",
+      "https://cdn.jsdelivr.net",
+    ],
   ),
 )
 def page():

mesop/examples/web_component/copy_to_clipboard/copy_to_clipboard_app.py

@@ -15,6 +15,11 @@
 
 @me.page(
   path="/web_component/copy_to_clipboard/copy_to_clipboard_app",
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+    ]
+  ),
 )
 def page():
   with me.box(

mesop/examples/web_component/custom_font_csp_repro/custom_font_app.py

@@ -17,6 +17,11 @@
   stylesheets=[
     "https://fonts.googleapis.com/css2?family=Inter+Tight:ital,wght@0,100..900;1,100..900&family=Inter:[email protected]&display=swap",
   ],
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+    ]
+  ),
 )
 def page():
   me.text("Custom font: Inter Tight", style=me.Style(font_family="Inter Tight"))

mesop/examples/web_component/firebase_auth/firebase_auth_app.py

@@ -21,7 +21,11 @@
   security_policy=me.SecurityPolicy(
     dangerously_disable_trusted_types=True,
     allowed_connect_srcs=["*.googleapis.com"],
-    allowed_script_srcs=["*.google.com"],
+    allowed_script_srcs=[
+      "*.google.com",
+      "https://www.gstatic.com",
+      "https://cdn.jsdelivr.net",
+    ],
   ),
 )
 def page():

mesop/examples/web_component/plotly/plotly_app.py

@@ -11,7 +11,13 @@
   #
   # Disabling trusted types because plotly uses DomParser#parseFromString
   # which violates TrustedHTML assignment.
-  security_policy=me.SecurityPolicy(dangerously_disable_trusted_types=True),
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+      "https://cdn.plot.ly",
+    ],
+    dangerously_disable_trusted_types=True,
+  ),
 )
 def page():
   plotly_component()

mesop/examples/web_component/quickstart/counter_component_app.py

@@ -9,6 +9,11 @@
 
 @me.page(
   path="/web_component/quickstart/counter_component_app",
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+    ]
+  ),
 )
 def page():
   counter_component(

mesop/examples/web_component/shared_js_module/shared_js_module_app.py

@@ -6,6 +6,11 @@
 
 @me.page(
   path="/web_component/shared_js_module/shared_js_module_app",
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+    ]
+  ),
 )
 def page():
   me.text("Loaded")

mesop/examples/web_component/slot/slot_app.py

@@ -12,6 +12,11 @@
 
 @me.page(
   path="/web_component/slot/slot_app",
+  security_policy=me.SecurityPolicy(
+    allowed_script_srcs=[
+      "https://cdn.jsdelivr.net",
+    ]
+  ),
 )
 def page():
   with outer_component(

mesop/labs/web_component.py

@@ -20,6 +20,8 @@ def web_component(*, path: str, skip_validation: bool = False):
     path: The path to the JavaScript file of the web component.
     skip_validation: If set to True, skips validation. Defaults to False.
   """
+  runtime().check_register_web_component_is_valid()
+
   current_frame = inspect.currentframe()
   assert current_frame
   previous_frame = current_frame.f_back
@@ -31,14 +33,14 @@ def web_component(*, path: str, skip_validation: bool = False):
   full_path = os.path.normpath(os.path.join(caller_module_dir, path))
   if not full_path.startswith("/"):
     full_path = "/" + full_path
-
-  runtime().register_js_module(full_path)
+  js_module_path = full_path
 
   def component_wrapper(fn: C) -> C:
     validated_fn = fn if skip_validation else validate(fn)
 
     @wraps(fn)
     def wrapper(*args: Any, **kw_args: Any):
+      runtime().context().register_js_module(js_module_path)
       return validated_fn(*args, **kw_args)
 
     return cast(C, wrapper)

mesop/protos/ui.proto

@@ -131,6 +131,8 @@ message RenderEvent {
     optional string title = 3;
     repeated Command commands = 4;
 
+    repeated string js_modules = 6;
+
     // Only sent in editor mode:
     repeated ComponentConfig component_configs = 5;
 }

mesop/runtime/context.py

@@ -37,6 +37,16 @@ def __init__(
     self._node_slot_children_count: int | None = None
     self._viewport_size: pb.ViewportSize | None = None
     self._theme_settings: pb.ThemeSettings | None = None
+    self._js_modules: set[str] = set()
+
+  def register_js_module(self, js_module_path: str) -> None:
+    self._js_modules.add(js_module_path)
+
+  def js_modules(self) -> set[str]:
+    return self._js_modules
+
+  def clear_js_modules(self):
+    self._js_modules = set()
 
   def commands(self) -> list[pb.Command]:
     return self._commands

mesop/runtime/runtime.py

@@ -48,7 +48,6 @@ def __init__(self):
     self.hot_reload_counter = 0
     self._path_to_page_config: dict[str, PageConfig] = {}
     self.component_fns: set[Callable[..., Any]] = set()
-    self.js_modules: set[str] = set()
     self._handlers: dict[str, Handler] = {}
     self.event_mappers: dict[Type[Any], Callable[[pb.UserEvent, Key], Any]] = {}
     self._state_classes: list[type[Any]] = []
@@ -146,12 +145,11 @@ def get_loading_errors(self) -> list[pb.ServerError]:
   def register_native_component_fn(self, component_fn: Callable[..., Any]):
     self.component_fns.add(component_fn)
 
-  def register_js_module(self, js_module: str) -> None:
+  def check_register_web_component_is_valid(self) -> None:
     if self._has_served_traffic:
       raise MesopDeveloperException(
         "Cannot register a JS module after traffic has been served. You must define all web components upon server startup before any traffic has been served. This prevents security issues."
       )
-    self.js_modules.add(js_module)
 
   def get_component_fns(self) -> set[Callable[..., Any]]:
     return self.component_fns

mesop/server/constants.py

@@ -1,2 +1,4 @@
 EDITOR_PACKAGE_PATH = "mesop/mesop/web/src/app/editor/web_package"
 PROD_PACKAGE_PATH = "mesop/mesop/web/src/app/prod/web_package"
+
+WEB_COMPONENTS_PATH_SEGMENT = "__web-components-module__"

mesop/server/server.py

@@ -13,6 +13,7 @@
 from mesop.exceptions import format_traceback
 from mesop.runtime import runtime
 from mesop.server.config import app_config
+from mesop.server.constants import WEB_COMPONENTS_PATH_SEGMENT
 from mesop.warn import warn
 
 LOCALHOSTS = (
@@ -58,6 +59,11 @@ def render_loop(
       # (e.g. scroll into view) for the same context (e.g. multiple render loops
       # when processing a generator handler function)
       runtime().context().clear_commands()
+      js_modules = runtime().context().js_modules()
+      # Similar to above, clear JS modules after sending it once to minimize payload.
+      # Although it shouldn't cause any issue because client-side, each js module
+      # should only be imported once.
+      runtime().context().clear_js_modules()
       data = pb.UiResponse(
         render=pb.RenderEvent(
           root_component=root_component,
@@ -67,6 +73,10 @@ def render_loop(
           if prod_mode or not init_request
           else get_component_configs(),
           title=title,
+          js_modules=[
+            f"/{WEB_COMPONENTS_PATH_SEGMENT}{js_module}"
+            for js_module in js_modules
+          ],
         )
       )
       yield serialize(data)

mesop/server/static_file_serving.py

@@ -13,12 +13,10 @@
 
 from mesop.exceptions import MesopException
 from mesop.runtime import runtime
+from mesop.server.constants import WEB_COMPONENTS_PATH_SEGMENT
 from mesop.utils.runfiles import get_runfile_location, has_runfiles
 from mesop.utils.url_utils import sanitize_url_for_csp
 
-WEB_COMPONENTS_PATH_SEGMENT = "__web-components-module__"
-
-
 # mimetypes are not always set correctly, thus manually
 # setting the mimetype here.
 # See: https://github.com/google/mesop/issues/441
@@ -51,16 +49,6 @@ def retrieve_index_html() -> io.BytesIO | str:
     for i, line in enumerate(lines):
       if "$$INSERT_CSP_NONCE$$" in line:
         lines[i] = lines[i].replace("$$INSERT_CSP_NONCE$$", g.csp_nonce)
-      if (
-        runtime().js_modules
-        and line.strip() == "<!-- Inject web components modules (if needed) -->"
-      ):
-        lines[i] = "\n".join(
-          [
-            f"<script type='module' nonce={g.csp_nonce} src='/{WEB_COMPONENTS_PATH_SEGMENT}{js_module}'></script>"
-            for js_module in runtime().js_modules
-          ]
-        )
       if (
         livereload_script_url
         and line.strip() == "<!-- Inject livereload script (if needed) -->"

mesop/tests/e2e/web_components/csp_violations_test.ts

@@ -0,0 +1,24 @@
+import {test, expect} from '@playwright/test';
+
+// Prevent regression where JS modules were loaded on every page,
+// and not just pages where it was needed.
+test('test CSP violations (from web components) are not shown on home page', async ({
+  page,
+}) => {
+  const cspViolations: string[] = [];
+
+  // Listen for CSP violations
+  page.on('console', (msg) => {
+    if (
+      msg.type() === 'error' &&
+      msg.text().includes('Content Security Policy')
+    ) {
+      cspViolations.push(msg.text());
+    }
+  });
+
+  await page.goto('/');
+  await page.waitForLoadState('networkidle');
+
+  expect(cspViolations).toHaveLength(0);
+});

mesop/tests/e2e/web_components/shared_js_module_test.ts

@@ -2,8 +2,8 @@ import {test, expect} from '@playwright/test';
 
 test('web components - shared JS module', async ({page}) => {
   await page.goto('/web_component/shared_js_module/shared_js_module_app');
-  expect(page.getByText('Loaded')).toBeVisible();
-  expect(
+  await expect(page.getByText('Loaded')).toBeVisible();
+  await expect(
     page.getByText('value from shared module: shared_module.js'),
   ).toBeVisible();
 });

mesop/web/src/services/channel.ts

@@ -29,6 +29,7 @@ interface InitParams {
   onRender: (
     rootComponent: ComponentProto,
     componentConfigs: readonly ComponentConfig[],
+    jsModules: readonly string[],
   ) => void;
   onError: (error: ServerError) => void;
   onCommand: (command: Command) => void;
@@ -200,7 +201,11 @@ export class Channel {
             this.componentConfigs = uiResponse
               .getRender()!
               .getComponentConfigsList();
-            onRender(this.rootComponent, this.componentConfigs);
+            onRender(
+              this.rootComponent,
+              this.componentConfigs,
+              uiResponse.getRender()!.getJsModulesList(),
+            );
             this.logger.log({
               type: 'RenderLog',
               states: this.states,

mesop/web/src/shell/shell.ts

@@ -88,7 +88,26 @@ export class Shell {
     this.channel.init(
       {
         zone: this.zone,
-        onRender: (rootComponent, componentConfigs) => {
+        onRender: async (rootComponent, componentConfigs, jsModules) => {
+          // Import all JS modules concurrently
+          await Promise.all(
+            jsModules.map((modulePath) =>
+              import(modulePath)
+                .then(() =>
+                  console.debug(
+                    `Successfully imported JS module: ${modulePath}`,
+                  ),
+                )
+                .catch((error) =>
+                  console.error(
+                    `Failed to import JS module: ${modulePath}`,
+                    error,
+                  ),
+                ),
+            ),
+          ).then(() => {
+            console.debug('All JS modules imported');
+          });
           this.rootComponent = rootComponent;
           // Component configs are only sent for the first response.
           // For subsequent reponses, use the component configs previously