@myst-theme/site 0.5.16 → 0.5.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myst-theme/site",
-  "version": "0.5.16",
+  "version": "0.5.18",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,23 +17,23 @@
   "dependencies": {
     "@headlessui/react": "^1.7.15",
     "@heroicons/react": "^2.0.18",
-    "@myst-theme/common": "^0.5.16",
-    "@myst-theme/diagrams": "^0.5.16",
-    "@myst-theme/frontmatter": "^0.5.16",
-    "@myst-theme/jupyter": "^0.5.16",
-    "@myst-theme/providers": "^0.5.16",
+    "@myst-theme/common": "^0.5.18",
+    "@myst-theme/diagrams": "^0.5.18",
+    "@myst-theme/frontmatter": "^0.5.18",
+    "@myst-theme/jupyter": "^0.5.18",
+    "@myst-theme/providers": "^0.5.18",
     "@radix-ui/react-collapsible": "^1.0.3",
     "classnames": "^2.3.2",
     "lodash.throttle": "^4.1.1",
-    "myst-common": "^1.1.16",
-    "myst-config": "^1.1.16",
-    "myst-demo": "^0.5.16",
-    "myst-spec-ext": "^1.1.16",
-    "myst-to-react": "^0.5.16",
+    "myst-common": "^1.1.18",
+    "myst-config": "^1.1.18",
+    "myst-demo": "^0.5.18",
+    "myst-spec-ext": "^1.1.18",
+    "myst-to-react": "^0.5.18",
     "nbtx": "^0.2.3",
     "node-cache": "^5.1.2",
     "node-fetch": "^2.6.11",
-    "thebe-react": "^0.3.5",
+    "thebe-react": "^0.4.3",
     "unist-util-select": "^4.0.1"
   },
   "peerDependencies": {

package/src/pages/Article.tsx

@@ -17,8 +17,8 @@ import {
   BusyScopeProvider,
   NotebookToolbar,
   ConnectionStatusTray,
-  useCanCompute,
   ErrorTray,
+  useComputeOptions,
 } from '@myst-theme/jupyter';
 import { FrontmatterBlock } from '@myst-theme/frontmatter';
 import { extractKnownParts } from '../utils.js';
@@ -32,7 +32,7 @@ export const ArticlePage = React.memo(function ({
   hide_all_footer_links?: boolean;
   hideKeywords?: boolean;
 }) {
-  const canCompute = useCanCompute();
+  const compute = useComputeOptions();
 
   const { hide_title_block, hide_footer_links } = (article.frontmatter as any)?.options ?? {};
 
@@ -46,7 +46,7 @@ export const ArticlePage = React.memo(function ({
       frontmatter={article.frontmatter}
     >
       <BusyScopeProvider>
-        <ExecuteScopeProvider contents={article}>
+        <ExecuteScopeProvider enable={compute?.enabled ?? false} contents={article}>
           {!hide_title_block && (
             <FrontmatterBlock
               kind={article.kind}
@@ -54,8 +54,12 @@ export const ArticlePage = React.memo(function ({
               className="pt-5 mb-8"
             />
           )}
-          {canCompute && article.kind === SourceFileKind.Notebook && <NotebookToolbar showLaunch />}
-          <ErrorTray pageSlug={article.slug} />
+          {compute?.enabled &&
+            compute.features.notebookCompute &&
+            article.kind === SourceFileKind.Notebook && <NotebookToolbar showLaunch />}
+          {compute?.enabled && article.kind === SourceFileKind.Article && (
+            <ErrorTray pageSlug={article.slug} />
+          )}
           <div id="skip-to-article" />
           <FrontmatterParts parts={parts} keywords={keywords} hideKeywords={hideKeywords} />
           <ContentBlocks pageKind={article.kind} mdast={tree as GenericParent} />

package/src/pages/Root.tsx

@@ -16,8 +16,6 @@ import { DEFAULT_NAV_HEIGHT, renderers } from '../components/index.js';
 import { Analytics } from '../seo/index.js';
 import { Error404 } from './Error404.js';
 import classNames from 'classnames';
-import { ConfiguredThebeServerProvider } from '@myst-theme/jupyter';
-import { ThebeBundleLoaderProvider } from 'thebe-react';
 
 export function Document({
   children,
@@ -27,7 +25,6 @@ export function Document({
   title,
   staticBuild,
   baseurl,
-  loadThebeLite,
   top = DEFAULT_NAV_HEIGHT,
 }: {
   children: React.ReactNode;
@@ -37,7 +34,6 @@ export function Document({
   title?: string;
   staticBuild?: boolean;
   baseurl?: string;
-  loadThebeLite?: boolean;
   top?: number;
 }) {
   const links = staticBuild
@@ -49,6 +45,7 @@ export function Document({
         Link: Link as any,
         NavLink: NavLink as any,
       };
+
   return (
     <html lang="en" className={classNames(theme)} style={{ scrollPadding: top }}>
       <head>
@@ -65,13 +62,7 @@ export function Document({
       <body className="m-0 transition-colors duration-500 bg-white dark:bg-stone-900">
         <ThemeProvider theme={theme} renderers={renderers} {...links} top={top}>
           <BaseUrlProvider baseurl={baseurl}>
-            <ThebeBundleLoaderProvider loadThebeLite={loadThebeLite} publicPath={baseurl}>
-              <SiteProvider config={config}>
-                <ConfiguredThebeServerProvider siteManifest={config}>
-                  {children}
-                </ConfiguredThebeServerProvider>
-              </SiteProvider>
-            </ThebeBundleLoaderProvider>
+            <SiteProvider config={config}>{children}</SiteProvider>
           </BaseUrlProvider>
         </ThemeProvider>
         <ScrollRestoration />