@cedarjs/cli 1.0.0-canary.13124 → 1.0.0-canary.13126

package/dist/commands/generate/package/templates/README.md.template

@@ -11,5 +11,5 @@ into your code:
 ```
 
 ```javascript
-import { ${camelName} } from '${packageName}';
+import { ${camelName} } from '${packageName}'
 ```

package/dist/commands/generate/package/templates/package.json.template

@@ -4,6 +4,13 @@
   "private": true,
   "type": "module",
   "main": "dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "watch": "tsc --watch"

package/dist/commands/generate/package/templates/tsconfig.json.template

@@ -13,4 +13,5 @@
     "declarationMap": true,
   },
   "include": ["src"],
+  "exclude": ["**/*.test.ts"],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13124+fb77feb5a",
+  "version": "1.0.0-canary.13126+03db3fb39",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13124",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13124",
-    "@cedarjs/fastify-web": "1.0.0-canary.13124",
-    "@cedarjs/internal": "1.0.0-canary.13124",
-    "@cedarjs/prerender": "1.0.0-canary.13124",
-    "@cedarjs/project-config": "1.0.0-canary.13124",
-    "@cedarjs/structure": "1.0.0-canary.13124",
-    "@cedarjs/telemetry": "1.0.0-canary.13124",
-    "@cedarjs/web-server": "1.0.0-canary.13124",
+    "@cedarjs/api-server": "1.0.0-canary.13126",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13126",
+    "@cedarjs/fastify-web": "1.0.0-canary.13126",
+    "@cedarjs/internal": "1.0.0-canary.13126",
+    "@cedarjs/prerender": "1.0.0-canary.13126",
+    "@cedarjs/project-config": "1.0.0-canary.13126",
+    "@cedarjs/structure": "1.0.0-canary.13126",
+    "@cedarjs/telemetry": "1.0.0-canary.13126",
+    "@cedarjs/web-server": "1.0.0-canary.13126",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fb77feb5a1719a126002bf5e4fb63d3bf670bea9"
+  "gitHead": "03db3fb397b7e0cc00899fbec2d1ad522fb81317"
 }

package/dist/commands/buildHandler.js

@@ -1,180 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-import concurrently from "concurrently";
-import execa from "execa";
-import { Listr } from "listr2";
-import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { buildApi, cleanApiBuild } from "@cedarjs/internal/dist/build/api";
-import { generate } from "@cedarjs/internal/dist/generate/generate";
-import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
-import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
-import { timedTelemetry, errorTelemetry } from "@cedarjs/telemetry";
-import { exitWithError } from "../lib/exit.js";
-import { generatePrismaCommand } from "../lib/generatePrismaClient.js";
-import { getPaths, getConfig } from "../lib/index.js";
-const handler = async ({
-  workspace = ["api", "web", "packages/*"],
-  verbose = false,
-  prisma = true,
-  prerender = true
-}) => {
-  recordTelemetryAttributes({
-    command: "build",
-    workspace: JSON.stringify(workspace),
-    verbose,
-    prisma,
-    prerender
-  });
-  const cedarPaths = getPaths();
-  const cedarConfig = getConfig();
-  const useFragments = cedarConfig.graphql?.fragments;
-  const useTrustedDocuments = cedarConfig.graphql?.trustedDocuments;
-  const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
-  const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
-  const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
-  const packageJsonPath = path.join(cedarPaths.base, "package.json");
-  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-  const packageJsonWorkspaces = packageJson.workspaces;
-  const restWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
-  const gqlFeaturesTaskTitle = `Generating types needed for ${[
-    useFragments && "GraphQL Fragments",
-    useTrustedDocuments && "Trusted Documents"
-  ].filter(Boolean).join(" and ")} support...`;
-  const tasks = [
-    shouldGeneratePrismaClient && {
-      title: "Generating Prisma Client...",
-      task: async () => {
-        const { cmd, args } = await generatePrismaCommand();
-        return execa(cmd, args, {
-          stdio: verbose ? "inherit" : "pipe",
-          cwd: cedarPaths.api.base
-        });
-      }
-    },
-    restWorkspaces.length > 0 && {
-      title: "Building Packages...",
-      task: async () => {
-        const globPattern = path.join(cedarPaths.packages, "*").replaceAll("\\", "/");
-        const allPackagePaths = await Array.fromAsync(
-          fs.promises.glob(globPattern)
-        );
-        const workspacePaths = restWorkspaces.some((w) => w === "packages/*") ? allPackagePaths : restWorkspaces.map((w) => {
-          const workspacePath = path.join(
-            cedarPaths.packages,
-            w.split("/").at(-1)
-          );
-          if (!fs.existsSync(workspacePath)) {
-            throw new Error(`Workspace not found: ${workspacePath}`);
-          }
-          return workspacePath;
-        });
-        const { result } = concurrently(
-          workspacePaths.map((workspacePath) => {
-            return {
-              command: `yarn build`,
-              name: workspacePath.split("/").at(-1),
-              cwd: workspacePath
-            };
-          }),
-          {
-            prefix: "{name} |",
-            timestampFormat: "HH:mm:ss"
-          }
-        );
-        await result.catch((e) => {
-          if (e?.message) {
-            errorTelemetry(
-              process.argv,
-              `Error concurrently building sides: ${e.message}`
-            );
-            exitWithError(e);
-          }
-        });
-      }
-    },
-    // 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
-    (useFragments || useTrustedDocuments) && {
-      title: gqlFeaturesTaskTitle,
-      task: generate
-    },
-    workspace.includes("api") && {
-      title: "Verifying graphql schema...",
-      task: loadAndValidateSdls
-    },
-    workspace.includes("api") && {
-      title: "Building API...",
-      task: async () => {
-        await cleanApiBuild();
-        const { errors, warnings } = await buildApi();
-        if (errors.length) {
-          console.error(errors);
-        }
-        if (warnings.length) {
-          console.warn(warnings);
-        }
-      }
-    },
-    workspace.includes("web") && {
-      title: "Building Web...",
-      task: async () => {
-        process.env.VITE_CJS_IGNORE_WARNING = "true";
-        const createdRequire = createRequire(import.meta.url);
-        const buildBinPath = createdRequire.resolve(
-          "@cedarjs/vite/bins/rw-vite-build.mjs"
-        );
-        await execa(
-          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
-          {
-            stdio: verbose ? "inherit" : "pipe",
-            shell: true,
-            // `cwd` is needed for yarn to find the rw-vite-build binary
-            // It won't change process.cwd for anything else here, in this
-            // process
-            cwd: cedarPaths.web.base
-          }
-        );
-        if (!getConfig().experimental?.streamingSsr?.enabled) {
-          console.log("Creating 200.html...");
-          const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
-          fs.copyFileSync(
-            indexHtmlPath,
-            path.join(getPaths().web.dist, "200.html")
-          );
-        }
-      }
-    }
-  ].filter(Boolean);
-  const triggerPrerender = async () => {
-    console.log("Starting prerendering...");
-    if (prerenderRoutes.length === 0) {
-      console.log(
-        `You have not marked any routes to "prerender" in your ${terminalLink(
-          "Routes",
-          "file://" + cedarPaths.web.routes
-        )}.`
-      );
-      return;
-    }
-    await execa("yarn cedar prerender", {
-      stdio: "inherit",
-      shell: true,
-      cwd: cedarPaths.web.base
-    });
-  };
-  const jobs = new Listr(tasks, {
-    renderer: verbose ? "verbose" : void 0
-  });
-  await timedTelemetry(process.argv, { type: "build" }, async () => {
-    await jobs.run();
-    if (workspace.includes("web") && prerender && prismaSchemaExists) {
-      await triggerPrerender();
-    }
-  });
-};
-export {
-  handler
-};