@cedarjs/cli 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/commands/setup/generator/generatorHandler.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import c from "../../../lib/colors.js";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { getPaths } from "../../../lib/index.js";
 const SIDE_MAP = {
   web: ["cell", "component", "layout", "page", "scaffold"],
@@ -36,7 +36,7 @@ const tasks = ({ name, force }) => {
       },
       {
         title: "Destination:",
-        task: (ctx, task) => {
+        task: (_ctx, task) => {
           task.title = `  Wrote templates to ${destination.replace(
             getPaths().base,
             ""
@@ -44,7 +44,7 @@ const tasks = ({ name, force }) => {
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false } }
   );
 };
 const handler = async ({ name, force }) => {
@@ -52,7 +52,8 @@ const handler = async ({ name, force }) => {
   try {
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
+    const message = e instanceof Error ? e.message : String(e);
+    console.log(c.error(message));
   }
 };
 export {

package/dist/commands/setup/graphql/features/fragments/appGqlConfigTransform.js

@@ -16,8 +16,11 @@ function isPropertyWithName(node, name) {
 function transform(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
-  const redwoodApolloProvider = root.findJSXElements("RedwoodApolloProvider");
-  const graphQLClientConfigCollection = redwoodApolloProvider.find(
+  let apolloProviderElements = root.findJSXElements("CedarApolloProvider");
+  if (apolloProviderElements.length === 0) {
+    apolloProviderElements = root.findJSXElements("RedwoodApolloProvider");
+  }
+  const graphQLClientConfigCollection = apolloProviderElements.find(
     j.JSXAttribute,
     {
       name: { name: "graphQLClientConfig" }
@@ -104,7 +107,7 @@ function transform(file, api) {
     cacheConfigValue.properties.push(property);
   }
   graphQLClientConfigCollection.remove();
-  redwoodApolloProvider.get(0).node.openingElement.attributes.push(
+  apolloProviderElements.get(0).node.openingElement.attributes.push(
     j.jsxAttribute(
       j.jsxIdentifier("graphQLClientConfig"),
       j.jsxExpressionContainer(j.identifier(graphQLClientConfigVariableName))

package/dist/commands/setup/graphql/features/fragments/fragments.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "fragments";
 const description = "Set up Fragments for GraphQL";
 function builder(yargs) {

package/dist/commands/setup/graphql/features/fragments/fragmentsHandler.js

@@ -1,13 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import {
-  colors,
-  getPrettierOptions,
-  setTomlSetting
-} from "@cedarjs/cli-helpers";
+import { colors } from "@cedarjs/cli-helpers/colors";
+import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 const command = "fragments";
@@ -34,7 +32,7 @@ async function handler({ force }) {
       {
         title: "Generate possibleTypes.ts",
         task: () => {
-          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
+          runBinSync("cedar", ["generate", "types"], { stdio: "ignore" });
         }
       },
       {

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocuments.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "trusted-documents";
 const description = "Set up Trusted Documents for GraphQL";
 function builder(yargs) {

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js

@@ -1,9 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-import execa from "execa";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { getPrettierOptions, setTomlSetting } from "@cedarjs/cli-helpers";
+import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 async function handler({ force }) {
@@ -28,7 +29,7 @@ async function handler({ force }) {
       {
         title: "Generating Trusted Documents store ...",
         task: () => {
-          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
+          runBinSync("cedar", ["generate", "types"], { stdio: "ignore" });
         }
       },
       {

package/dist/commands/setup/i18n/i18n.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "i18n";
 const description = "Set up i18n";
 const builder = (yargs) => {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -1,21 +1,22 @@
 import fs from "node:fs";
 import path from "path";
-import execa from "execa";
 import { Listr } from "listr2";
+import { terminalLink } from "termi-link";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import c from "../../../lib/colors.js";
 import extendStorybookConfiguration from "../../../lib/configureStorybook.js";
 import { fileIncludes } from "../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../lib/index.js";
 const APP_JS_PATH = getPaths().web.app;
 const i18nImportExist = (appJS) => {
-  let content = appJS.toString();
+  const content = appJS.toString();
   const hasBaseImport = () => /import '.\/i18n'/.test(content);
   return hasBaseImport();
 };
 const addI18nImport = (appJS) => {
-  var content = appJS.toString().split("\n").reverse();
-  const index = content.findIndex((value) => /import/.test(value));
+  const content = appJS.toString().split("\n").reverse();
+  const index = content.findIndex((value) => value.includes("import"));
   content.splice(index, 0, "import './i18n'");
   return content.reverse().join(`
 `);
@@ -38,14 +39,15 @@ const handler = async ({ force }) => {
               {
                 title: "Install i18next, react-i18next and i18next-browser-languagedetector",
                 task: async () => {
-                  await execa("yarn", [
-                    "workspace",
+                  await addWorkspacePackages(
                     "web",
-                    "add",
-                    "i18next",
-                    "react-i18next",
-                    "i18next-browser-languagedetector"
-                  ]);
+                    [
+                      "i18next",
+                      "react-i18next",
+                      "i18next-browser-languagedetector"
+                    ],
+                    { cwd: rwPaths.base }
+                  );
                 }
               }
             ],
@@ -122,7 +124,7 @@ const handler = async ({ force }) => {
       {
         title: "Adding import to App.{jsx,tsx}...",
         task: (_ctx, task) => {
-          let appJS = fs.readFileSync(APP_JS_PATH);
+          const appJS = fs.readFileSync(APP_JS_PATH);
           if (i18nImportExist(appJS)) {
             task.skip("Import already exists in App.js");
           } else {
@@ -149,7 +151,7 @@ const handler = async ({ force }) => {
 
           ${c.tip("Quick link to the docs:")}
 
-          ${c.link("https://react.i18next.com/guides/quick-start/")}
+          ${terminalLink("react-i18next quick start guide", "https://react.i18next.com/guides/quick-start/")}
         `;
         }
       }
@@ -159,9 +161,11 @@ const handler = async ({ force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/jobs/jobs.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "jobs";
 const description = "Sets up the config file and parent directory for background jobs";
 const builder = (yargs) => {

package/dist/commands/setup/jobs/jobsHandler.js

@@ -2,12 +2,14 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
-import { addApiPackages } from "@cedarjs/cli-helpers";
-import { getSchemaPath } from "@cedarjs/project-config";
-import c from "../../../lib/colors.js";
+import { terminalLink } from "termi-link";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
-const { getDMMF, getSchemaWithPath } = prismaInternals;
+const { getDMMF } = prismaInternals;
 const MODEL_SCHEMA = `
 model BackgroundJob {
   id        Int       @id @default(autoincrement())
@@ -26,8 +28,7 @@ model BackgroundJob {
 }
 `;
 const getModelNames = async () => {
-  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
-  const { schemas } = await getSchemaWithPath(schemaPath);
+  const { schemas } = await getPrismaSchemas();
   const schema = await getDMMF({ datamodel: schemas });
   return schema.datamodel.models.map((model) => model.name);
 };
@@ -54,6 +55,7 @@ const tasks = async ({ force }) => {
           if (modelExists) {
             return "BackgroundJob model exists, skipping";
           }
+          return false;
         }
       },
       {
@@ -98,19 +100,22 @@ const tasks = async ({ force }) => {
           ${c.success("\nBackground jobs configured!\n")}
 
           ${!modelExists ? "Migrate your database to finish setting up jobs:\n" : ""}
-          ${!modelExists ? c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n") : ""}
+          ${!modelExists ? c.highlight(`
+\xA0\xA0${formatCedarCommand(["prisma", "migrate", "dev"])}
+`) : ""}
 
-          Generate jobs with: ${c.highlight("yarn cedar g job <name>")}
-          Execute jobs with:  ${c.highlight("yarn cedar jobs work\n")}
+          Generate jobs with: ${c.highlight(formatCedarCommand(["g", "job", "<name>"]))}
+          Execute jobs with:  ${c.highlight(`${formatCedarCommand(["jobs", "work"])}
+`)}
 
           Check out the docs for more info:
-          ${c.link("https://cedarjs.com/docs/background-jobs")}
+          ${terminalLink("", "https://cedarjs.com/docs/background-jobs")}
 
         `;
         }
       }
     ],
-    { rendererOptions: { collapseSubtasks: false }, errorOnExist: true }
+    { rendererOptions: { collapseSubtasks: false }, exitOnError: true }
   );
 };
 const handler = async ({ force }) => {
@@ -118,7 +123,7 @@ const handler = async ({ force }) => {
   try {
     await t.run();
   } catch (e) {
-    console.error(c.error(e.message));
+    console.error(c.error(e instanceof Error ? e.message : String(e)));
   }
 };
 export {

package/dist/commands/setup/mailer/mailer.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "mailer";
 const description = "Setup the Cedar mailer. This will install the required packages and add the required initial configuration to your Cedar app.";
 const builder = (yargs) => {

package/dist/commands/setup/mailer/mailerHandler.js

@@ -1,19 +1,19 @@
 import fs from "node:fs";
 import path from "node:path";
-import { pathToFileURL } from "node:url";
 import { Listr } from "listr2";
-import { addApiPackages } from "@cedarjs/cli-helpers";
+import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
 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 handler = async ({ force, skipExamples }) => {
+const handler = async ({
+  force,
+  skipExamples
+}) => {
   const projectIsTypescript = isTypeScriptProject();
   const pkgJsonPath = path.join(getPaths().base, "package.json");
-  const { default: pkgJson } = await import(pathToFileURL(pkgJsonPath), {
-    with: { type: "json" }
-  });
-  const cedarVersion = pkgJson.devDependencies["@cedarjs/core"] ?? "latest";
+  const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+  const cedarVersion = pkgJson.devDependencies?.["@cedarjs/core"] ?? "latest";
   const extension = projectIsTypescript ? "ts" : "js";
   const tasks = new Listr(
     [
@@ -100,9 +100,11 @@ const handler = async ({ force, skipExamples }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup/middleware/ogImage/ogImage.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "og-image";
 const aliases = ["ogImage", "ogimage"];
 const description = "Set up OG Image generation middleware";

package/dist/commands/setup/middleware/ogImage/ogImageHandler.js

@@ -2,7 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { addWebPackages, getPrettierOptions } from "@cedarjs/cli-helpers";
+import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import { addWebPackages } from "@cedarjs/cli-helpers/installHelpers";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../lib/runTransform.js";
 async function handler({ force }) {

package/dist/commands/setup/monitoring/sentry/sentry.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 const command = "sentry";
 const description = "Setup Sentry error and performance tracking";
 const builder = (yargs) => {

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -1,16 +1,17 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
+import { colors } from "@cedarjs/cli-helpers/colors";
+import { prettify, writeFilesTask } from "@cedarjs/cli-helpers/fileHelpers";
 import {
   addApiPackages,
+  addWebPackages
+} from "@cedarjs/cli-helpers/installHelpers";
+import { getPaths } from "@cedarjs/cli-helpers/paths";
+import {
   addEnvVarTask,
-  addWebPackages,
-  colors,
-  getPaths,
-  isTypeScriptProject,
-  prettify,
-  writeFilesTask
-} from "@cedarjs/cli-helpers";
+  isTypeScriptProject
+} from "@cedarjs/cli-helpers/project";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 const rwPaths = getPaths();
@@ -90,15 +91,20 @@ const handler = async ({ force }) => {
       title: "Replacing Redwood's Error boundary",
       task: async () => {
         const contentLines = fs.readFileSync(rwPaths.web.app).toString().split("\n");
+        const webImportRe = /^import \{ FatalErrorBoundary, ((?:Cedar|Redwood)Provider) \} from '@cedarjs\/web'$/;
         const webImportIndex = contentLines.findLastIndex(
-          (line) => /^import { FatalErrorBoundary, RedwoodProvider } from '@cedarjs\/web'$/.test(
-            line
-          )
+          (line) => webImportRe.test(line)
         );
+        if (webImportIndex === -1) {
+          throw new Error(
+            `Could not find "import { FatalErrorBoundary, CedarProvider } from '@cedarjs/web'" in web/src/App`
+          );
+        }
+        const providerName = contentLines[webImportIndex].match(webImportRe)?.[1];
         contentLines.splice(
           webImportIndex,
           1,
-          "import { RedwoodProvider } from '@cedarjs/web'"
+          `import { ${providerName} } from '@cedarjs/web'`
         );
         const boundaryOpenIndex = contentLines.findLastIndex(
           (line) => line.includes("<FatalErrorBoundary page={FatalErrorPage}>")
@@ -121,7 +127,7 @@ const handler = async ({ force }) => {
     },
     {
       title: "One more thing...",
-      task: (ctx) => {
+      task: (ctx, task) => {
         notes.push(
           colors.important(
             task.output = `You will need to add \`SENTRY_DSN\` to \`includeEnvironmentVariables\` in ${configFileName}.`

package/dist/commands/setup/neon/neon.js

@@ -0,0 +1,35 @@
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+const command = "neon";
+const description = "Provision a Neon Postgres database and configure your project";
+function builder(yargs) {
+  return yargs.option("force", {
+    alias: "f",
+    default: false,
+    description: "Overwrite existing DATABASE_URL in .env",
+    type: "boolean"
+  }).option("migrations", {
+    description: "Run Prisma migrations after setup. Omit to be prompted. Use --no-migrations to skip.",
+    type: "boolean"
+  }).option("verbose", {
+    alias: "v",
+    default: false,
+    description: "Show full output from migration commands (stderr visible in terminal)",
+    type: "boolean"
+  });
+}
+async function handler({ force, migrations, verbose }) {
+  recordTelemetryAttributes({
+    command: "setup neon",
+    force,
+    migrations,
+    verbose
+  });
+  const { handler: handler2 } = await import("./neonHandler.js");
+  return handler2({ force, migrations, verbose });
+}
+export {
+  builder,
+  command,
+  description,
+  handler
+};