@myst-theme/jupyter 0.5.10 → 0.5.12

package/dist/ConnectionStatusTray.js

@@ -4,7 +4,8 @@ import { useThebeServer } from 'thebe-react';
 import { useThebeOptions } from './providers.js';
 import { selectAreExecutionScopesBuilding, useExecutionScope } from './execute/index.js';
 export function ConnectionStatusTray({ waitForSessions }) {
-    const { options } = useThebeOptions();
+    var _a, _b, _c;
+    const thebe = useThebeOptions();
     const { connecting, ready: serverReady, error: serverError, events } = useThebeServer();
     const { slug, ready: scopeReady, state } = useExecutionScope();
     const [show, setShow] = useState(false);
@@ -22,7 +23,7 @@ export function ConnectionStatusTray({ waitForSessions }) {
         events.on('status', handleStatus);
     }, [events]);
     useEffect(() => {
-        if (!options)
+        if (!(thebe === null || thebe === void 0 ? void 0 : thebe.options))
             return;
         if (busy || error) {
             setShow(true);
@@ -34,17 +35,17 @@ export function ConnectionStatusTray({ waitForSessions }) {
                 setUnsub(undefined);
             }, 1000);
         }
-    }, [options, busy, ready, error]);
-    const host = (options === null || options === void 0 ? void 0 : options.useBinder)
+    }, [thebe, busy, ready, error]);
+    const host = ((_a = thebe === null || thebe === void 0 ? void 0 : thebe.options) === null || _a === void 0 ? void 0 : _a.useBinder)
         ? 'Binder'
-        : (options === null || options === void 0 ? void 0 : options.useJupyterLite)
+        : ((_b = thebe === null || thebe === void 0 ? void 0 : thebe.options) === null || _b === void 0 ? void 0 : _b.useJupyterLite)
             ? 'JupyterLite'
             : 'Local Server';
     // TODO radix ui toast!
     if (show && error) {
         return (_jsxs("div", { className: "fixed p-3 z-[11] text-sm text-gray-700 bg-white border rounded shadow-lg bottom-2 sm:right-2 max-w-[90%] md:max-w-[300px] min-w-0", children: [_jsxs("div", { className: "mb-2 font-semibold text-center", children: ["\u26D4\uFE0F Error connecting to ", host, " \u26D4\uFE0F"] }), _jsx("div", { className: "my-1 max-h-[15rem] mono overflow-hidden text-ellipsis", children: error }), _jsx("div", { className: "flex justify-end", children: _jsx("div", { className: "text-xs cursor-pointer hover:underline", role: "button", onClick: () => setShow(false), children: "dismiss" }) })] }));
     }
-    if (show && (options === null || options === void 0 ? void 0 : options.useJupyterLite)) {
+    if (show && ((_c = thebe === null || thebe === void 0 ? void 0 : thebe.options) === null || _c === void 0 ? void 0 : _c.useJupyterLite)) {
         return (_jsxs("div", { className: "fixed p-3 z-[11] text-sm text-gray-700 bg-white border rounded shadow-lg bottom-2 sm:right-2 max-w-[90%] md:max-w-[300px] min-w-0", children: [_jsxs("div", { className: "mb-1 font-semibold text-center", children: ["\u26A1\uFE0F Connecting to ", host, " \u26A1\uFE0F"] }), !ready && _jsx("div", { className: "max-h-[5rem] mono overflow-hidden text-ellipsis", children: status }), ready && (_jsx("div", { className: "max-h-[15rem] mono overflow-hidden text-ellipsis", children: "The in-browser JupyterLite server is ready, press run anytime." }))] }));
     }
     if (show) {

package/dist/execute/provider.d.ts

@@ -3,7 +3,6 @@ import { SourceFileKind } from 'myst-spec-ext';
 import React from 'react';
 import type { ExecuteScopeAction } from './actions.js';
 import type { ExecuteScopeState, IdKeyMap } from './types.js';
-import type { Thebe } from 'myst-frontmatter';
 import type { GenericParent } from 'myst-common';
 export interface ExecuteScopeType {
     canCompute: boolean;
@@ -19,9 +18,6 @@ type ArticleContents = {
     mdast: GenericParent;
     location?: string;
     dependencies?: Dependency[];
-    frontmatter: {
-        thebe?: boolean | Thebe;
-    };
 };
 /**
  *  The ExecuteScopeProvider is responsible for maintaining the state of the

package/dist/execute/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/execute/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAc,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAS1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,iBAAiB,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC7C,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,eAAO,MAAM,mBAAmB,6CAA+D,CAAC;AAEhG,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,KAAK,CAAA;KAAE,CAAC;CAC1C,CAAC;AAiEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAAE,QAAQ,EAAE,eAAe,CAAA;CAAE,CAAC,2CAmGxD"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/execute/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAwC,MAAM,OAAO,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAc,iBAAiB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAU1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,iBAAiB,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC7C,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,eAAO,MAAM,mBAAmB,6CAA+D,CAAC;AAEhG,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;CAC7B,CAAC;AAmEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,QAAQ,EACR,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAAE,QAAQ,EAAE,eAAe,CAAA;CAAE,CAAC,2CAmGxD"}

package/dist/execute/provider.js

@@ -44,7 +44,7 @@ function useExecutionScopeFetcher({ slug, state, dispatch, }) {
     }, [state.builds, state.mdast]);
 }
 function listComputables(mdast) {
-    return selectAll('container[kind=figure] > output, embed > output', mdast).map((node) => {
+    return selectAll('container[kind=figure]:has(output), embed:has(output)', mdast).map((node) => {
         const { key, label, source } = node;
         const output = selectAll('output', node);
         return { embedKey: key, outputKey: output[0].key, label, source };
@@ -57,7 +57,7 @@ function listComputables(mdast) {
  */
 export function ExecuteScopeProvider({ children, contents, }) {
     var _a, _b;
-    const canCompute = useCanCompute(contents);
+    const canCompute = useCanCompute();
     // compute incoming for first render
     const computables = listComputables(contents.mdast);
     const fallbackLocation = contents.kind === SourceFileKind.Notebook ? '/fallback.ipynb' : '/';

package/dist/providers.d.ts

@@ -14,12 +14,8 @@ export declare function ConfiguredThebeServerProvider({ siteManifest, optionOver
     optionOverrideFn?: (opts: ExtendedCoreOptions) => ExtendedCoreOptions;
     customRepoProviders?: RepoProviderSpec[];
 }>): import("react/jsx-runtime").JSX.Element;
-export declare function useCanCompute(article: {
-    frontmatter: {
-        thebe?: boolean | Record<string, any>;
-    };
-}): boolean;
-export declare function useThebeOptions(): ThebeOptionsContextType;
+export declare function useCanCompute(): boolean;
+export declare function useThebeOptions(): ThebeOptionsContextType | undefined;
 export type PartialPage = {
     kind: SourceFileKind;
     file: string;

package/dist/providers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../src/providers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,KAAK,mBAAmB,EAA6B,MAAM,YAAY,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiCnD,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAIF,wBAAgB,6BAA6B,CAAC,EAC5C,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACzB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,mBAAmB,CAAC;IACtE,mBAAmB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC1C,CAAC,2CAqBD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE;IAAE,WAAW,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAA;CAAE,WAGhG;AAED,wBAAgB,eAAe,4BAE9B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../src/providers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAqB,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,KAAK,mBAAmB,EAA6B,MAAM,YAAY,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiCnD,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAIF,wBAAgB,6BAA6B,CAAC,EAC5C,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACzB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,mBAAmB,CAAC;IACtE,mBAAmB,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC1C,CAAC,2CAqBD;AAED,wBAAgB,aAAa,YAG5B;AAED,wBAAgB,eAAe,wCAE9B;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,aAAa,CAAC;CACtB,CAAC"}

package/dist/providers.js

@@ -22,7 +22,7 @@ function makeThebeOptions(siteManifest, optionsOverrideFn = (opts) => opts) {
         binderBadgeUrl,
     };
 }
-const ThebeOptionsContext = React.createContext({});
+const ThebeOptionsContext = React.createContext(undefined);
 export function ConfiguredThebeServerProvider({ siteManifest, optionOverrideFn, customRepoProviders, children, }) {
     var _a, _b, _c, _d;
     const thebe = React.useMemo(() => makeThebeOptions(siteManifest, optionOverrideFn), [siteManifest, optionOverrideFn]);
@@ -30,10 +30,9 @@ export function ConfiguredThebeServerProvider({ siteManifest, optionOverrideFn,
         return _jsx(_Fragment, { children: children });
     return (_jsx(ThebeOptionsContext.Provider, { value: thebe, children: _jsx(ThebeServerProvider, { connect: false, options: thebe.options, useBinder: (_b = (_a = thebe.options) === null || _a === void 0 ? void 0 : _a.useBinder) !== null && _b !== void 0 ? _b : false, useJupyterLite: (_d = (_c = thebe.options) === null || _c === void 0 ? void 0 : _c.useJupyterLite) !== null && _d !== void 0 ? _d : false, customRepoProviders: customRepoProviders, children: _jsx(_Fragment, { children: children }) }) }));
 }
-export function useCanCompute(article) {
-    var _a;
+export function useCanCompute() {
     const thebe = useContext(ThebeOptionsContext);
-    return !!thebe && ((_a = article.frontmatter) === null || _a === void 0 ? void 0 : _a.thebe) !== false;
+    return !!(thebe === null || thebe === void 0 ? void 0 : thebe.options);
 }
 export function useThebeOptions() {
     return useContext(ThebeOptionsContext);

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,KAAK,EAIN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,WAAW,EAAyB,MAAM,YAAY,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAyDF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,OAAO,GAAG,KAAK,GAAG,SAAS,EAC/B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,mBAAmB,GAAG,SAAS,CA+IjC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAA0C,MAAM,kBAAkB,CAAC;AACtF,OAAO,KAAK,EAAE,WAAW,EAAyB,MAAM,YAAY,CAAC;AAErE,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAC9C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAyDF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,OAAO,GAAG,KAAK,GAAG,SAAS,EAC/B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,mBAAmB,GAAG,SAAS,CAgHjC"}

package/dist/utils.js

@@ -42,35 +42,11 @@ export function thebeFrontmatterToOptions(fm, githubBadgeUrl, binderBadgeUrl) {
     var _a;
     if (fm === undefined || fm === false)
         return undefined;
-    const { binder, server, lite, local, kernelName, disableSessionSaving, mathjaxConfig, mathjaxUrl, } = (_a = fm) !== null && _a !== void 0 ? _a : {};
+    const { binder, server, lite, kernelName, disableSessionSaving, mathjaxConfig, mathjaxUrl } = (_a = fm) !== null && _a !== void 0 ? _a : {};
     const thebeOptions = { mathjaxConfig, mathjaxUrl };
     if (disableSessionSaving) {
         thebeOptions.savedSessionOptions = { enabled: false };
     }
-    // handle thebe.local.*
-    // as local OVERRIDES other binder and server settings, handle these first
-    // TODO need to expose NODE_ENV somehow via a loader
-    let NODE_ENV = 'development';
-    if (typeof window !== 'undefined') {
-        NODE_ENV = window.NODE_ENV;
-    }
-    if (NODE_ENV !== 'production' && local) {
-        if (isObject(local)) {
-            const { url, token, kernelName: localKernelName } = local;
-            if (url || token) {
-                thebeOptions.serverSettings = {};
-                if (url)
-                    thebeOptions.serverSettings.baseUrl = url;
-                if (token)
-                    thebeOptions.serverSettings.token = token;
-            }
-            if (localKernelName) {
-                thebeOptions.kernelOptions = { kernelName: localKernelName };
-            }
-        }
-        return thebeOptions;
-        // else just fall through & return - TODO return early?
-    }
     // handle additional options
     if (kernelName) {
         thebeOptions.kernelOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myst-theme/jupyter",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -25,16 +25,16 @@
     "@curvenote/ansi-to-react": "^7.0.0",
     "@headlessui/react": "^1.7.15",
     "@heroicons/react": "^2.0.18",
-    "@myst-theme/providers": "^0.5.10",
+    "@myst-theme/providers": "^0.5.12",
     "@scienceicons/react": "^0.0.6",
     "buffer": "^6.0.3",
     "classnames": "^2.3.2",
-    "myst-common": "^1.1.8",
-    "myst-config": "^1.1.8",
-    "myst-frontmatter": "^1.1.8",
+    "myst-common": "^1.1.12",
+    "myst-config": "^1.1.12",
+    "myst-frontmatter": "^1.1.12",
     "myst-spec": "^0.0.4",
-    "myst-spec-ext": "^1.1.8",
-    "myst-to-react": "^0.5.10",
+    "myst-spec-ext": "^1.1.12",
+    "myst-to-react": "^0.5.12",
     "nanoid": "^4.0.2",
     "nbtx": "^0.2.3",
     "react-syntax-highlighter": "^15.5.0",