@canopy-iiif/app 1.8.9 → 1.8.11

package/lib/build/mdx.js

@@ -72,6 +72,15 @@ function buildCompileOptions(overrides = {}) {
 const yaml = require("js-yaml");
 const {getPageContext} = require("../page-context");
 
+const UI_PACKAGE_SPEC = "@canopy-iiif/app/ui";
+const UI_SERVER_SPEC = "@canopy-iiif/app/ui/server";
+const UI_SPEC_REGEX = new RegExp(`(['"])${UI_PACKAGE_SPEC.replace(/\//g, '\\/')}(['"])`, "g");
+
+function rewriteUiImportsForServer(source) {
+  if (typeof source !== "string" || !source.includes(UI_PACKAGE_SPEC)) return source;
+  return source.replace(UI_SPEC_REGEX, ($0, open, close) => `${open}${UI_SERVER_SPEC}${close}`);
+}
+
 function parseFrontmatter(src) {
   let input = String(src || "");
   // Strip UTF-8 BOM if present
@@ -591,6 +600,13 @@ async function compileCustomComponentModule(entryPath, signature) {
       ],
       allowOverwrite: true,
     });
+    try {
+      const built = fs.readFileSync(tmpFile, "utf8");
+      const rewritten = rewriteUiImportsForServer(built);
+      if (rewritten !== built) {
+        fs.writeFileSync(tmpFile, rewritten, "utf8");
+      }
+    } catch (_) {}
   } catch (err) {
     const msg = err && (err.message || err.stack) ? err.message || err.stack : err;
     throw new Error(
@@ -870,7 +886,8 @@ async function loadAppWrapper() {
   const {compile} = await import("@mdx-js/mdx");
   const raw = await fsp.readFile(appPath, "utf8");
   const {content: source} = parseFrontmatter(raw);
-  let code = String(await compile(source, buildCompileOptions()));
+  const safeSource = rewriteUiImportsForServer(source);
+  let code = String(await compile(safeSource, buildCompileOptions()));
   // MDX v3 default export (MDXContent) does not forward external children.
   // When present, expose the underlying layout function as __MDXLayout for wrapping.
   if (
@@ -918,7 +935,8 @@ async function compileMdxFile(filePath, outPath, Layout, extraProps = {}) {
   const {compile} = await import("@mdx-js/mdx");
   const raw = await fsp.readFile(filePath, "utf8");
   const {content: source} = parseFrontmatter(raw);
-  const compiled = await compile(source, buildCompileOptions());
+  const safeSource = rewriteUiImportsForServer(source);
+  const compiled = await compile(safeSource, buildCompileOptions());
   const code = String(compiled);
   ensureDirSync(CACHE_DIR);
   const relCacheName =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.8.9",
+  "version": "1.8.11",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",
@@ -62,11 +62,13 @@
     "access": "public"
   },
   "dependencies": {
+    "@allmaps/leaflet": "^1.0.0-beta.53",
     "@iiif/helpers": "^1.4.0",
     "@mdx-js/mdx": "^3.1.0",
     "@mdx-js/react": "^3.1.0",
     "@radix-ui/colors": "^3.0.0",
     "charm": "^1.0.2",
+    "hast-util-to-html": "^9.0.5",
     "js-yaml": "^4.1.0",
     "leaflet": "^1.9.4",
     "leaflet.markercluster": "^1.5.3",
@@ -75,7 +77,6 @@
     "mdast-util-to-hast": "^13.2.0",
     "mdast-util-to-string": "^4.0.0",
     "micromark-extension-gfm-footnote": "^2.1.0",
-    "hast-util-to-html": "^9.0.5",
     "react-masonry-css": "^1.0.16",
     "remark-gfm": "^4.0.0",
     "sass": "^1.77.0",