Merge branch 'main' into start-ckhub-api-gha

Author: agriyakhetarpal

.github/inject-gh-pages-config.sh

@@ -0,0 +1,4 @@
+set -eux
+# Inject service URL
+cat jupyter-lite.json | jq '.["jupyter-config-data"]["sharing_service_api_url"] = "https://jupytereverywhere.coursekata.org/api/v1"' > jupyter-lite.json.tmp
+mv jupyter-lite.json.tmp jupyter-lite.json

.github/workflows/build.yml

@@ -55,7 +55,7 @@ jobs:
         key: playwright-browsers-${{ runner.os }}-v1
         restore-keys: |
           playwright-browsers-${{ runner.os }}-
-      
+
     - name: Build the extension
       run: |
         set -eux
@@ -106,35 +106,47 @@ jobs:
       run: |
         pip install jupytereverywhere*.whl
 
+    - name: Install jlpm
+      run: |
+        set -eux
+        python -m pip install "jupyterlab>=4.0.0,<5"
+
     - name: Build the JupyterLite app
       run: |
         cd lite
-        jupyter lite build --output-dir dist
+        bash ../.github/inject-gh-pages-config.sh
+        cd ..
+        jlpm install
+        jlpm build:all
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: lite-app
-        path: ./lite/dist
+        path: ./dist
         if-no-files-found: error
 
     - name: Upload GitHub Pages artifact
       uses: actions/upload-pages-artifact@v3
       with:
-        path: ./lite/dist
+        path: ./dist
 
-    - name: Build the JupyterLite app (in test mode)
+    - name: Build landing page and JupyterLite app (in test mode)
       run: |
+        rm -rf dist dist-test
         cd lite
-        rm -r dist # jupyter lite will not build in `dist-test/` if `dist/` exists...?
         bash ../ui-tests/inject-test-config.sh
-        jupyter lite build --output-dir dist-test
+        cd ..
+        jlpm install
+        jlpm build:all
+        mv dist dist-test
+
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: lite-app-test
-        path: ./lite/dist-test
+        path: ./dist-test
         if-no-files-found: error
 
     - name: Leave instructions for testing

.github/workflows/update-integration-tests.yml

@@ -82,11 +82,15 @@ jobs:
           jlpm
           python -m pip install .
 
-      - name: Build the JupyterLite app
+      - name: Build landing page and JupyterLite app
         run: |
+          rm -rf dist dist-test
           cd lite
           bash ../ui-tests/inject-test-config.sh
-          jupyter lite build --output-dir ../dist
+          cd ..
+          jlpm install
+          jlpm build:all
+          mv dist dist-test
 
       - uses: jupyterlab/maintainer-tools/.github/actions/update-snapshots@v1
         with:
@@ -96,3 +100,4 @@ jobs:
           test_folder: ui-tests
           npm_client: jlpm
           server_url: http-get://localhost:3000
+          browser: chromium

package.json

@@ -33,6 +33,13 @@
         "build": "jlpm build:lib && jlpm build:labextension:dev",
         "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension",
         "build:labextension": "jupyter labextension build .",
+        "copy:landing:template": "cp templates/index.html dist/index.html",
+        "build:landing:css": "esbuild style/landing.css --bundle --minify --outfile=dist/landing.css",
+        "build:base:css": "esbuild style/base.css --bundle --minify --outfile=dist/base.css",
+        "build:css": "jlpm build:landing:css && jlpm build:base:css",
+        "build:landing": "esbuild src/landing.tsx --bundle --outfile=dist/landing.js --minify --loader:.svg=dataurl --loader:.png=dataurl --loader:.jpeg=dataurl && jlpm copy:landing:template && jlpm build:css",
+        "build:jupyterlite": "cd lite && jupyter lite build --output-dir=../dist && cd .. && jlpm build:landing",
+        "build:all": "jlpm build && jlpm build:jupyterlite",
         "build:labextension:dev": "jupyter labextension build --development True .",
         "build:lib": "tsc --sourceMap",
         "build:lib:prod": "tsc",
@@ -78,11 +85,13 @@
         "@jupyterlab/testutils": "^4.0.0",
         "@types/jest": "^29.2.0",
         "@types/json-schema": "^7.0.11",
-        "@types/react": "^18.0.26",
+        "@types/react": "^19.1.8",
         "@types/react-addons-linked-state-mixin": "^0.14.22",
+        "@types/react-dom": "^19.1.6",
         "@typescript-eslint/eslint-plugin": "^6.1.0",
         "@typescript-eslint/parser": "^6.1.0",
         "css-loader": "^6.7.1",
+        "esbuild": "^0.25.5",
         "eslint": "^8.36.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^5.0.0",

schema/plugin.json

@@ -3,14 +3,27 @@
   "title": "jupytereverywhere",
   "description": "jupytereverywhere settings.",
   "type": "object",
-  "properties": {},
   "additionalProperties": false,
   "jupyter.lab.toolbars": {
+    "ViewOnlyNotebook": [
+      {
+        "name": "createCopy",
+        "caption": "Create a new editable copy of this notebook",
+        "rank": 30
+      },
+      { "name": "spacer", "type": "spacer", "rank": 32 },
+      {
+        "name": "share",
+        "rank": 35
+      },
+      {
+        "name": "downloadDropdown",
+        "rank": 36
+      }
+    ],
     "Notebook": [
       {
         "name": "save",
-        "command": "",
-        "disabled": true,
         "rank": 10
       },
       {
@@ -106,5 +119,13 @@
         "disabled": true
       }
     ]
+  },
+  "jupyter.lab.transform": true,
+  "properties": {
+    "toolbar": {
+      "title": "View-only notebook panel toolbar items",
+      "type": "array",
+      "default": []
+    }
   }
 }

setup.py

@@ -4,4 +4,5 @@ export namespace Commands {
   export const downloadNotebookCommand = 'jupytereverywhere:download-notebook';
   export const downloadPDFCommand = 'jupytereverywhere:download-pdf';
   export const shareNotebookCommand = 'jupytereverywhere:share-notebook';
+  export const createCopyNotebookCommand = 'jupytereverywhere:create-copy-notebook';
 }

src/commands.ts

@@ -25,6 +25,8 @@ import refreshSvg from '../style/icons/refresh.svg';
 import stopSvg from '../style/icons/stop.svg';
 import fastForwardSvg from '../style/icons/fast-forward.svg';
 import downloadCaretSvg from '../style/icons/download-caret.svg';
+import imageIconSvg from '../style/icons/image-icon.svg';
+import fileIconSvg from '../style/icons/file-icon.svg';
 
 export namespace EverywhereIcons {
   // Overwrite Jupyter default icons
@@ -64,7 +66,7 @@ export namespace EverywhereIcons {
     name: fastForwardIcon.name,
     svgstr: fastForwardSvg
   });
-  // Addd custom icons
+  // Add custom icons
   export const folderSidebar = new LabIcon({
     name: 'everywhere:folder-sidebar',
     svgstr: folderSidebarSvg
@@ -85,4 +87,12 @@ export namespace EverywhereIcons {
     name: 'everywhere:download-caret',
     svgstr: downloadCaretSvg
   });
+  export const imageIcon = new LabIcon({
+    name: 'everywhere:image-icon',
+    svgstr: imageIconSvg
+  });
+  export const fileIcon = new LabIcon({
+    name: 'everywhere:file-icon',
+    svgstr: fileIconSvg
+  });
 }