@canopy-iiif/app 1.8.5 → 1.8.7

package/lib/build/dev.js

@@ -23,11 +23,6 @@ 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] });
@@ -37,6 +32,9 @@ function resolveTailwindCli() {
   if (cliEntry) {
     return { cmd: process.execPath || "node", args: [cliEntry] };
   }
+  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: [] };
   return null;
 }
 const PORT = Number(process.env.PORT || 5001);
@@ -976,13 +974,16 @@ 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 tailwindArgVector = (args = []) => {
+      const vector = [];
+      if (cli.cmd) vector.push(cli.cmd);
+      if (Array.isArray(cli.args) && cli.args.length) vector.push(...cli.args);
+      if (Array.isArray(args) && args.length) vector.push(...args);
+      return vector;
     };
 
+    const tailwindCmd = (args = []) => tailwindArgVector(args).join(" ");
+
     const formatSpawnOutput = (result) => {
       if (!result) return "";
       const messages = [];
@@ -1004,6 +1005,28 @@ async function dev() {
         `  config: ${configPath ? prettyPath(configPath) : "<unknown>"}`,
         `  cli: ${tailwindCmd(args)}`,
       ];
+      if (result && typeof result.status === "number") {
+        details.push(`  exitCode: ${result.status}`);
+      }
+      if (result && result.error) {
+        const err = result.error;
+        details.push(
+          `  spawnError: ${err && err.message ? err.message : String(err)}`
+        );
+      }
+      if (result && result.signal) {
+        details.push(`  signal: ${result.signal}`);
+      }
+      const extraArgs = tailwindArgVector(args)
+        .map((part) => {
+          if (!part || typeof part !== "string") return part;
+          if (part.includes("\n")) return part.replace(/\n/g, "\\n");
+          return part;
+        })
+        .join(" ");
+      if (extraArgs && extraArgs !== tailwindCmd(args)) {
+        details.push(`  cliRaw: ${extraArgs}`);
+      }
       const extra = formatSpawnOutput(result);
       if (extra) {
         details.push(
@@ -1026,10 +1049,12 @@ async function dev() {
       "--minify",
     ];
 
-    const initial = spawnSync(cli.cmd, [...cli.args, ...baseArgs], {
+    const spawnOptions = {
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: "1" },
-    });
+    };
+
+    const initial = spawnSync(cli.cmd, [...cli.args, ...baseArgs], spawnOptions);
     if (!initial || initial.status !== 0) {
       throw new Error(
         tailwindFailureMessage(
@@ -1083,10 +1108,7 @@ async function dev() {
     }
 
     function compileTailwindOnce() {
-      const res = spawnSync(cli.cmd, [...cli.args, ...baseArgs], {
-        stdio: ["ignore", "pipe", "pipe"],
-        env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: "1" },
-      });
+      const res = spawnSync(cli.cmd, [...cli.args, ...baseArgs], spawnOptions);
       if (!res || res.status !== 0) {
         throw new Error(
           tailwindFailureMessage(

package/lib/build/styles.js

@@ -9,11 +9,6 @@ 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] });
@@ -23,6 +18,9 @@ function resolveTailwindCli() {
   if (cliEntry) {
     return {cmd: process.execPath || "node", args: [cliEntry]};
   }
+  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: []};
   return null;
 }
 

package/package.json

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