@cedarjs/cli 3.0.0-canary.13445 → 3.0.0-canary.13447

package/dist/commands/build/buildHandler.js

@@ -10,9 +10,57 @@ import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
 import { timedTelemetry } from "@cedarjs/telemetry";
+import c from "../../lib/colors.js";
 import { generatePrismaCommand } from "../../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../../lib/index.js";
 import { buildPackagesTask } from "./buildPackagesTask.js";
+function checkWorkspacePackageEntryPoints(cedarPaths) {
+  const packagesDir = cedarPaths.packages;
+  if (!packagesDir || !fs.existsSync(packagesDir)) {
+    return [];
+  }
+  const problems = [];
+  const packageDirs = fs.readdirSync(packagesDir, { withFileTypes: true });
+  for (const entry of packageDirs) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const pkgJsonPath = path.join(packagesDir, entry.name, "package.json");
+    if (!fs.existsSync(pkgJsonPath)) {
+      continue;
+    }
+    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+    const pkgName = pkgJson.name || entry.name;
+    const pkgDir = path.join(packagesDir, entry.name);
+    const entryFiles = /* @__PURE__ */ new Set();
+    if (pkgJson.main) {
+      entryFiles.add(path.normalize(pkgJson.main));
+    }
+    if (pkgJson.exports) {
+      const collectPaths = (obj) => {
+        if (typeof obj === "string") {
+          if (!obj.endsWith(".d.ts")) {
+            entryFiles.add(path.normalize(obj));
+          }
+        } else if (obj && typeof obj === "object") {
+          for (const [key, value] of Object.entries(obj)) {
+            if (key !== "types") {
+              collectPaths(value);
+            }
+          }
+        }
+      };
+      collectPaths(pkgJson.exports);
+    }
+    for (const entryFile of entryFiles) {
+      const resolvedPath = path.resolve(pkgDir, entryFile);
+      if (!fs.existsSync(resolvedPath)) {
+        problems.push({ pkgName, entryFile, pkgDir });
+      }
+    }
+  }
+  return problems;
+}
 const handler = async ({
   workspace = ["api", "web", "packages/*"],
   verbose = false,
@@ -56,6 +104,25 @@ const handler = async ({
       title: "Building Packages...",
       task: (_ctx, task) => buildPackagesTask(task, nonApiWebWorkspaces)
     },
+    (workspace.includes("web") || workspace.includes("api")) && {
+      title: "Checking workspace packages...",
+      task: () => {
+        const problems = checkWorkspacePackageEntryPoints(cedarPaths);
+        if (problems.length === 0) {
+          return;
+        }
+        const details = problems.map(
+          ({ pkgName, entryFile, pkgDir }) => `  \u2022 ${c.error(pkgName)}: missing "${entryFile}" (in ${pkgDir})`
+        ).join("\n");
+        throw new Error(
+          `The following workspace package entry points are missing:
+${details}
+
+This usually means the package has not been built yet.
+Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build everything,\nor build the package manually first, e.g. " + c.info(`yarn workspace ${problems[0].pkgName} build`)
+        );
+      }
+    },
     // If using GraphQL Fragments or Trusted Documents, then we need to use
     // codegen to generate the types needed for possible types and the trusted
     // document store hashes

package/dist/commands/build/buildPackagesTask.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import concurrently from "concurrently";
+import execa from "execa";
 import { importStatementPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import { exitWithError } from "../../lib/exit.js";
 import { getPaths } from "../../lib/index.js";
 async function buildPackagesTask(task, nonApiWebWorkspaces) {
   const cedarPaths = getPaths();
@@ -22,28 +21,30 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
     task.skip("No packages to build at " + nonApiWebWorkspaces.join(", "));
     return;
   }
-  const { result } = concurrently(
+  return task.newListr(
     workspacePaths.map((workspacePath) => {
+      const name = workspacePath.split("/").at(-1);
       return {
-        command: `yarn build`,
-        name: workspacePath.split("/").at(-1),
-        cwd: workspacePath
+        title: name,
+        task: async () => {
+          try {
+            await execa("yarn", ["build"], { cwd: workspacePath });
+          } catch (e) {
+            errorTelemetry(
+              process.argv,
+              `Error building package "${name}": ${e.message}`
+            );
+            throw new Error(
+              `Building "${name}" failed
+
+${e.stderr || e.message}`
+            );
+          }
+        }
       };
     }),
-    {
-      prefix: "{name} |",
-      timestampFormat: "HH:mm:ss"
-    }
+    { concurrent: true, rendererOptions: { collapseSubtasks: false } }
   );
-  await result.catch((e) => {
-    if (e?.message) {
-      errorTelemetry(
-        process.argv,
-        `Error concurrently building sides: ${e.message}`
-      );
-      exitWithError(e);
-    }
-  });
 }
 export {
   buildPackagesTask

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "3.0.0-canary.13445+bbaff8cc9",
+  "version": "3.0.0-canary.13447+a36a861f1",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,15 +34,15 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "3.0.0-canary.13445",
-    "@cedarjs/cli-helpers": "3.0.0-canary.13445",
-    "@cedarjs/fastify-web": "3.0.0-canary.13445",
-    "@cedarjs/internal": "3.0.0-canary.13445",
-    "@cedarjs/prerender": "3.0.0-canary.13445",
-    "@cedarjs/project-config": "3.0.0-canary.13445",
-    "@cedarjs/structure": "3.0.0-canary.13445",
-    "@cedarjs/telemetry": "3.0.0-canary.13445",
-    "@cedarjs/web-server": "3.0.0-canary.13445",
+    "@cedarjs/api-server": "3.0.0-canary.13447",
+    "@cedarjs/cli-helpers": "3.0.0-canary.13447",
+    "@cedarjs/fastify-web": "3.0.0-canary.13447",
+    "@cedarjs/internal": "3.0.0-canary.13447",
+    "@cedarjs/prerender": "3.0.0-canary.13447",
+    "@cedarjs/project-config": "3.0.0-canary.13447",
+    "@cedarjs/structure": "3.0.0-canary.13447",
+    "@cedarjs/telemetry": "3.0.0-canary.13447",
+    "@cedarjs/web-server": "3.0.0-canary.13447",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bbaff8cc92a44a0bf7619977a23a8164aa1ee4cf"
+  "gitHead": "a36a861f1c3b192cd3e80f2369981fe0a55e0a5a"
 }