@canopy-iiif/app 0.12.6 → 0.12.7

package/lib/AGENTS.md

@@ -65,6 +65,7 @@ Logbook
 - 2025-09-27 / chatgpt: Documented Tailwind token flow in `app/styles/tailwind.config.mts`, compiled UI Sass variables during config load, and exposed `stylesheetHref`/`Stylesheet` helpers via `@canopy-iiif/app/head` so `_app.mdx` can reference the generated CSS directly.
 - 2025-09-27 / chatgpt: Expanded search indexing to harvest MDX pages (respecting frontmatter/layout types), injected BASE_PATH hydration data into search.html, and reworked `mdx.extractTitle()` so generated records surface real headings instead of `Untitled`.
 - 2025-10-19 / chatgpt: Embedded the Tailwind preset/plugin in a packaged config so dev/build fall back automatically; removed `app/styles/tailwind.config.*` from the default app and switched the public stylesheet to Tailwind’s CSS-first (`@import 'tailwindcss'; @theme { ... }`) workflow.
+- 2025-10-20 / chatgpt: Added `lib/config-path.js` to resolve `canopy.yml` from the workspace root (preferring `options.cwd`, then npm `INIT_CWD`, then `process.cwd()`) and updated all loaders (theme, common base URL, search metadata, IIIF builder, featured manifests) to use it so hosted builds and Tailwind runs inside `node_modules/@canopy-iiif/app/ui` pick up user theme settings.
 
 Verification Commands
 ---------------------

package/lib/build/iiif.js

@@ -14,6 +14,7 @@ const {
   rootRelativeHref,
   canopyBodyClassForType,
 } = require("../common");
+const {resolveCanopyConfigPath} = require("../config-path");
 const mdx = require("./mdx");
 const {log, logLine, logResponse} = require("./log");
 const { getPageContext } = require("../page-context");
@@ -1109,7 +1110,7 @@ async function rebuildManifestIndexFromCache() {
 }
 
 async function loadConfig() {
-  const cfgPath = path.resolve("canopy.yml");
+  const cfgPath = resolveCanopyConfigPath();
   if (!fs.existsSync(cfgPath)) return {};
   const raw = await fsp.readFile(cfgPath, "utf8");
   let cfg = {};

package/lib/common.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const fsp = fs.promises;
 const path = require('path');
+const { resolveCanopyConfigPath } = require('./config-path');
 
 const CONTENT_DIR = path.resolve('content');
 const OUT_DIR = path.resolve('site');
@@ -29,7 +30,7 @@ function resolveThemeAppearance() {
 function readYamlConfigBaseUrl() {
   try {
     const y = require('js-yaml');
-    const p = path.resolve(process.env.CANOPY_CONFIG || 'canopy.yml');
+    const p = resolveCanopyConfigPath();
     if (!fs.existsSync(p)) return '';
     const raw = fs.readFileSync(p, 'utf8');
     const data = y.load(raw) || {};

package/lib/components/featured.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
 const { rootRelativeHref } = require('../common');
+const { resolveCanopyConfigPath } = require('../config-path');
 
 function firstLabelString(label) {
   if (!label) return 'Untitled';
@@ -85,7 +86,7 @@ function findSlugByIdFromDiskSync(nid) {
 function readFeaturedFromCacheSync() {
   try {
     const debug = !!process.env.CANOPY_DEBUG_FEATURED;
-    const cfg = readYaml(path.resolve('canopy.yml')) || {};
+    const cfg = readYaml(resolveCanopyConfigPath()) || {};
     const featured = Array.isArray(cfg && cfg.featured) ? cfg.featured : [];
     if (!featured.length) return [];
     const idx = readJson(path.resolve('.cache/iiif/index.json')) || {};

package/lib/config-path.js

@@ -0,0 +1,28 @@
+const path = require('path');
+
+const DEFAULT_CONFIG_NAME = 'canopy.yml';
+
+function resolveWorkspaceRoot(options = {}) {
+  const rawCwd = options && options.cwd ? String(options.cwd).trim() : '';
+  if (rawCwd) return path.resolve(rawCwd);
+  const initCwd = String(process.env.INIT_CWD || '').trim();
+  if (initCwd) return path.resolve(initCwd);
+  return process.cwd();
+}
+
+function resolveCanopyConfigPath(options = {}) {
+  const root = resolveWorkspaceRoot(options);
+  const explicit = options && options.configPath ? String(options.configPath).trim() : '';
+  if (explicit) {
+    return path.isAbsolute(explicit) ? explicit : path.resolve(root, explicit);
+  }
+  const override = options && options.configFile ? String(options.configFile).trim() : '';
+  const envOverride = String(process.env.CANOPY_CONFIG || '').trim();
+  const fileName = override || envOverride || DEFAULT_CONFIG_NAME;
+  return path.resolve(root, fileName);
+}
+
+module.exports = {
+  resolveWorkspaceRoot,
+  resolveCanopyConfigPath,
+};

package/lib/search/search.js

@@ -12,6 +12,7 @@ const {
   htmlShell,
   canopyBodyClassForType,
 } = require('../common');
+const { resolveCanopyConfigPath } = require('../config-path');
 
 const SEARCH_TEMPLATES_ALIAS = '__CANOPY_SEARCH_RESULT_TEMPLATES__';
 const SEARCH_TEMPLATES_CACHE_DIR = path.resolve('.cache/search');
@@ -444,10 +445,9 @@ async function writeSearchIndex(records) {
     let resultsConfigEntries = [];
     try {
       const yaml = require('js-yaml');
-      const common = require('../common');
-      const cfgPath = common.path.resolve(process.env.CANOPY_CONFIG || 'canopy.yml');
-      if (common.fs.existsSync(cfgPath)) {
-        const raw = common.fs.readFileSync(cfgPath, 'utf8');
+      const cfgPath = resolveCanopyConfigPath();
+      if (fs.existsSync(cfgPath)) {
+        const raw = fs.readFileSync(cfgPath, 'utf8');
         const data = yaml.load(raw) || {};
         const searchCfg = data && data.search ? data.search : {};
         const tabs = searchCfg && searchCfg.tabs ? searchCfg.tabs : {};

package/package.json

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

package/ui/theme.js

@@ -1,7 +1,7 @@
 const fs = require("fs");
-const path = require("path");
 const yaml = require("js-yaml");
 const radixColors = require("@radix-ui/colors");
+const {resolveCanopyConfigPath} = require("../lib/config-path");
 
 const DEFAULT_ACCENT = "indigo";
 const DEFAULT_GRAY = "slate";
@@ -205,10 +205,7 @@ function buildSassConfig(brandScale, grayScale) {
 }
 
 function loadCanopyTheme(options = {}) {
-  const cwd = options.cwd || process.cwd();
-  const cfgPath =
-    options.configPath ||
-    path.resolve(cwd, process.env.CANOPY_CONFIG || "canopy.yml");
+  const cfgPath = resolveCanopyConfigPath(options);
   const cfg = readYamlConfig(cfgPath);
   const theme = (cfg && cfg.theme) || {};
   const accentRequested = theme && theme.accentColor;