@cedarjs/cli 1.0.0-canary.12726 → 1.0.0-canary.12729

package/dist/commands/generate/directive/directiveHandler.js

@@ -120,15 +120,9 @@ const handler = async (args) => {
         title: "Generating TypeScript definitions and GraphQL schemas ...",
         task: () => {
           addFunctionToRollback(async () => {
-            await execa("yarn rw-gen", [], {
-              stdio: "pipe",
-              shell: true
-            });
+            await execa("yarn", ["rw-gen"], { stdio: "pipe" });
           }, true);
-          return execa("yarn rw-gen", [], {
-            stdio: "inherit",
-            shell: true
-          });
+          return execa("yarn", ["rw-gen"], { stdio: "inherit" });
         }
       },
       {

package/dist/commands/generate.js

@@ -22,11 +22,9 @@ const command = "generate <type>";
 const aliases = ["g"];
 const description = "Generate boilerplate code and type definitions";
 const builder = (yargs) => yargs.command("types", "Generate supplementary code", {}, () => {
-  recordTelemetryAttributes({
-    command: "generate types"
-  });
+  recordTelemetryAttributes({ command: "generate types" });
   try {
-    execa.sync("yarn rw-gen", { shell: true, stdio: "inherit" });
+    execa.sync("yarn", ["rw-gen"], { stdio: "inherit" });
   } catch (error) {
     process.exitCode = error.exitCode ?? 1;
   }

package/dist/commands/lint.js

@@ -29,24 +29,22 @@ const handler = async ({ path, fix, format }) => {
   try {
     const pathString = path?.join(" ");
     const sbPath = getPaths().web.storybook;
-    const result = await execa(
-      "yarn eslint",
-      [
-        fix && "--fix",
-        `--format ${format}`,
-        !pathString && fs.existsSync(getPaths().web.src) && "web/src",
-        !pathString && fs.existsSync(getPaths().web.config) && "web/config",
-        !pathString && fs.existsSync(sbPath) && "web/.storybook",
-        !pathString && fs.existsSync(getPaths().scripts) && "scripts",
-        !pathString && fs.existsSync(getPaths().api.src) && "api/src",
-        pathString
-      ].filter(Boolean),
-      {
-        cwd: getPaths().base,
-        shell: true,
-        stdio: "inherit"
-      }
-    );
+    const args = [
+      "eslint",
+      fix && "--fix",
+      "--format",
+      format,
+      !pathString && fs.existsSync(getPaths().web.src) && "web/src",
+      !pathString && fs.existsSync(getPaths().web.config) && "web/config",
+      !pathString && fs.existsSync(sbPath) && "web/.storybook",
+      !pathString && fs.existsSync(getPaths().scripts) && "scripts",
+      !pathString && fs.existsSync(getPaths().api.src) && "api/src",
+      pathString
+    ].filter(Boolean);
+    const result = await execa("yarn", args, {
+      cwd: getPaths().base,
+      stdio: "inherit"
+    });
     process.exitCode = result.exitCode;
   } catch (error) {
     process.exitCode = error.exitCode ?? 1;

package/dist/commands/prismaHandler.js

@@ -49,16 +49,12 @@ const handler = async ({ _, $0, commands = [], ...options }) => {
   console.log(c.underline("$ yarn prisma " + args.join(" ")));
   console.log();
   try {
-    execa.sync(
-      `"${path.join(rwjsPaths.base, "node_modules/.bin/prisma")}"`,
-      args,
-      {
-        shell: true,
-        cwd: rwjsPaths.base,
-        stdio: "inherit",
-        cleanup: true
-      }
-    );
+    const prismaBin = path.join(rwjsPaths.base, "node_modules/.bin/prisma");
+    execa.sync(prismaBin, args, {
+      cwd: rwjsPaths.base,
+      stdio: "inherit",
+      cleanup: true
+    });
     if (hasHelpOption || commands.length === 0) {
       printWrapInfo();
     }

package/dist/commands/serveBothHandler.js

@@ -16,8 +16,7 @@ const bothServerFileHandler = async (argv) => {
     logSkippingFastifyWebServer();
     await execa("yarn", ["rw-serve-fe"], {
       cwd: getPaths().web.base,
-      stdio: "inherit",
-      shell: true
+      stdio: "inherit"
     });
   } else {
     argv.apiPort ??= getAPIPort();
@@ -74,7 +73,6 @@ const bothSsrRscServerHandler = async (argv, rscEnabled) => {
   const fePromise = execa("yarn", ["rw-serve-fe"], {
     cwd: getPaths().web.base,
     stdio: "inherit",
-    shell: true,
     env: rscEnabled ? {
       // TODO (RSC): Is this how we want to do it? If so, we need to find a way
       // to merge this with users' NODE_OPTIONS

package/dist/commands/serveWebHandler.js

@@ -4,7 +4,6 @@ const webSsrServerHandler = async (rscEnabled) => {
   await execa("yarn", ["rw-serve-fe"], {
     cwd: getPaths().web.base,
     stdio: "inherit",
-    shell: true,
     env: rscEnabled ? {
       // TODO (RSC): Is this how we want to do it? If so, we need to find a way
       // to merge this with users' NODE_OPTIONS

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

@@ -94,20 +94,9 @@ const handler = async ({ force, install }) => {
               {
                 title: `Install ${projectPackages.join(", ")}`,
                 task: async () => {
-                  const yarnVersion = await execa("yarn", ["--version"]);
-                  const isYarnV1 = yarnVersion.stdout.trim().startsWith("1");
-                  await execa(
-                    "yarn",
-                    [
-                      "add",
-                      "-D",
-                      ...isYarnV1 ? ["-W"] : [],
-                      ...projectPackages
-                    ],
-                    {
-                      cwd: rwPaths.base
-                    }
-                  );
+                  await execa("yarn", ["add", "-D", ...projectPackages], {
+                    cwd: rwPaths.base
+                  });
                 }
               }
             ],

package/dist/commands/testHandler.js

@@ -114,9 +114,8 @@ const handler = async ({
       process.env.SKIP_DB_PUSH = "1";
     }
     const runCommand = async () => {
-      await execa("yarn jest", jestArgs, {
+      await execa("yarn", ["jest", ...jestArgs], {
         cwd: rwjsPaths.base,
-        shell: true,
         stdio: "inherit",
         env: { DATABASE_URL }
       });

package/dist/commands/testHandlerEsm.js

@@ -62,9 +62,8 @@ const handler = async ({
       process.env.SKIP_DB_PUSH = "1";
     }
     const runCommand = async () => {
-      await execa("yarn vitest", vitestArgs, {
+      await execa("yarn", ["vitest", ...vitestArgs], {
         cwd: rwjsPaths.base,
-        shell: true,
         stdio: "inherit",
         env: { DATABASE_URL }
       });

package/dist/commands/type-checkHandler.js

@@ -3,7 +3,6 @@ import concurrently from "concurrently";
 import execa from "execa";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { getCmdMajorVersion } from "../commands/upgrade.js";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
 const handler = async ({ sides, verbose, prisma, generate }) => {
@@ -16,12 +15,11 @@ const handler = async ({ sides, verbose, prisma, generate }) => {
   });
   const typeCheck = async () => {
     let conclusiveExitCode = 0;
-    const yarnVersion = await getCmdMajorVersion("yarn");
     const tscForAllSides = sides.map((side) => {
       const projectDir = path.join(getPaths().base, side);
       return {
         cwd: projectDir,
-        command: `yarn ${yarnVersion > 1 ? "" : "-s"} tsc --noEmit --skipLibCheck`
+        command: `yarn tsc --noEmit --skipLibCheck`
       };
     });
     const { result } = concurrently(tscForAllSides, {

package/dist/commands/upgrade.js

@@ -204,17 +204,12 @@ const handler = async ({ dryRun, tag, verbose, dedupe, yes }) => {
   await tasks.run();
 };
 async function yarnInstall({ verbose }) {
-  const yarnVersion = await getCmdMajorVersion("yarn");
   try {
-    await execa(
-      "yarn install",
-      yarnVersion > 1 ? [] : ["--force", "--non-interactive"],
-      {
-        shell: true,
-        stdio: verbose ? "inherit" : "pipe",
-        cwd: getPaths().base
-      }
-    );
+    await execa("yarn install", {
+      shell: true,
+      stdio: verbose ? "inherit" : "pipe",
+      cwd: getPaths().base
+    });
   } catch (e) {
     throw new Error(
       "Could not finish installation. Please run `yarn install` and then `yarn dedupe`, before continuing"
@@ -433,31 +428,13 @@ async function refreshPrismaClient(task, { verbose }) {
     console.log(c.error(e.message));
   }
 }
-const getCmdMajorVersion = async (command2) => {
-  const { stdout } = await execa(command2, ["--version"], {
-    cwd: getPaths().base
-  });
-  if (!SEMVER_REGEX.test(stdout)) {
-    throw new Error(`Unable to verify ${command2} version.`);
-  }
-  const version = stdout.match(SEMVER_REGEX)[0];
-  return parseInt(version.split(".")[0]);
-};
 const dedupeDeps = async (task, { verbose }) => {
   try {
-    const yarnVersion = await getCmdMajorVersion("yarn");
-    const baseExecaArgsForDedupe = {
+    await execa("yarn dedupe", {
       shell: true,
       stdio: verbose ? "inherit" : "pipe",
       cwd: getPaths().base
-    };
-    if (yarnVersion > 1) {
-      await execa("yarn", ["dedupe"], baseExecaArgsForDedupe);
-    } else {
-      task.skip(
-        "Yarn 1.x doesn't support dedupe directly. Please upgrade yarn or use npx with `npx yarn-deduplicate` manually."
-      );
-    }
+    });
   } catch (e) {
     console.log(c.error(e.message));
     throw new Error(
@@ -470,7 +447,6 @@ export {
   builder,
   command,
   description,
-  getCmdMajorVersion,
   handler,
   validateTag
 };

package/dist/lib/index.js

@@ -1,4 +1,3 @@
-import { execSync } from "child_process";
 import https from "https";
 import path from "path";
 import * as babel from "@babel/core";
@@ -375,16 +374,11 @@ const addPackagesTask = async ({
       ].filter(Boolean)
     ];
   } else {
-    const stdout = execSync("yarn --version");
-    const yarnVersion = stdout.toString().trim();
     installCommand = [
       "yarn",
-      [
-        yarnVersion.startsWith("1") && "-W",
-        "add",
-        devDependency && "--dev",
-        ...packagesWithSameRWVersion
-      ].filter(Boolean)
+      ["add", devDependency && "--dev", ...packagesWithSameRWVersion].filter(
+        Boolean
+      )
     ];
   }
   return {

package/dist/rwfw.js

@@ -36,7 +36,6 @@ if (!command.length || command.some((cmd) => helpCommands.includes(cmd))) {
 try {
   execa.sync("yarn", [...command], {
     stdio: "inherit",
-    shell: true,
     cwd: absRwFwPath,
     env: {
       RWJS_CWD: projectPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.12726+454aa0bc6",
+  "version": "1.0.0-canary.12729+338020ede",
   "description": "The CedarJS 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": "1.0.0-canary.12726",
-    "@cedarjs/cli-helpers": "1.0.0-canary.12726",
-    "@cedarjs/fastify-web": "1.0.0-canary.12726",
-    "@cedarjs/internal": "1.0.0-canary.12726",
-    "@cedarjs/prerender": "1.0.0-canary.12726",
-    "@cedarjs/project-config": "1.0.0-canary.12726",
-    "@cedarjs/structure": "1.0.0-canary.12726",
-    "@cedarjs/telemetry": "1.0.0-canary.12726",
-    "@cedarjs/web-server": "1.0.0-canary.12726",
+    "@cedarjs/api-server": "1.0.0-canary.12729",
+    "@cedarjs/cli-helpers": "1.0.0-canary.12729",
+    "@cedarjs/fastify-web": "1.0.0-canary.12729",
+    "@cedarjs/internal": "1.0.0-canary.12729",
+    "@cedarjs/prerender": "1.0.0-canary.12729",
+    "@cedarjs/project-config": "1.0.0-canary.12729",
+    "@cedarjs/structure": "1.0.0-canary.12729",
+    "@cedarjs/telemetry": "1.0.0-canary.12729",
+    "@cedarjs/web-server": "1.0.0-canary.12729",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "454aa0bc6f3d13376f8ac6bcc7be381344e46b4d"
+  "gitHead": "338020ede5f5249d4126a6914f762c35ad1448f2"
 }