@cedarjs/cli 5.0.6-rc.4 → 5.0.7-next.186

package/README.md

@@ -238,12 +238,9 @@ export const builder = (yargs) => {
 
     ...
 
-    .option('stats', {
-      default: false,
-      description: `Use ${terminalLink(
-        'Webpack Bundle Analyzer',
-        'https://github.com/webpack-contrib/webpack-bundle-analyzer'
-      )}`,
+    .option('prerender', {
+      default: true,
+      description: 'Prerender after building web',
       type: 'boolean',
     })
     .option('verbose', {
@@ -258,11 +255,11 @@ export const builder = (yargs) => {
 }
 ```
 
-These two calls to `options` configure this command to have options `--stats` and `--verbose`:
+These two calls to `options` configure this command to have options `--prerender` and `--verbose`:
 
 ```terminal
-yarn rw build --stats
-yarn rw build --verbose
+yarn cedar build --no-prerender
+yarn cedar build --verbose
 ```
 
 For the full list of what properties you can use to compose the options object, see [options(key, [opt])](https://yargs.js.org/docs/#api-optionskey-opt).
@@ -280,8 +277,8 @@ While `build`'s `handler` is too long to reproduce here in full, to get the poin
 
 export const handler = async ({
   side = ['api', 'web'],
+  prerender = true,
   verbose = false,
-  stats = false,
 }) => {
 
   ...

package/dist/cfw.js

@@ -40,6 +40,8 @@ try {
     // CEDAR_DISABLE_TELEMETRY
     env: { CEDAR_CWD: projectPath }
   });
-} catch {
+} catch (e) {
   console.log();
+  const exitCode = e && typeof e === "object" && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+  process.exit(exitCode);
 }

package/dist/commands/build/buildHandler.js

@@ -181,10 +181,14 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           "@cedarjs/vite/bins/cedar-vite-build.mjs"
         );
         await execa(
-          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
+          "node",
+          [
+            buildBinPath,
+            `--webDir=${cedarPaths.web.base}`,
+            `--verbose=${verbose}`
+          ],
           {
             stdio: verbose ? "inherit" : "pipe",
-            shell: true,
             cwd: cedarPaths.web.base
           }
         );
@@ -223,12 +227,16 @@ Run ` + c.info(formatCedarCommand(["build"])) + " (without specifying a workspac
           "@cedarjs/vite/bins/cedar-vite-build.mjs"
         );
         await execa(
-          `node ${buildBinPath} --webDir="${cedarPaths.web.base}" --verbose=${verbose}`,
+          "node",
+          [
+            buildBinPath,
+            `--webDir=${cedarPaths.web.base}`,
+            `--verbose=${verbose}`
+          ],
           {
             stdio: verbose ? "inherit" : "pipe",
-            shell: true,
-            // `cwd` is needed for the package manager (e.g. yarn) to find the
-            // cedar-vite-build binary
+            // `cwd` makes postcss/tailwind config resolution work (see the
+            // @NOTE above)
             // It won't change process.cwd for anything else here, in this
             // process
             cwd: cedarPaths.web.base

package/dist/commands/console.js

@@ -1,9 +1,11 @@
 const command = "console";
 const aliases = ["c"];
-const description = "Launch an interactive Redwood shell (experimental)";
+const description = "Launch an interactive Cedar shell";
 const handler = async () => {
-  const { handler: handler2 } = await import("./consoleHandler.js");
-  return handler2();
+  console.log(
+    "`cedar console` has been removed from the Cedar CLI.\nRun it as a standalone tool instead:\n\n  yarn dlx @cedarjs/console\n  npx @cedarjs/console\n  pnpm dlx @cedarjs/console\n"
+  );
+  process.exit(1);
 };
 export {
   aliases,

package/dist/commands/dev/devHandler.js

@@ -1,4 +1,5 @@
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
@@ -7,6 +8,7 @@ import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display
 import { shutdownPort } from "@cedarjs/internal/dist/dev";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { getConfig, getConfigPath } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { exitWithError } from "../../lib/exit.js";
 import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
@@ -15,13 +17,38 @@ import { getFreePort } from "../../lib/ports.js";
 import { serverFileExists } from "../../lib/project.js";
 import { getApiDebugFlag } from "./apiDebugFlag.js";
 import { getPackageWatchCommands } from "./packageWatchCommands.js";
+const createdRequire = createRequire(import.meta.url);
+function formatViteDevBinCommand(binName, extraNodeArgs = "") {
+  let vitePackageJsonPath;
+  let vitePackageJson;
+  try {
+    vitePackageJsonPath = createdRequire.resolve("@cedarjs/vite/package.json");
+    vitePackageJson = createdRequire("@cedarjs/vite/package.json");
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      `Could not resolve @cedarjs/vite, which the dev server needs to run. Is it installed? (${message})`
+    );
+  }
+  const binRelativePath = vitePackageJson.bin?.[binName];
+  if (!binRelativePath) {
+    throw new Error(
+      `@cedarjs/vite does not declare a "${binName}" bin. This is a bug in CedarJS.`
+    );
+  }
+  const binPath = path.join(path.dirname(vitePackageJsonPath), binRelativePath);
+  const nodeLauncher = getPackageManager() === "yarn" ? "yarn node" : "node";
+  const flags = extraNodeArgs ? `${extraNodeArgs} ` : "";
+  return `${nodeLauncher} ${flags}"${binPath}"`;
+}
 const handler = async ({
   workspace = ["api", "web", "packages/*"],
   forward = "",
   generate = true,
   apiDebugPort,
   debugBrk,
-  ud = false
+  ud = false,
+  nodeArgs = ""
 }) => {
   recordTelemetryAttributes({
     command: "dev",
@@ -174,7 +201,7 @@ const handler = async ({
       return null;
     }
     return [
-      `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-unified-dev"])}`,
+      formatViteDevBinCommand("cedar-unified-dev", nodeArgs),
       `  --port ${webAvailablePort}`,
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
@@ -230,13 +257,16 @@ const handler = async ({
       });
     }
     if (workspace.includes("web")) {
-      let webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-vite-dev"])} ${forward}`;
+      let webCommand = `${formatViteDevBinCommand("cedar-vite-dev", nodeArgs)} ${forward}`;
       if (streamingSsrEnabled) {
-        webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-dev-fe"])} ${forward}`;
+        webCommand = `${formatViteDevBinCommand("cedar-dev-fe", nodeArgs)} ${forward}`;
       }
       jobs.push({
         name: "web",
         command: webCommand,
+        env: {
+          NODE_ENV: "development"
+        },
         prefixColor: "blue",
         cwd: cedarPaths.web.base,
         runWhen: () => fs.existsSync(cedarPaths.web.src)

package/dist/commands/dev.js

@@ -31,6 +31,9 @@ const builder = (yargs) => {
     type: "boolean",
     default: false,
     description: "Use the unified Vite dev server that handles both web and API in a single process (experimental)."
+  }).option("nodeArgs", {
+    type: "string",
+    description: 'CLI args to pass to the node process running the web dev server, for example: `--node-args="--inspect --max-old-space-size=8192"`.'
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/generate/job/jobHandler.js

@@ -97,13 +97,11 @@ const handler = async ({
       {
         title: "Cleaning up...",
         task: () => {
-          runBinSync("eslint", [
-            "--fix",
-            "--config",
-            `${getPaths().base}/node_modules/@cedarjs/eslint-config/shared.js`,
-            `${getPaths().api.jobsConfig}`,
-            ...Object.keys(jobFiles)
-          ]);
+          runBinSync(
+            "eslint",
+            ["--fix", `${getPaths().api.jobsConfig}`, ...Object.keys(jobFiles)],
+            { cwd: getPaths().base }
+          );
         }
       }
     ],

package/dist/commands/generate/package/packageHandler.js

@@ -407,12 +407,9 @@ const handler = async ({
       {
         title: "Cleaning up...",
         task: () => {
-          runBinSync("eslint", [
-            "--fix",
-            "--config",
-            `${getPaths().base}/node_modules/@cedarjs/eslint-config/index.js`,
-            ...Object.keys(packageFiles)
-          ]);
+          runBinSync("eslint", ["--fix", ...Object.keys(packageFiles)], {
+            cwd: getPaths().base
+          });
         }
       }
     ],

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

@@ -46,15 +46,8 @@ const addFieldGraphQLComment = (field, str) => {
 const modelFieldToSDL = ({
   field,
   required = true,
-  types = {},
   docs = false
 }) => {
-  if (Object.entries(types).length && field.kind === "object") {
-    const resolvedType = idType(types[field.type]);
-    if (typeof resolvedType === "string") {
-      field.type = resolvedType;
-    }
-  }
   const prismaTypeToGraphqlType = {
     Json: "JSON",
     Decimal: "Float",
@@ -73,7 +66,7 @@ const modelFieldToSDL = ({
 const querySDL = (model, docs = false) => {
   return model.fields.map((field) => modelFieldToSDL({ field, docs }));
 };
-const inputSDL = (model, required, types = {}, docs = false) => {
+const inputSDL = (model, required, docs = false) => {
   const ignoredFields = DEFAULT_IGNORE_FIELDS_FOR_INPUT;
   return model.fields.filter((field) => {
     const idField = model.fields.find((field2) => field2.isId);
@@ -81,21 +74,19 @@ const inputSDL = (model, required, types = {}, docs = false) => {
       ignoredFields.push(idField.name);
     }
     return !ignoredFields.includes(field.name) && field.kind !== "object";
-  }).map((field) => modelFieldToSDL({ field, required, types, docs }));
+  }).map((field) => modelFieldToSDL({ field, required, docs }));
 };
 function idInputSDL(idType2, docs) {
   if (!Array.isArray(idType2)) {
     return [];
   }
-  return idType2.map(
-    (field) => modelFieldToSDL({ field, required: true, types: {}, docs })
-  );
+  return idType2.map((field) => modelFieldToSDL({ field, required: true, docs }));
 }
-const createInputSDL = (model, types = {}, docs = false) => {
-  return inputSDL(model, true, types, docs);
+const createInputSDL = (model, docs = false) => {
+  return inputSDL(model, true, docs);
 };
-const updateInputSDL = (model, types = {}, docs = false) => {
-  return inputSDL(model, false, types, docs);
+const updateInputSDL = (model, docs = false) => {
+  return inputSDL(model, false, docs);
 };
 function idType(model, crud) {
   if (!crud || !model) {
@@ -131,21 +122,6 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     );
   }
   const model = schemaResult;
-  const resolvedTypes = await Promise.all(
-    model.fields.filter((field) => field.kind === "object").map(async (field) => {
-      const fieldModel = await getSchema(field.type);
-      return fieldModel && "fields" in fieldModel ? fieldModel : void 0;
-    })
-  );
-  const types = resolvedTypes.reduce(
-    (acc, cur) => {
-      if (!cur) {
-        return acc;
-      }
-      return { ...acc, [cur.name]: cur };
-    },
-    {}
-  );
   const enums = (await Promise.all(
     model.fields.filter((field) => field.kind === "enum").map(async (field) => {
       const enumDef = await getEnum(field.type);
@@ -159,8 +135,8 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     modelName,
     modelDescription,
     query: querySDL(model, docs).join("\n    "),
-    createInput: createInputSDL(model, types, docs).join("\n    "),
-    updateInput: updateInputSDL(model, types, docs).join("\n    "),
+    createInput: createInputSDL(model, docs).join("\n    "),
+    updateInput: updateInputSDL(model, docs).join("\n    "),
     idInput: idInputSDL(idTypeRes, docs).join("\n    "),
     idType: idType(model, crud),
     idName: idName(model, crud),

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -30,14 +30,8 @@ const customOrDefaultTemplatePath = ({
     generator,
     templatePath
   );
-  const deprecatedCustomPath = getPaths()[side].generators ? path.join(getPaths()[side].generators, generator, templatePath) : void 0;
   if (fs.existsSync(customPath)) {
     return customPath;
-  } else if (deprecatedCustomPath && fs.existsSync(deprecatedCustomPath)) {
-    console.log(
-      `Having generator templates in ${getPaths()[side].generators} has been deprecated. Please move them to ${getPaths().generatorTemplates}.`
-    );
-    return deprecatedCustomPath;
   } else {
     return defaultPath;
   }

package/dist/commands/lint.js

@@ -1,63 +1,8 @@
 import fs from "node:fs";
-import path from "node:path";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getPaths, getConfig } from "@cedarjs/project-config";
-function detectLegacyEslintConfig() {
-  const projectRoot = getPaths().base;
-  const legacyConfigFiles = [
-    ".eslintrc.js",
-    ".eslintrc.cjs",
-    ".eslintrc.json",
-    ".eslintrc.yaml",
-    ".eslintrc.yml"
-  ];
-  const foundLegacyFiles = [];
-  for (const configFile of legacyConfigFiles) {
-    if (fs.existsSync(path.join(projectRoot, configFile))) {
-      foundLegacyFiles.push(configFile);
-    }
-  }
-  const packageJsonPath = path.join(projectRoot, "package.json");
-  if (fs.existsSync(packageJsonPath)) {
-    try {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
-      if (packageJson.eslintConfig) {
-        foundLegacyFiles.push("package.json (eslintConfig field)");
-      }
-      if (packageJson.eslint) {
-        foundLegacyFiles.push("package.json (eslint field)");
-      }
-    } catch {
-    }
-  }
-  return foundLegacyFiles;
-}
-function showLegacyEslintDeprecationWarning(legacyFiles) {
-  console.warn("");
-  console.warn("\u26A0\uFE0F  DEPRECATION WARNING: Legacy ESLint Configuration Detected");
-  console.warn("");
-  console.warn("   The following legacy ESLint configuration files were found:");
-  legacyFiles.forEach((file) => {
-    console.warn(`   - ${file}`);
-  });
-  console.warn("");
-  console.warn(
-    "   Cedar has migrated to ESLint flat config format. Legacy configurations"
-  );
-  console.warn(
-    "   still work but are deprecated and will be removed in a future version."
-  );
-  console.warn("");
-  console.warn("   To migrate to the new format:");
-  console.warn("   1. Remove the legacy config file(s) listed above");
-  console.warn("   2. Create an eslint.config.mjs");
-  console.warn("   3. Use the flat config format with @cedarjs/eslint-config");
-  console.warn("");
-  console.warn("   See more here: https://github.com/cedarjs/cedar/pull/629");
-  console.warn("");
-}
+import { getPaths } from "@cedarjs/project-config";
 const command = "lint [paths..]";
 const description = "Lint your files";
 const builder = (yargs) => {
@@ -86,11 +31,6 @@ const handler = async ({
   format = "stylish"
 }) => {
   recordTelemetryAttributes({ command: "lint", fix, format });
-  const config = getConfig();
-  const legacyConfigFiles = detectLegacyEslintConfig();
-  if (legacyConfigFiles.length > 0 && config instanceof Object && "eslintLegacyConfigWarning" in config && config.eslintLegacyConfigWarning) {
-    showLegacyEslintDeprecationWarning(legacyConfigFiles);
-  }
   try {
     const sbPath = getPaths().web.storybook;
     const eslintArgs = [

package/dist/commands/prismaHandler.js

@@ -49,18 +49,15 @@ const handler = async ({
   for (const [name, value] of Object.entries(options)) {
     args.push(name.length > 1 ? `--${name}` : `-${name}`);
     if (typeof value === "string") {
-      if (value.split(" ").length > 1) {
-        args.push(`"${value}"`);
-      } else {
-        args.push(value);
-      }
+      args.push(value);
     } else if (typeof value === "number") {
       args.push(String(value));
     }
   }
+  const displayCommand = args.map((arg) => arg.includes(" ") ? `"${arg}"` : arg).join(" ");
   console.log();
   console.log(c.note("Running Prisma CLI..."));
-  console.log(c.underline(`$ <pm exec> prisma ${args.join(" ")}`));
+  console.log(c.underline(`$ <pm exec> prisma ${displayCommand}`));
   console.log();
   try {
     runTransitiveBinSync("prisma", args, {

package/dist/commands/serve.js

@@ -6,7 +6,6 @@ import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
-import { projectIsEsm } from "@cedarjs/project-config";
 import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";
@@ -162,12 +161,7 @@ const builder = async (yargs) => {
         const serveBothHandlers = await import("./serveBothHandler.js");
         await serveBothHandlers.bothSsrRscServerHandler(argv, rscEnabled);
       } else {
-        if (!projectIsEsm()) {
-          const { handler } = await import("@cedarjs/api-server/cjs/bothCliConfigHandler");
-          await handler(argv);
-        } else {
-          await bothServerCLIConfig.handler(argv);
-        }
+        await bothServerCLIConfig.handler(argv);
       }
     }
   }).command({
@@ -219,12 +213,7 @@ const builder = async (yargs) => {
         const { apiServerFileHandler } = await import("./serveApiHandler.js");
         await apiServerFileHandler(argv);
       } else {
-        if (!projectIsEsm()) {
-          const { handler } = await import("@cedarjs/api-server/cjs/apiCliConfigHandler");
-          await handler(argv);
-        } else {
-          await apiServerCLIConfig.handler(argv);
-        }
+        await apiServerCLIConfig.handler(argv);
       }
     }
   }).command({

package/dist/commands/serveBothHandler.js

@@ -1,13 +1,13 @@
 import path from "path";
 import concurrently from "concurrently";
-import { handler as apiServerHandler } from "@cedarjs/api-server/cjs/apiCliConfigHandler";
+import { handler as apiServerHandler } from "@cedarjs/api-server/apiCliConfigHandler";
 import {
   getAPIHost,
   getAPIPort,
   getAPIRootPath,
   getWebHost,
   getWebPort
-} from "@cedarjs/api-server/cjs/cliHelpers";
+} from "@cedarjs/api-server/cliHelpers";
 import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { getConfig, getPaths } from "@cedarjs/project-config";

package/dist/commands/setup/auth/auth.js

@@ -237,7 +237,7 @@ async function getAuthSetupHandler(module) {
     });
   }
   const setupModule = await import(module);
-  return setupModule.default.handler;
+  return setupModule.handler;
 }
 function isInstalled(module) {
   const { dependencies, devDependencies } = JSON.parse(

package/dist/commands/setup/deploy/helpers/index.js

@@ -4,7 +4,6 @@ import * as parser from "@babel/parser";
 import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
-import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -88,14 +87,6 @@ const verifyUDSetupTask = () => {
     }
   };
 };
-function posToIndex(str, line, column) {
-  const lines = str.split("\n");
-  let index = 0;
-  for (let i = 0; i < line - 1; i++) {
-    index += lines[i].length + 1;
-  }
-  return index + column;
-}
 function resolveConfigObject(arg) {
   if (t.isObjectExpression(arg)) {
     return arg;
@@ -127,15 +118,9 @@ function insertPluginsBeforeCedar({
   content,
   pluginCodes
 }) {
-  const ast = recast.parse(content, {
-    parser: {
-      parse(source) {
-        return parser.parse(source, {
-          sourceType: "module",
-          plugins: ["typescript", "jsx"]
-        });
-      }
-    }
+  const ast = parser.parse(content, {
+    sourceType: "module",
+    plugins: ["typescript", "jsx"]
   });
   const defaultExport = ast.program.body.find(t.isExportDefaultDeclaration);
   if (!defaultExport) {
@@ -163,33 +148,18 @@ function insertPluginsBeforeCedar({
     return null;
   }
   const cedarNode = cedarElement;
-  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc) {
+  if (!cedarNode.loc || !arrayExpr.loc || !pluginsProp.loc || cedarNode.start == null || arrayExpr.start == null || arrayExpr.end == null) {
     return null;
   }
   const isInline = cedarNode.loc.start.line === arrayExpr.loc.start.line;
   if (isInline) {
-    const startPos = posToIndex(
-      content,
-      arrayExpr.loc.start.line,
-      arrayExpr.loc.start.column
-    );
-    const endPos = posToIndex(
-      content,
-      arrayExpr.loc.end.line,
-      arrayExpr.loc.end.column
-    );
-    const precedingText = content.slice(0, startPos);
-    const followingText = content.slice(endPos);
+    const precedingText = content.slice(0, arrayExpr.start);
+    const followingText = content.slice(arrayExpr.end);
     const existingCodes = elements.flatMap((el) => {
-      if (!el?.loc) {
+      if (el?.start == null || el.end == null) {
         return [];
       }
-      return [
-        content.slice(
-          posToIndex(content, el.loc.start.line, el.loc.start.column),
-          posToIndex(content, el.loc.end.line, el.loc.end.column)
-        )
-      ];
+      return [content.slice(el.start, el.end)];
     });
     const lines2 = content.split("\n");
     const pluginsLine = pluginsProp.loc.start.line;
@@ -205,7 +175,7 @@ function insertPluginsBeforeCedar({
     return precedingText + multiline + followingText;
   }
   const cedarLine = cedarNode.loc.start.line;
-  const insertPos = posToIndex(content, cedarLine, 0);
+  const insertPos = cedarNode.start - cedarNode.loc.start.column;
   const lines = content.split("\n");
   const indent = (lines[cedarLine - 1].match(/^\s*/) ?? [""])[0];
   const insertion = pluginCodes.map((code) => `${indent}${code},

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -16,6 +16,10 @@ import {
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
 const { getConfig } = prismaInternals;
+const APOLLO_PROVIDER_COMPONENT_NAMES = [
+  "CedarApolloProvider",
+  "RedwoodApolloProvider"
+];
 const getFlightcontrolJson = async (database) => {
   const flightcontrolConfig = getFlightcontrolConfig();
   if (database === "none") {
@@ -205,18 +209,26 @@ const updateApp = () => {
         appContent[authLineIndex] = `      <AuthProvider type="dbAuth" config={{ fetchConfig: { credentials: 'include' } }}>
 `;
       }
-      const gqlLineIndex = appContent.findIndex(
-        (line) => line.includes("<RedwoodApolloProvider")
-      );
+      let gqlLineIndex = -1;
+      let apolloProviderComponentName = "";
+      for (const componentName of APOLLO_PROVIDER_COMPONENT_NAMES) {
+        gqlLineIndex = appContent.findIndex(
+          (line) => line.includes(`<${componentName}`)
+        );
+        if (gqlLineIndex !== -1) {
+          apolloProviderComponentName = componentName;
+          break;
+        }
+      }
       if (gqlLineIndex === -1) {
         console.log(`
-    Couldn't find <RedwoodApolloProvider in web/src/App.js
+    Couldn't find <CedarApolloProvider in web/src/App.js
     If (and when) you use *dbAuth*, you'll have to add the following fetch config manually:
 
     graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}}
     `);
       } else if (appContent.toString().match(/dbAuth/)) {
-        appContent[gqlLineIndex] = `        <RedwoodApolloProvider graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
+        appContent[gqlLineIndex] = `        <${apolloProviderComponentName} graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
 `;
       }
       fs.writeFileSync(appPath, appContent.join(EOL));

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/ui/libraries/tailwindcssHandler.js

@@ -87,7 +87,6 @@ const handler = async ({
   const projectPackages = ["prettier-plugin-tailwindcss@^0.8.0"];
   const webWorkspacePackages = [
     "postcss",
-    "postcss-loader",
     "tailwindcss@^3.4.17",
     "autoprefixer"
   ];

package/dist/lib/exec.js

@@ -54,19 +54,16 @@ async function runScriptFunction({
       nodeRunnerEnv: {}
     },
     resolve: {
+      // `$api/` and `api/` imports are handled by
+      // cedarjsResolveCedarStyleImportsPlugin below, which also resolves
+      // Cedar's directory named modules (`$api/src/services/posts` ->
+      // posts/posts.ts) and leaves an actual `api` npm package alone. The web
+      // side equivalents have no plugin support, so they stay aliases
       alias: [
-        {
-          find: /^\$api\//,
-          replacement: getPaths().api.base + "/"
-        },
         {
           find: /^\$web\//,
           replacement: getPaths().web.base + "/"
         },
-        {
-          find: /^api\//,
-          replacement: getPaths().api.base + "/"
-        },
         {
           find: /^web\//,
           replacement: getPaths().web.base + "/"

package/dist/lib/updateCheck.js

@@ -24,15 +24,35 @@ function getPersistenceDirectory() {
   persistenceDirectory = path.join(getPaths().generated.base, "updateCheck");
   return persistenceDirectory;
 }
-async function check() {
+function getLocalVersion() {
+  let version;
   try {
-    console.time("Update Check");
     const packageJson = JSON.parse(
       fs.readFileSync(path.join(getPaths().base, "package.json"), "utf-8")
     );
-    let localVersion = packageJson.devDependencies["@cedarjs/core"];
-    while (!/\d/.test(localVersion.charAt(0))) {
-      localVersion = localVersion.substring(1);
+    version = packageJson.devDependencies?.["@cedarjs/core"];
+  } catch {
+    return void 0;
+  }
+  if (typeof version === "string" && semver.valid(version)) {
+    return version;
+  }
+  return void 0;
+}
+async function check() {
+  try {
+    console.time("Update Check");
+    const localVersion = getLocalVersion();
+    if (!localVersion) {
+      console.log(
+        "Skipping update check: no pinned @cedarjs/core version found"
+      );
+      updateUpdateDataFile({
+        localVersion: "0.0.0",
+        remoteVersions: /* @__PURE__ */ new Map(),
+        checkedAt: (/* @__PURE__ */ new Date()).getTime()
+      });
+      return;
     }
     console.log(`Detected the current version of Cedar: '${localVersion}'`);
     const remoteVersions = /* @__PURE__ */ new Map();
@@ -69,16 +89,24 @@ function shouldCheck() {
     return false;
   }
   const data = readUpdateDataFile();
+  const localVersion = getLocalVersion();
+  if (localVersion && localVersion !== data.localVersion) {
+    return true;
+  }
   return data.checkedAt < (/* @__PURE__ */ new Date()).getTime() - CHECK_PERIOD;
 }
 function shouldShow() {
   if (isLockSet(SHOW_LOCK_IDENTIFIER)) {
     return false;
   }
+  const localVersion = getLocalVersion();
+  if (!localVersion) {
+    return false;
+  }
   const data = readUpdateDataFile();
   let newerVersion = false;
   data.remoteVersions.forEach((version) => {
-    newerVersion ||= semver.gt(version, data.localVersion);
+    newerVersion ||= semver.gt(version, localVersion);
   });
   return data.shownAt < (/* @__PURE__ */ new Date()).getTime() - SHOW_PERIOD && newerVersion;
 }

package/dist/telemetry/resource.js

@@ -89,8 +89,6 @@ async function getResources() {
     complexity,
     sides,
     experiments: JSON.stringify(experiments),
-    webBundler: "vite",
-    // Hardcoded because this is now the only supported bundler
     uid: UID
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.6-rc.4",
+  "version": "5.0.7-next.186",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,18 +33,18 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "5.0.6-rc.4",
-    "@cedarjs/cli-helpers": "5.0.6-rc.4",
-    "@cedarjs/fastify-web": "5.0.6-rc.4",
-    "@cedarjs/internal": "5.0.6-rc.4",
-    "@cedarjs/prerender": "5.0.6-rc.4",
-    "@cedarjs/project-config": "5.0.6-rc.4",
-    "@cedarjs/structure": "5.0.6-rc.4",
-    "@cedarjs/telemetry": "5.0.6-rc.4",
-    "@cedarjs/utils": "5.0.6-rc.4",
-    "@cedarjs/vite": "5.0.6-rc.4",
-    "@cedarjs/web-server": "5.0.6-rc.4",
-    "@listr2/prompt-adapter-enquirer": "4.2.1",
+    "@cedarjs/api-server": "5.0.7-next.186",
+    "@cedarjs/cli-helpers": "5.0.7-next.186",
+    "@cedarjs/fastify-web": "5.0.7-next.186",
+    "@cedarjs/internal": "5.0.7-next.186",
+    "@cedarjs/prerender": "5.0.7-next.186",
+    "@cedarjs/project-config": "5.0.7-next.186",
+    "@cedarjs/structure": "5.0.7-next.186",
+    "@cedarjs/telemetry": "5.0.7-next.186",
+    "@cedarjs/utils": "5.0.7-next.186",
+    "@cedarjs/vite": "5.0.7-next.186",
+    "@cedarjs/web-server": "5.0.7-next.186",
+    "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
     "@opentelemetry/exporter-trace-otlp-http": "0.57.2",
@@ -52,7 +52,7 @@
     "@opentelemetry/sdk-trace-node": "1.30.1",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@prisma/internals": "7.8.0",
-    "ansis": "4.2.0",
+    "ansis": "4.3.1",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
     "camel-case": "4.1.2",
@@ -69,7 +69,7 @@
     "execa": "5.1.1",
     "fast-glob": "3.3.3",
     "humanize-string": "2.1.0",
-    "jscodeshift": "17.3.0",
+    "jscodeshift": "17.4.0",
     "jsonc-parser": "3.3.1",
     "latest-version": "9.0.0",
     "listr2": "10.2.2",
@@ -80,7 +80,6 @@
     "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
-    "recast": "0.23.11",
     "rimraf": "6.1.3",
     "semver": "7.7.4",
     "smol-toml": "1.6.1",
@@ -102,7 +101,7 @@
     "node-ssh": "13.2.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.6"
+    "vitest": "4.1.10"
   },
   "engines": {
     "node": ">=24"

package/dist/commands/consoleHandler.js

@@ -1,75 +0,0 @@
-import fs from "node:fs";
-import { createRequire } from "node:module";
-import path from "node:path";
-import repl from "node:repl";
-import { registerApiSideBabelHook } from "@cedarjs/babel-config";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getPaths } from "../lib/index.js";
-const paths = getPaths();
-function isREPLServerWithHistory(replServer) {
-  return "history" in replServer && "lines" in replServer;
-}
-const loadPrismaClient = (replContext) => {
-  const createdRequire = createRequire(import.meta.url);
-  const { db } = createdRequire(path.join(paths.api.lib, "db"));
-  db[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = "PrismaClient";
-  replContext.db = db;
-};
-const consoleHistoryFile = path.join(paths.generated.base, "console_history");
-const persistConsoleHistory = (r) => {
-  const lines = isREPLServerWithHistory(r) ? r.lines : [];
-  fs.appendFileSync(
-    consoleHistoryFile,
-    lines.filter((line) => line.trim()).join("\n") + "\n",
-    "utf8"
-  );
-};
-const loadConsoleHistory = async (r) => {
-  try {
-    const history = await fs.promises.readFile(consoleHistoryFile, "utf8");
-    if (isREPLServerWithHistory(r)) {
-      history.split("\n").reverse().map((line) => r.history.push(line));
-    }
-  } catch {
-  }
-};
-const handler = (_options) => {
-  recordTelemetryAttributes({
-    command: "console"
-  });
-  registerApiSideBabelHook({
-    plugins: [
-      [
-        "babel-plugin-module-resolver",
-        {
-          alias: {
-            src: paths.api.src
-          }
-        },
-        "rwjs-console-module-resolver"
-      ]
-    ]
-  });
-  const r = repl.start();
-  const defaultEval = r.eval;
-  const asyncEval = (cmd, context, filename, callback) => {
-    defaultEval.call(r, cmd, context, filename, async (err, result) => {
-      if (err) {
-        callback(err, null);
-      } else {
-        try {
-          callback(null, await Promise.resolve(result));
-        } catch (err2) {
-          callback(err2 instanceof Error ? err2 : new Error(String(err2)), null);
-        }
-      }
-    });
-  };
-  r.eval = asyncEval;
-  loadConsoleHistory(r);
-  r.addListener("close", () => persistConsoleHistory(r));
-  loadPrismaClient(r.context);
-};
-export {
-  handler
-};