@canopy-iiif/app 1.8.0 → 1.8.2

package/lib/build/dev.js

@@ -23,6 +23,11 @@ const APP_COMPONENTS_DIR = path.join(process.cwd(), "app", "components");
 
 function resolveTailwindCli() {
   const root = process.cwd();
+  const binName = process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss";
+  const bin = path.join(root, "node_modules", ".bin", binName);
+  if (fs.existsSync(bin)) {
+    return { cmd: bin, args: [] };
+  }
   let cliEntry = null;
   try {
     cliEntry = require.resolve("@tailwindcss/cli/dist/index.mjs", { paths: [root] });
@@ -32,14 +37,7 @@ function resolveTailwindCli() {
   if (cliEntry) {
     return { cmd: process.execPath || "node", args: [cliEntry] };
   }
-  const bin = path.join(
-    root,
-    "node_modules",
-    ".bin",
-    process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss"
-  );
-  if (fs.existsSync(bin)) return { cmd: bin, args: [] };
-  return { cmd: "tailwindcss", args: [] };
+  return null;
 }
 const PORT = Number(process.env.PORT || 5001);
 const BUILD_MODULE_PATH = path.resolve(__dirname, "build.js");
@@ -965,7 +963,7 @@ async function dev() {
     const cli = resolveTailwindCli();
     if (!cli) {
       throw new Error(
-        "[tailwind] Tailwind CLI not found. Install the 'tailwindcss' package in the workspace."
+        "[tailwind] Tailwind CLI not found. Install '@tailwindcss/cli' (and tailwindcss) in this workspace."
       );
     }
 
@@ -978,6 +976,46 @@ async function dev() {
       }
     };
 
+    const tailwindCmd = (args = []) => {
+      const parts = [cli.cmd];
+      if (Array.isArray(cli.args) && cli.args.length) parts.push(...cli.args);
+      if (Array.isArray(args) && args.length) parts.push(...args);
+      return parts.filter(Boolean).join(" ");
+    };
+
+    const formatSpawnOutput = (result) => {
+      if (!result) return "";
+      const messages = [];
+      if (result.stderr && result.stderr.length) {
+        const text = String(result.stderr).trim();
+        if (text) messages.push(`stderr: ${text}`);
+      }
+      if (result.stdout && result.stdout.length) {
+        const text = String(result.stdout).trim();
+        if (text) messages.push(`stdout: ${text}`);
+      }
+      return messages.join("\n");
+    };
+
+    const tailwindFailureMessage = (label, result, args) => {
+      const details = [
+        label,
+        `  input: ${prettyPath(inputCss)}`,
+        `  config: ${configPath ? prettyPath(configPath) : "<unknown>"}`,
+        `  cli: ${tailwindCmd(args)}`,
+      ];
+      const extra = formatSpawnOutput(result);
+      if (extra) {
+        details.push(
+          extra
+            .split(/\r?\n/)
+            .map((line) => `  ${line}`)
+            .join("\n")
+        );
+      }
+      return details.join("\n");
+    };
+
     const baseArgs = [
       "-i",
       inputCss,
@@ -993,10 +1031,13 @@ async function dev() {
       env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: "1" },
     });
     if (!initial || initial.status !== 0) {
-      if (initial && initial.stderr) {
-        try { process.stderr.write(initial.stderr); } catch (_) {}
-      }
-      throw new Error("[tailwind] Initial Tailwind build failed.");
+      throw new Error(
+        tailwindFailureMessage(
+          "[tailwind] Initial Tailwind build failed.",
+          initial,
+          baseArgs
+        )
+      );
     }
     injectThemeTokens(outputCss);
     stripTailwindThemeLayer(outputCss);
@@ -1047,10 +1088,13 @@ async function dev() {
         env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: "1" },
       });
       if (!res || res.status !== 0) {
-        if (res && res.stderr) {
-          try { process.stderr.write(res.stderr); } catch (_) {}
-        }
-        throw new Error("[tailwind] On-demand Tailwind compile failed.");
+        throw new Error(
+          tailwindFailureMessage(
+            "[tailwind] On-demand Tailwind compile failed.",
+            res,
+            baseArgs
+          )
+        );
       }
       injectThemeTokens(outputCss);
       stripTailwindThemeLayer(outputCss);

package/lib/build/styles.js

@@ -9,6 +9,11 @@ const {
 
 function resolveTailwindCli() {
   const root = process.cwd();
+  const binName = process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss";
+  const localBin = path.join(root, "node_modules", ".bin", binName);
+  if (fs.existsSync(localBin)) {
+    return {cmd: localBin, args: []};
+  }
   let cliEntry = null;
   try {
     cliEntry = require.resolve("@tailwindcss/cli/dist/index.mjs", { paths: [root] });
@@ -18,14 +23,7 @@ function resolveTailwindCli() {
   if (cliEntry) {
     return {cmd: process.execPath || "node", args: [cliEntry]};
   }
-  const localBin = path.join(
-    root,
-    "node_modules",
-    ".bin",
-    process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss"
-  );
-  if (fs.existsSync(localBin)) return {cmd: localBin, args: []};
-  return {cmd: "tailwindcss", args: []};
+  return null;
 }
 
 function injectThemeTokens(targetPath) {

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.8.0",
+  "version": "1.8.2",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",