diff --git a/packages/docs-md/assets/TryItNow/index.tsx b/packages/docs-md/assets/TryItNow/index.tsx
index 5e1b632e0..a378a303d 100644
--- a/packages/docs-md/assets/TryItNow/index.tsx
+++ b/packages/docs-md/assets/TryItNow/index.tsx
@@ -1,16 +1,12 @@
-import type {
-  SandpackOptions,
-  SandpackSetup,
-} from "@codesandbox/sandpack-react";
 import {
   SandpackCodeEditor,
   SandpackConsole,
   SandpackLayout,
   SandpackPreview,
   SandpackProvider,
+  useErrorMessage,
 } from "@codesandbox/sandpack-react";
 import { useAtomValue } from "jotai";
-import { Fragment } from "react";
 
 import { CodeEditor } from "./CodeEditor/index.tsx";
 import { dependenciesAtom, lastEditorValueAtom } from "./state/index.ts";
@@ -30,17 +26,6 @@ type TryItNowProps = {
    * Starting value of the editor
    */
   defaultValue?: string;
-  /**
-   * Props for the container that wraps the editor and console output.
-   */
-  containerProps?: React.HTMLAttributes<HTMLDivElement>;
-  /**
-   * Render only the Sandpack provider and components to use in a
-   * custom container.
-   */
-  disableContainer?: boolean;
-  sandpackOptions?: Partial<SandpackOptions>;
-  sandpackSetupOptions?: Partial<SandpackSetup>;
   /**
    * Experimental: When enabled, the editor will automatically
    * scan for external dependencies from npm as the user adds them
@@ -49,34 +34,48 @@ type TryItNowProps = {
   _enableUnsafeAutoImport?: boolean;
 };
 
+const TryItNowContents = ({
+  _enableUnsafeAutoImport,
+}: {
+  _enableUnsafeAutoImport?: boolean;
+}) => {
+  const error = useErrorMessage();
+  return (
+    <SandpackLayout>
+      {_enableUnsafeAutoImport ? <CodeEditor /> : <SandpackCodeEditor />}
+      {!error && (
+        <SandpackConsole
+          resetOnPreviewRestart
+          showSetupProgress
+          showRestartButton
+        />
+      )}
+      <SandpackPreview style={error ? undefined : styles.preview}>
+        {error ? <pre>{error}</pre> : null}
+      </SandpackPreview>
+    </SandpackLayout>
+  );
+};
+
 export const TryItNow = ({
   externalDependencies,
   defaultValue = "",
   _enableUnsafeAutoImport,
-  containerProps,
-  disableContainer,
-  sandpackOptions = {},
-  sandpackSetupOptions = {},
 }: TryItNowProps) => {
   const autoImportDependencies = useAtomValue(dependenciesAtom);
   const previousCodeAtomValue = useAtomValue(lastEditorValueAtom);
-  const OuterContainer = disableContainer ? Fragment : "div";
 
   return (
-    <OuterContainer
-      style={{ ...styles.container, ...containerProps?.style }}
-      {...containerProps}
-    >
+    <div style={{ ...styles.container }}>
       <SandpackProvider
         options={{
           autoReload: false,
           autorun: false,
-          activeFile: "index.tsx",
-          ...sandpackOptions,
+          activeFile: "index.ts",
         }}
         template="vanilla-ts"
         files={{
-          "index.tsx": {
+          "index.ts": {
             code:
               _enableUnsafeAutoImport && previousCodeAtomValue
                 ? previousCodeAtomValue
@@ -89,21 +88,12 @@ export const TryItNow = ({
             autoImportDependencies && _enableUnsafeAutoImport
               ? { ...autoImportDependencies, ...externalDependencies }
               : externalDependencies,
-          entry: "index.tsx",
-          ...sandpackSetupOptions,
+          entry: "index.ts",
         }}
         theme="dark"
       >
-        <SandpackLayout>
-          <SandpackPreview style={styles.preview} />
-          {_enableUnsafeAutoImport ? <CodeEditor /> : <SandpackCodeEditor />}
-          <SandpackConsole
-            resetOnPreviewRestart
-            showSetupProgress
-            showRestartButton
-          />
-        </SandpackLayout>
+        <TryItNowContents />
       </SandpackProvider>
-    </OuterContainer>
+    </div>
   );
 };
diff --git a/packages/docs-md/src/generator/mdx/renderer.ts b/packages/docs-md/src/generator/mdx/renderer.ts
index ec5cc0f4f..d83b45d6b 100644
--- a/packages/docs-md/src/generator/mdx/renderer.ts
+++ b/packages/docs-md/src/generator/mdx/renderer.ts
@@ -43,7 +43,7 @@ export class Site {
       recursive: true,
       withFileTypes: true,
     })
-      .filter((f) => f.isFile())
+      .filter((f) => f.isFile() && f.name !== "tsconfig.json")
       .map((f) => join(f.parentPath, f.name).replace(ASSET_PATH + "/", ""));
     for (const assetFile of assetFileList) {
       this.#pages.set(
@@ -213,13 +213,14 @@ sidebarTitle: ${this.escapeText(sidebarLabel)}
     title: string;
     embedName: string;
   }) {
-    this.#includeSidebar = true;
-    this.insertComponentImport("SideBarCta", "SideBar/index.tsx");
-    this.insertComponentImport("SideBar", "SideBar/index.tsx");
+    // If this is a circular import, skip processing sidebar
     if (!this.#insertEmbedImport(embedName)) {
-      console.error(`Direct circular import detected, skipping sidebar link`);
+      // TODO: add debug logging
       return;
     }
+    this.#includeSidebar = true;
+    this.insertComponentImport("SideBarCta", "SideBar/index.tsx");
+    this.insertComponentImport("SideBar", "SideBar/index.tsx");
     this.#lines.push(
       `<p>
   <SideBarCta cta="${`View ${this.escapeText(title, { mdxOnly: true })}`}" title="${this.escapeText(title)}">