Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

perf: convert fonts from TTF to WOFF2, remove unused font files (#8873)

Myles Scolnick80edf6520c3b
diff --git a/frontend/index.html b/frontend/index.html
index 3fbaacbecd..39a3bb76ee 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -8,12 +8,12 @@
<link rel="preload" href="/src/assets/gradient.png" as="image" />
<link rel="preload" href="/src/assets/noise.png" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" href="/src/fonts/Lora/Lora-VariableFont_wght.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="/src/fonts/PT_Sans/PTSans-Regular.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="/src/fonts/PT_Sans/PTSans-Bold.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Regular.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Medium.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Bold.ttf" as="font" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/Lora/Lora-VariableFont_wght.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/PT_Sans/PTSans-Regular.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/PT_Sans/PTSans-Bold.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Regular.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Medium.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="/src/fonts/Fira_Mono/FiraMono-Bold.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
diff --git a/frontend/src/css/app/fonts.css b/frontend/src/css/app/fonts.css
index a0f311879e..4bd5ff709e 100644
--- a/frontend/src/css/app/fonts.css
+++ b/frontend/src/css/app/fonts.css
@@ -6,7 +6,7 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 400;
font-display: block;
- src: url("../../fonts/Lora/Lora-VariableFont_wght.ttf") format("truetype");
+ src: url("../../fonts/Lora/Lora-VariableFont_wght.woff2") format("woff2");
}
@font-face {
@@ -14,7 +14,7 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 400;
font-display: block;
- src: url("../../fonts/PT_Sans/PTSans-Regular.ttf") format("truetype");
+ src: url("../../fonts/PT_Sans/PTSans-Regular.woff2") format("woff2");
}
@font-face {
@@ -22,7 +22,7 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 700;
font-display: block;
- src: url("../../fonts/PT_Sans/PTSans-Bold.ttf") format("truetype");
+ src: url("../../fonts/PT_Sans/PTSans-Bold.woff2") format("woff2");
}
@font-face {
@@ -30,7 +30,7 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 400;
font-display: block;
- src: url("../../fonts/Fira_Mono/FiraMono-Regular.ttf") format("truetype");
+ src: url("../../fonts/Fira_Mono/FiraMono-Regular.woff2") format("woff2");
}
@font-face {
@@ -38,7 +38,7 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 500;
font-display: block;
- src: url("../../fonts/Fira_Mono/FiraMono-Medium.ttf") format("truetype");
+ src: url("../../fonts/Fira_Mono/FiraMono-Medium.woff2") format("woff2");
}
@font-face {
@@ -46,5 +46,5 @@ see frontend/src/core/static/download-html.ts */
font-style: normal;
font-weight: 700;
font-display: block;
- src: url("../../fonts/Fira_Mono/FiraMono-Bold.ttf") format("truetype");
+ src: url("../../fonts/Fira_Mono/FiraMono-Bold.woff2") format("woff2");
}
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Bold.ttf b/frontend/src/fonts/Fira_Mono/FiraMono-Bold.ttf
deleted file mode 100644
index 23bc30f6c4..0000000000
Binary files a/frontend/src/fonts/Fira_Mono/FiraMono-Bold.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Bold.woff2 b/frontend/src/fonts/Fira_Mono/FiraMono-Bold.woff2
new file mode 100644
index 0000000000..acccdc1d13
Binary files /dev/null and b/frontend/src/fonts/Fira_Mono/FiraMono-Bold.woff2 differ
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Medium.ttf b/frontend/src/fonts/Fira_Mono/FiraMono-Medium.ttf
deleted file mode 100644
index 793c60df15..0000000000
Binary files a/frontend/src/fonts/Fira_Mono/FiraMono-Medium.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Medium.woff2 b/frontend/src/fonts/Fira_Mono/FiraMono-Medium.woff2
new file mode 100644
index 0000000000..a768949426
Binary files /dev/null and b/frontend/src/fonts/Fira_Mono/FiraMono-Medium.woff2 differ
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Regular.ttf b/frontend/src/fonts/Fira_Mono/FiraMono-Regular.ttf
deleted file mode 100644
index 67bbd4287d..0000000000
Binary files a/frontend/src/fonts/Fira_Mono/FiraMono-Regular.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Fira_Mono/FiraMono-Regular.woff2 b/frontend/src/fonts/Fira_Mono/FiraMono-Regular.woff2
new file mode 100644
index 0000000000..3e304c82e1
Binary files /dev/null and b/frontend/src/fonts/Fira_Mono/FiraMono-Regular.woff2 differ
diff --git a/frontend/src/fonts/Lora/Lora-Italic-VariableFont_wght.ttf b/frontend/src/fonts/Lora/Lora-Italic-VariableFont_wght.ttf
deleted file mode 100644
index 6ae9cf8b93..0000000000
Binary files a/frontend/src/fonts/Lora/Lora-Italic-VariableFont_wght.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/Lora-VariableFont_wght.ttf b/frontend/src/fonts/Lora/Lora-VariableFont_wght.ttf
deleted file mode 100644
index 72b97d5fe1..0000000000
Binary files a/frontend/src/fonts/Lora/Lora-VariableFont_wght.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/Lora-VariableFont_wght.woff2 b/frontend/src/fonts/Lora/Lora-VariableFont_wght.woff2
new file mode 100644
index 0000000000..1b40ecf07d
Binary files /dev/null and b/frontend/src/fonts/Lora/Lora-VariableFont_wght.woff2 differ
diff --git a/frontend/src/fonts/Lora/static/Lora-Bold.ttf b/frontend/src/fonts/Lora/static/Lora-Bold.ttf
deleted file mode 100644
index cd154bfc6a..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-Bold.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-BoldItalic.ttf b/frontend/src/fonts/Lora/static/Lora-BoldItalic.ttf
deleted file mode 100644
index 9d61f1b773..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-BoldItalic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-Italic.ttf b/frontend/src/fonts/Lora/static/Lora-Italic.ttf
deleted file mode 100644
index c037576df0..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-Italic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-Medium.ttf b/frontend/src/fonts/Lora/static/Lora-Medium.ttf
deleted file mode 100644
index 6d652b59d0..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-Medium.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-MediumItalic.ttf b/frontend/src/fonts/Lora/static/Lora-MediumItalic.ttf
deleted file mode 100644
index f52f15086f..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-MediumItalic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-Regular.ttf b/frontend/src/fonts/Lora/static/Lora-Regular.ttf
deleted file mode 100644
index 5306a942f4..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-Regular.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-SemiBold.ttf b/frontend/src/fonts/Lora/static/Lora-SemiBold.ttf
deleted file mode 100644
index c69d778a7f..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-SemiBold.ttf and /dev/null differ
diff --git a/frontend/src/fonts/Lora/static/Lora-SemiBoldItalic.ttf b/frontend/src/fonts/Lora/static/Lora-SemiBoldItalic.ttf
deleted file mode 100644
index c3d61ee57f..0000000000
Binary files a/frontend/src/fonts/Lora/static/Lora-SemiBoldItalic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-Bold.ttf b/frontend/src/fonts/PT_Sans/PTSans-Bold.ttf
deleted file mode 100644
index f82c3bda50..0000000000
Binary files a/frontend/src/fonts/PT_Sans/PTSans-Bold.ttf and /dev/null differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-Bold.woff2 b/frontend/src/fonts/PT_Sans/PTSans-Bold.woff2
new file mode 100644
index 0000000000..4744f57eec
Binary files /dev/null and b/frontend/src/fonts/PT_Sans/PTSans-Bold.woff2 differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-BoldItalic.ttf b/frontend/src/fonts/PT_Sans/PTSans-BoldItalic.ttf
deleted file mode 100644
index 3e6cf4e324..0000000000
Binary files a/frontend/src/fonts/PT_Sans/PTSans-BoldItalic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-Italic.ttf b/frontend/src/fonts/PT_Sans/PTSans-Italic.ttf
deleted file mode 100644
index b06ce61216..0000000000
Binary files a/frontend/src/fonts/PT_Sans/PTSans-Italic.ttf and /dev/null differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-Regular.ttf b/frontend/src/fonts/PT_Sans/PTSans-Regular.ttf
deleted file mode 100644
index adaf6718ab..0000000000
Binary files a/frontend/src/fonts/PT_Sans/PTSans-Regular.ttf and /dev/null differ
diff --git a/frontend/src/fonts/PT_Sans/PTSans-Regular.woff2 b/frontend/src/fonts/PT_Sans/PTSans-Regular.woff2
new file mode 100644
index 0000000000..282cc5cd8e
Binary files /dev/null and b/frontend/src/fonts/PT_Sans/PTSans-Regular.woff2 differ
diff --git a/tests/_server/templates/data/index.html b/tests/_server/templates/data/index.html
index 8048631688..1c5b745b5a 100644
--- a/tests/_server/templates/data/index.html
+++ b/tests/_server/templates/data/index.html
@@ -8,12 +8,12 @@
<link rel="preload" href="./assets/gradient-yHQUC_QB.png" as="image" />
<link rel="preload" href="./assets/noise-60BoTA8O.png" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" href="./assets/Lora-VariableFont_wght-B2ootaw-.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="./assets/PTSans-Regular-CxL0S8W7.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="./assets/PTSans-Bold-D9fedIX3.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="./assets/FiraMono-Regular-BTCkDNvf.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="./assets/FiraMono-Medium-DU3aDxX5.ttf" as="font" crossorigin="anonymous" />
- <link rel="preload" href="./assets/FiraMono-Bold-CLVRCuM9.ttf" as="font" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/Lora-VariableFont_wght-CZceb_kH.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/PTSans-Regular-Bam3NpBI.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/PTSans-Bold-C_DwAp7Z.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/FiraMono-Regular-CEsLFVD9.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/FiraMono-Medium-D5MAsWEG.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" href="./assets/FiraMono-Bold-C6PDArdf.woff2" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,21 +50,29 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>{{ filename }}</marimo-filename>
- <script data-marimo="true">
- window.__MARIMO_MOUNT_CONFIG__ = '{{ mount_config }}';
- </script>
<title>{{ title }}</title>
- <script type="module" crossorigin src="./assets/index-h93-9ptT.js"></script>
- <link rel="stylesheet" crossorigin href="./assets/index-Bkoicf0g.css" />
+ <script type="module" crossorigin src="./assets/index-B8mbfE_Q.js"></script>
+ <link rel="stylesheet" crossorigin href="./assets/cells-jmgGt1lS.css">
+ <link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DdDKmWlR.css">
+ <link rel="stylesheet" crossorigin href="./assets/JsonOutput-B7vuddcd.css">
+ <link rel="stylesheet" crossorigin href="./assets/index-DtdvIKY3.css">
</head>
<body>
<div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
+ <script data-marimo="true">
+ window.__MARIMO_MOUNT_CONFIG__ = '{{ mount_config }}';
+ </script>
</body>
</html>
diff --git a/tests/_server/templates/snapshots/export1.txt b/tests/_server/templates/snapshots/export1.txt
index dcc9a735a8..6b541e08ac 100644
--- a/tests/_server/templates/snapshots/export1.txt
+++ b/tests/_server/templates/snapshots/export1.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,13 +50,33 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>notebook.py</marimo-filename>
+ <title>notebook</title>
+ <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
+
+<script data-marimo="true">
+ window.__MARIMO_STATIC__ = {};
+ window.__MARIMO_STATIC__.files = {"file1": "File 1 content", "file2": "File 2 content"};
+ window.__MARIMO_STATIC__.modelNotifications = [];
+</script>
+</head>
+ <body>
+ <div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
<script data-marimo="true">
window.__MARIMO_MOUNT_CONFIG__ = {
"filename": "notebook.py",
@@ -69,18 +93,6 @@
"runtimeConfig": null,
};
</script>
- <title>notebook</title>
- <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
-
-<script data-marimo="true">
- window.__MARIMO_STATIC__ = {};
- window.__MARIMO_STATIC__.files = {"file1": "File 1 content", "file2": "File 2 content"};
- window.__MARIMO_STATIC__.modelNotifications = [];
-</script>
-</head>
- <body>
- <div id="root"></div>
<marimo-code hidden="">
print('Hello%2C%20World!')
diff --git a/tests/_server/templates/snapshots/export2.txt b/tests/_server/templates/snapshots/export2.txt
index 1f8b26ab15..c44c81f2c8 100644
--- a/tests/_server/templates/snapshots/export2.txt
+++ b/tests/_server/templates/snapshots/export2.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,13 +50,33 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden></marimo-filename>
+ <title>marimo</title>
+ <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
+
+<script data-marimo="true">
+ window.__MARIMO_STATIC__ = {};
+ window.__MARIMO_STATIC__.files = {"file1": "File 1 content", "file2": "File 2 content"};
+ window.__MARIMO_STATIC__.modelNotifications = [];
+</script>
+</head>
+ <body>
+ <div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
<script data-marimo="true">
window.__MARIMO_MOUNT_CONFIG__ = {
"filename": "",
@@ -69,18 +93,6 @@
"runtimeConfig": null,
};
</script>
- <title>marimo</title>
- <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
-
-<script data-marimo="true">
- window.__MARIMO_STATIC__ = {};
- window.__MARIMO_STATIC__.files = {"file1": "File 1 content", "file2": "File 2 content"};
- window.__MARIMO_STATIC__.modelNotifications = [];
-</script>
-</head>
- <body>
- <div id="root"></div>
<marimo-code hidden="">
print('Hello%2C%20World!')
diff --git a/tests/_server/templates/snapshots/export3.txt b/tests/_server/templates/snapshots/export3.txt
index ba43f5b3b5..4442b974b9 100644
--- a/tests/_server/templates/snapshots/export3.txt
+++ b/tests/_server/templates/snapshots/export3.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,13 +50,33 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>notebook.py</marimo-filename>
+ <title>notebook</title>
+ <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
+
+<script data-marimo="true">
+ window.__MARIMO_STATIC__ = {};
+ window.__MARIMO_STATIC__.files = {};
+ window.__MARIMO_STATIC__.modelNotifications = [];
+</script>
+</head>
+ <body>
+ <div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
<script data-marimo="true">
window.__MARIMO_MOUNT_CONFIG__ = {
"filename": "notebook.py",
@@ -69,18 +93,6 @@
"runtimeConfig": null,
};
</script>
- <title>notebook</title>
- <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
-
-<script data-marimo="true">
- window.__MARIMO_STATIC__ = {};
- window.__MARIMO_STATIC__.files = {};
- window.__MARIMO_STATIC__.modelNotifications = [];
-</script>
-</head>
- <body>
- <div id="root"></div>
<marimo-code hidden=""></marimo-code>
<marimo-code-hash hidden="">07da107bb575cc4e02b0e1d6d99cc204</marimo-code-hash>
</body>
diff --git a/tests/_server/templates/snapshots/export4.txt b/tests/_server/templates/snapshots/export4.txt
index 1d36f3286f..6101524ce3 100644
--- a/tests/_server/templates/snapshots/export4.txt
+++ b/tests/_server/templates/snapshots/export4.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,13 +50,33 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>notebook.py</marimo-filename>
+ <title>notebook</title>
+ <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
+
+<script data-marimo="true">
+ window.__MARIMO_STATIC__ = {};
+ window.__MARIMO_STATIC__.files = {};
+ window.__MARIMO_STATIC__.modelNotifications = [];
+</script>
+<style title='marimo-custom'>/* custom css */</style></head>
+ <body>
+ <div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
<script data-marimo="true">
window.__MARIMO_MOUNT_CONFIG__ = {
"filename": "notebook.py",
@@ -69,18 +93,6 @@
"runtimeConfig": null,
};
</script>
- <title>notebook</title>
- <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
-
-<script data-marimo="true">
- window.__MARIMO_STATIC__ = {};
- window.__MARIMO_STATIC__.files = {};
- window.__MARIMO_STATIC__.modelNotifications = [];
-</script>
-<style title='marimo-custom'>/* custom css */</style></head>
- <body>
- <div id="root"></div>
<marimo-code hidden=""></marimo-code>
<marimo-code-hash hidden="">07da107bb575cc4e02b0e1d6d99cc204</marimo-code-hash>
</body>
diff --git a/tests/_server/templates/snapshots/export5.txt b/tests/_server/templates/snapshots/export5.txt
index a23bcbd83f..6838c27a15 100644
--- a/tests/_server/templates/snapshots/export5.txt
+++ b/tests/_server/templates/snapshots/export5.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,32 +50,22 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>notebook.py</marimo-filename>
- <script data-marimo="true">
- window.__MARIMO_MOUNT_CONFIG__ = {
- "filename": "notebook.py",
- "cwd": "",
- "mode": "read",
- "version": "0.0.0",
- "serverToken": "token",
- "config": {"ai": {"custom_providers": {}, "models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "uv"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_csv_encoding": "utf-8", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},
- "configOverrides": {"formatting": {"line_length": 100}},
- "appConfig": {"app_title": "My App", "html_head_file": "head.html", "sql_output": "auto", "width": "compact"},
- "view": {"showAppCode": true},
- "notebook": {"cells": [], "metadata": {"marimo_version": "0.0.0"}, "version": "1"},
- "session": {"cells": [], "metadata": {"marimo_version": "0.0.0"}, "version": "1"},
- "runtimeConfig": null,
- };
- </script>
<title>My App</title>
<script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
<script data-marimo="true">
window.__MARIMO_STATIC__ = {};
@@ -93,6 +87,24 @@
</head>
<body>
<div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
+ <script data-marimo="true">
+ window.__MARIMO_MOUNT_CONFIG__ = {
+ "filename": "notebook.py",
+ "cwd": "",
+ "mode": "read",
+ "version": "0.0.0",
+ "serverToken": "token",
+ "config": {"ai": {"custom_providers": {}, "models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "uv"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_csv_encoding": "utf-8", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},
+ "configOverrides": {"formatting": {"line_length": 100}},
+ "appConfig": {"app_title": "My App", "html_head_file": "head.html", "sql_output": "auto", "width": "compact"},
+ "view": {"showAppCode": true},
+ "notebook": {"cells": [], "metadata": {"marimo_version": "0.0.0"}, "version": "1"},
+ "session": {"cells": [], "metadata": {"marimo_version": "0.0.0"}, "version": "1"},
+ "runtimeConfig": null,
+ };
+ </script>
<marimo-code hidden=""></marimo-code>
<marimo-code-hash hidden="">07da107bb575cc4e02b0e1d6d99cc204</marimo-code-hash>
</body>
diff --git a/tests/_server/templates/snapshots/export6.txt b/tests/_server/templates/snapshots/export6.txt
index 2f0487cd53..48836e2678 100644
--- a/tests/_server/templates/snapshots/export6.txt
+++ b/tests/_server/templates/snapshots/export6.txt
@@ -8,12 +8,12 @@
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/gradient.png"" as="image" />
<link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/noise.png"" as="image" />
<!-- Preload the fonts -->
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.ttf"" as="font" crossorigin="anonymous" />
- <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.ttf"" as="font" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/Lora-VariableFont_wght.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/PTSans-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Regular.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Medium.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
+ <link rel="preload" crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/FiraMono-Bold.woff2"" as="font" type="font/woff2" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
@@ -23,18 +23,22 @@
<script data-marimo="true">
function __resizeIframe(obj) {
- var scrollbarHeight = 20; // Max between windows, mac, and linux
+ const scrollbarHeight = 20; // Max between windows, mac, and linux
function setHeight() {
- var element = obj.contentWindow.document.documentElement;
+ // Guard against race condition where iframe isn't ready
+ if (!obj.contentWindow?.document?.documentElement) {
+ return;
+ }
+ const element = obj.contentWindow.document.documentElement;
// If there is no vertical scrollbar, we don't need to resize the iframe
if (element.scrollHeight === element.clientHeight) {
return;
}
// Create a new height that includes the scrollbar height if it's visible
- var hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
- var newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
+ const hasHorizontalScrollbar = element.scrollWidth > element.clientWidth;
+ const newHeight = element.scrollHeight + (hasHorizontalScrollbar ? scrollbarHeight : 0);
// Only update the height if it's different from the current height
if (obj.style.height !== `${newHeight}px`) {
@@ -46,13 +50,34 @@
setHeight();
// Resize the iframe when the content changes
- const resizeObserver = new ResizeObserver((entries) => {
+ const resizeObserver = new ResizeObserver((_entries) => {
setHeight();
});
- resizeObserver.observe(obj.contentWindow.document.body);
+ // Only observe if iframe content is ready
+ if (obj.contentWindow?.document?.body) {
+ resizeObserver.observe(obj.contentWindow.document.body);
+ }
}
</script>
<marimo-filename hidden>notebook.py</marimo-filename>
+ <title>notebook</title>
+ <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/cells.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/markdown-renderer.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/JsonOutput.css"">
+ <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"">
+
+<script data-marimo="true">
+ window.__MARIMO_STATIC__ = {};
+ window.__MARIMO_STATIC__.files = {};
+ window.__MARIMO_STATIC__.modelNotifications = [];
+</script>
+<style title='marimo-custom'>/* custom css 1 */</style>
+<style title='marimo-custom'>/* custom css 2 */</style></head>
+ <body>
+ <div id="root"></div>
+ <!-- This is a portal for the data editor to render in -->
+ <div id="portal" data-testid="glide-portal" style="position: fixed; left: 0; top: 0; z-index: 9999"></div>
<script data-marimo="true">
window.__MARIMO_MOUNT_CONFIG__ = {
"filename": "notebook.py",
@@ -69,19 +94,6 @@
"runtimeConfig": null,
};
</script>
- <title>notebook</title>
- <script type="module" crossorigin crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.js""></script>
- <link rel="stylesheet" crossorigin crossorigin="anonymous" href="https://cdn.jsdelivr.net/npm/@marimo-team/[email protected]/dist/assets/index.css"" />
-
-<script data-marimo="true">
- window.__MARIMO_STATIC__ = {};
- window.__MARIMO_STATIC__.files = {};
- window.__MARIMO_STATIC__.modelNotifications = [];
-</script>
-<style title='marimo-custom'>/* custom css 1 */</style>
-<style title='marimo-custom'>/* custom css 2 */</style></head>
- <body>
- <div id="root"></div>
<marimo-code hidden=""></marimo-code>
<marimo-code-hash hidden="">07da107bb575cc4e02b0e1d6d99cc204</marimo-code-hash>
</body>