@tinacms/cli 2.5.4 → 2.5.6

package/dist/index.js

@@ -2,7 +2,7 @@
 import { Cli, Builtins } from "clipanion";
 
 // package.json
-var version = "2.5.3";
+var version = "2.5.6";
 
 // src/next/commands/dev-command/index.ts
 import path10 from "path";
@@ -816,26 +816,165 @@ var unlinkIfExists = async (filepath) => {
 };
 
 // src/next/config-manager.ts
-import fs4 from "fs-extra";
+import { createRequire } from "module";
 import path5 from "path";
 import { pathToFileURL } from "url";
-import * as esbuild from "esbuild";
 import * as dotenv from "dotenv";
+import * as esbuild from "esbuild";
+import fs4 from "fs-extra";
 import normalizePath2 from "normalize-path";
-import { createRequire } from "module";
 
-// src/next/resolve-content-root.ts
+// src/next/build-database-esbuild-config.ts
+var buildDatabaseEsbuildConfig = (opts) => ({
+  entryPoints: [opts.entryPoint],
+  bundle: true,
+  platform: "node",
+  format: "esm",
+  outfile: opts.outfile,
+  loader: opts.loader,
+  external: opts.external,
+  // Provide a require() polyfill for ESM bundles containing CommonJS packages.
+  // Some bundled packages (e.g., 'scmp' used by 'mongodb-level') use
+  // require('crypto'). When esbuild inlines these CommonJS packages, it keeps
+  // the require() calls, but ESM doesn't have a global require. This banner
+  // creates one using Node.js's official createRequire API, allowing the
+  // bundled CommonJS code to work in ESM.
+  banner: {
+    js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
+  }
+});
+
+// src/next/cache-manager.ts
 import fs2 from "fs-extra";
-import path3 from "path";
+import path2 from "path";
+var buildReadOnlyMountErrorMessage = (cacheParentPath, underlyingError) => `TinaCMS cannot write to ${cacheParentPath}.
+
+Tina v3 needs write access to your project's tina/__generated__/.cache/ directory at build time. This usually means your project directory is read-only \u2014 common in some Docker setups (\`:ro\` volumes), AWS Lambda's \`/var/task\`, sandboxed CI runners, or restricted file permissions.
+
+To resolve, either:
+  - Make the project directory writable (e.g. remount with read-write access, or copy the project to a writable location), or
+  - Run \`tinacms build\` against a writable copy of your project and deploy the resulting artifacts.
+
+Underlying error: ${underlyingError.code} ${underlyingError.message}`;
+var READONLY_ERROR_CODES = /* @__PURE__ */ new Set(["EACCES", "EROFS", "EPERM"]);
+var prepareCacheLocation = async (generatedFolderPath, now = Date.now()) => {
+  const parentPath = path2.join(generatedFolderPath, ".cache");
+  try {
+    if (await fs2.pathExists(parentPath)) {
+      await fs2.remove(parentPath);
+    }
+    await fs2.ensureDir(parentPath);
+  } catch (err) {
+    const code = err?.code;
+    if (code && READONLY_ERROR_CODES.has(code)) {
+      throw new Error(
+        buildReadOnlyMountErrorMessage(parentPath, err)
+      );
+    }
+    throw err;
+  }
+  return {
+    parentPath,
+    buildPath: path2.join(parentPath, String(now))
+  };
+};
+var reapBuildSubdir = (buildSubdirPath, buildParentPath) => {
+  fs2.removeSync(buildSubdirPath);
+  try {
+    fs2.rmdirSync(buildParentPath);
+  } catch (err) {
+    if (err?.code !== "ENOTEMPTY") throw err;
+  }
+};
+
+// src/next/config-build-error.ts
+var isObject = (value) => typeof value === "object" && value !== null;
+var isTinaPackage = (specifier) => specifier === "tinacms" || specifier.startsWith("@tinacms/");
+var collectResolveTargets = (text) => {
+  if (!text) {
+    return [];
+  }
+  const targets = [];
+  const pattern = /Could not resolve "([^"]+)"/g;
+  for (const match of text.matchAll(pattern)) {
+    targets.push(match[1]);
+  }
+  return targets;
+};
+var getUnresolvedTinaPackage = (error) => {
+  if (!isObject(error)) {
+    return null;
+  }
+  const esbuildError = error;
+  const targets = [
+    ...(esbuildError.errors ?? []).flatMap(
+      (item) => collectResolveTargets(item.text)
+    ),
+    ...collectResolveTargets(esbuildError.message)
+  ];
+  return targets.find(isTinaPackage) ?? null;
+};
+var getResolveLocation = (error) => {
+  if (!isObject(error)) {
+    return null;
+  }
+  const esbuildError = error;
+  const entry = (esbuildError.errors ?? []).find(
+    (item) => collectResolveTargets(item.text).some(isTinaPackage)
+  );
+  return entry?.location ?? null;
+};
+var formatConfigBuildError = ({
+  error,
+  rootPath
+}) => {
+  const unresolvedPackage = getUnresolvedTinaPackage(error);
+  if (!unresolvedPackage) {
+    return error;
+  }
+  const lines = [
+    `Unable to resolve the "${unresolvedPackage}" package while building your Tina config.`,
+    "",
+    `Tina looked from: ${rootPath}`
+  ];
+  const location = getResolveLocation(error);
+  if (location?.file) {
+    const position = [location.line, location.column].filter((value) => typeof value === "number").join(":");
+    lines.push(
+      "",
+      `Failing import: ${location.file}${position ? `:${position}` : ""}`
+    );
+    if (location.lineText) {
+      lines.push(`  ${location.lineText.trim()}`);
+    }
+  }
+  lines.push(
+    "",
+    "Make sure the TinaCMS packages are installed in this project and that you are running the CLI from the project root.",
+    "If they are installed, check parent directories for package-manager files that can interfere with module resolution, such as package.json, node_modules, yarn.lock, or .pnp.cjs."
+  );
+  return new Error(lines.join("\n"));
+};
+
+// src/next/external-resolver.ts
+var EXTERNAL_BASELINE = ["better-sqlite3"];
+var resolveDatabaseExternals = (config2) => {
+  const userExternals = config2?.build?.externalDependencies ?? [];
+  return [...EXTERNAL_BASELINE, ...userExternals];
+};
+
+// src/next/resolve-content-root.ts
+import fs3 from "fs-extra";
+import path4 from "path";
 import chalk3 from "chalk";
 import { z } from "zod";
 
 // src/utils/path.ts
-import path2 from "path";
+import path3 from "path";
 function stripNativeTrailingSlash(p) {
-  const { root } = path2.parse(p);
+  const { root } = path3.parse(p);
   let str = p;
-  while (str.length > root.length && str.endsWith(path2.sep)) {
+  while (str.length > root.length && str.endsWith(path3.sep)) {
     str = str.slice(0, -1);
   }
   return str;
@@ -859,9 +998,9 @@ async function resolveContentRootPath(params) {
     return params.rootPath;
   }
   const fullLocalContentPath = stripNativeTrailingSlash(
-    path3.join(params.tinaFolderPath, localContentPath)
+    path4.join(params.tinaFolderPath, localContentPath)
   );
-  const exists = await fs2.pathExists(fullLocalContentPath);
+  const exists = await fs3.pathExists(fullLocalContentPath);
   if (exists) {
     logger.info(`Using separate content repo at ${fullLocalContentPath}`);
     return fullLocalContentPath;
@@ -876,76 +1015,6 @@ async function resolveContentRootPath(params) {
   return params.rootPath;
 }
 
-// src/next/external-resolver.ts
-var EXTERNAL_BASELINE = ["better-sqlite3"];
-var resolveDatabaseExternals = (config2) => {
-  const userExternals = config2?.build?.externalDependencies ?? [];
-  return [...EXTERNAL_BASELINE, ...userExternals];
-};
-
-// src/next/cache-manager.ts
-import fs3 from "fs-extra";
-import path4 from "path";
-var buildReadOnlyMountErrorMessage = (cacheParentPath, underlyingError) => `TinaCMS cannot write to ${cacheParentPath}.
-
-Tina v3 needs write access to your project's tina/__generated__/.cache/ directory at build time. This usually means your project directory is read-only \u2014 common in some Docker setups (\`:ro\` volumes), AWS Lambda's \`/var/task\`, sandboxed CI runners, or restricted file permissions.
-
-To resolve, either:
-  - Make the project directory writable (e.g. remount with read-write access, or copy the project to a writable location), or
-  - Run \`tinacms build\` against a writable copy of your project and deploy the resulting artifacts.
-
-Underlying error: ${underlyingError.code} ${underlyingError.message}`;
-var READONLY_ERROR_CODES = /* @__PURE__ */ new Set(["EACCES", "EROFS", "EPERM"]);
-var prepareCacheLocation = async (generatedFolderPath, now = Date.now()) => {
-  const parentPath = path4.join(generatedFolderPath, ".cache");
-  try {
-    if (await fs3.pathExists(parentPath)) {
-      await fs3.remove(parentPath);
-    }
-    await fs3.ensureDir(parentPath);
-  } catch (err) {
-    const code = err?.code;
-    if (code && READONLY_ERROR_CODES.has(code)) {
-      throw new Error(
-        buildReadOnlyMountErrorMessage(parentPath, err)
-      );
-    }
-    throw err;
-  }
-  return {
-    parentPath,
-    buildPath: path4.join(parentPath, String(now))
-  };
-};
-var reapBuildSubdir = (buildSubdirPath, buildParentPath) => {
-  fs3.removeSync(buildSubdirPath);
-  try {
-    fs3.rmdirSync(buildParentPath);
-  } catch (err) {
-    if (err?.code !== "ENOTEMPTY") throw err;
-  }
-};
-
-// src/next/build-database-esbuild-config.ts
-var buildDatabaseEsbuildConfig = (opts) => ({
-  entryPoints: [opts.entryPoint],
-  bundle: true,
-  platform: "node",
-  format: "esm",
-  outfile: opts.outfile,
-  loader: opts.loader,
-  external: opts.external,
-  // Provide a require() polyfill for ESM bundles containing CommonJS packages.
-  // Some bundled packages (e.g., 'scmp' used by 'mongodb-level') use
-  // require('crypto'). When esbuild inlines these CommonJS packages, it keeps
-  // the require() calls, but ESM doesn't have a global require. This banner
-  // creates one using Node.js's official createRequire API, allowing the
-  // bundled CommonJS code to work in ESM.
-  banner: {
-    js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
-  }
-});
-
 // src/next/config-manager.ts
 var TINA_FOLDER = "tina";
 var LEGACY_TINA_FOLDER = ".tina";
@@ -1250,14 +1319,21 @@ var ConfigManager = class {
     const buildDir = path5.join(this.generatedCachePath, "database");
     const outfile = path5.join(buildDir, "database.build.mjs");
     const external = resolveDatabaseExternals(this.config);
-    await esbuild.build(
-      buildDatabaseEsbuildConfig({
-        entryPoint: this.selfHostedDatabaseFilePath,
-        outfile,
-        external,
-        loader: loaders
-      })
-    );
+    try {
+      await esbuild.build(
+        buildDatabaseEsbuildConfig({
+          entryPoint: this.selfHostedDatabaseFilePath,
+          outfile,
+          external,
+          loader: loaders
+        })
+      );
+    } catch (e) {
+      throw formatConfigBuildError({
+        error: e,
+        rootPath: path5.resolve(this.rootPath)
+      });
+    }
     const result = await import(pathToFileURL(outfile).href);
     reapBuildSubdir(buildDir, this.generatedCachePath);
     return result.default;
@@ -1274,20 +1350,26 @@ var ConfigManager = class {
     const esmRequireBanner = {
       js: `import { createRequire } from 'module';const require = createRequire(import.meta.url);`
     };
+    const resolvedRootPath = path5.resolve(this.rootPath);
     fs4.outputFileSync(tempTSConfigFile, "{}");
-    const result2 = await esbuild.build({
-      entryPoints: [configFilePath],
-      bundle: true,
-      target: ["esnext"],
-      platform: "browser",
-      format: "esm",
-      logLevel: "silent",
-      packages: "external",
-      ignoreAnnotations: true,
-      outfile: preBuildConfigPath,
-      loader: loaders,
-      metafile: true
-    });
+    let result2;
+    try {
+      result2 = await esbuild.build({
+        entryPoints: [configFilePath],
+        bundle: true,
+        target: ["esnext"],
+        platform: "browser",
+        format: "esm",
+        logLevel: "silent",
+        packages: "external",
+        ignoreAnnotations: true,
+        outfile: preBuildConfigPath,
+        loader: loaders,
+        metafile: true
+      });
+    } catch (e) {
+      throw formatConfigBuildError({ error: e, rootPath: resolvedRootPath });
+    }
     const flattenedList = [];
     Object.keys(result2.metafile.inputs).forEach((key) => {
       if (key.includes("node_modules") || key.includes("__generated__")) {
@@ -1295,27 +1377,31 @@ var ConfigManager = class {
       }
       flattenedList.push(key);
     });
-    await esbuild.build({
-      entryPoints: [configFilePath],
-      bundle: true,
-      target: ["esnext"],
-      logLevel: "silent",
-      platform: "node",
-      format: "esm",
-      outfile,
-      loader: loaders,
-      banner: esmRequireBanner
-    });
-    await esbuild.build({
-      entryPoints: [outfile],
-      bundle: true,
-      logLevel: "silent",
-      platform: "node",
-      target: ["esnext"],
-      format: "esm",
-      outfile: outfile2,
-      loader: loaders
-    });
+    try {
+      await esbuild.build({
+        entryPoints: [configFilePath],
+        bundle: true,
+        target: ["esnext"],
+        logLevel: "silent",
+        platform: "node",
+        format: "esm",
+        outfile,
+        loader: loaders,
+        banner: esmRequireBanner
+      });
+      await esbuild.build({
+        entryPoints: [outfile],
+        bundle: true,
+        logLevel: "silent",
+        platform: "node",
+        target: ["esnext"],
+        format: "esm",
+        outfile: outfile2,
+        loader: loaders
+      });
+    } catch (e) {
+      throw formatConfigBuildError({ error: e, rootPath: resolvedRootPath });
+    }
     let result;
     try {
       result = await import(pathToFileURL(outfile2).href);
@@ -7826,7 +7912,7 @@ var LOCAL_REFERENCE_PREFIXES = [
   "portal:",
   "workspace:"
 ];
-function isTinaPackage(name2) {
+function isTinaPackage2(name2) {
   return name2 === "tinacms" || name2 === "create-tina-app" || name2.startsWith("@tinacms/") || name2.startsWith("tinacms-") || name2.startsWith("next-tinacms-");
 }
 function getTinaDependencies(packageJson) {
@@ -7835,7 +7921,7 @@ function getTinaDependencies(packageJson) {
     for (const [name2, declared] of Object.entries(
       packageJson[dependencyType] || {}
     )) {
-      if (!isTinaPackage(name2) || dependencies.has(name2)) continue;
+      if (!isTinaPackage2(name2) || dependencies.has(name2)) continue;
       dependencies.set(name2, { name: name2, declared, dependencyType });
     }
   }
@@ -8002,13 +8088,13 @@ async function readPackageLockVersions(rootPath) {
     if (!key.startsWith("node_modules/")) continue;
     const name2 = key.replace(/^node_modules\//, "");
     const version2 = value.version;
-    if (isTinaPackage(name2) && typeof version2 === "string") {
+    if (isTinaPackage2(name2) && typeof version2 === "string") {
       versions.set(name2, version2);
     }
   }
   for (const [name2, value] of Object.entries(lockfile.dependencies || {})) {
     const version2 = value.version;
-    if (isTinaPackage(name2) && typeof version2 === "string") {
+    if (isTinaPackage2(name2) && typeof version2 === "string") {
       versions.set(name2, version2);
     }
   }
@@ -8024,14 +8110,14 @@ async function readPnpmLockVersions(rootPath) {
     for (const [name2, value] of Object.entries(
       rootImporter?.[dependencyType] || {}
     )) {
-      if (!isTinaPackage(name2)) continue;
+      if (!isTinaPackage2(name2)) continue;
       const version2 = typeof value === "string" ? value : typeof value.version === "string" ? value.version : void 0;
       if (version2) versions.set(name2, normalizeInstalledVersion(version2));
     }
   }
   for (const key of Object.keys(lockfile?.packages || {})) {
     const parsed = parsePnpmPackageKey(key);
-    if (parsed && isTinaPackage(parsed.name) && !versions.has(parsed.name)) {
+    if (parsed && isTinaPackage2(parsed.name) && !versions.has(parsed.name)) {
       versions.set(parsed.name, parsed.version);
     }
   }
@@ -8055,7 +8141,7 @@ async function readYarnLockVersions(rootPath) {
     const version2 = line.match(/^\s+version\s+"([^"]+)"/)?.[1];
     if (!version2) continue;
     for (const name2 of activeNames) {
-      if (isTinaPackage(name2) && !versions.has(name2)) {
+      if (isTinaPackage2(name2) && !versions.has(name2)) {
         versions.set(name2, version2);
       }
     }
@@ -8069,7 +8155,7 @@ function readYarnBerryLockVersions(contents) {
     if (descriptor === "__metadata") continue;
     const name2 = extractYarnBerryPackageName(descriptor);
     const version2 = getYarnBerryInstalledVersion(descriptor, value?.version);
-    if (name2 && isTinaPackage(name2) && version2) {
+    if (name2 && isTinaPackage2(name2) && version2) {
       versions.set(name2, version2);
     }
   }

package/dist/next/config-build-error.d.ts

@@ -0,0 +1,4 @@
+export declare const formatConfigBuildError: ({ error, rootPath, }: {
+    error: unknown;
+    rootPath: string;
+}) => unknown;

package/dist/next/config-manager.d.ts

@@ -1,5 +1,5 @@
-import type { Loader } from 'esbuild';
 import { Config } from '@tinacms/schema-tools';
+import type { Loader } from 'esbuild';
 export declare const TINA_FOLDER = "tina";
 export declare const LEGACY_TINA_FOLDER = ".tina";
 export declare const GENERATED_FOLDER = "__generated__";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/cli",
   "type": "module",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -91,12 +91,12 @@
     "vite": "^4.5.9",
     "yup": "^1.6.1",
     "zod": "^3.24.2",
-    "@tinacms/app": "2.5.8",
-    "@tinacms/metrics": "2.1.1",
-    "@tinacms/schema-tools": "2.8.3",
-    "tinacms": "3.10.0",
-    "@tinacms/search": "1.2.21",
-    "@tinacms/graphql": "2.4.7"
+    "@tinacms/app": "^2.5.10",
+    "@tinacms/graphql": "^2.4.9",
+    "@tinacms/schema-tools": "^2.8.3",
+    "@tinacms/search": "^1.2.23",
+    "tinacms": "^3.11.0",
+    "@tinacms/metrics": "^2.1.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"