@marimo-team/islands 0.20.4-dev1 → 0.20.4

package/dist/main.js

@@ -27007,7 +27007,6 @@ ${c.sqlString}
     rtc_v2: false,
     cache_panel: false,
     external_agents: false,
-    server_side_pdf_export: true,
     storage_inspector: false
   };
   function getFeatureFlag(e) {
@@ -70358,7 +70357,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.20.4-dev1"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.20.4"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.20.4-dev1",
+  "version": "0.20.4",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/app-config/user-config-form.tsx

@@ -1371,39 +1371,6 @@ export const UserConfigForm: React.FC = () => {
                 </div>
               )}
             />
-            <FormField
-              control={form.control}
-              name="experimental.server_side_pdf_export"
-              render={({ field }) => (
-                <div className="flex flex-col gap-y-1">
-                  <FormItem className={formItemClasses}>
-                    <FormLabel className="font-normal">
-                      Better PDF Export
-                    </FormLabel>
-                    <FormControl>
-                      <Checkbox
-                        data-testid="server-side-pdf-export-checkbox"
-                        checked={field.value === true}
-                        onCheckedChange={field.onChange}
-                      />
-                    </FormControl>
-                  </FormItem>
-                  <IsOverridden
-                    userConfig={config}
-                    name="experimental.server_side_pdf_export"
-                  />
-                  <FormDescription>
-                    Enable PDF export using{" "}
-                    <Kbd className="inline">nbconvert</Kbd> and{" "}
-                    <Kbd className="inline">playwright</Kbd>. Refer to{" "}
-                    <ExternalLink href="https://docs.marimo.io/guides/exporting/#exporting-to-pdf-slides-or-rst">
-                      the docs
-                    </ExternalLink>
-                    .
-                  </FormDescription>
-                </div>
-              )}
-            />
             <FormField
               control={form.control}
               name="experimental.storage_inspector"

package/src/components/editor/actions/__tests__/pdf-export.test.ts

@@ -15,10 +15,10 @@ describe("runServerSidePDFDownload", () => {
 
     expect(downloadPDF).toHaveBeenCalledWith({
       filename: "slides.py",
-      webpdf: true,
+      webpdf: false,
       preset: "document",
-      includeInputs: false,
-      rasterServer: "live",
+      includeInputs: true,
+      rasterServer: "static",
     });
   });
 
@@ -33,10 +33,10 @@ describe("runServerSidePDFDownload", () => {
 
     expect(downloadPDF).toHaveBeenCalledWith({
       filename: "slides.py",
-      webpdf: true,
+      webpdf: false,
       preset: "slides",
-      includeInputs: false,
-      rasterServer: "live",
+      includeInputs: true,
+      rasterServer: "static",
     });
   });
 });

package/src/components/editor/actions/pdf-export.ts

@@ -18,9 +18,9 @@ export async function runServerSidePDFDownload(opts: {
 
   await downloadPDF({
     filename,
-    webpdf: true,
+    webpdf: false,
     preset,
-    includeInputs: false,
-    rasterServer: "live",
+    includeInputs: true,
+    rasterServer: "static",
   });
 }

package/src/components/editor/actions/useNotebookActions.tsx

@@ -55,8 +55,11 @@ import {
 } from "@/core/cells/cells";
 import { disabledCellIds } from "@/core/cells/utils";
 import { useResolvedMarimoConfig } from "@/core/config/config";
-import { getFeatureFlag } from "@/core/config/feature-flag";
 import { Constants } from "@/core/constants";
+import {
+  updateCellOutputsWithScreenshots,
+  useEnrichCellOutputs,
+} from "@/core/export/hooks";
 import { useLayoutActions, useLayoutState } from "@/core/layout/layout";
 import { useTogglePresenting } from "@/core/layout/useTogglePresenting";
 import { kioskModeAtom, viewStateAtom } from "@/core/mode";
@@ -75,6 +78,7 @@ import {
 } from "@/utils/download";
 import { Filenames } from "@/utils/filenames";
 import { Objects } from "@/utils/objects";
+import type { ProgressState } from "@/utils/progress";
 import { newNotebookURL } from "@/utils/urls";
 import { useRunAllCells } from "../cell/useRunCells";
 import { useChromeActions, useChromeState } from "../chrome/state";
@@ -119,7 +123,9 @@ export function useNotebookActions() {
   const setCommandPaletteOpen = useSetAtom(commandPaletteAtom);
   const setSettingsDialogOpen = useSetAtom(settingDialogAtom);
   const setKeyboardShortcutsOpen = useSetAtom(keyboardShortcutsAtom);
-  const { exportAsMarkdown, readCode, saveCellConfig } = useRequestClient();
+  const { exportAsMarkdown, readCode, saveCellConfig, updateCellOutputs } =
+    useRequestClient();
+  const takeScreenshots = useEnrichCellOutputs();
 
   const hasDisabledCells = useAtomValue(hasDisabledCellsAtom);
   const canUndoDeletes = useAtomValue(canUndoDeletesAtom);
@@ -130,11 +136,9 @@ export function useNotebookActions() {
   const sharingHtmlEnabled = resolvedConfig.sharing?.html ?? true;
   const sharingWasmEnabled = resolvedConfig.sharing?.wasm ?? true;
 
-  const isServerSidePdfExportEnabled = getFeatureFlag("server_side_pdf_export");
-  // With server side pdf export, it doesn't matter what mode we are in,
-  // Default export uses browser print, which is better in present mode
-  const pdfDownloadEnabled =
-    isServerSidePdfExportEnabled || viewState.mode === "present";
+  // Server-side PDF export is always available outside WASM.
+  // Browser print fallback is used in WASM.
+  const serverSidePdfEnabled = !isWasm();
   const isSlidesLayout = selectedLayout === "slides";
 
   const renderCheckboxElement = (checked: boolean) => (
@@ -166,7 +170,11 @@ export function useNotebookActions() {
       return;
     }
 
-    const runDownload = async () => {
+    const runDownload = async (progress: ProgressState) => {
+      await updateCellOutputsWithScreenshots({
+        takeScreenshots: () => takeScreenshots({ progress }),
+        updateCellOutputs,
+      });
       await runServerSidePDFDownload({
         filename,
         preset,
@@ -176,6 +184,21 @@ export function useNotebookActions() {
     await withLoadingToast(title, runDownload);
   };
 
+  const handleDocumentPDF = async () => {
+    if (serverSidePdfEnabled) {
+      await downloadServerSidePDF({
+        preset: "document",
+        title: "Downloading Document PDF...",
+      });
+      return;
+    }
+    const beforeprint = new Event("export-beforeprint");
+    const afterprint = new Event("export-afterprint");
+    window.dispatchEvent(beforeprint);
+    setTimeout(() => window.print(), 0);
+    setTimeout(() => window.dispatchEvent(afterprint), 0);
+  };
+
   const actions: ActionButton[] = [
     {
       icon: <DownloadIcon size={14} strokeWidth={1.5} />,
@@ -253,62 +276,38 @@ export function useNotebookActions() {
             });
           },
         },
-        {
-          divider: true,
-          icon: <FileIcon size={14} strokeWidth={1.5} />,
-          label: "Download as PDF",
-          handle: NOOP_HANDLER,
-          disabled: !pdfDownloadEnabled && !isServerSidePdfExportEnabled,
-          dropdown: [
-            {
+        isSlidesLayout
+          ? {
+              divider: true,
               icon: <FileIcon size={14} strokeWidth={1.5} />,
-              label: "Document Layout",
-              rightElement: renderRecommendedElement(!isSlidesLayout),
-              disabled: !pdfDownloadEnabled,
-              tooltip: pdfDownloadEnabled ? undefined : (
-                <span>
-                  Only available in app view. <br />
-                  Toggle with: {renderShortcut("global.hideCode", false)}
-                </span>
-              ),
-              handle: async () => {
-                if (isServerSidePdfExportEnabled) {
-                  await downloadServerSidePDF({
-                    preset: "document",
-                    title: "Downloading Document PDF...",
-                  });
-                  return;
-                }
-
-                const beforeprint = new Event("export-beforeprint");
-                const afterprint = new Event("export-afterprint");
-                function print() {
-                  window.dispatchEvent(beforeprint);
-                  setTimeout(() => window.print(), 0);
-                  setTimeout(() => window.dispatchEvent(afterprint), 0);
-                }
-                print();
-              },
-            },
-            {
+              label: "Download as PDF",
+              handle: NOOP_HANDLER,
+              dropdown: [
+                {
+                  icon: <FileIcon size={14} strokeWidth={1.5} />,
+                  label: "Document Layout",
+                  handle: handleDocumentPDF,
+                },
+                {
+                  icon: <FileIcon size={14} strokeWidth={1.5} />,
+                  label: "Slides Layout",
+                  rightElement: renderRecommendedElement(true),
+                  hidden: !serverSidePdfEnabled,
+                  handle: async () => {
+                    await downloadServerSidePDF({
+                      preset: "slides",
+                      title: "Downloading Slides PDF...",
+                    });
+                  },
+                },
+              ],
+            }
+          : {
+              divider: true,
               icon: <FileIcon size={14} strokeWidth={1.5} />,
-              label: "Slides Layout",
-              rightElement: renderRecommendedElement(isSlidesLayout),
-              disabled: !isServerSidePdfExportEnabled,
-              tooltip: isServerSidePdfExportEnabled ? undefined : (
-                <span>
-                  Requires Better PDF Export in Settings &gt; Experimental.
-                </span>
-              ),
-              handle: async () => {
-                await downloadServerSidePDF({
-                  preset: "slides",
-                  title: "Downloading Slides PDF...",
-                });
-              },
+              label: "Download as PDF",
+              handle: handleDocumentPDF,
             },
-          ],
-        },
       ],
     },
 

package/src/core/config/feature-flag.tsx

@@ -11,7 +11,6 @@ export interface ExperimentalFeatures {
   rtc_v2: boolean;
   cache_panel: boolean;
   external_agents: boolean;
-  server_side_pdf_export: boolean;
   storage_inspector: boolean;
   // Add new feature flags here
 }
@@ -22,7 +21,6 @@ const defaultValues: ExperimentalFeatures = {
   rtc_v2: false,
   cache_panel: false,
   external_agents: import.meta.env.DEV,
-  server_side_pdf_export: true,
   storage_inspector: false,
 };
 

package/src/utils/__tests__/download.test.tsx

@@ -205,7 +205,7 @@ describe("downloadAsPDF", () => {
     expect(mockExportAsPDF).toHaveBeenCalledWith({
       webpdf: false,
       preset: "slides",
-      includeInputs: false,
+      includeInputs: true,
       rasterizeOutputs: true,
       rasterScale: 4,
       rasterServer: "static",

package/src/utils/download.ts

@@ -210,7 +210,7 @@ export async function downloadAsPDF(opts: {
     filename,
     webpdf,
     preset = "document",
-    includeInputs = false,
+    includeInputs = true,
     rasterizeOutputs = true,
     rasterScale = 4,
     rasterServer = "static",