chore: config loading (#270)

echarles · web-flow · commit def8c4382dc8 · 2024-07-23T16:34:04.000+02:00
diff --git a/docs/docs/about/index.mdx b/docs/docs/about/index.mdx
@@ -93,4 +93,3 @@ The open source components removes the above limitations and supports:
 Listed on:
 
 - [reactjs-example](https://reactjsexample.com/react-components-compatible-with-the-jupyter-ecosystem-to-create-your-own-custom-data-product)
-- [best-of-reactjs](https://bestofreactjs.com/repo/datalayer-jupyter-react-react-react-apps)  
diff --git a/examples/cra/package.json b/examples/cra/package.json
@@ -12,7 +12,7 @@
     "eject": "react-scripts eject"
   },
   "dependencies": {
-    "@datalayer/icons-react": "0.3.0",
+    "@datalayer/icons-react": "^0.3.0",
     "@datalayer/jupyter-react": "^0.12.0",
     "@datalayer/primer-addons": "0.3.0",
     "jupyterlab-plotly": "^5.17.0",
diff --git a/examples/next-js/package.json b/examples/next-js/package.json
@@ -10,7 +10,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@datalayer/icons-react": "0.3.0",
+    "@datalayer/icons-react": "^0.3.0",
     "@datalayer/jupyter-react": "^0.12.0",
     "@datalayer/primer-addons": "0.3.0",
     "autoprefixer": "^10.4.14",
diff --git a/examples/slate/package.json b/examples/slate/package.json
@@ -23,7 +23,7 @@
     "kill": "./../dev/sh/kill.sh || true"
   },
   "dependencies": {
-    "@datalayer/icons-react": "0.3.0",
+    "@datalayer/icons-react": "^0.3.0",
     "@datalayer/jupyter-react": "^0.12.0",
     "@datalayer/primer-addons": "0.3.0",
     "@emotion/css": "^11.1.3",
diff --git a/packages/docusaurus-plugin/package.json b/packages/docusaurus-plugin/package.json
@@ -22,7 +22,7 @@
     "directory": "packages/docusaurus-plugin"
   },
   "dependencies": {
-    "@datalayer/icons-react": "0.3.0",
+    "@datalayer/icons-react": "^0.3.0",
     "@datalayer/jupyter-react": "^0.12.0",
     "@datalayer/primer-addons": "0.3.0",
     "@docusaurus/core": "^2.4.0",
diff --git a/packages/lexical/package.json b/packages/lexical/package.json
@@ -58,7 +58,7 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@datalayer/icons-react": "0.3.0",
+    "@datalayer/icons-react": "^0.3.0",
     "@datalayer/jupyter-react": "^0.12.0",
     "@datalayer/primer-addons": "0.3.0",
     "@jupyterlab/application": "^4.0.0",
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -131,7 +131,7 @@
     "@jupyterlite/server": "^0.2.2",
     "@jupyterlite/server-extension": "^0.2.2",
     "@lumino/default-theme": "^2.0.0",
-    "@primer/react": "^36.6.0",
+    "@primer/react": "^36.25.0",
     "assert": "^2.0.0",
     "bufferutil": "^4.0.8",
     "codemirror": "^6.0.1",
diff --git a/packages/react/src/components/cell/CellAdapter.ts b/packages/react/src/components/cell/CellAdapter.ts
@@ -248,7 +248,7 @@ export class CellAdapter {
     this._sessionContext.kernelChanged.connect(
       (_, arg: Session.ISessionConnection.IKernelChangedArgs) => {
         const kernelConnection = arg.newValue;
-        console.log('Current Kernel Connection', kernelConnection);
+        console.log('Current Kernel connection', kernelConnection);
         if (kernelConnection && !kernelConnection.handleComms) {
           console.warn(
             'Kernel Connection does not handle Comms',
diff --git a/packages/react/src/components/notebook/NotebookAdapter.ts b/packages/react/src/components/notebook/NotebookAdapter.ts
@@ -341,9 +341,9 @@ export class NotebookAdapter {
       };
 
     this._context.sessionContext.kernelChanged.connect((_, args) => {
-      console.log('Previous Kernel Connection', args.oldValue);
+      console.log('Previous Kernel connection', args.oldValue);
       const kernelConnection = args.newValue;
-      console.log('Current Kernel Connection', kernelConnection);
+      console.log('Current Kernel connection', kernelConnection);
       if (kernelConnection && !kernelConnection.handleComms) {
         console.warn(
           'The current Kernel Connection does not handle Comms',
diff --git a/packages/react/src/examples/KernelExecutor.tsx b/packages/react/src/examples/KernelExecutor.tsx
@@ -36,14 +36,14 @@ const KernelExecutorView = () => {
         msg: KernelMessage.IIOPubMessage
       ) => {
         // Do something with the IOPub message.
-        console.log('---iopubMessage', msg);
+        console.debug('---iopubMessage', msg);
         return true;
       };
       const shellMessageHook: ShellMessageHook = (
         msg: KernelMessage.IShellControlMessage
       ) => {
         // Do something with the IOPub message.
-        console.log('---shellMessage', msg);
+        console.debug('---shellMessage', msg);
         return true;
       };
       const kernelExecutor = defaultKernel.execute(CODE, {
diff --git a/packages/react/src/examples/Kernels.tsx b/packages/react/src/examples/Kernels.tsx
@@ -89,10 +89,10 @@ export const KernelExecResultView = () => {
 const KernelComponents = () => {
   const { defaultKernel } = useJupyter();
   const selectKernel = (kernelModel: IModel) => {
-    console.log('---', kernelModel);
+    console.log('Kernel model', kernelModel);
   };
   const selectKernelSpec = (specModel: ISpecModel) => {
-    console.log('---', specModel);
+    console.log('Spec model', specModel);
   };
   return (
     <>
diff --git a/packages/react/src/examples/Notebook.tsx b/packages/react/src/examples/Notebook.tsx
@@ -17,7 +17,10 @@ document.body.appendChild(div);
 const root = createRoot(div);
 
 root.render(
-  <Jupyter>
+  <Jupyter
+    jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
+    jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
+  >
     <Notebook
       path="ipywidgets.ipynb"
       uid={NOTEBOOK_UID}
diff --git a/packages/react/src/examples/NotebookLite.tsx b/packages/react/src/examples/NotebookLite.tsx
@@ -15,7 +15,9 @@ import CellSidebar from '../components/notebook/cell/sidebar/CellSidebar';
 import nbformat from './notebooks/NotebookExample1.ipynb.json';
 
 const NotebookLite = () => (
-  <Jupyter lite={true}>
+  <Jupyter
+    lite={true}
+  >
     <Box as="h1">A Jupyter Notebook with a Lite Kernel</Box>
     <Notebook
       nbformat={nbformat as INotebookContent}
diff --git a/packages/react/src/jupyter/Jupyter.tsx b/packages/react/src/jupyter/Jupyter.tsx
@@ -13,10 +13,7 @@ import {
 import { Theme } from '@primer/react/lib/ThemeProvider';
 import { useMemo } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
-import {
-  getJupyterServerUrl,
-  loadJupyterConfig,
-} from './JupyterConfig';
+import { loadJupyterConfig } from './JupyterConfig';
 import { JupyterContextProps, JupyterContextProvider } from './JupyterContext';
 import { ColorMode } from './lab/JupyterLabColorMode';
 import JupyterLabCss from './lab/JupyterLabCss';
@@ -27,12 +24,10 @@ import JupyterLabCss from './lab/JupyterLabCss';
  */
 export type JupyterProps = Omit<
   JupyterContextProps,
-  'serverUrls' | 'variant'
+  'variant'
 > & {
   colorMode?: ColorMode;
   disableCssLoading?: boolean;
-  jupyterServerUrl?: string;
-  jupyterServerToken?: string;
   theme?: Theme;
   terminals?: boolean;
 };
@@ -54,8 +49,7 @@ const ErrorFallback = ({ error, resetErrorBoundary }: any) => {
 
 /**
  * The Jupyter context. This handles the needed initialization
- * and ensure the Redux and the Material UI theme providers
- * are available.
+ * and ensure the Primer theme providers is available.
  */
 export const Jupyter = (props: JupyterProps) => {
   const {
@@ -75,7 +69,6 @@ export const Jupyter = (props: JupyterProps) => {
     useRunningKernelId,
     useRunningKernelIndex,
   } = props;
-
   const config = useMemo(() => {
     return loadJupyterConfig({
       collaborative,
@@ -91,7 +84,6 @@ export const Jupyter = (props: JupyterProps) => {
     lite,
     terminals,
   ]);
-
   return (
     <ErrorBoundary
       FallbackComponent={ErrorFallback}
@@ -115,10 +107,6 @@ export const Jupyter = (props: JupyterProps) => {
               defaultKernelName={defaultKernelName}
               initCode={initCode}
               lite={lite}
-              serverUrls={{
-                baseUrl: getJupyterServerUrl(),
-                wsUrl: getJupyterServerUrl().replace(/^http/, 'ws'),
-              }}
               skeleton={skeleton}
               startDefaultKernel={startDefaultKernel}
               useRunningKernelId={useRunningKernelId}
diff --git a/packages/react/src/jupyter/JupyterConfig.ts b/packages/react/src/jupyter/JupyterConfig.ts
diff --git a/packages/react/src/jupyter/JupyterContext.tsx b/packages/react/src/jupyter/JupyterContext.tsx
diff --git a/packages/react/src/jupyter/JupyterHandlers.ts b/packages/react/src/jupyter/JupyterHandlers.ts
diff --git a/packages/react/src/jupyter/kernel/Kernel.ts b/packages/react/src/jupyter/kernel/Kernel.ts
diff --git a/packages/react/src/state/State.ts b/packages/react/src/state/State.ts
diff --git a/storybook/src/stories/Cell.stories.tsx b/storybook/src/stories/Cell.stories.tsx

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,3 @@ The open source components removes the above limitations and supports:`
`93`	`93`	`Listed on:`
`94`	`94`
`95`	`95`	`- [reactjs-example](https://reactjsexample.com/react-components-compatible-with-the-jupyter-ecosystem-to-create-your-own-custom-data-product)`
`96`		`-- [best-of-reactjs](https://bestofreactjs.com/repo/datalayer-jupyter-react-react-react-apps)`