@cedarjs/cli 3.1.1 → 3.1.2-next.126

package/dist/commands/build/buildHandler.js

@@ -4,13 +4,19 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import {
+  formatCedarCommand,
+  formatRunWorkspaceScriptCommand
+} from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { buildApi, cleanApiBuild } from "@cedarjs/internal/dist/build/api";
 import { generate } from "@cedarjs/internal/dist/generate/generate";
+import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
+import {} from "@cedarjs/project-config";
 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";
@@ -124,7 +130,9 @@ const handler = async ({
 ${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`)
+Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspace) to build everything,\nor build the package manually first, e.g. " + c.info(
+            formatRunWorkspaceScriptCommand(problems[0].pkgName, "build")
+          )
         );
       }
     },
@@ -135,6 +143,17 @@ Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build
       title: gqlFeaturesTaskTitle,
       task: generate
     },
+    workspace.includes("web") && cedarConfig.experimental?.gqlorm?.enabled && {
+      title: "Generating gqlorm schema...",
+      task: async () => {
+        const { errors } = await generateGqlormArtifacts();
+        if (errors.length > 0) {
+          for (const { message } of errors) {
+            console.warn(`Warning: ${message}`);
+          }
+        }
+      }
+    },
     workspace.includes("api") && {
       title: "Verifying graphql schema...",
       task: loadAndValidateSdls
@@ -193,9 +212,8 @@ Run ` + c.info("yarn cedar build") + " (without specifying a workspace) to build
       );
       return;
     }
-    await execa("yarn cedar prerender", {
+    await runBin("cedar", ["prerender"], {
       stdio: "inherit",
-      shell: true,
       cwd: cedarPaths.web.base
     });
   };

package/dist/commands/build/buildPackagesTask.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
+import { runScript } from "@cedarjs/cli-helpers/packageManager/exec";
 import { importStatementPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -28,7 +28,7 @@ async function buildPackagesTask(task, nonApiWebWorkspaces) {
         title: name,
         task: async () => {
           try {
-            await execa("yarn", ["build"], { cwd: workspacePath });
+            await runScript("build", [], { cwd: workspacePath });
           } catch (e) {
             errorTelemetry(
               process.argv,

package/dist/commands/build.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import c from "../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { exitWithError } from "../lib/exit.js";
 import { workspaces } from "../lib/project.js";
 import { checkNodeVersion } from "../middleware/checkNodeVersion.js";

package/dist/commands/check.js

@@ -1,5 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 const command = "check";
 const aliases = ["diagnostics"];
 const description = "Get structural diagnostics for a Redwood project (experimental)";

package/dist/commands/consoleHandler.js

@@ -12,7 +12,7 @@ function isREPLServerWithHistory(replServer) {
 const loadPrismaClient = (replContext) => {
   const createdRequire = createRequire(import.meta.url);
   const { db } = createdRequire(path.join(paths.api.lib, "db"));
-  db[Symbol.for("nodejs.util.inspect.custom")] = "PrismaClient";
+  db[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = "PrismaClient";
   replContext.db = db;
 };
 const consoleHistoryFile = path.join(paths.generated.base, "console_history");

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -5,8 +5,7 @@ import { Listr } from "listr2";
 import * as toml from "smol-toml";
 import { env as envInterpolation } from "string-env-interpolation";
 import { titleCase } from "title-case";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../lib/colors.js";
+import { colors as c, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getPaths } from "../../../lib/index.js";
 import { SshExecutor } from "./SshExecutor.js";
 const CONFIG_FILENAME = "deploy.toml";

package/dist/commands/deploy/helpers/deployHandler.js

@@ -1,6 +1,6 @@
 import execa from "execa";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { getPaths } from "@cedarjs/project-config";
-import c from "../../../lib/colors.js";
 const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
   const paths = getPaths();
   let commandSet = [];

package/dist/commands/deploy/serverlessHandler.js

@@ -6,8 +6,7 @@ import { config } from "dotenv-defaults";
 import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths } from "../../lib/index.js";
 const preRequisites = () => [
   {

package/dist/commands/destroy/page/pageHandler.js

@@ -1,7 +1,6 @@
 import camelcase from "camelcase";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   deleteFilesTask,
   removeRoutesFromRouterTask

package/dist/commands/destroy/scaffold/scaffoldHandler.js

@@ -1,8 +1,7 @@
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { pluralize } from "@cedarjs/utils/cedarPluralize";
-import c from "../../../lib/colors.js";
 import {
   deleteFilesTask,
   getPaths,

package/dist/commands/destroy/sdl/sdlHandler.js

@@ -1,6 +1,5 @@
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import c from "../../../lib/colors.js";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { deleteFilesTask } from "../../../lib/index.js";
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import { files } from "../../generate/sdl/sdlHandler.js";

package/dist/commands/dev/devHandler.js

@@ -2,11 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
+import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { exitWithError } from "../../lib/exit.js";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
 import { getPaths } from "../../lib/index.js";
@@ -112,6 +112,14 @@ const handler = async ({
       );
     }
   }
+  if (generate && workspace.includes("web") && getConfig().experimental?.gqlorm?.enabled) {
+    try {
+      await generateGqlormArtifacts();
+    } catch (e) {
+      const message = getErrorMessage(e);
+      console.error(c.error(`Error generating gqlorm schema: ${message}`));
+    }
+  }
   const cedarConfigPath = getConfigPath();
   const streamingSsrEnabled = getConfig().experimental?.streamingSsr?.enabled;
   process.env.VITE_CJS_IGNORE_WARNING = "true";
@@ -158,7 +166,7 @@ const handler = async ({
   if (generate) {
     jobs.push({
       name: "gen",
-      command: "yarn rw-gen-watch",
+      command: "yarn cedar-gen-watch",
       prefixColor: "green"
     });
   }
@@ -208,7 +216,7 @@ const handler = async ({
     handleInput: true,
     outputStream
   });
-  result.catch((e) => {
+  result.then(() => process.exit(0)).catch((e) => {
     if (e?.message) {
       errorTelemetry(
         process.argv,

package/dist/commands/dev/packageWatchCommands.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { importStatementPath } from "@cedarjs/project-config";
-import c from "../../lib/colors.js";
 import { getPaths } from "../../lib/index.js";
 async function getPackageWatchCommands(packageWorkspaces) {
   const cedarPaths = getPaths();

package/dist/commands/dev.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import c from "../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { workspaces } from "../lib/project.js";
 import { checkNodeVersion } from "../middleware/checkNodeVersion.js";
 const command = "dev [workspace..]";

package/dist/commands/execHandler.js

@@ -3,9 +3,8 @@ import path from "node:path";
 import { context } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
-import c from "../lib/colors.js";
 import { runScriptFunction } from "../lib/exec.js";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
@@ -81,8 +80,8 @@ No script called \`${name}\` in the ./scripts folder.
             args: { args: scriptArgs }
           });
         } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          console.error(c.error(`Error in script: ${message}`));
+          console.error(c.error("\nError in script:"));
+          console.error(error);
           throw error;
         }
       }
@@ -91,9 +90,13 @@ No script called \`${name}\` in the ./scripts folder.
   const tasks = new Listr(scriptTasks, {
     renderer: args.silent ? "silent" : "verbose"
   });
-  await context.with(suppressTracing(context.active()), async () => {
-    await tasks.run();
-  });
+  try {
+    await context.with(suppressTracing(context.active()), async () => {
+      await tasks.run();
+    });
+  } catch {
+    process.exit(1);
+  }
 };
 function resolveScriptPath(name) {
   const scriptPath = path.join(getPaths().scripts, name);

package/dist/commands/{setup → experimental}/live-queries/liveQueries.js

@@ -1,8 +1,9 @@
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-const command = "live-queries";
+import { getEpilogue } from "../util.js";
+const command = "setup-live-queries";
 const description = "Setup live query invalidation with Postgres notifications";
 function builder(yargs) {
-  yargs.option("force", {
+  return yargs.option("force", {
     alias: "f",
     default: false,
     description: "Overwrite existing configuration",
@@ -12,11 +13,11 @@ function builder(yargs) {
     default: false,
     description: "Print more logs",
     type: "boolean"
-  });
+  }).epilogue(getEpilogue(command, description));
 }
 async function handler(options) {
   recordTelemetryAttributes({
-    command: "setup live-queries",
+    command: `experimental ${command}`,
     force: options.force,
     verbose: options.verbose
   });

package/dist/commands/{setup → experimental}/live-queries/liveQueriesHandler.js

@@ -1,22 +1,25 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { addApiPackages } from "@cedarjs/cli-helpers";
-import { getMigrationsPath, getSchemaPath } from "@cedarjs/project-config";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
+import {
+  getConfigPath,
+  getMigrationsPath,
+  getSchemaPath
+} from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const getApiPackageJson = () => {
+function getApiPackageJson() {
   const apiPackageJsonPath = path.join(getPaths().api.base, "package.json");
   return JSON.parse(fs.readFileSync(apiPackageJsonPath, "utf-8"));
-};
-const hasPackage = (packageJson, packageName) => {
+}
+function hasPackage(packageJson, packageName) {
   return Boolean(
     packageJson.dependencies?.[packageName] || packageJson.devDependencies?.[packageName]
   );
-};
-const getPrismaProvider = async () => {
+}
+async function getPrismaProvider() {
   try {
     const prismaConfigPath = getPaths().api.prismaConfig;
     if (!prismaConfigPath) {
@@ -29,10 +32,10 @@ const getPrismaProvider = async () => {
     let stat;
     try {
       stat = fs.statSync(schemaPath);
-    } catch (e) {
+    } catch {
       stat = void 0;
     }
-    if (stat && stat.isDirectory()) {
+    if (stat?.isDirectory()) {
       const candidate = path.join(schemaPath, "schema.prisma");
       if (fs.existsSync(candidate)) {
         schemaPath = candidate;
@@ -45,15 +48,15 @@ const getPrismaProvider = async () => {
     }
     const content = fs.readFileSync(schemaPath, "utf-8");
     const match = content.match(/^\s*provider\s*=\s*["']([^"']+)["']/im);
-    if (match && match[1]) {
+    if (match?.[1]) {
       return match[1].toLowerCase();
     }
     return void 0;
   } catch {
     return void 0;
   }
-};
-const findExistingLiveQueryMigration = ({ migrationsDirectoryPath }) => {
+}
+function findExistingLiveQueryMigration(migrationsDirectoryPath) {
   if (!fs.existsSync(migrationsDirectoryPath)) {
     return void 0;
   }
@@ -63,8 +66,8 @@ const findExistingLiveQueryMigration = ({ migrationsDirectoryPath }) => {
     const content = fs.readFileSync(migrationFilePath, "utf-8");
     return content.includes("cedar_notify_table_change");
   });
-};
-const generateMigrationFolderName = () => {
+}
+function generateMigrationFolderName() {
   const now = /* @__PURE__ */ new Date();
   const year = String(now.getFullYear());
   const month = String(now.getMonth() + 1).padStart(2, "0");
@@ -73,8 +76,8 @@ const generateMigrationFolderName = () => {
   const minute = String(now.getMinutes()).padStart(2, "0");
   const second = String(now.getSeconds()).padStart(2, "0");
   return `${year}${month}${day}${hour}${minute}${second}_live_queries_notifications`;
-};
-const addLiveQueryListenerToGraphqlHandler = ({ force }) => {
+}
+function addLiveQueryListenerToGraphqlHandler({ force }) {
   const graphqlHandlerPath = path.join(
     getPaths().api.functions,
     `graphql.${isTypeScriptProject() ? "ts" : "js"}`
@@ -143,8 +146,8 @@ const addLiveQueryListenerToGraphqlHandler = ({ force }) => {
   return {
     skipped: false
   };
-};
-const handler = async ({ force }) => {
+}
+async function handler({ force, verbose }) {
   const projectIsTypescript = isTypeScriptProject();
   const apiPackageJson = getApiPackageJson();
   const migrationsPath = await getMigrationsPath(getPaths().api.prismaConfig);
@@ -161,9 +164,7 @@ const handler = async ({ force }) => {
     "templates",
     "liveQueriesListener.ts.template"
   );
-  const existingMigrationPath = findExistingLiveQueryMigration({
-    migrationsDirectoryPath: migrationsPath
-  });
+  const existingMigrationPath = findExistingLiveQueryMigration(migrationsPath);
   const migrationDirPath = path.join(
     migrationsPath,
     generateMigrationFolderName()
@@ -203,6 +204,44 @@ const handler = async ({ force }) => {
           }
         }
       },
+      {
+        title: "Adding [experimental.gqlorm] config...",
+        task: (_ctx, task) => {
+          const configTomlPath = getConfigPath();
+          const configFileName = path.basename(configTomlPath);
+          const configContent = fs.readFileSync(configTomlPath, "utf-8");
+          if (!configContent.includes("[experimental.gqlorm]")) {
+            writeFile(
+              configTomlPath,
+              configContent.concat(
+                "\n[experimental.gqlorm]\n  enabled = true\n"
+              ),
+              {
+                overwriteExisting: true
+              }
+            );
+          } else {
+            if (force) {
+              task.output = `Overwriting config in ${configFileName}`;
+              writeFile(
+                configTomlPath,
+                configContent.replace(
+                  "\n[experimental.gqlorm]\n  enabled = false\n",
+                  "\n[experimental.gqlorm]\n  enabled = true\n"
+                ),
+                {
+                  overwriteExisting: true
+                }
+              );
+            } else {
+              task.skip(
+                `The [experimental.gqlorm] config block already exists in ${configFileName}.`
+              );
+            }
+          }
+        },
+        rendererOptions: { persistentOutput: true }
+      },
       {
         ...addApiPackages(["pg@^8.18.0"]),
         title: "Adding pg dependency to your api side...",
@@ -210,6 +249,7 @@ const handler = async ({ force }) => {
           if (hasPgDependency) {
             return "pg is already installed";
           }
+          return false;
         }
       },
       {
@@ -232,6 +272,7 @@ const handler = async ({ force }) => {
             );
             return `Existing live query migration found: ${migrationPath2}`;
           }
+          return false;
         }
       },
       {
@@ -273,17 +314,29 @@ const handler = async ({ force }) => {
       }
     ],
     {
-      rendererOptions: { collapseSubtasks: false }
+      rendererOptions: { collapseSubtasks: false },
+      renderer: verbose ? "verbose" : "default"
     }
   );
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    if (isObject(e) && "message" in e) {
+      errorTelemetry(process.argv, e.message);
+      console.error(c.error(e.message));
+    } else {
+      errorTelemetry(process.argv, e);
+      console.error(c.error(e));
+    }
+    process.exit(isObjectWithExitCode(e) ? e.exitCode : 1);
   }
-};
+}
+function isObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isObjectWithExitCode(value) {
+  return isObject(value) && typeof value.exitCode === "number";
+}
 export {
   handler
 };

package/dist/commands/{setup → experimental}/live-queries/templates/liveQueriesListener.ts.template

@@ -1,5 +1,6 @@
 import { Client } from 'pg'
 
+import { getPaths, loadPrismaConfig } from '@cedarjs/project-config'
 import { liveQueryStore } from '@cedarjs/realtime'
 import { pluralize } from '@cedarjs/utils/cedarPluralize'
 
@@ -80,6 +81,18 @@ async function onNotification(payload: string | undefined) {
 async function connect() {
   connectionGeneration = connectionGeneration + 1
   const generation = connectionGeneration
+  const prismaConfigPath = getPaths().api.prismaConfig
+  const prismaConfig = await loadPrismaConfig(prismaConfigPath)
+  const prismaDatasourceUrl = prismaConfig.datasource?.url
+
+  if (!prismaDatasourceUrl) {
+    const config = JSON.stringify(prismaConfig, null, 2)
+
+    throw new Error(
+      'Could not determine Postgres connection URL from Prisma config ' +
+        `datasource. Using parsed Prisma config: ${config}`
+    )
+  }
 
   try {
     if (reconnectTimeout) {
@@ -94,9 +107,7 @@ async function connect() {
       await previousClient.end().catch(() => {})
     }
 
-    const nextClient = new Client({
-      connectionString: process.env.DATABASE_URL,
-    })
+    const nextClient = new Client({ connectionString: prismaDatasourceUrl })
 
     nextClient.on('notification', async (msg) => {
       await onNotification(msg.payload)

package/dist/commands/experimental/setupInngestHandler.js

@@ -1,7 +1,7 @@
 import execa from "execa";
 import { Listr } from "listr2";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths } from "../../lib/index.js";
 import { command, description, EXPERIMENTAL_TOPIC_ID } from "./setupInngest.js";
 import { printTaskEpilogue } from "./util.js";

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -3,14 +3,13 @@ import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import { Listr } from "listr2";
-import { addApiPackages } from "@cedarjs/cli-helpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import {
   getConfigPath,
   resolveFile,
   getSchemaPath
 } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
 import { isTypeScriptProject } from "../../lib/project.js";
 import {

package/dist/commands/experimental/setupReactCompilerHandler.js

@@ -3,9 +3,9 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import semver from "semver";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths, writeFile } from "../../lib/index.js";
 import {
   command,

package/dist/commands/experimental/setupRscHandler.js

@@ -2,12 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { prettify } from "@cedarjs/cli-helpers";
+import { prettify, colors as c } from "@cedarjs/cli-helpers";
 import { install } from "@cedarjs/cli-helpers/packageManager";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
 import { isTypeScriptProject } from "../../lib/project.js";
 import { command, description, EXPERIMENTAL_TOPIC_ID } from "./setupRsc.js";

package/dist/commands/experimental/setupStreamingSsrHandler.js

@@ -2,10 +2,9 @@ import fs from "node:fs";
 import path from "path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { Listr } from "listr2";
-import { addWebPackages } from "@cedarjs/cli-helpers";
+import { addWebPackages, colors as c } from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../lib/index.js";
 import { isTypeScriptProject } from "../../lib/project.js";
 import {

package/dist/commands/experimental/templates/streamingSsr/tsconfig.json.template

@@ -9,16 +9,16 @@
     "skipLibCheck": false,
     "rootDirs": [
       "./src",
-      "../.redwood/types/mirror/web/src",
+      "../.cedar/types/mirror/web/src",
       "../api/src",
-      "../.redwood/types/mirror/api/src"
+      "../.cedar/types/mirror/api/src"
     ],
     "paths": {
       "src/*": [
         "./src/*",
-        "../.redwood/types/mirror/web/src/*",
+        "../.cedar/types/mirror/web/src/*",
         "../api/src/*",
-        "../.redwood/types/mirror/api/src/*"
+        "../.cedar/types/mirror/api/src/*"
       ],
       "$api/*": [
         "../api/*"
@@ -46,8 +46,8 @@
   "include": [
     "src",
     "config",
-    "../.redwood/types/includes/all-*",
-    "../.redwood/types/includes/web-*",
+    "../.cedar/types/includes/all-*",
+    "../.cedar/types/includes/web-*",
     "../types",
     "./types"
   ]