Remove Jupyter and Notebook2 and bump to version 2.0.0 (#457)

* feat: remove jupyter and notebook

* fix: build

* fix: build

* fix: build

* fix: build

* fix: build

* fix: build

* chore: remove 2

* lint

* docs: readme

* fix: patches

* fix: build

* Automatic application of license header

* fix: build

* fix: build

* fix: storybook

* fix: build

* Automatic application of license header

* nextjs

* nextjs

* Automatic application of license header

* fix: build

* fix: build

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: echarles

.github/workflows/build.yml

@@ -32,47 +32,3 @@ jobs:
       - name: Run the build
         run: |
           npm run build
-
-  storybook-test:
-    name: Test Storybook Stories and Docs
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Build all packages
-        run: npm run build
-
-      - name: Install Playwright
-        run: npx playwright install chromium --with-deps
-        working-directory: storybook
-
-      - name: Build Storybook
-        run: npm run build:storybook
-        working-directory: storybook
-
-      - name: Serve Storybook and run all tests
-        run: |
-          npx serve -l 6006 storybook-static &
-          npx wait-on http://localhost:6006 --timeout 30000
-          npm run test:all:ci
-        working-directory: storybook
-
-      - name: Upload test results
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: storybook-test-results
-          path: |
-            storybook/test-results/
-            storybook/html-report/

.github/workflows/storybook.yml

@@ -0,0 +1,56 @@
+name: Storybook
+
+on:
+  push:
+    branches: 'main'
+  pull_request:
+    branches: '*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  storybook-build-run:
+    name: Build Storybook Stories
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build all packages
+        run: npm run build
+
+      - name: Install Playwright
+        run: npx playwright install chromium --with-deps
+        working-directory: storybook
+
+      - name: Build Storybook
+        run: npm run build:storybook
+        working-directory: storybook
+
+      - name: Serve Storybook and run all tests
+        run: |
+          npx serve -l 6006 storybook-static &
+          npx wait-on http://localhost:6006 --timeout 30000
+          npm run test:all:ci
+        working-directory: storybook
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: storybook-build-run-results
+          path: |
+            storybook/test-results/
+            storybook/html-report/

.licenserc.yaml

@@ -32,13 +32,9 @@ header:
     - 'dev/notebooks/example1.dash'
     - 'dev/notebooks/subfolder-2/untitled.txt'
     - 'examples/cra/public/robots.txt'
-    - '**/LICENSE.txt'
-    - '**/*.nblink'
     - 'docs/docs'
     - 'packages/lexical/src/ui/PrettierButton.tsx_tmp'
     - 'packages/react/third-party-license.txt'
-    - 'patches/'
-    - '**/robots.txt'
     - '.husky/_/applypatch-msg'
     - '.husky/_/commit-msg'
     - '.husky/_/h'
@@ -55,6 +51,10 @@ header:
     - '.husky/_/pre-rebase'
     - '.husky/_/prepare-commit-msg'
     - '.husky/pre-commit'
+    - '**/LICENSE.txt'
+    - '**/robots.txt'
+    - '**/*.nblink'
+    - '**/*.patch'
     - '**/*.disabled'
     - '**/*.lexical'
 

docs/src/theme/ReactLiveScope/index.tsx

@@ -16,22 +16,22 @@ const Cell = (props: any) => {
       {() => {
         // Keep the import via require in the BrowserOnly code block.
         const {
-          Jupyter,
-        } = require('@datalayer/jupyter-react/lib/jupyter/Jupyter');
+          JupyterReactTheme,
+        } = require('@datalayer/jupyter-react/lib/theme/JupyterReactTheme');
         const {
           Cell,
         } = require('@datalayer/jupyter-react/lib/components/cell/Cell');
         return (
           <>
-            <Jupyter
-              jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
-              jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
-              disableCssLoading={true}
-              starDefaultKernel
-              skeleton={<ContentLoader />}
+            <JupyterReactTheme
+            //              jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
+            //              jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
+            //              disableCssLoading={true}
+            //              starDefaultKernel
+            //              skeleton={<ContentLoader />}
             >
               <Cell {...props} />
-            </Jupyter>
+            </JupyterReactTheme>
           </>
         );
       }}

eslint.config.js

@@ -27,6 +27,7 @@ module.exports = tseslint.config(
             'gulpfile.js',
             'packages/*/entries.js',
             'packages/*/vite.config.ts',
+            'storybook/.storybook/*.ts',
           ],
         },
       },

examples/lexical/src/AppNbformat.tsx

@@ -4,7 +4,7 @@
  * MIT License
  */
 
-import { useState } from 'react';
+import { useState, useMemo } from 'react';
 import { $getRoot } from 'lexical';
 import styled from 'styled-components';
 import {
@@ -15,13 +15,15 @@ import {
 } from '@datalayer/jupyter-lexical';
 import {
   useNotebookStore,
-  Jupyter,
+  useJupyter,
+  JupyterReactTheme,
   Notebook,
   CellSidebar,
   CellSidebarExtension,
 } from '@datalayer/jupyter-react';
-import { Box, Button, UnderlineNav } from '@primer/react';
+import { Button, UnderlineNav } from '@primer/react';
 import { ThreeBarsIcon } from '@primer/octicons-react';
+import { Box } from '@datalayer/primer-addons';
 import { JSONTree } from 'react-json-tree';
 import { INotebookContent } from '@jupyterlab/nbformat';
 import { INotebookModel } from '@jupyterlab/notebook';
@@ -46,11 +48,18 @@ const StyledNotebook = styled.div`
 
 const Tabs = () => {
   const { editor } = useLexical();
+  const { serviceManager, defaultKernel } = useJupyter({
+    startDefaultKernel: true,
+  });
   const notebookStore = useNotebookStore();
   const [tab, setTab] = useState<TabType>('editor');
   const [notebookContent, setNotebookContent] = useState<INotebookContent>(
     INITIAL_NBFORMAT_MODEL,
   );
+  const extensions = useMemo(
+    () => [new CellSidebarExtension({ factory: CellSidebar })],
+    [],
+  );
   const notebook = notebookStore.selectNotebook(NOTEBOOK_UID);
   const goToTab = (
     e: any,
@@ -84,21 +93,21 @@ const Tabs = () => {
         <UnderlineNav.Item
           href=""
           aria-current={tab === 'editor' ? 'page' : undefined}
-          onClick={(e: any) => goToTab(e, 'editor', notebook?.model)}
+          //          onClick={(e: any) => goToTab(e, 'editor', notebook?.model)}
         >
           Editor
         </UnderlineNav.Item>
         <UnderlineNav.Item
           href=""
           aria-current={tab === 'notebook' ? 'page' : undefined}
-          onClick={(e: any) => goToTab(e, 'notebook', notebook?.model)}
+          //          onClick={(e: any) => goToTab(e, 'notebook', notebook?.model)}
         >
           Notebook
         </UnderlineNav.Item>
         <UnderlineNav.Item
           href=""
           aria-current={tab === 'nbformat' ? 'page' : undefined}
-          onClick={(e: any) => goToTab(e, 'nbformat', notebook?.model)}
+          //          onClick={(e: any) => goToTab(e, 'nbformat', notebook?.model)}
         >
           NbFormat
         </UnderlineNav.Item>
@@ -124,11 +133,15 @@ const Tabs = () => {
       {tab === 'notebook' && (
         <StyledNotebook>
           <Box mb={3}>
-            <Notebook
-              id={NOTEBOOK_UID}
-              nbformat={notebookContent}
-              extensions={[new CellSidebarExtension({ factory: CellSidebar })]}
-            />
+            {serviceManager && defaultKernel && (
+              <Notebook
+                id={NOTEBOOK_UID}
+                kernel={defaultKernel}
+                serviceManager={serviceManager}
+                nbformat={notebookContent}
+                extensions={extensions}
+              />
+            )}
             <Button
               onClick={(e: React.MouseEvent) => {
                 e.preventDefault();
@@ -155,11 +168,11 @@ export function AppNbformat() {
       <div className="App">
         <h1>Jupyter UI ❤️ Lexical</h1>
       </div>
-      <Jupyter startDefaultKernel>
+      <JupyterReactTheme>
         <LexicalProvider>
           <Tabs />
         </LexicalProvider>
-      </Jupyter>
+      </JupyterReactTheme>
       <div className="other App">
         <br />
         <a href="https://datalayer.ai" target="_blank" rel="noreferrer">

examples/next-js/.yarnrc.yml

@@ -0,0 +1,20 @@
+# Copyright (c) Datalayer, Inc. https://datalayer.io
+# Distributed under the terms of the MIT License.
+
+enableImmutableInstalls: false
+enableInlineBuilds: false
+enableTelemetry: false
+httpTimeout: 60000
+nodeLinker: node-modules
+npmRegistryServer: 'https://registry.yarnpkg.com'
+
+# This will fix the build error with @lerna/legacy-package-management
+# See https://github.com/lerna/repro/pull/11
+packageExtensions:
+  '@lerna/legacy-package-management@*':
+    dependencies:
+      '@lerna/child-process': '*'
+      'js-yaml': '*'
+      'rimraf': '*'
+    peerDependencies:
+      'nx': '*'

examples/next-js/next-env.d.ts

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2021-2023 Datalayer, Inc.
+ *
+ * MIT License
+ */
+
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.