@cedarjs/cli 5.0.0-canary.2542 → 5.0.0-canary.2544

package/dist/commands/build/buildHandler.js

@@ -19,7 +19,6 @@ import { generate } from "@cedarjs/internal/dist/generate/generate";
 import { generateGqlormArtifacts } from "@cedarjs/internal/dist/generate/gqlormSchema";
 import { loadAndValidateSdls } from "@cedarjs/internal/dist/validateSchema";
 import { detectPrerenderRoutes } from "@cedarjs/prerender/detection";
-import {} from "@cedarjs/project-config";
 import { timedTelemetry } from "@cedarjs/telemetry";
 import { buildCedarApp } from "@cedarjs/vite/build";
 import { buildUDApiServer } from "@cedarjs/vite/buildUDApiServer";
@@ -99,12 +98,9 @@ const handler = async ({
   const prismaSchemaExists = fs.existsSync(cedarPaths.api.prismaConfig);
   const prerenderRoutes = prerender && workspace.includes("web") ? detectPrerenderRoutes() : [];
   const shouldGeneratePrismaClient = prisma && prismaSchemaExists && (workspace.includes("api") || prerenderRoutes.length > 0);
-  const packageJsonPath = path.join(cedarPaths.base, "package.json");
-  const packageJson = JSON.parse(
-    fs.readFileSync(packageJsonPath, "utf8")
+  const nonApiWebWorkspaces = workspace.filter(
+    (w) => w !== "api" && w !== "web"
   );
-  const packageJsonWorkspaces = packageJson.workspaces;
-  const nonApiWebWorkspaces = Array.isArray(packageJsonWorkspaces) && packageJsonWorkspaces.length > 2 ? workspace.filter((w) => w !== "api" && w !== "web") : [];
   const gqlFeaturesTaskTitle = `Generating types needed for ${[
     useFragments && "GraphQL Fragments",
     useTrustedDocuments && "Trusted Documents"

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

@@ -10,7 +10,9 @@ import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 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 } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -283,34 +285,12 @@ const handler = async ({ name, force, ...rest }) => {
       },
       {
         title: "Updating workspace config...",
-        task: async (ctx, task) => {
-          const rootPackageJsonPath = path.join(getPaths().base, "package.json");
-          const packageJson = JSON.parse(
-            await fs.promises.readFile(rootPackageJsonPath, "utf8")
-          );
-          if (!Array.isArray(packageJson.workspaces)) {
-            throw new Error(
-              "Invalid workspace config in " + rootPackageJsonPath
-            );
-          }
+        task: (ctx, task) => {
+          const pm = getPackageManager();
           const packagePath = `packages/${ctx.nameVariants.folderName}`;
-          const hasWildcardPackagesWorkspace = packageJson.workspaces.includes("packages/*");
-          const hasNamedPackagesWorkspace = packageJson.workspaces.includes(packagePath);
-          const hasOtherNamedPackages = packageJson.workspaces.some(
-            (workspace) => workspace.startsWith("packages/") && workspace !== packagePath
-          );
-          if (hasWildcardPackagesWorkspace || hasNamedPackagesWorkspace) {
+          const result = addWorkspaceDir(getPaths().base, packagePath, pm);
+          if (result === "exists") {
             task.skip("Workspaces already configured");
-          } else {
-            if (hasOtherNamedPackages) {
-              packageJson.workspaces.push(packagePath);
-            } else {
-              packageJson.workspaces.push("packages/*");
-            }
-            await fs.promises.writeFile(
-              rootPackageJsonPath,
-              JSON.stringify(packageJson, null, 2)
-            );
           }
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2542",
+  "version": "5.0.0-canary.2544",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "5.0.0-canary.2542",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2542",
-    "@cedarjs/fastify-web": "5.0.0-canary.2542",
-    "@cedarjs/internal": "5.0.0-canary.2542",
-    "@cedarjs/prerender": "5.0.0-canary.2542",
-    "@cedarjs/project-config": "5.0.0-canary.2542",
-    "@cedarjs/structure": "5.0.0-canary.2542",
-    "@cedarjs/telemetry": "5.0.0-canary.2542",
-    "@cedarjs/utils": "5.0.0-canary.2542",
-    "@cedarjs/vite": "5.0.0-canary.2542",
-    "@cedarjs/web-server": "5.0.0-canary.2542",
+    "@cedarjs/api-server": "5.0.0-canary.2544",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2544",
+    "@cedarjs/fastify-web": "5.0.0-canary.2544",
+    "@cedarjs/internal": "5.0.0-canary.2544",
+    "@cedarjs/prerender": "5.0.0-canary.2544",
+    "@cedarjs/project-config": "5.0.0-canary.2544",
+    "@cedarjs/structure": "5.0.0-canary.2544",
+    "@cedarjs/telemetry": "5.0.0-canary.2544",
+    "@cedarjs/utils": "5.0.0-canary.2544",
+    "@cedarjs/vite": "5.0.0-canary.2544",
+    "@cedarjs/web-server": "5.0.0-canary.2544",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",