@cedarjs/cli 2.0.1 → 2.0.2-next.24

package/dist/commands/buildHandler.js

@@ -113,7 +113,7 @@ const handler = async ({
       );
       return;
     }
-    await execa("yarn rw prerender", {
+    await execa("yarn cedar prerender", {
       stdio: "inherit",
       shell: true,
       cwd: rwjsPaths.web.base

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

@@ -31,7 +31,7 @@ const throwMissingConfig = (name) => {
 const verifyConfig = (config, yargs) => {
   if (!yargs.environment) {
     throw new Error(
-      "Must specify an environment to deploy to, ex: `yarn rw deploy baremetal production`"
+      "Must specify an environment to deploy to, ex: `yarn cedar deploy baremetal production`"
     );
   }
   if (!config[yargs.environment]) {
@@ -511,7 +511,7 @@ const handler = async (yargs) => {
   const ecosystemPath = path.join(getPaths().base, "ecosystem.config.js");
   if (!fs.existsSync(tomlPath) || !fs.existsSync(ecosystemPath)) {
     console.error(
-      c.error("\nError: Baremetal deploy has not been properly setup.\n") + "Please run `yarn rw setup deploy baremetal` before deploying"
+      c.error("\nError: Baremetal deploy has not been properly setup.\n") + "Please run `yarn cedar setup deploy baremetal` before deploying"
     );
     process.exit(1);
   }

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

@@ -5,13 +5,13 @@ const deployHandler = ({ build, prisma, dm: dataMigrate }) => {
   const paths = getPaths();
   let commandSet = [];
   if (build) {
-    commandSet.push("yarn rw build --verbose");
+    commandSet.push("yarn cedar build --verbose");
   }
   if (prisma) {
-    commandSet.push("yarn rw prisma migrate deploy");
+    commandSet.push("yarn cedar prisma migrate deploy");
   }
   if (dataMigrate) {
-    commandSet.push("yarn rw data-migrate up");
+    commandSet.push("yarn cedar data-migrate up");
   }
   const joinedCommands = commandSet.join(" && ");
   console.log(c.note("\nRunning:\n") + `${joinedCommands}

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -170,7 +170,7 @@ const handler = async ({ force, verbose }) => {
     {
       title: "Regenerate the Prisma client...",
       task: (_ctx, _task) => {
-        return execa(`yarn rw prisma generate`, {
+        return execa(`yarn cedar prisma generate`, {
           stdio: "inherit",
           shell: true,
           cwd: getPaths().web.base

package/dist/commands/experimental/templates/opentelemetry.ts.template

@@ -26,7 +26,7 @@ const resource = Resource.default().merge(
 const studioPort = getConfig().studio.basePort
 const exporter = new OTLPTraceExporter({
   // Update this URL to point to where your OTLP compatible collector is listening
-  // The redwood development studio (`yarn rw exp studio`) can collect your
+  // The redwood development studio (`yarn cedar exp studio`) can collect your
   // telemetry at `http://127.0.0.1:<PORT>/v1/traces` (default PORT is 4318)
   url: `http://127.0.0.1:${studioPort}/.redwood/functions/otel-trace`,
   concurrencyLimit: 64,

package/dist/commands/generate/dataMigration/dataMigration.js

@@ -16,7 +16,7 @@ const POST_RUN_INSTRUCTIONS = `Next steps...
   "After writing your migration, you can run it with:"
 )}
 
-     yarn rw dataMigrate up
+     yarn cedar dataMigrate up
 `;
 const TEMPLATE_PATHS = {
   js: path.resolve(

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -37,7 +37,7 @@ function getPostInstallMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn rw setup auth dbAuth\n",
+    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
@@ -56,7 +56,7 @@ function getPostInstallWebauthnMessage(isDbAuthSetup2) {
     "   logged in. Also take a look in the onSubmit() functions in ForgotPasswordPage",
     "   and ResetPasswordPage to change where the user redirects to after submitting",
     "   those forms.\n",
-    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn rw setup auth dbAuth\n",
+    !isDbAuthSetup2 && "   Oh, and if you haven't already, add the necessary dbAuth functions and\n   app setup by running:\n\n     yarn cedar setup auth dbAuth\n",
     "   Happy authenticating!"
   ].filter(Boolean).join("\n");
 }
@@ -304,7 +304,7 @@ const tasks = ({
       {
         title: "Generate types...",
         task: () => {
-          execa.commandSync("yarn rw g types");
+          execa.commandSync("yarn cedar g types");
         }
       },
       {

package/dist/commands/generate/script/scriptHandler.js

@@ -46,9 +46,9 @@ const handler = async ({ force, ...args }) => {
     "After modifying your script, you can invoke it like:"
   )}
 
-     yarn rw exec ${args.name}
+     yarn cedar exec ${args.name}
 
-     yarn rw exec ${args.name} --param1 true
+     yarn cedar exec ${args.name} --param1 true
 `;
   validateName(args.name);
   const tasks = new Listr(

package/dist/commands/prerenderHandler.js

@@ -82,7 +82,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   }
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
-      "You must run `yarn rw build web` before trying to prerender."
+      "You must run `yarn cedar build web` before trying to prerender."
     );
     process.exit(1);
   }
@@ -212,7 +212,9 @@ const prerenderRoute = async (prerenderer, queryCache, routeToPrerender, dryrun,
     }
   } catch (e) {
     console.log();
-    console.log(c.warning("You can use `yarn rw prerender --dry-run` to debug"));
+    console.log(
+      c.warning("You can use `yarn cedar prerender --dry-run` to debug")
+    );
     console.log();
     console.log(
       `${c.info("-".repeat(10))} Error rendering path "${routeToPrerender.path}" ${c.info("-".repeat(10))}`

package/dist/commands/serve.js

@@ -33,7 +33,12 @@ const builder = async (yargs) => {
         const { bothSsrRscServerHandler } = await import("./serveBothHandler.js");
         await bothSsrRscServerHandler(argv, rscEnabled);
       } else {
-        await bothServerCLIConfig.handler(argv);
+        if (!projectIsEsm()) {
+          const { handler } = await import("@cedarjs/api-server/cjs/bothCliConfigHandler");
+          await handler(argv);
+        } else {
+          await bothServerCLIConfig.handler(argv);
+        }
       }
     }
   }).command({
@@ -86,7 +91,7 @@ const builder = async (yargs) => {
     if (positionalArgs.includes("web") && !fs.existsSync(path.join(getPaths().web.dist), "index.html")) {
       console.error(
         c.error(
-          "\n Please run `yarn rw build web` before trying to serve web. \n"
+          "\n Please run `yarn cedar build web` before trying to serve web. \n"
         )
       );
       process.exit(1);
@@ -104,7 +109,7 @@ const builder = async (yargs) => {
       if (!fs.existsSync(path.join(getPaths().api.dist))) {
         console.error(
           c.error(
-            "\n Please run `yarn rw build api` before trying to serve api. \n"
+            "\n Please run `yarn cedar build api` before trying to serve api. \n"
           )
         );
         process.exit(1);
@@ -114,7 +119,7 @@ const builder = async (yargs) => {
       if (!apiSideExists && !rscEnabled) {
         console.error(
           c.error(
-            "\n Unable to serve the both sides as no `api` folder exists. Please use `yarn rw serve web` instead. \n"
+            "\n Unable to serve the both sides as no `api` folder exists. Please use `yarn cedar serve web` instead. \n"
           )
         );
         process.exit(1);
@@ -122,7 +127,7 @@ const builder = async (yargs) => {
       if (fs.existsSync(path.join(getPaths().api.base)) && !fs.existsSync(path.join(getPaths().api.dist)) || !fs.existsSync(path.join(getPaths().web.dist), "index.html")) {
         console.error(
           c.error(
-            "\n Please run `yarn rw build` before trying to serve your redwood app. \n"
+            "\n Please run `yarn cedar build` before trying to serve your redwood app. \n"
           )
         );
         process.exit(1);

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

@@ -78,8 +78,8 @@ const getFlightcontrolJson = async (database) => {
     Prisma datasource provider is detected to be ${detectedDatabase}.
 
     Update your schema.prisma provider to be postgresql or mysql, then run
-    yarn rw prisma migrate dev
-    yarn rw setup deploy flightcontrol
+    yarn cedar prisma migrate dev
+    yarn cedar setup deploy flightcontrol
     `);
   }
 };

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

@@ -52,11 +52,11 @@ const getRenderYamlContent = async (database) => {
     Prisma datasource provider is detected to be ${detectedDatabase}.
 
     Option 1: Update your schema.prisma provider to be ${database}, then run
-    yarn rw prisma migrate dev
-    yarn rw setup deploy render --database ${database}
+    yarn cedar prisma migrate dev
+    yarn cedar setup deploy render --database ${database}
 
     Option 2: Rerun setup deploy command with current schema.prisma provider:
-    yarn rw setup deploy render --database ${detectedDatabase}`);
+    yarn cedar setup deploy render --database ${detectedDatabase}`);
   }
 };
 const notes = [

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

@@ -30,9 +30,9 @@ const notes = [
   "  want to give it a shot, open your `.env` file and add your AWS credentials,",
   "  then run: ",
   "",
-  "    yarn rw deploy serverless --first-run",
+  "    yarn cedar deploy serverless --first-run",
   "",
-  "  For subsequent deploys you can just run `yarn rw deploy serverless`.",
+  "  For subsequent deploys you can just run `yarn cedar deploy serverless`.",
   "",
   "\u2022 If you want to use the Serverless Dashboard to manage your app, plug in",
   "  the values for `org` and `app` in `web/serverless.yml` and `api/serverless.yml`",

package/dist/commands/setup/deploy/templates/baremetal.js

@@ -67,11 +67,11 @@ freeSpaceRequired = 2048
 const MAINTENANCE = `<!--
 Put up this maintenance page on your deployed service with:
 
-  yarn rw baremetal deploy --maintenance up
+  yarn cedar baremetal deploy --maintenance up
 
 And take it back down with:
 
-  yarn rw baremetal deploy --maintenance down
+  yarn cedar baremetal deploy --maintenance down
 -->
 
 <!DOCTYPE html>

package/dist/commands/setup/deploy/templates/flightcontrol.js

@@ -16,8 +16,8 @@ const flightcontrolConfig = {
           buildType: "nixpacks",
           cpu: 0.5,
           memory: 1,
-          buildCommand: "yarn rw deploy flightcontrol api",
-          startCommand: "yarn rw deploy flightcontrol api --serve",
+          buildCommand: "yarn cedar deploy flightcontrol api",
+          startCommand: "yarn cedar deploy flightcontrol api --serve",
           port: 8911,
           healthCheckPath: "/graphql/health",
           ci: {
@@ -35,7 +35,7 @@ const flightcontrolConfig = {
           type: "static",
           buildType: "nixpacks",
           singlePageApp: true,
-          buildCommand: "yarn rw deploy flightcontrol web",
+          buildCommand: "yarn cedar deploy flightcontrol web",
           outputDirectory: "web/dist",
           ci: {
             type: "ec2"

package/dist/commands/setup/deploy/templates/netlify.js

@@ -1,7 +1,7 @@
 import { getConfig } from "../../../../lib/index.js";
 const config = getConfig();
 const NETLIFY_TOML = `[build]
-  command = "yarn rw deploy netlify"
+  command = "yarn cedar deploy netlify"
   publish = "web/dist"
   functions = "api/dist/functions"
 

package/dist/commands/setup/deploy/templates/render.js

@@ -10,7 +10,7 @@ services:
 - name: ${PROJECT_NAME}-web
   type: web
   env: static
-  buildCommand: npm install --global corepack && yarn install && yarn rw deploy render web
+  buildCommand: npm install --global corepack && yarn install && yarn cedar deploy render web
   staticPublishPath: ./web/dist
 
   envVars:
@@ -35,8 +35,8 @@ services:
   plan: free
   env: node
   region: oregon
-  buildCommand: npm install --global corepack && yarn install && yarn rw build api
-  startCommand: yarn rw deploy render api
+  buildCommand: npm install --global corepack && yarn install && yarn cedar build api
+  startCommand: yarn cedar deploy render api
 
   envVars:
 ${database}

package/dist/commands/setup/docker/dockerHandler.js

@@ -227,7 +227,7 @@ async function handler({ force }) {
         "Then, connect to the container and migrate your database:",
         "",
         "  docker compose -f ./docker-compose.dev.yml run --rm -it console /bin/bash",
-        "  root@...:/home/node/app# yarn rw prisma migrate dev",
+        "  root@...:/home/node/app# yarn cedar prisma migrate dev",
         "",
         "We assume you're using Postgres. If you're not, you'll need to make other changes to switch over.",
         "Lastly, ensure you have Docker. If you don't, see https://docs.docker.com/desktop/",

package/dist/commands/setup/docker/templates/Dockerfile

@@ -41,21 +41,21 @@ FROM base as api_build
 # ARG MY_BUILD_TIME_ENV_VAR
 
 COPY --chown=node:node api api
-RUN yarn rw build api
+RUN yarn cedar build api
 
 # web prerender build
 # -------------------
 FROM api_build as web_build_with_prerender
 
 COPY --chown=node:node web web
-RUN yarn rw build web
+RUN yarn cedar build web
 
 # web build
 # ---------
 FROM base as web_build
 
 COPY --chown=node:node web web
-RUN yarn rw build web --no-prerender
+RUN yarn cedar build web --no-prerender
 
 # api serve
 # ---------

package/dist/commands/setup/docker/templates/docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
       context: .
       dockerfile: ./Dockerfile
       target: base
-    command: yarn rw dev
+    command: yarn cedar dev
     volumes:
       - .:/home/node/app
       - node_modules:/home/node/app/node_modules
@@ -36,7 +36,7 @@ services:
   #
   # ```
   # docker compose -f ./docker-compose.dev.yml run --rm -it console /bin/bash
-  # root@...:/home/node/app# yarn rw prisma migrate dev
+  # root@...:/home/node/app# yarn cedar prisma migrate dev
   # ```
   console:
     user: root

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

@@ -34,7 +34,7 @@ async function handler({ force }) {
       {
         title: "Generate possibleTypes.ts",
         task: () => {
-          execa.commandSync("yarn redwood generate types", { stdio: "ignore" });
+          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
         }
       },
       {

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

@@ -28,7 +28,7 @@ async function handler({ force }) {
       {
         title: "Generating Trusted Documents store ...",
         task: () => {
-          execa.commandSync("yarn redwood generate types", { stdio: "ignore" });
+          execa.commandSync("yarn cedar generate types", { stdio: "ignore" });
         }
       },
       {

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

@@ -98,10 +98,10 @@ 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 rw prisma migrate dev\n") : ""}
+          ${!modelExists ? c.highlight("\n\xA0\xA0yarn cedar prisma migrate dev\n") : ""}
 
-          Generate jobs with: ${c.highlight("yarn rw g job <name>")}
-          Execute jobs with:  ${c.highlight("yarn rw jobs work\n")}
+          Generate jobs with: ${c.highlight("yarn cedar g job <name>")}
+          Execute jobs with:  ${c.highlight("yarn cedar jobs work\n")}
 
           Check out the docs for more info:
           ${c.link("https://cedarjs.com/docs/background-jobs")}

package/dist/commands/setup/jobs/templates/jobs.ts.template

@@ -1,5 +1,5 @@
 // Setup for background jobs. Jobs themselves live in api/src/jobs
-// Execute jobs in dev with `yarn rw jobs work`
+// Execute jobs in dev with `yarn cedar jobs work`
 // See https://cedarjs.com/docs/background-jobs
 
 import { PrismaAdapter, JobManager } from '@cedarjs/jobs'

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

@@ -18,7 +18,7 @@ async function handler({ force }) {
         task: () => {
           if (!getConfig().experimental?.streamingSsr?.enabled) {
             throw new Error(
-              "The Streaming SSR experimental feature must be enabled before you can setup middleware.\n\nRun this command to setup streaming ssr: \n  yarn rw exp setup-streaming-ssr\n"
+              "The Streaming SSR experimental feature must be enabled before you can setup middleware.\n\nRun this command to setup streaming ssr: \n  yarn cedar exp setup-streaming-ssr\n"
             );
           }
         }

package/dist/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -20,7 +20,7 @@ const tailwindImportsAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  " * `yarn rw setup ui tailwindcss` placed these directives here",
+  " * `yarn cedar setup ui tailwindcss` placed these directives here",
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -120,7 +120,7 @@ const handler = async ({ force }) => {
 
           ${c.success("\nUploads and storage configured!\n")}
 
-          Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight("yarn rw generate secret")}
+          Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight("yarn cedar generate secret")}
 
 
           Check out the docs for more info:

package/dist/commands/upgrade.js

@@ -422,7 +422,7 @@ async function refreshPrismaClient(task, { verbose }) {
   } catch (e) {
     task.skip("Refreshing the Prisma client caused an Error.");
     console.log(
-      "You may need to update your prisma client manually: $ yarn rw prisma generate"
+      "You may need to update your prisma client manually: $ yarn cedar prisma generate"
     );
     console.log(c.error(e.message));
   }

package/dist/index.js

@@ -119,14 +119,14 @@ async function runYargs() {
     describe: "Load additional .env files. Values defined in files specified later override earlier ones.",
     array: true
   }).example(
-    "yarn rw exec migrateUsers --load-env-files stripe nakama",
+    "yarn cedar exec migrateUsers --load-env-files stripe nakama",
     "Run a script, also loading env vars from '.env.stripe' and '.env.nakama'"
   ).option("telemetry", {
     describe: "Whether to send anonymous usage telemetry to RedwoodJS",
     boolean: true
     // hidden: true,
   }).example(
-    "yarn rw g page home /",
+    "yarn cedar g page home /",
     "Create a page component named 'Home' at path '/'"
   ).demandCommand().strict().exitProcess(false).alias("h", "help").command(buildCommand).command(checkCommand).command(consoleCommand).command(deployCommand).command(destroyCommand).command(devCommand).command(execCommand).command(experimentalCommand).command(generateCommand).command(infoCommand).command(jobsCommand).command(lintCommand).command(prerenderCommand).command(prismaCommand).command(recordCommand).command(serveCommand).command(setupCommand).command(studioCommand).command(projectIsEsm() ? testCommandEsm : testCommand).command(tstojsCommand).command(typeCheckCommand).command(upgradeCommand);
   await loadPlugins(yarg);

package/dist/lib/index.js

@@ -184,7 +184,7 @@ const getPrettierOptions = async () => {
 const transformTSToJS = async (filename, content) => {
   const { code } = babel.transform(content, {
     filename,
-    // If you ran `yarn rw generate` in `./web` transformSync would import the `.babelrc.js` file,
+    // If you ran `yarn cedar generate` in `./web` transformSync would import the `.babelrc.js` file,
     // in `./web`? despite us setting `configFile: false`.
     cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
     configFile: false,

package/dist/lib/updateCheck.js

@@ -88,7 +88,7 @@ function getUpdateMessage() {
   const data = readUpdateDataFile();
   const localTag = extractTagFromVersion(data.localVersion) || "latest";
   let updateCount = 0;
-  let message = " New updates to Cedar are available via `yarn rw upgrade#REPLACEME#` ";
+  let message = " New updates to Cedar are available via `yarn cedar upgrade#REPLACEME#` ";
   data.remoteVersions.forEach((version, tag) => {
     if (semver.gt(version, data.localVersion)) {
       updateCount += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "2.0.1",
+  "version": "2.0.2-next.24+7d862a743",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "2.0.1",
-    "@cedarjs/cli-helpers": "2.0.1",
-    "@cedarjs/fastify-web": "2.0.1",
-    "@cedarjs/internal": "2.0.1",
-    "@cedarjs/prerender": "2.0.1",
-    "@cedarjs/project-config": "2.0.1",
-    "@cedarjs/structure": "2.0.1",
-    "@cedarjs/telemetry": "2.0.1",
-    "@cedarjs/web-server": "2.0.1",
+    "@cedarjs/api-server": "2.0.2-next.24+7d862a743",
+    "@cedarjs/cli-helpers": "2.0.2-next.24+7d862a743",
+    "@cedarjs/fastify-web": "2.0.2-next.24+7d862a743",
+    "@cedarjs/internal": "2.0.2-next.24+7d862a743",
+    "@cedarjs/prerender": "2.0.2-next.24+7d862a743",
+    "@cedarjs/project-config": "2.0.2-next.24+7d862a743",
+    "@cedarjs/structure": "2.0.2-next.24+7d862a743",
+    "@cedarjs/telemetry": "2.0.2-next.24+7d862a743",
+    "@cedarjs/web-server": "2.0.2-next.24+7d862a743",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -95,11 +95,11 @@
     "memfs": "4.17.2",
     "node-ssh": "13.2.1",
     "tsx": "4.20.5",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "vitest": "3.2.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "857071cda8373db8db3248e3a58560e3fdef0240"
+  "gitHead": "7d862a7432fd0821b6da7194f2fd88f3d4adb1a0"
 }