@cedarjs/cli 5.0.7-next.338 → 5.0.7-rc.3

package/README.md

@@ -238,9 +238,12 @@ export const builder = (yargs) => {
 
     ...
 
-    .option('prerender', {
-      default: true,
-      description: 'Prerender after building web',
+    .option('stats', {
+      default: false,
+      description: `Use ${terminalLink(
+        'Webpack Bundle Analyzer',
+        'https://github.com/webpack-contrib/webpack-bundle-analyzer'
+      )}`,
       type: 'boolean',
     })
     .option('verbose', {
@@ -255,11 +258,11 @@ export const builder = (yargs) => {
 }
 ```
 
-These two calls to `options` configure this command to have options `--prerender` and `--verbose`:
+These two calls to `options` configure this command to have options `--stats` and `--verbose`:
 
 ```terminal
-yarn cedar build --no-prerender
-yarn cedar build --verbose
+yarn rw build --stats
+yarn rw 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).
@@ -277,8 +280,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,8 +40,6 @@ try {
     // CEDAR_DISABLE_TELEMETRY
     env: { CEDAR_CWD: projectPath }
   });
-} catch (e) {
+} catch {
   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,14 +181,10 @@ 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
           }
         );
@@ -227,16 +223,12 @@ 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",
-            // `cwd` makes postcss/tailwind config resolution work (see the
-            // @NOTE above)
+            shell: true,
+            // `cwd` is needed for the package manager (e.g. yarn) to find the
+            // cedar-vite-build binary
             // It won't change process.cwd for anything else here, in this
             // process
             cwd: cedarPaths.web.base

package/dist/commands/console.js

@@ -1,11 +1,9 @@
 const command = "console";
 const aliases = ["c"];
-const description = "Launch an interactive Cedar shell";
+const description = "Launch an interactive Redwood shell (experimental)";
 const handler = async () => {
-  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);
+  const { handler: handler2 } = await import("./consoleHandler.js");
+  return handler2();
 };
 export {
   aliases,

package/dist/commands/consoleHandler.js

@@ -0,0 +1,75 @@
+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
+};

package/dist/commands/dev/devHandler.js

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import { createRequire } from "node:module";
 import path from "node:path";
 import { Writable } from "node:stream";
 import concurrently from "concurrently";
@@ -8,7 +7,6 @@ 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";
@@ -17,39 +15,13 @@ 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,
-  nodeArgs = "",
-  jobs: jobsOption
+  ud = false
 }) => {
   recordTelemetryAttributes({
     command: "dev",
@@ -202,16 +174,11 @@ const handler = async ({
       return null;
     }
     return [
-      formatViteDevBinCommand("cedar-unified-dev", nodeArgs),
+      `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-unified-dev"])}`,
       `  --port ${webAvailablePort}`,
       `  --apiPort ${apiAvailablePort}`,
       getApiDebugFlag(apiDebugPort, apiAvailablePort),
       debugBrk ? "--debug-brk" : "",
-      // `cedar-unified-dev` starts its own in-process jobs worker pool (see
-      // `jobsDevMiddleware.ts`) rather than relying on the nodemon-wrapped
-      // worker pushed below, so `--no-jobs` has to be forwarded explicitly -
-      // it isn't part of `forward` unless the user passed it after `--`.
-      jobsOption === false ? "--no-jobs" : "",
       forward
     ].join(" ").replace(/\s+/g, " ").trim();
   };
@@ -263,16 +230,13 @@ const handler = async ({
       });
     }
     if (workspace.includes("web")) {
-      let webCommand = `${formatViteDevBinCommand("cedar-vite-dev", nodeArgs)} ${forward}`;
+      let webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-vite-dev"])} ${forward}`;
       if (streamingSsrEnabled) {
-        webCommand = `${formatViteDevBinCommand("cedar-dev-fe", nodeArgs)} ${forward}`;
+        webCommand = `${formatRunBinCommand("cross-env", ["NODE_ENV=development", "cedar-dev-fe"])} ${forward}`;
       }
       jobs.push({
         name: "web",
         command: webCommand,
-        env: {
-          NODE_ENV: "development"
-        },
         prefixColor: "blue",
         cwd: cedarPaths.web.base,
         runWhen: () => fs.existsSync(cedarPaths.web.src)
@@ -286,37 +250,6 @@ const handler = async ({
       prefixColor: "green"
     });
   }
-  const jobsConfigured = jobsOption !== false && workspace.includes("api") && !!cedarPaths.api.jobsConfig && // `getPaths()` resolves `jobsConfig` once and caches it in-process, so
-  // if `api/src/lib/jobs.ts` is deleted mid-session the cached path would
-  // otherwise still look "configured". Guard against starting a worker
-  // that can't load a jobs config that no longer exists.
-  fs.existsSync(cedarPaths.api.jobsConfig) && fs.existsSync(cedarPaths.api.jobs) && // Job files always live in `api/src/jobs/<ComponentName>Job/`
-  // subdirectories (see `generate/job/jobHandler.ts`), so entries here are
-  // directories, not files — only the `.keep` placeholder (and any stray
-  // dotfiles, e.g. `.DS_Store`) should be excluded.
-  fs.readdirSync(cedarPaths.api.jobs).some((entry) => !entry.startsWith("."));
-  if (jobsConfigured && unifiedDevCommand) {
-  } else if (jobsConfigured) {
-    jobs.push({
-      name: "jobs",
-      // `cedar-jobs work` loads its config and job files from `api/dist`
-      // (compiled output), not `api/src`. That dist output is only written
-      // once the `api` watcher's initial build finishes, which happens
-      // asynchronously — so on a clean `cedar dev` start there's a window
-      // where `api/dist` doesn't exist yet and the worker would exit
-      // immediately. Wrapping it in nodemon (same tool the `api` job above
-      // uses) means it retries as soon as `api/dist` changes, instead of
-      // staying dead for the rest of the session. This also means the
-      // worker restarts automatically whenever job code is rebuilt, since
-      // Node's ESM cache would otherwise keep serving stale job code.
-      command: formatRunBinCommand("nodemon", [
-        "--quiet",
-        `--watch "${cedarPaths.api.dist}"`,
-        `--exec "${formatRunBinCommand("cedar-jobs", ["work"])}"`
-      ]),
-      prefixColor: "magenta"
-    });
-  }
   const packageWorkspaces = workspace.filter(
     (w) => w !== "api" && w !== "web" && w !== "gen"
   );

package/dist/commands/dev.js

@@ -13,7 +13,10 @@ const builder = (yargs) => {
   }).option("forward", {
     alias: "fwd",
     description: 'String of one or more vite dev server config options, for example: `--fwd="--port=1234 --open=false"`',
-    type: "string"
+    type: "string",
+    // The reason `forward` is hidden is that it's been broken with Vite and
+    // it's not clear how to fix it.
+    hidden: true
   }).option("generate", {
     type: "boolean",
     default: true,
@@ -28,12 +31,6 @@ 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"`.'
-  }).option("jobs", {
-    type: "boolean",
-    description: "Start the background jobs worker alongside the other dev servers when jobs are configured (`cedar setup jobs` + at least one `cedar g job`). Pass `--no-jobs` to opt out and run `cedar jobs work` yourself instead."
   }).middleware(() => {
     const check = checkNodeVersion();
     if (check.ok) {

package/dist/commands/execHandler.js

@@ -3,7 +3,6 @@ import path from "node:path";
 import { context } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { Listr } from "listr2";
-import { Parser } from "yargs/helpers";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { findScripts } from "@cedarjs/internal/dist/files";
 import { runScriptFunction } from "../lib/exec.js";
@@ -51,17 +50,6 @@ const handler = async (args) => {
   delete scriptArgs.l;
   delete scriptArgs.s;
   delete scriptArgs.silent;
-  if (Array.isArray(scriptArgs._)) {
-    const dashBlockIndex = scriptArgs._.findIndex(
-      (arg) => typeof arg === "string" && arg.startsWith("-")
-    );
-    if (dashBlockIndex !== -1) {
-      const unparsedTail = scriptArgs._.splice(dashBlockIndex);
-      const { _: reparsedPositionals, ...reparsedFlags } = Parser(unparsedTail);
-      scriptArgs._.push(...reparsedPositionals);
-      Object.assign(scriptArgs, reparsedFlags);
-    }
-  }
   const scriptPath = resolveScriptPath(name);
   if (!scriptPath) {
     console.error(

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -114,7 +114,7 @@ const handler = async ({
       },
       task: (_ctx, task) => {
         task.output = [
-          "Please add the following to your 'cedarFastifyGraphQLServer' plugin options to enable OTel for your graphql",
+          "Please add the following to your 'redwoodFastifyGraphQLServer' plugin options to enable OTel for your graphql",
           "openTelemetryOptions: {",
           "  resolvers: true,",
           "  result: true,",

package/dist/commands/generate/helpers.js

@@ -23,20 +23,6 @@ const validateName = (name) => {
     );
   }
 };
-const SENSITIVE_FIELDS = [
-  "hashedPassword",
-  "salt",
-  "resetToken",
-  "resetTokenExpiresAt",
-  "webAuthnChallenge"
-];
-const redactedModelFields = (fieldNames) => {
-  const sensitive = fieldNames.filter((name) => SENSITIVE_FIELDS.includes(name));
-  if (sensitive.length === 1 && sensitive[0] === "salt") {
-    return [];
-  }
-  return sensitive;
-};
 const relationsForModel = (model) => {
   return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
@@ -74,13 +60,11 @@ const mapPrismaScalarToPagePropTsType = (scalarType) => {
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {
-  SENSITIVE_FIELDS,
   forcePluralizeWord,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
   mapRouteParamTypeToTsType,
   pathName,
-  redactedModelFields,
   relationsForModel,
   removeGeneratorName,
   validateName

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

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

package/dist/commands/generate/package/filesTask.js

@@ -8,7 +8,6 @@ const files = async ({
   fileName,
   typescript,
   tests: generateTests = true,
-  esm = false,
   ...rest
 }) => {
   const extension = typescript ? ".ts" : ".js";
@@ -59,17 +58,6 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
-    if (esm) {
-      const vitestConfigFile = await templateForFile({
-        name,
-        side: "packages",
-        generator: "package",
-        templatePath: "vitest.config.ts.template",
-        templateVars: { folderName, ...rest },
-        outputPath: path.join(folderName, `vitest.config${extension}`)
-      });
-      outputFiles.push(vitestConfigFile);
-    }
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;

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

@@ -11,11 +11,11 @@ import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
-import { getConfig, projectIsEsm } from "@cedarjs/project-config";
+import { getConfig } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
-import { addFileToRollback, prepareForRollback } from "../../../lib/rollback.js";
+import { prepareForRollback } from "../../../lib/rollback.js";
 import { files } from "./filesTask.js";
 function nameVariants(nameArg) {
   const base = path.basename(getPaths().base);
@@ -32,10 +32,8 @@ async function updateTsconfig(task) {
       path: path.join(getPaths().api.base, "tsconfig.json"),
       expectedModule: "node20",
       // While Cedar doesn't officially endorse NodeNext, it will still work
-      // here, so we'll keep it. ESNext is also acceptable: it's the current
-      // create-cedar-app default, paired with `moduleResolution: bundler` so
-      // extensionless scaffold/generator imports resolve correctly.
-      acceptable: ["node20", "nodenext", "esnext"]
+      // here, so we'll keep it
+      acceptable: ["node20", "nodenext"]
     },
     {
       name: "web",
@@ -248,9 +246,6 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
 async function installAndBuild(folderName) {
   const packagePath = path.join("packages", folderName);
   await installPackages({ stdio: "inherit", cwd: getPaths().base });
-  addFileToRollback(
-    path.join(getPaths().base, packagePath, "tsconfig.tsbuildinfo")
-  );
   await runScript("build", [], { stdio: "inherit", cwd: packagePath });
 }
 const handler = async ({
@@ -340,12 +335,7 @@ const handler = async ({
       {
         title: "Generating package files...",
         task: async (ctx) => {
-          packageFiles = await files({
-            ...ctx.nameVariants,
-            // Only Vitest projects get a config generated for them
-            esm: projectIsEsm(),
-            ...rest
-          });
+          packageFiles = await files({ ...ctx.nameVariants, ...rest });
           return writeFilesTask(packageFiles, { overwriteExisting: force });
         }
       },
@@ -417,9 +407,12 @@ const handler = async ({
       {
         title: "Cleaning up...",
         task: () => {
-          runBinSync("eslint", ["--fix", ...Object.keys(packageFiles)], {
-            cwd: getPaths().base
-          });
+          runBinSync("eslint", [
+            "--fix",
+            "--config",
+            `${getPaths().base}/node_modules/@cedarjs/eslint-config/index.js`,
+            ...Object.keys(packageFiles)
+          ]);
         }
       }
     ],

package/dist/commands/generate/package/templates/test.ts.template

@@ -1,7 +1,7 @@
 import { ${camelName} } from './index.js'
 
 describe('${camelName}', () => {
-  it('should not throw any errors', () => {
-    expect(() => ${camelName}()).not.toThrow()
+  it('should not throw any errors', async () => {
+    expect(${camelName}()).not.toThrow()
   })
 })