@canopy-iiif/app 1.7.0 → 1.8.1

package/lib/build/dev.js

@@ -22,14 +22,24 @@ const {
 const APP_COMPONENTS_DIR = path.join(process.cwd(), "app", "components");
 
 function resolveTailwindCli() {
+  const root = process.cwd();
+  let cliEntry = null;
+  try {
+    cliEntry = require.resolve("@tailwindcss/cli/dist/index.mjs", { paths: [root] });
+  } catch (_) {
+    cliEntry = null;
+  }
+  if (cliEntry) {
+    return { cmd: process.execPath || "node", args: [cliEntry] };
+  }
   const bin = path.join(
-    process.cwd(),
+    root,
     "node_modules",
     ".bin",
     process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss"
   );
   if (fs.existsSync(bin)) return { cmd: bin, args: [] };
-  return { cmd: 'tailwindcss', args: [] };
+  return { cmd: "tailwindcss", args: [] };
 }
 const PORT = Number(process.env.PORT || 5001);
 const BUILD_MODULE_PATH = path.resolve(__dirname, "build.js");

package/lib/build/styles.js

@@ -8,8 +8,18 @@ const {
 } = require("../common");
 
 function resolveTailwindCli() {
+  const root = process.cwd();
+  let cliEntry = null;
+  try {
+    cliEntry = require.resolve("@tailwindcss/cli/dist/index.mjs", { paths: [root] });
+  } catch (_) {
+    cliEntry = null;
+  }
+  if (cliEntry) {
+    return {cmd: process.execPath || "node", args: [cliEntry]};
+  }
   const localBin = path.join(
-    process.cwd(),
+    root,
     "node_modules",
     ".bin",
     process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss"

package/lib/orchestrator.js

@@ -10,6 +10,40 @@ let uiWatcherChild = null;
 
 const workspacePackageJsonPath = path.resolve(process.cwd(), 'packages/app/package.json');
 const hasAppWorkspace = fs.existsSync(workspacePackageJsonPath);
+const workspaceUiDistDir = path.resolve(process.cwd(), 'packages/app/ui/dist');
+const requiredUiArtifacts = [
+  path.join(workspaceUiDistDir, 'server.mjs'),
+  path.join(workspaceUiDistDir, 'index.mjs'),
+];
+
+function prettyPath(p) {
+  try {
+    const rel = path.relative(process.cwd(), p);
+    return rel ? rel.split(path.sep).join('/') : p;
+  } catch (_) {
+    return p;
+  }
+}
+
+function ensureUiDistReady(context = 'build') {
+  if (!hasAppWorkspace) return;
+  const missing = [];
+  for (const file of requiredUiArtifacts) {
+    try {
+      if (!fs.existsSync(file)) missing.push(file);
+    } catch (_) {
+      missing.push(file);
+    }
+  }
+  if (missing.length) {
+    const list = missing.map((file) => prettyPath(file)).join(', ');
+    const label = context ? `${context} ` : '';
+    throw new Error(
+      `@canopy-iiif/app/ui ${label}did not produce required bundle(s): ${list}. ` +
+        'Run "npm -w @canopy-iiif/app run ui:build" and ensure it completes successfully.'
+    );
+  }
+}
 
 function getMode(argv = process.argv.slice(2), env = process.env) {
   const cli = new Set(argv);
@@ -49,6 +83,20 @@ function start(cmd, args, opts = {}) {
   return child;
 }
 
+async function buildUiOnce(label, env = process.env) {
+  if (!hasAppWorkspace) return;
+  const prefix = label || 'Building';
+  log(`${prefix} UI assets (@canopy-iiif/app/ui)`);
+  try {
+    await runOnce('npm', ['-w', '@canopy-iiif/app', 'run', 'ui:build'], { env });
+  } catch (error) {
+    const message = (error && error.message) || String(error);
+    throw new Error(`[canopy] Failed to ${prefix.toLowerCase()} UI assets: ${message}`);
+  }
+  ensureUiDistReady(prefix.toLowerCase());
+  log('UI assets ready');
+}
+
 async function prepareUi(mode, env = process.env) {
   if (!hasAppWorkspace) {
     log('Using bundled UI assets from @canopy-iiif/app (workspace not detected)');
@@ -56,22 +104,11 @@ async function prepareUi(mode, env = process.env) {
   }
 
   if (mode === 'build') {
-    log('Building UI assets (@canopy-iiif/app/ui)');
-    try {
-      await runOnce('npm', ['-w', '@canopy-iiif/app', 'run', 'ui:build'], { env });
-      log('UI assets built');
-    } catch (error) {
-      warn(`UI build skipped: ${(error && error.message) || String(error)}`);
-    }
+    await buildUiOnce('Building', env);
     return null;
   }
 
-  try {
-    log('Prebuilding UI assets (@canopy-iiif/app/ui)');
-    await runOnce('npm', ['-w', '@canopy-iiif/app', 'run', 'ui:build'], { env });
-  } catch (error) {
-    warn(`UI prebuild skipped: ${(error && error.message) || String(error)}`);
-  }
+  await buildUiOnce('Prebuilding', env);
 
   log('Starting UI watcher (@canopy-iiif/app/ui)');
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",

package/ui/dist/index.mjs

@@ -4625,6 +4625,13 @@ function GalleryFigure({ item }) {
     )
   );
 }
+function GalleryContent({ children, flex = false }) {
+  const contentClassName = [
+    "canopy-gallery-item__content",
+    flex ? "canopy-gallery-item__content_flex" : null
+  ].filter(Boolean).join(" ");
+  return /* @__PURE__ */ React40.createElement("div", { className: contentClassName }, children);
+}
 function GalleryItem() {
   return null;
 }
@@ -4690,6 +4697,7 @@ function Gallery({
   ));
 }
 Gallery.Item = GalleryItem;
+Gallery.Content = GalleryContent;
 export {
   ArticleCard,
   Button,
@@ -4703,6 +4711,7 @@ export {
   Container,
   MarkdownTable as DocsMarkdownTable,
   Gallery,
+  GalleryContent,
   GalleryItem,
   GoogleAnalytics,
   Grid,