Merge remote-tracking branch 'origin/master' into i18n

Author: haraldschilly

src/compute/compute/package.json

@@ -42,7 +42,7 @@
     "cookie": "^0.5.0",
     "debug": "^4.3.2",
     "websocketfs": "^0.17.2",
-    "ws": "^8.13.0"
+    "ws": "^8.18.0"
   },
   "homepage": "https://github.com/sagemathinc/cocalc/tree/master/src/packages/compute",
   "repository": {

src/compute/pnpm-lock.yaml

@@ -34,7 +34,7 @@
     "@cocalc/util": "workspace:*",
     "@types/debug": "^4.1.12",
     "awaiting": "^3.0.0",
-    "chokidar": "^3.5.3",
+    "chokidar": "^3.6.0",
     "debug": "^4.3.2",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",

src/packages/backend/package.json

@@ -4,9 +4,10 @@
  */
 
 import { CSSProperties } from "react";
+import { load } from "cheerio";
+
 import { register, SlateElement } from "../register";
 import { dict } from "@cocalc/util/misc";
-import $ from "cheerio";
 
 export const STYLE = {
   cursor: "pointer",
@@ -42,6 +43,7 @@ register({
 
   toSlate: ({ children, state, token }) => {
     const attrs = dict(state.attrs as any);
+    const $ = load("");
     const x = $(token.content);
     const summary = x.find("summary").text().trim();
     return {

src/packages/frontend/editors/slate/elements/details/index.tsx

@@ -3,10 +3,11 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
-import { register, SlateElement } from "../register";
-import { dict } from "@cocalc/util/misc";
-import $ from "cheerio";
+import { load } from "cheerio";
+
 import { useFileContext } from "@cocalc/frontend/lib/file-context";
+import { dict } from "@cocalc/util/misc";
+import { register, SlateElement } from "../register";
 
 export interface Image extends SlateElement {
   type: "image";
@@ -28,6 +29,7 @@ export function toSlate({ type, children, token }) {
       // token.content will be a string like this:
       //    <img src='https://wstein.org/bella-and-william.jpg' width=200px title='my pup' />
       // easiest way to parse this is with jquery style api but via cheerio (not by hand).
+      const $ = load("");
       const elt = $(token.content);
       const node = {
         type: "image",

src/packages/frontend/editors/slate/elements/image/index.tsx

@@ -1,6 +1,7 @@
-import $ from "cheerio";
+import { load } from "cheerio";
 
 export function getAttrs(content: string, attrs: string[]): [string, string][] {
+  const $ = load("");
   const x = $(content);
   const v: [string, string][] = [];
   for (const attr of attrs) {

src/packages/frontend/editors/slate/markdown-to-slate/util.ts

@@ -14,7 +14,8 @@ share server.
 TODO: this is NOT used anywhere yet.
 */
 
-import $ from "cheerio";
+import { load } from "cheerio";
+
 import processLinks from "./generic";
 
 interface Options {
@@ -25,8 +26,9 @@ interface Options {
 
 export default function processLinksString(
   html: string,
-  opts: Options
+  opts: Options,
 ): string {
+  const $ = load("");
   const elt = $(`<div>${html}</div>`);
   processLinks(elt, { ...opts, $ });
   return elt.html() ?? "";

src/packages/frontend/misc/process-links/string.ts

@@ -73,7 +73,7 @@
     "bootstrap": "=3.4.1",
     "bootstrap-colorpicker": "^2.5.3",
     "cat-names": "^3.1.0",
-    "cheerio": "^1.0.0-rc.10",
+    "cheerio": "1.0.0-rc.10",
     "codemirror": "^5.65.16",
     "color-map": "^2.0.6",
     "copy-to-clipboard": "^3.0.8",
@@ -151,7 +151,6 @@
     "react-redux": "^8.0.5",
     "react-timeago": "^7.2.0",
     "react-virtuoso": "^4.9.0",
-    "requirejs": "^2.3.6",
     "resize-observer-polyfill": "^1.5.1",
     "sha1": "^1.1.1",
     "shallowequal": "^1.1.0",
@@ -187,9 +186,9 @@
     "@types/md5": "^2.2.0",
     "@types/mocha": "^10.0.0",
     "@types/pica": "^5.1.3",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.0.28",
     "@types/react-bootstrap": "^0.32.21",
-    "@types/react-dom": "^18.0.10",
+    "@types/react-dom": "^18.0.11",
     "@types/react-image-crop": "^8.1.3",
     "@types/react-redux": "^7.1.25",
     "coffeescript": "^2.5.1",

src/packages/frontend/package.json

@@ -23,7 +23,7 @@
     "@types/express": "^4.17.13",
     "@types/formidable": "^3.4.5",
     "@types/primus": "^7.3.6",
-    "@types/react": "^18.0.26",
+    "@types/react": "^18.0.28",
     "@types/uuid": "^8.3.1",
     "async": "^1.5.2",
     "awaiting": "^3.0.0",
@@ -70,14 +70,14 @@
     "validator": "^13.6.0",
     "webpack-dev-middleware": "^6.1.2",
     "webpack-hot-middleware": "^2.25.4",
-    "ws": "^8.13.0"
+    "ws": "^8.18.0"
   },
   "devDependenicesNotes": "For license and size reasons, we make @cocalc/crm a dev dependency so it is NOT installed unless explicitly installed as a separate step.",
   "devDependencies": {
     "@types/http-proxy": "^1.17.9",
     "@types/node": "^18.16.14",
     "@types/passport": "^1.0.9",
-    "@types/react-dom": "^18.0.10",
+    "@types/react-dom": "^18.0.11",
     "coffee-coverage": "^3.0.1",
     "coffeescript": "^2.5.1",
     "expect": "^26.6.2",

src/packages/hub/package.json

@@ -40,6 +40,7 @@ import {
 import { SyncDB } from "@cocalc/sync/editor/db/sync";
 import type { Client } from "@cocalc/sync/client/types";
 import { once } from "@cocalc/util/async-utils";
+import latexEnvs from "@cocalc/util/latex-envs";
 
 const { close, required, defaults } = misc;
 
@@ -2729,6 +2730,8 @@ export abstract class JupyterActions extends Actions<JupyterStoreState> {
   };
 
   processRenderedMarkdown = ({ value, id }: { value: string; id: string }) => {
+    value = latexEnvs(value);
+
     const labelRegExp = /\s*\\label\{.*?\}\s*/g;
     if (this.labels == null) {
       const labels = (this.labels = {});
@@ -2778,94 +2781,10 @@ export abstract class JupyterActions extends Actions<JupyterStoreState> {
       return `[${tag}](#id=${id})`;
     });
 
-    const figures = transformFigures(noRefs);
-
-    return figures;
+    return noRefs;
   };
 }
 
-/*
-Turn this:
-
----
-
-...
-
-\begin{figure}
-\centering
-\centerline{\includegraphics[width=WIDTH]{URL}}
-\caption{CAPTION}
-\end{figure}
-
-...
-
----
-
-into this:
-
----
-
-...
-
-<div style="text-align:center"><img src="URL" style="width:WIDTH"/></div>
-\begin{equation}
-\text{CAPTION}
-\end{equation}
-
-...
-
----
-
-There can be lots of figures.
-
-*/
-
-function transformFigures(content: string): string {
-  while (true) {
-    const i = content.indexOf("\\begin{figure}");
-    if (i == -1) {
-      return content;
-    }
-    const j = content.indexOf("\\end{figure}");
-    if (j == -1) {
-      return content;
-    }
-    const k = content.indexOf("\\includegraphics");
-    if (k == -1) {
-      return content;
-    }
-    const c = content.indexOf("\\caption{");
-    if (c == -1) {
-      return content;
-    }
-    const c2 = content.lastIndexOf("}", j);
-    if (c2 == -1) {
-      return content;
-    }
-
-    const w = content.indexOf("width=");
-    const w2 = content.indexOf("{", k);
-    const w3 = content.indexOf("}", k);
-    if (w2 == -1 || w3 == -1) {
-      return content;
-    }
-    let style = "";
-    if (w != -1) {
-      style = `width:${content.slice(w + "width=".length, w2 - 1)}`;
-    }
-    const url = content.slice(w2 + 1, w3);
-    const caption = content.slice(c + "\\caption{".length, c2);
-
-    const md = `\n\n<div style="text-align:center"><img src="${url}" style="${style}"/></div>\n\n
-\\begin{equation}
-\\text{${caption}}
-\\end{equation}\n\n`;
-
-    content =
-      content.slice(0, i) + md + content.slice(j + "\\end{figure}".length);
-  }
-}
-
 function extractLabel(content: string): string {
   const i = content.indexOf("{");
   const j = content.lastIndexOf("}");