🔨 downgrade dependencies to avoid ESM for now

Also fixed a few other issues

adminSiteClient/ChartEditorPage.tsx

@@ -10,7 +10,6 @@ import {
     IReactionDisposer,
 } from "mobx"
 import { Prompt, Redirect } from "react-router-dom"
-import { extractDetailsFromSyntax } from "@ourworldindata/components"
 import {
     Bounds,
     capitalize,
@@ -19,6 +18,7 @@ import {
     get,
     set,
     groupBy,
+    extractDetailsFromSyntax,
 } from "@ourworldindata/utils"
 import { Grapher, Topic, GrapherInterface } from "@ourworldindata/grapher"
 import { Admin } from "./Admin.js"

baker/SiteBaker.tsx

@@ -45,8 +45,9 @@ import {
     OwidGdocPublished,
     clone,
     LinkedChart,
+    extractDetailsFromSyntax,
 } from "@ourworldindata/utils"
-import { extractDetailsFromSyntax } from "@ourworldindata/components"
+
 import { execWrapper } from "../db/execWrapper.js"
 import { countryProfileSpecs } from "../site/countryProfileProjects.js"
 import {

package.json

@@ -82,7 +82,7 @@
         "@types/jsonwebtoken": "^9.0.0",
         "@types/lodash": "^4.14.185",
         "@types/md5": "^2.3.2",
-        "@types/mdast": "^4.0.2",
+        "@types/mdast": "^3.0",
         "@types/minimist": "^1.2.2",
         "@types/mousetrap": "^1.6.9",
         "@types/mysql": "^2.15.21",
@@ -155,7 +155,7 @@
         "lodash": "^4.17.20",
         "mathjax-full": "^3.1.0",
         "md5": "^2.3.0",
-        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-from-markdown": "^0.8.0",
         "minimist": "^1.2.6",
         "mobx": "^5.15.7",
         "mobx-formatters": "^1.0.2",

packages/@ourworldindata/components/src/MarkdownTextWrap/MarkdownTextWrap.tsx

@@ -12,8 +12,8 @@ import {
     FontFamily,
 } from "@ourworldindata/utils"
 import { TextWrap } from "../TextWrap/TextWrap.js"
-import { fromMarkdown } from "mdast-util-from-markdown"
-import { Root, Node, RootContentMap } from "mdast"
+import fromMarkdown from "mdast-util-from-markdown"
+import { Root, Content } from "mdast"
 import { match } from "ts-pattern"
 
 const SUPERSCRIPT_NUMERALS = {
@@ -749,9 +749,9 @@ function convertMarkdownRootToIRTokens(node: Root): IRToken[] {
     return node.children.flatMap(convertMarkdownNodeToIRTokens)
 }
 
-function convertMarkdownNodeToIRTokens(
-    node: RootContentMap[keyof RootContentMap]
-): IRToken[] {
+// When using mdast types version 4 this should be typed as:
+// node: RootContentMap[keyof RootContentMap]
+function convertMarkdownNodeToIRTokens(node: Content): IRToken[] {
     const converted = match(node)
         .with(
             {
@@ -970,6 +970,14 @@ function convertMarkdownNodeToIRTokens(
                 return [new IRText(item.value)]
             }
         )
+        .with(
+            {
+                type: "footnote",
+            },
+            (item) => {
+                return item.children.flatMap(convertMarkdownNodeToIRTokens)
+            }
+        )
         .exhaustive()
     return converted
 }

packages/@ourworldindata/utils/src/Util.ts

@@ -1794,3 +1794,18 @@ export const formatAuthors = ({
 
     return authorsText
 }
+
+/** Works for:
+ * #dod:text
+ * #dod:text-hyphenated
+ * #dod:text_underscored
+ * #dod:text_underscored-and-hyphenated
+ * Duplicated in parser.ts
+ */
+export const detailOnDemandRegex = /#dod:([\w\-_]+)/
+
+export function extractDetailsFromSyntax(str: string): string[] {
+    return [...str.matchAll(new RegExp(detailOnDemandRegex, "g"))].map(
+        ([_, term]) => term
+    )
+}

packages/@ourworldindata/utils/src/index.ts

@@ -410,6 +410,8 @@ export {
     without,
     zip,
     lowercaseObjectKeys,
+    detailOnDemandRegex,
+    extractDetailsFromSyntax,
 } from "./Util.js"
 
 export { isPresent } from "./isPresent.js"
@@ -609,5 +611,4 @@ export {
     IMAGES_DIRECTORY,
     gdocUrlRegex,
     gdocIdRegex,
-    detailOnDemandRegex,
 } from "./GdocsConstants.js"

tsconfig.json

@@ -7,20 +7,47 @@
     },
     "files": [],
     "references": [
-        { "path": "./gridLang" },
-        { "path": "./gitCms" },
-        { "path": "./explorer" },
-        { "path": "./datapage" },
-        { "path": "./site" },
-        { "path": "./settings" },
-        { "path": "./adminSiteClient" },
-        { "path": "./adminSiteServer" },
-        { "path": "./devTools/svgTester" },
-        { "path": "./devTools/schema" },
-        { "path": "./devTools/schemaProcessor" },
-        { "path": "./devTools/dodParserTestGenerator" },
-        { "path": "./devTools/uploadWordpressImagesToObjStorage" },
-        { "path": "./devTools/explorerTools" },
-        { "path": "./devTools/regionsUpdater" }
+        {
+            "path": "./gridLang"
+        },
+        {
+            "path": "./gitCms"
+        },
+        {
+            "path": "./explorer"
+        },
+        {
+            "path": "./datapage"
+        },
+        {
+            "path": "./site"
+        },
+        {
+            "path": "./settings"
+        },
+        {
+            "path": "./adminSiteClient"
+        },
+        {
+            "path": "./adminSiteServer"
+        },
+        {
+            "path": "./devTools/svgTester"
+        },
+        {
+            "path": "./devTools/schema"
+        },
+        {
+            "path": "./devTools/schemaProcessor"
+        },
+        {
+            "path": "./devTools/uploadWordpressImagesToObjStorage"
+        },
+        {
+            "path": "./devTools/explorerTools"
+        },
+        {
+            "path": "./devTools/regionsUpdater"
+        }
     ]
 }