From c26e2be27f3d56c45a6b10ce59ed41e0f9210a91 Mon Sep 17 00:00:00 2001 From: Sam Ritchie Date: Sat, 1 Jun 2024 09:11:01 -0600 Subject: [PATCH] Upgrade to mafs 0.18.8 (#19) --- CHANGELOG.md | 5 ++ dev/mafs/notebook.clj | 4 +- dev/user.clj | 4 +- package-lock.json | 132 +++++++---------------------- package.json | 2 +- resources/mafs/clerk/dev/user.tmpl | 4 +- src/deps.cljs | 2 +- 7 files changed, 45 insertions(+), 108 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0164f..448fb1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [unreleased] + - #19 upgrades Mafs to 0.18.8 (see the [Mafs CHANGELOG entry + here](https://github.com/stevenpetryk/mafs/blob/main/CHANGELOG.md#0188)). + + - #18 fixes a documentation issue with the `Mafs` component. + ## [0.3.0] - #17: diff --git a/dev/mafs/notebook.clj b/dev/mafs/notebook.clj index deb057e..7c3ab25 100644 --- a/dev/mafs/notebook.clj +++ b/dev/mafs/notebook.clj @@ -106,9 +106,9 @@ ;; ```clj ;; (mentat.clerk-utils.css/set-css! -;; "https://unpkg.com/mafs@0.17.0/core.css" +;; "https://unpkg.com/mafs@0.18.8/core.css" ;; "https://unpkg.com/computer-modern@0.1.2/cmu-serif.css" -;; "https://unpkg.com/mafs@0.17.0/font.css") +;; "https://unpkg.com/mafs@0.18.8/font.css") ;; ``` ;; ;; Otherwise find some way to load these CSS files in your project's header. diff --git a/dev/user.clj b/dev/user.clj index 0e3d338..7eafe42 100644 --- a/dev/user.clj +++ b/dev/user.clj @@ -4,8 +4,8 @@ (css/set-css! "https://unpkg.com/computer-modern@0.1.2/cmu-serif.css" - "https://unpkg.com/mafs@0.17.0/core.css" - "https://unpkg.com/mafs@0.17.0/font.css") + "https://unpkg.com/mafs@0.18.8/core.css" + "https://unpkg.com/mafs@0.18.8/font.css") (def index "dev/mafs/notebook.clj") diff --git a/package-lock.json b/package-lock.json index e48e70c..8096b53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "d3-require": "1.3.0", "framer-motion": "6.5.1", "katex": "0.12.0", - "mafs": "0.17.0", + "mafs": "0.18.8", "markdown-it": "12.3.2", "markdown-it-block-image": "0.0.3", "markdown-it-footnote": "3.0.3", @@ -336,54 +336,17 @@ "@lezer/lr": "^1.0.0" } }, - "node_modules/@react-hook/latest": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@react-hook/latest/-/latest-1.0.3.tgz", - "integrity": "sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==", - "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/@react-hook/passive-layout-effect": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@react-hook/passive-layout-effect/-/passive-layout-effect-1.2.1.tgz", - "integrity": "sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg==", - "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/@react-hook/resize-observer": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@react-hook/resize-observer/-/resize-observer-1.2.6.tgz", - "integrity": "sha512-DlBXtLSW0DqYYTW3Ft1/GQFZlTdKY5VAFIC4+km6IK5NiPPDFchGbEJm1j6pSgMqPRHbUQgHJX7RaR76ic1LWA==", - "dependencies": { - "@juggle/resize-observer": "^3.3.1", - "@react-hook/latest": "^1.0.2", - "@react-hook/passive-layout-effect": "^1.2.0" - }, - "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/@swc/helpers": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@use-gesture/core": { - "version": "10.2.24", - "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.24.tgz", - "integrity": "sha512-ZL7F9mgOn3Qlnp6QLI9jaOfcvqrx6JPE/BkdVSd8imveaFTm/a3udoO6f5Us/1XtqnL4347PsIiK6AtCvMHk2Q==" + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz", + "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw==" }, "node_modules/@use-gesture/react": { - "version": "10.2.24", - "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.24.tgz", - "integrity": "sha512-rAZ8Nnpu1g4eFzqCPlaq+TppJpMy0dTpYOQx5KpfoBF4P3aWnCqwj7eKxcmdIb1NJKpIJj50DPugUH4mq5cpBg==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz", + "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==", "dependencies": { - "@use-gesture/core": "10.2.24" + "@use-gesture/core": "10.3.1" }, "peerDependencies": { "react": ">= 16.8.0" @@ -1120,21 +1083,22 @@ } }, "node_modules/mafs": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/mafs/-/mafs-0.17.0.tgz", - "integrity": "sha512-iIoYBHpIXoIi7jxWkaBSGCpPf0HBdpU05gKLycbtqdpKudq39Q+xain4fwaecB7Uv69n+IXkkSkEnewdam3xyw==", + "version": "0.18.8", + "resolved": "https://registry.npmjs.org/mafs/-/mafs-0.18.8.tgz", + "integrity": "sha512-dCVdZkQzTyBpr1eb1ZwEaE2anGu9rCanf1PYiRJcKWeyr08NCzhnVI3VV3Nd5uHJJzo8GFMy10OQRfeSrofrpw==", "dependencies": { - "@react-hook/resize-observer": "^1.2.6", - "@swc/helpers": "^0.4.14", - "@use-gesture/react": "^10.2.23", + "@use-gesture/react": "^10.2.27", "computer-modern": "^0.1.2", - "katex": "^0.16.4", + "katex": "^0.16", "tiny-invariant": "^1.3.1", - "use-resize-observer": "^9.0.0" + "use-resize-observer": "^9" + }, + "engines": { + "node": ">=20" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "react": ">=18", + "react-dom": ">=18" } }, "node_modules/mafs/node_modules/commander": { @@ -2197,47 +2161,17 @@ "@lezer/lr": "^1.0.0" } }, - "@react-hook/latest": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@react-hook/latest/-/latest-1.0.3.tgz", - "integrity": "sha512-dy6duzl+JnAZcDbNTfmaP3xHiKtbXYOaz3G51MGVljh548Y8MWzTr+PHLOfvpypEVW9zwvl+VyKjbWKEVbV1Rg==", - "requires": {} - }, - "@react-hook/passive-layout-effect": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@react-hook/passive-layout-effect/-/passive-layout-effect-1.2.1.tgz", - "integrity": "sha512-IwEphTD75liO8g+6taS+4oqz+nnroocNfWVHWz7j+N+ZO2vYrc6PV1q7GQhuahL0IOR7JccFTsFKQ/mb6iZWAg==", - "requires": {} - }, - "@react-hook/resize-observer": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@react-hook/resize-observer/-/resize-observer-1.2.6.tgz", - "integrity": "sha512-DlBXtLSW0DqYYTW3Ft1/GQFZlTdKY5VAFIC4+km6IK5NiPPDFchGbEJm1j6pSgMqPRHbUQgHJX7RaR76ic1LWA==", - "requires": { - "@juggle/resize-observer": "^3.3.1", - "@react-hook/latest": "^1.0.2", - "@react-hook/passive-layout-effect": "^1.2.0" - } - }, - "@swc/helpers": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", - "requires": { - "tslib": "^2.4.0" - } - }, "@use-gesture/core": { - "version": "10.2.24", - "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.24.tgz", - "integrity": "sha512-ZL7F9mgOn3Qlnp6QLI9jaOfcvqrx6JPE/BkdVSd8imveaFTm/a3udoO6f5Us/1XtqnL4347PsIiK6AtCvMHk2Q==" + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.3.1.tgz", + "integrity": "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw==" }, "@use-gesture/react": { - "version": "10.2.24", - "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.24.tgz", - "integrity": "sha512-rAZ8Nnpu1g4eFzqCPlaq+TppJpMy0dTpYOQx5KpfoBF4P3aWnCqwj7eKxcmdIb1NJKpIJj50DPugUH4mq5cpBg==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.3.1.tgz", + "integrity": "sha512-Yy19y6O2GJq8f7CHf7L0nxL8bf4PZCPaVOCgJrusOeFHY1LvHgYXnmnXg6N5iwAnbgbZCDjo60SiM6IPJi9C5g==", "requires": { - "@use-gesture/core": "10.2.24" + "@use-gesture/core": "10.3.1" } }, "argparse": { @@ -2849,17 +2783,15 @@ } }, "mafs": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/mafs/-/mafs-0.17.0.tgz", - "integrity": "sha512-iIoYBHpIXoIi7jxWkaBSGCpPf0HBdpU05gKLycbtqdpKudq39Q+xain4fwaecB7Uv69n+IXkkSkEnewdam3xyw==", + "version": "0.18.8", + "resolved": "https://registry.npmjs.org/mafs/-/mafs-0.18.8.tgz", + "integrity": "sha512-dCVdZkQzTyBpr1eb1ZwEaE2anGu9rCanf1PYiRJcKWeyr08NCzhnVI3VV3Nd5uHJJzo8GFMy10OQRfeSrofrpw==", "requires": { - "@react-hook/resize-observer": "^1.2.6", - "@swc/helpers": "^0.4.14", - "@use-gesture/react": "^10.2.23", + "@use-gesture/react": "^10.2.27", "computer-modern": "^0.1.2", - "katex": "^0.16.4", + "katex": "^0.16", "tiny-invariant": "^1.3.1", - "use-resize-observer": "^9.0.0" + "use-resize-observer": "^9" }, "dependencies": { "commander": { diff --git a/package.json b/package.json index 95131d5..8f552bc 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "d3-require": "1.3.0", "framer-motion": "6.5.1", "katex": "0.12.0", - "mafs": "0.17.0", + "mafs": "0.18.8", "markdown-it": "12.3.2", "markdown-it-block-image": "0.0.3", "markdown-it-footnote": "3.0.3", diff --git a/resources/mafs/clerk/dev/user.tmpl b/resources/mafs/clerk/dev/user.tmpl index 9ca3980..6201f2d 100644 --- a/resources/mafs/clerk/dev/user.tmpl +++ b/resources/mafs/clerk/dev/user.tmpl @@ -5,8 +5,8 @@ (css/set-css! "https://unpkg.com/computer-modern@0.1.2/cmu-serif.css" - "https://unpkg.com/mafs@0.17.0/core.css" - "https://unpkg.com/mafs@0.17.0/font.css") + "https://unpkg.com/mafs@0.18.8/core.css" + "https://unpkg.com/mafs@0.18.8/font.css") (def index "notebooks/{{top/file}}/{{main/file}}.clj") diff --git a/src/deps.cljs b/src/deps.cljs index a635940..feffc57 100644 --- a/src/deps.cljs +++ b/src/deps.cljs @@ -1,2 +1,2 @@ {:npm-deps - {"mafs" "^0.17.0"}} + {"mafs" "^0.18.8"}}