@cedarjs/cli 4.2.1-next.0 → 4.2.1-next.258

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

@@ -5,6 +5,12 @@ import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
+import {
+  addRootPackages,
+  addWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
 const tailwindDirectives = [
@@ -19,7 +25,7 @@ const tailwindImportsAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  " * `yarn cedar setup ui tailwindcss` placed these directives here",
+  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed these directives here`,
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",
@@ -68,14 +74,17 @@ async function recommendExtensionsToInstall() {
     });
   }
 }
-const handler = async ({ force, install }) => {
+const handler = async ({
+  force,
+  install
+}) => {
   recordTelemetryAttributes({
     command: "setup ui tailwindcss",
     force,
     install
   });
   const rwPaths = getPaths();
-  const projectPackages = ["prettier-plugin-tailwindcss@^0.7.0"];
+  const projectPackages = ["prettier-plugin-tailwindcss@^0.8.0"];
   const webWorkspacePackages = [
     "postcss",
     "postcss-loader",
@@ -93,8 +102,9 @@ const handler = async ({ force, install }) => {
               {
                 title: `Install ${projectPackages.join(", ")}`,
                 task: async () => {
-                  await execa("yarn", ["add", "-D", ...projectPackages], {
-                    cwd: rwPaths.base
+                  await addRootPackages(projectPackages, {
+                    cwd: rwPaths.base,
+                    dev: true
                   });
                 }
               }
@@ -112,19 +122,16 @@ const handler = async ({ force, install }) => {
               {
                 title: `Install ${webWorkspacePackages.join(", ")}`,
                 task: async () => {
-                  await execa(
-                    "yarn",
-                    ["workspace", "web", "add", "-D", ...webWorkspacePackages],
-                    {
-                      cwd: rwPaths.base,
-                      env: {
-                        // For some reason yarn started installing deprecated
-                        // typescript types when installing tailwind. This
-                        // prevents it from happening.
-                        YARN_TS_ENABLE_AUTO_TYPES: "false"
-                      }
-                    }
-                  );
+                  await addWorkspacePackages("web", webWorkspacePackages, {
+                    cwd: rwPaths.base,
+                    env: {
+                      // For some reason yarn started installing deprecated
+                      // typescript types when installing tailwind. This
+                      // prevents it from happening. (yarn-only env var.)
+                      YARN_TS_ENABLE_AUTO_TYPES: "false"
+                    },
+                    dev: true
+                  });
                 }
               }
             ],
@@ -169,7 +176,7 @@ const handler = async ({ force, install }) => {
               );
             }
           }
-          await execa("yarn", ["tailwindcss", "init", tailwindConfigPath], {
+          await runBin("tailwindcss", ["init", tailwindConfigPath], {
             cwd: rwPaths.web.base
           });
           const tailwindConfig = fs.readFileSync(tailwindConfigPath, "utf-8");
@@ -234,7 +241,7 @@ const handler = async ({ force, install }) => {
             rwPaths.base,
             ".vscode/extensions.json"
           );
-          let originalExtensionsJson = { recommendations: [] };
+          let originalExtensionsJson = {};
           if (fs.existsSync(VS_CODE_EXTENSIONS_PATH)) {
             const originalExtensionsFile = fs.readFileSync(
               VS_CODE_EXTENSIONS_PATH,
@@ -245,7 +252,7 @@ const handler = async ({ force, install }) => {
           const newExtensionsJson = {
             ...originalExtensionsJson,
             recommendations: [
-              ...originalExtensionsJson.recommendations,
+              ...originalExtensionsJson.recommendations ?? [],
               ...recommendedVSCodeExtensions
             ]
           };
@@ -280,7 +287,10 @@ const handler = async ({ force, install }) => {
             const originalSettingsJson = JSON.parse(
               originalSettingsFile || "{}"
             );
-            const originalTwClassAttributesJson = originalSettingsJson["tailwindCSS.classAttributes"] || [];
+            const existingAttributes = originalSettingsJson["tailwindCSS.classAttributes"];
+            const originalTwClassAttributesJson = Array.isArray(
+              existingAttributes
+            ) ? existingAttributes : [];
             const mergedClassAttributes = Array.from(
               /* @__PURE__ */ new Set([...classAttributes, ...originalTwClassAttributesJson])
             );
@@ -342,7 +352,7 @@ const handler = async ({ force, install }) => {
             const pluginsMatch = newPrettierConfig.match(
               /plugins: \[[\sa-z\(\)'\-,]*]/
             );
-            const matched = pluginsMatch && pluginsMatch[0];
+            const matched = pluginsMatch != null ? pluginsMatch[0] : void 0;
             if (matched && (matched.includes("'prettier-plugin-tailwindcss'") || matched.includes('"prettier-plugin-tailwindcss"'))) {
               task.skip(
                 "tailwindcss-plugin-prettier already required in plugins"
@@ -370,9 +380,11 @@ const handler = async ({ force, install }) => {
     await tasks.run();
     await recommendExtensionsToInstall();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 };
 export {

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

@@ -8,6 +8,7 @@ import {
   getPrettierOptions,
   colors as c
 } from "@cedarjs/cli-helpers";
+import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
@@ -124,7 +125,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 cedar generate secret")}
+          Remember to add UPLOADS_SECRET to your .env file. You can generate one with ${c.highlight(formatCedarCommand(["generate", "secret"]))}
 
           Check out the docs for more info:
           ${terminalLink("", "https://cedarjs.com/docs/uploads")}
@@ -140,9 +141,11 @@ const handler = async ({ force }) => {
   try {
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/setup.js

@@ -18,10 +18,9 @@ import * as setupServerFile from "./setup/server-file/serverFile.js";
 import * as setupTsconfig from "./setup/tsconfig/tsconfig.js";
 import * as setupUi from "./setup/ui/ui.js";
 import * as setupUploads from "./setup/uploads/uploads.js";
-import * as setupVite from "./setup/vite/vite.js";
 const command = "setup <command>";
 const description = "Initialize project config and install packages";
-const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupNeon).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).command(setupVite).demandCommand().middleware(detectCedarVersion).epilogue(
+const builder = (yargs) => yargs.command(setupAuth).command(setupCache).command(setupDeploy).command(setupDocker).command(setupGenerator).command(setupGraphql).command(setupI18n).command(setupJobs).command(setupMailer).command(setupMiddleware).command(setupMonitoring).command(setupNeon).command(setupPackage).command(setupRealtime).command(setupServerFile).command(setupTsconfig).command(setupUi).command(setupUploads).demandCommand().middleware(detectCedarVersion).epilogue(
   `Also see the ${terminalLink(
     "CedarJS CLI Reference",
     "https://cedarjs.com/docs/cli-commands#setup"

package/dist/commands/test/testHandler.js

@@ -2,6 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -125,7 +126,7 @@ const handler = async ({
       await warnIfNonStandardDatasourceUrl({ force });
     }
     const runCommand = async () => {
-      await execa("yarn", ["jest", ...jestArgs], {
+      await runBin("jest", jestArgs, {
         cwd: rwjsPaths.base,
         stdio: "inherit",
         env: { ...process.env, DATABASE_URL }

package/dist/commands/test/testHandlerEsm.js

@@ -1,5 +1,5 @@
-import execa from "execa";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { ensurePosixPath } from "@cedarjs/project-config";
 import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../../lib/index.js";
@@ -76,7 +76,7 @@ const handler = async ({
       await warnIfNonStandardDatasourceUrl({ force });
     }
     const runCommand = async () => {
-      await execa("yarn", ["vitest", ...vitestArgs], {
+      await runBin("vitest", vitestArgs, {
         cwd: rwjsPaths.base,
         stdio: "inherit",
         env: { ...process.env, DATABASE_URL }

package/dist/commands/type-checkHandler.js

@@ -1,8 +1,9 @@
 import path from "node:path";
 import concurrently from "concurrently";
-import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const isConcurrentlyErrorArray = (value) => {
@@ -30,7 +31,7 @@ const handler = async ({
       const projectDir = path.join(getPaths().base, side);
       return {
         cwd: projectDir,
-        command: "yarn tsc --noEmit --skipLibCheck"
+        command: formatRunBinCommand("tsc", ["--noEmit", "--skipLibCheck"])
       };
     });
     const { result } = concurrently(tscForAllSides, {
@@ -55,10 +56,7 @@ const handler = async ({
       [
         {
           title: "Generating types",
-          task: () => execa("yarn cedar-gen", {
-            shell: true,
-            stdio: verbose ? "inherit" : "ignore"
-          })
+          task: () => runBin("cedar-gen", [], { stdio: verbose ? "inherit" : "ignore" })
         }
       ],
       {

package/dist/commands/upgrade/upgradeHandler.js

@@ -194,8 +194,7 @@ const handler = async (upgradeOptions) => {
 };
 async function packageManagerInstall({ verbose }) {
   try {
-    await execa(`${getPackageManager()} ${install()}`, {
-      shell: true,
+    await execa(getPackageManager(), [install()], {
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });
@@ -456,8 +455,7 @@ async function dedupeDeps(_task, { verbose }) {
     return;
   }
   try {
-    await execa(`${getPackageManager()} ${dedupeCmd}`, {
-      shell: true,
+    await execa(getPackageManager(), [dedupeCmd], {
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
     });

package/dist/index.js

@@ -38,15 +38,21 @@ import { exitWithError } from "./lib/exit.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";
 import { startTelemetry, shutdownTelemetry } from "./telemetry/index.js";
-let { cwd, telemetry, help, version } = Parser(hideBin(process.argv), {
+const {
+  telemetry,
+  help,
+  version,
+  cwd: parsedCwd
+} = Parser(hideBin(process.argv), {
   // Telemetry is enabled by default, but can be disabled in two ways
   // - by passing a `--telemetry false` option
-  // - by setting a `REDWOOD_DISABLE_TELEMETRY` env var
+  // - by setting a `CEDAR_DISABLE_TELEMETRY` env var
   boolean: ["telemetry"],
   default: {
-    telemetry: process.env.REDWOOD_DISABLE_TELEMETRY === void 0 || process.env.REDWOOD_DISABLE_TELEMETRY === ""
+    telemetry: (process.env.CEDAR_DISABLE_TELEMETRY === void 0 || process.env.CEDAR_DISABLE_TELEMETRY === "") && (process.env.REDWOOD_DISABLE_TELEMETRY === void 0 || process.env.REDWOOD_DISABLE_TELEMETRY === "")
   }
 });
+let cwd = parsedCwd;
 cwd ??= process.env.CEDAR_CWD;
 cwd ??= process.env.RWJS_CWD;
 cwd = getTomlDir(cwd);
@@ -168,7 +174,7 @@ function getTomlDir(cwd2) {
       tomlDir = path.dirname(configTomlPath);
     }
   } catch (error) {
-    console.error(error.message);
+    console.error(error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
   return tomlDir;

package/dist/lib/configureStorybook.js

@@ -10,11 +10,11 @@ import {
 } from "./merge/strategy.js";
 import { isTypeScriptProject } from "./project.js";
 import { getPaths, transformTSToJS, writeFile } from "./index.js";
-async function extendStorybookConfiguration(newConfigPath = void 0) {
+async function extendStorybookConfiguration(newConfigPath) {
   const webPaths = getPaths().web;
   const ts = isTypeScriptProject();
   const sbPreviewConfigPath = webPaths.storybookPreviewConfig ?? `${webPaths.storybook}/preview.${ts ? "tsx" : "js"}`;
-  const read = (path2) => fse.readFileSync(path2, { encoding: "utf-8" });
+  const read = (filePath) => fse.readFileSync(filePath, { encoding: "utf-8" });
   if (!fse.existsSync(sbPreviewConfigPath)) {
     const templateContent = read(
       path.resolve(

package/dist/lib/exec.js

@@ -1,4 +1,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, statSync } from "node:fs";
 import path from "node:path";
 import { createServer, isRunnableDevEnvironment } from "vite";
 import { getPaths, importStatementPath } from "@cedarjs/project-config";
@@ -11,8 +11,8 @@ import {
   cedarAutoImportsPlugin,
   cedarCjsCompatPlugin
 } from "@cedarjs/vite";
-function resolveExtension(id) {
-  if (existsSync(id)) {
+function resolveId(id) {
+  if (existsSync(id) && statSync(id).isFile()) {
     return id;
   }
   const withoutExt = /\.jsx?$/.test(id) ? id.replace(/\.jsx?$/, "") : id;
@@ -21,6 +21,16 @@ function resolveExtension(id) {
       return withoutExt + ext;
     }
   }
+  if (existsSync(id) && statSync(id).isDirectory()) {
+    for (const base of ["index", path.basename(id)]) {
+      for (const ext of [".ts", ".tsx", ".js", ".jsx"]) {
+        const candidate = path.join(id, base + ext);
+        if (existsSync(candidate)) {
+          return candidate;
+        }
+      }
+    }
+  }
   return id;
 }
 async function runScriptFunction({
@@ -67,14 +77,14 @@ async function runScriptFunction({
           customResolver: (id, importer, _options) => {
             const apiImportBase = importStatementPath(getPaths().api.base);
             const webImportBase = importStatementPath(getPaths().web.base);
-            if (importer.startsWith(apiImportBase)) {
+            if (importer?.startsWith(apiImportBase)) {
               const apiImportSrc = importStatementPath(getPaths().api.src);
-              const resolvedId = id.replace("src", apiImportSrc);
-              return { id: resolveExtension(resolvedId) };
-            } else if (importer.startsWith(webImportBase)) {
+              const apiId = id.replace("src", apiImportSrc);
+              return { id: resolveId(apiId) };
+            } else if (importer?.startsWith(webImportBase)) {
               const webImportSrc = importStatementPath(getPaths().web.src);
-              const resolvedId = id.replace("src", webImportSrc);
-              return { id: resolveExtension(resolvedId) };
+              const webId = id.replace("src", webImportSrc);
+              return { id: resolveId(webId) };
             }
             return null;
           }
@@ -97,25 +107,27 @@ async function runScriptFunction({
     throw new Error("Vite environment is not runnable.");
   }
   let returnValue;
-  let scriptError = null;
-  try {
-    const script = await env.runner.import(scriptPath);
-    returnValue = await script[functionName](args);
-  } catch (error) {
-    scriptError = error;
-  }
   try {
-    const { db } = await env.runner.import(path.join(getPaths().api.lib, "db"));
-    db.$disconnect();
-  } catch (e) {
-  }
-  await server.close();
-  process.env.NODE_ENV = NODE_ENV;
-  if (scriptError) {
-    throw scriptError;
+    const module = await env.runner.import(scriptPath);
+    const fn = module[functionName];
+    if (typeof fn !== "function") {
+      throw new Error(`Function '${functionName}' not found in script`);
+    }
+    returnValue = await fn(args);
+  } finally {
+    try {
+      const dbModule = await env.runner.import(
+        path.join(getPaths().api.lib, "db")
+      );
+      dbModule.db?.$disconnect?.();
+    } catch {
+    }
+    await server.close();
+    process.env.NODE_ENV = NODE_ENV;
   }
   return returnValue;
 }
 export {
+  resolveId,
   runScriptFunction
 };

package/dist/lib/exit.js

@@ -12,12 +12,27 @@ const DEFAULT_ERROR_EPILOGUE = [
   ` - Not sure about something or need advice? Reach out on our ${discordLink}`,
   ` - Think you've found a bug? Open an issue on our ${githubLink}`
 ].join("\n");
-function exitWithError(error, { exitCode, message, epilogue, includeEpilogue, includeReferenceCode } = {}) {
-  exitCode ??= error?.exitCode ?? 1;
+function exitWithError(error, {
+  exitCode,
+  message,
+  epilogue,
+  includeEpilogue,
+  includeReferenceCode
+} = {}) {
+  if (error && typeof error === "object" && "exitCode" in error) {
+    exitCode ??= typeof error.exitCode === "number" ? error.exitCode : 1;
+  }
+  exitCode ??= 1;
   epilogue ??= DEFAULT_ERROR_EPILOGUE;
   includeEpilogue ??= true;
   includeReferenceCode ??= true;
-  message ??= error.stack ?? (error.toString() || "Unknown error");
+  if (message === void 0) {
+    if (error instanceof Error && error.stack) {
+      message = error.stack;
+    } else {
+      message = String(error) || "Unknown error";
+    }
+  }
   const errorReferenceCode = uuidv4();
   const line = ansis.red("-".repeat(process.stderr.columns - 4));
   const content = !includeEpilogue ? message : [
@@ -31,7 +46,7 @@ ${line}`,
     line
   ].filter(Boolean).join("\n");
   console.error(content);
-  recordTelemetryError(error ?? new Error(message));
+  recordTelemetryError(error ?? new Error(message ?? ""));
   recordTelemetryAttributes({ errorReferenceCode });
   process.exit(exitCode);
 }

package/dist/lib/extendFile.js

@@ -1,8 +1,8 @@
 import fs from "node:fs";
-function fileIncludes(path, str) {
-  return fs.existsSync(path) && fs.readFileSync(path).toString().includes(str);
+function fileIncludes(filePath, str) {
+  return fs.existsSync(filePath) && fs.readFileSync(filePath).toString().includes(str);
 }
-function extendJSXFile(path, {
+function extendJSXFile(filePath, {
   insertComponent: {
     name = void 0,
     props = void 0,
@@ -14,7 +14,7 @@ function extendJSXFile(path, {
   imports = [],
   moduleScopeLines = []
 }) {
-  const content = fs.readFileSync(path).toString().split("\n");
+  const content = fs.readFileSync(filePath).toString().split("\n");
   if (moduleScopeLines?.length) {
     content.splice(
       content.findLastIndex((l) => l.trimStart().startsWith("import")) + 1,
@@ -41,9 +41,16 @@ function extendJSXFile(path, {
       insertAfter
     });
   }
-  fs.writeFileSync(path, content.filter((e) => e !== void 0).join("\n"));
+  fs.writeFileSync(filePath, content.join("\n"));
 }
-function insertComponent(content, { component, props, around, within, insertBefore, insertAfter }) {
+function insertComponent(content, {
+  component,
+  props,
+  around,
+  within,
+  insertBefore,
+  insertAfter
+}) {
   if (around && within || !(around || within)) {
     throw new Error(
       "Exactly one of (around | within) must be defined. Choose one."
@@ -62,16 +69,16 @@ function insertComponent(content, { component, props, around, within, insertBefo
     open++;
     close--;
   }
-  const [, componentDepth] = content[open].match(/([^\S\r\n]*).*/);
+  const depthMatch = content[open].match(/([^\S\r\n]*).*/);
+  const componentDepth = depthMatch?.[1] ?? "";
   content.splice(
     open,
     close - open,
-    // "Delete" the wrapped component contents. We put it back below.
-    insertBefore && componentDepth + insertBefore,
+    ...insertBefore ? [componentDepth + insertBefore] : [],
     componentDepth + buildOpeningTag(component, props),
     ...content.slice(open, close).map((line) => "  " + line),
     componentDepth + `</${component}>`,
-    insertAfter && componentDepth + insertAfter
+    ...insertAfter ? [componentDepth + insertAfter] : []
   );
 }
 function buildOpeningTag(componentName, props) {
@@ -92,11 +99,14 @@ function buildOpeningTag(componentName, props) {
   const possibleSpace = propsString.length ? " " : "";
   return `<${componentName}${possibleSpace}${propsString}>`;
 }
-function objectToComponentProps(obj, options = { exclude: [], raw: false }) {
+function objectToComponentProps(obj, options = {
+  exclude: [],
+  raw: false
+}) {
   const props = [];
   const doRaw = (key) => options.raw === true || Array.isArray(options.raw) && options.raw.includes(key);
   for (const [key, value] of Object.entries(obj)) {
-    if (options.exclude && options.exclude.includes(key)) {
+    if (options.exclude?.includes(key)) {
       continue;
     }
     if (doRaw(key)) {