@cedarjs/cli 0.7.2-next.2 → 0.7.2-next.49

package/dist/commands/experimental/util.js

@@ -40,7 +40,7 @@ const printTaskEpilogue = (command, description, topicId) => {
 const isServerFileSetup = () => {
   if (!serverFileExists()) {
     throw new Error(
-      "RedwoodJS Realtime requires a serverful environment. Please run `yarn rw setup server-file` first."
+      "CedarJS Realtime requires a serverful environment. Please run `yarn cedarjs setup server-file` first."
     );
   }
   return true;
@@ -53,9 +53,9 @@ const realtimeExists = () => {
   return fs.existsSync(realtimePath);
 };
 const isRealtimeSetup = () => {
-  if (!realtimeExists) {
+  if (!realtimeExists()) {
     throw new Error(
-      "Adding realtime events requires that RedwoodJS Realtime be setup. Please run `yarn setup realtime` first."
+      "Adding realtime events requires that CedarJS Realtime is setup. Please run `yarn cedarjs setup realtime` first."
     );
   }
   return true;

package/dist/commands/generate/realtime/realtimeHandler.js

@@ -5,6 +5,7 @@ import pascalcase from "pascalcase";
 import pluralize, { singular } from "pluralize";
 import prompts from "prompts";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../lib/colors.js";
 import {
@@ -34,7 +35,7 @@ const templateVariables = (name) => {
     subscriptionServiceResolver: `publishTo${pascalcase(name)}Channel`
   };
 };
-async function handler({ name, type, force, verbose }) {
+async function handler({ name, type, force, verbose, silent }) {
   const redwoodPaths = getPaths();
   const ts = isTypeScriptProject();
   name = singular(name.toLowerCase());
@@ -112,6 +113,16 @@ async function handler({ name, type, force, verbose }) {
             exampleFile,
             exampleSubscriptionTemplateContent
           );
+          let blankTemplateContent = await generateTemplate(
+            setupScriptContent,
+            templateVariables(name)
+          );
+          if (projectIsEsm()) {
+            blankTemplateContent = blankTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           return [
             writeFile(
               sdlFile,
@@ -127,16 +138,9 @@ async function handler({ name, type, force, verbose }) {
                 overwriteExisting: force
               }
             ),
-            writeFile(
-              exampleFile,
-              await generateTemplate(
-                setupScriptContent,
-                templateVariables(name)
-              ),
-              {
-                overwriteExisting: force
-              }
-            )
+            writeFile(exampleFile, blankTemplateContent, {
+              overwriteExisting: force
+            })
           ];
         }
       },
@@ -199,7 +203,7 @@ async function handler({ name, type, force, verbose }) {
     ],
     {
       rendererOptions: { collapseSubtasks: false, persistentOutput: true },
-      renderer: verbose ? "verbose" : "default"
+      renderer: silent ? "silent" : verbose ? "verbose" : "default"
     }
   );
   try {

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -3,6 +3,7 @@ import fs from "fs-extra";
 import { Listr } from "listr2";
 import { addApiPackages } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../lib/colors.js";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
@@ -50,7 +51,7 @@ async function handler({ force, includeExamples, verbose }) {
         title: "Adding Countdown example subscription ...",
         enabled: () => includeExamples,
         task: async () => {
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -60,6 +61,12 @@ async function handler({ force, includeExamples, verbose }) {
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             redwoodPaths.api.subscriptions,
             "countdown",
@@ -111,16 +118,22 @@ async function handler({ force, includeExamples, verbose }) {
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const serviceContent = ts ? exampleServiceTemplateContent : await transformTSToJS(serviceFile, exampleServiceTemplateContent);
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
               "subscriptions",
               "newMessage",
-              `newMessage.ts.template`
+              "newMessage.ts.template"
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             redwoodPaths.api.subscriptions,
             "newMessage",

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

@@ -188,7 +188,7 @@ const handler = async ({ force, install }) => {
           const newTailwindConfig = 'const { join } = require("node:path");\n\n' + tailwindConfig.replace(
             "content: []",
             "content: [join(__dirname, '../src/**/*.{js,jsx,ts,tsx}')]"
-          );
+          ).replace("export default {", "module.exports = {");
           fs.writeFileSync(tailwindConfigPath, newTailwindConfig);
         }
       },

package/dist/commands/testEsm.js

@@ -0,0 +1,36 @@
+import { terminalLink } from "termi-link";
+import c from "../lib/colors.js";
+import { sides } from "../lib/project.js";
+const command = "test [filter..]";
+const description = "Run Vitest tests. Defaults to watch mode";
+const builder = (yargs) => {
+  const cliDocsLink = terminalLink(
+    "CedarJS CLI Reference",
+    "https://cedarjs.com/docs/cli-commands#test"
+  );
+  const vitestTip = c.tip("yarn vitest --help");
+  yargs.strict(false).positional("filter", {
+    default: sides(),
+    description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
+    type: "array"
+  }).option("db-push", {
+    describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
+    type: "boolean",
+    default: true
+  }).epilogue(
+    `For all available flags, run vitest cli directly ${vitestTip}
+
+Also see the ${cliDocsLink}
+`
+  );
+};
+const handler = async (options) => {
+  const { handler: handler2 } = await import("./testHandlerEsm.js");
+  return handler2(options);
+};
+export {
+  builder,
+  command,
+  description,
+  handler
+};

package/dist/commands/testHandlerEsm.js

@@ -0,0 +1,86 @@
+import execa from "execa";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { ensurePosixPath } from "@cedarjs/project-config";
+import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
+import { getPaths } from "../lib/index.js";
+import * as project from "../lib/project.js";
+const handler = async ({
+  filter: filterParams = [],
+  dbPush = true,
+  ...others
+}) => {
+  recordTelemetryAttributes({
+    command: "test",
+    dbPush
+  });
+  let watch = true;
+  const rwjsPaths = getPaths();
+  const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
+    if (["db-push", "loadEnvFiles", "$0", "_"].includes(flagName)) {
+      return [];
+    } else {
+      const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
+      const flagValue = others[flagName];
+      if (flagName === "watch") {
+        watch = flagValue === true;
+      } else if (flagName === "run" && flagValue) {
+        watch = false;
+      }
+      if (Array.isArray(flagValue)) {
+        return flagValue.flatMap((val) => [flag, val]);
+      } else {
+        return [flag, flagValue];
+      }
+    }
+  });
+  const sides = filterParams.filter(
+    (filterString) => project.sides().includes(filterString)
+  );
+  const vitestFilterArgs = [
+    ...filterParams.filter(
+      (filterString) => !project.sides().includes(filterString)
+    )
+  ];
+  const vitestArgs = [
+    ...vitestFilterArgs,
+    ...forwardVitestFlags,
+    "--passWithNoTests"
+  ].filter((flagOrValue) => flagOrValue !== null);
+  if (process.env.CI) {
+    vitestArgs.push("--run");
+  }
+  if (!sides.length) {
+    project.sides().forEach((side) => sides.push(side));
+  }
+  sides.forEach((side) => vitestArgs.push("--project", side));
+  try {
+    const cacheDirDb = `file:${ensurePosixPath(
+      rwjsPaths.generated.base
+    )}/test.db`;
+    const DATABASE_URL = process.env.TEST_DATABASE_URL || cacheDirDb;
+    if (sides.includes("api") && !dbPush) {
+      process.env.SKIP_DB_PUSH = "1";
+    }
+    const runCommand = async () => {
+      await execa("yarn vitest", vitestArgs, {
+        cwd: rwjsPaths.base,
+        shell: true,
+        stdio: "inherit",
+        env: { DATABASE_URL }
+      });
+    };
+    if (watch) {
+      await runCommand();
+    } else {
+      await timedTelemetry(process.argv, { type: "test" }, async () => {
+        await runCommand();
+      });
+    }
+  } catch (e) {
+    errorTelemetry(process.argv, e.message);
+    process.exit(e?.exitCode || 1);
+  }
+};
+export {
+  handler
+};

package/dist/index.js

@@ -5,6 +5,7 @@ import fs from "fs-extra";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
 import { loadEnvFiles, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { telemetryMiddleware } from "@cedarjs/telemetry";
 import * as buildCommand from "./commands/build.js";
 import * as checkCommand from "./commands/check.js";
@@ -25,6 +26,7 @@ import * as serveCommand from "./commands/serve.js";
 import * as setupCommand from "./commands/setup.js";
 import * as studioCommand from "./commands/studio.js";
 import * as testCommand from "./commands/test.js";
+import * as testCommandEsm from "./commands/testEsm.js";
 import * as tstojsCommand from "./commands/ts-to-js.js";
 import * as typeCheckCommand from "./commands/type-check.js";
 import * as upgradeCommand from "./commands/upgrade.js";
@@ -126,7 +128,7 @@ async function runYargs() {
   }).example(
     "yarn rw 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(testCommand).command(tstojsCommand).command(typeCheckCommand).command(upgradeCommand);
+  ).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);
   const pkgJson = await import("../package.json", { with: { type: "json" } });
   yarg.version(pkgJson.default["version"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "0.7.2-next.2+30d6c0c8c",
+  "version": "0.7.2-next.49+eaf36e897",
   "description": "The Redwood Command Line",
   "repository": {
     "type": "git",
@@ -32,15 +32,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.27.1",
     "@babel/runtime-corejs3": "7.27.6",
-    "@cedarjs/api-server": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/cli-helpers": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/fastify-web": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/internal": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/prerender": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/project-config": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/structure": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/telemetry": "0.7.2-next.2+30d6c0c8c",
-    "@cedarjs/web-server": "0.7.2-next.2+30d6c0c8c",
+    "@cedarjs/api-server": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/cli-helpers": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/fastify-web": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/internal": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/prerender": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/project-config": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/structure": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/telemetry": "0.7.2-next.49+eaf36e897",
+    "@cedarjs/web-server": "0.7.2-next.49+eaf36e897",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -95,12 +95,12 @@
     "@types/archiver": "^6",
     "memfs": "4.17.2",
     "node-ssh": "13.2.1",
-    "tsx": "4.20.3",
+    "tsx": "4.20.4",
     "typescript": "5.6.2",
     "vitest": "3.2.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "30d6c0c8c64f48a0ecd4acdb5a52dc7c6db19c42"
+  "gitHead": "eaf36e897609e775295faca150fe4a3b448841e3"
 }