fix: vscode fails to load scripts from _solara/cdn

packages/solara-enterprise/solara_enterprise/search/search.py

@@ -10,6 +10,14 @@ class SearchWidget(ipyvue.VueTemplate):
     query = traitlets.Unicode("", allow_none=True).tag(sync=True)
     search_open = traitlets.Bool(False).tag(sync=True)
     failed = traitlets.Bool(False).tag(sync=True)
+    cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+
+    @traitlets.default("cdn")
+    def _cdn(self):
+        import solara.settings
+
+        if not solara.settings.assets.proxy:
+            return solara.settings.assets.cdn
 
 
 @solara.component

packages/solara-enterprise/solara_enterprise/search/search.vue

@@ -154,7 +154,7 @@ module.exports = {
             return base
         },
         getCdn() {
-            return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
+            return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
         },
     }
 }

solara/components/echarts.py

@@ -20,6 +20,14 @@ class EchartsWidget(ipyvuetify.VuetifyTemplate):
     on_mouseout = traitlets.Callable(None, allow_none=True)
     # same, for performance
     on_mouseout_enabled = traitlets.Bool(False).tag(sync=True)
+    cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+
+    @traitlets.default("cdn")
+    def _cdn(self):
+        import solara.settings
+
+        if not solara.settings.assets.proxy:
+            return solara.settings.assets.cdn
 
     def vue_on_click(self, data):
         if self.on_click is not None:

solara/components/echarts.vue

@@ -110,7 +110,7 @@ module.exports = {
       return base;
     },
     getCdn() {
-      return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`
+      return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
     },
   },
 };

solara/components/markdown.py

@@ -76,6 +76,12 @@ def _markdown_template(
     html,
     style="",
 ):
+    cdn = None
+    import solara.settings
+
+    if not solara.settings.assets.proxy:
+        cdn = solara.settings.assets.cdn
+
     template = (
         """
 <template>
@@ -89,6 +95,9 @@ def _markdown_template(
 <script>
 module.exports = {
     async mounted() {
+        this.cdn = """
+        + (rf"'{cdn}'" if cdn is not None else r"null")
+        + r""";
         await this.loadRequire();
         this.mermaid = await this.loadMermaid();
         this.mermaid.init();

solara/components/markdown_editor.py

@@ -11,6 +11,14 @@ class MarkdownEditorWidget(ipyvuetify.VuetifyTemplate):
 
     value = traitlets.Unicode("").tag(sync=True)
     height = traitlets.Unicode("180px").tag(sync=True)
+    cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+
+    @traitlets.default("cdn")
+    def _cdn(self):
+        import solara.settings
+
+        if not solara.settings.assets.proxy:
+            return solara.settings.assets.cdn
 
 
 @solara.component

solara/components/markdown_editor.vue

@@ -264,7 +264,7 @@ module.exports = {
       return base
     },
     getCdn() {
-      return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
+      return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
     },
   },
 };

solara/components/sql_code.py

@@ -13,6 +13,14 @@ class SqlCodeWidget(ipyvue.VueTemplate):
     query = traitlets.Unicode(allow_none=True, default_value=None).tag(sync=True)
     tables = traitlets.Dict(allow_none=True, default_value=None).tag(sync=True)
     height = traitlets.Unicode("180px").tag(sync=True)
+    cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+
+    @traitlets.default("cdn")
+    def _cdn(self):
+        import solara.settings
+
+        if not solara.settings.assets.proxy:
+            return solara.settings.assets.cdn
 
 
 @solara.component

solara/components/sql_code.vue

@@ -100,7 +100,7 @@
         return base
       },
       getCdn() {
-        return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
+        return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
       },
     }
   }

solara/widgets/vue/gridlayout.vue

@@ -94,7 +94,7 @@ module.exports = {
           return base
         },
         getCdn() {
-          return window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`;
+          return this.cdn || (window.solara ? window.solara.cdn : `${this.getJupyterBaseUrl()}_solara/cdn`);
         },
     }
 }

solara/widgets/widgets.py

@@ -51,6 +51,14 @@ class GridLayout(v.VuetifyTemplate):
     grid_layout = traitlets.List(default_value=cast(List[Dict], [])).tag(sync=True)
     draggable = traitlets.CBool(True).tag(sync=True)
     resizable = traitlets.CBool(True).tag(sync=True)
+    cdn = traitlets.Unicode(None, allow_none=True).tag(sync=True)
+
+    @traitlets.default("cdn")
+    def _cdn(self):
+        import solara.settings
+
+        if not solara.settings.assets.proxy:
+            return solara.settings.assets.cdn
 
 
 class HTML(v.VuetifyTemplate):