@cedarjs/cli 8.0.0-canary.3532 → 8.0.0-canary.3536

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

@@ -1,18 +1,15 @@
 import { describe, it } from "vitest";
-describe.skipIf(process.env.CI && process.platform === "win32")(
-  "Middleware codemod",
-  () => {
-    it("Handles the default TSX case", async () => {
-      await matchTransformSnapshot("codemodMiddleware", "defaultTsx");
-    });
-    it("Handles when OgImageMiddleware is already imported", async () => {
-      await matchTransformSnapshot("codemodMiddleware", "alreadyContainsImport");
-    });
-    it("Handles when registerMiddleware function is already defined", async () => {
-      await matchTransformSnapshot(
-        "codemodMiddleware",
-        "registerFunctionAlreadyDefined"
-      );
-    });
-  }
-);
+describe("Middleware codemod", () => {
+  it("Handles the default TSX case", async () => {
+    await matchTransformSnapshot("codemodMiddleware", "defaultTsx");
+  });
+  it("Handles when OgImageMiddleware is already imported", async () => {
+    await matchTransformSnapshot("codemodMiddleware", "alreadyContainsImport");
+  });
+  it("Handles when registerMiddleware function is already defined", async () => {
+    await matchTransformSnapshot(
+      "codemodMiddleware",
+      "registerFunctionAlreadyDefined"
+    );
+  });
+});

package/dist/commands/setup/middleware/ogImage/__codemod_tests__/vitePlugin.js

@@ -1,9 +1,6 @@
 import { describe, it } from "vitest";
-describe.skipIf(process.env.CI && process.platform === "win32")(
-  "Vite plugin codemod",
-  () => {
-    it("Handles the default vite config case", async () => {
-      await matchTransformSnapshot("codemodVitePlugin", "defaultViteConfig");
-    });
-  }
-);
+describe("Vite plugin codemod", () => {
+  it("Handles the default vite config case", async () => {
+    await matchTransformSnapshot("codemodVitePlugin", "defaultViteConfig");
+  });
+});

package/dist/commands/setup/tenancy/authCodemod.js

@@ -21,6 +21,7 @@ function buildMembershipsSelectProperty() {
 function transform(fileInfo) {
   const root = j.withParser("tsx")(fileInfo.source);
   let selectFound = false;
+  let changed = false;
   root.find(j.CallExpression, {
     callee: {
       type: "MemberExpression",
@@ -47,6 +48,7 @@ function transform(fileInfo) {
     );
     if (!alreadyHasMemberships) {
       selectProperty.value.properties.push(buildMembershipsSelectProperty());
+      changed = true;
     }
     selectFound = true;
   });
@@ -72,8 +74,9 @@ function transform(fileInfo) {
     root.find(j.Program).forEach((path) => {
       path.node.body.push(tenancyExport);
     });
+    changed = true;
   }
-  return root.toSource();
+  return changed ? root.toSource() : fileInfo.source;
 }
 export {
   transform as default

package/dist/commands/upgrade/upgradeHandler.js

@@ -4,6 +4,7 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import latestVersion from "latest-version";
 import { Listr } from "listr2";
+import packageJson from "package-json";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import {
@@ -103,6 +104,13 @@ const handler = async (upgradeOptions) => {
         // https://github.com/redwoodjs/redwood/pull/8855
         enabled: (ctx) => String(ctx.versionToUpgradeTo).includes("canary") && notBlockedByPreUpgradeChecks(ctx)
       },
+      {
+        title: "Updating Prisma to the version CedarJS supports",
+        // Runs after the canary template sync, so the Prisma versions come
+        // from the target release rather than from the template on main
+        task: (ctx, task) => updatePrismaDeps(ctx, task, { dryRun, verbose }),
+        enabled: (ctx) => !!ctx.versionToUpgradeTo && notBlockedByPreUpgradeChecks(ctx)
+      },
       {
         title: "Downloading yarn patches",
         task: (ctx) => downloadYarnPatches(ctx, { dryRun, verbose }),
@@ -312,6 +320,130 @@ function updateCedarJSDepsForAllSides(ctx, options) {
     })
   );
 }
+async function fetchPrismaPeerVersion(cedarVersion) {
+  const version = cedarVersion.split("+")[0];
+  let manifest;
+  try {
+    manifest = await packageJson("@cedarjs/cli", { version });
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      `Failed to fetch @cedarjs/cli@${version} from the npm registry: ` + message
+    );
+  }
+  const prismaVersion = manifest.peerDependencies?.["prisma"];
+  return typeof prismaVersion === "string" ? prismaVersion : void 0;
+}
+function isPrismaReleasePackage(depName) {
+  return depName === "prisma" || depName === "@prisma/client" || depName.startsWith("@prisma/adapter-");
+}
+function updatePrismaDependencies(pkg, prismaVersion, messages, { dryRun, verbose } = {}) {
+  let updated = false;
+  for (const field of ["dependencies", "devDependencies"]) {
+    const deps = pkg[field] ?? {};
+    for (const [depName, depVersion] of Object.entries(deps)) {
+      if (!isPrismaReleasePackage(depName) || depVersion === prismaVersion) {
+        continue;
+      }
+      if (verbose || dryRun) {
+        messages.push(` - ${depName}: ${depVersion} => ${prismaVersion}`);
+      }
+      deps[depName] = prismaVersion;
+      updated = true;
+    }
+  }
+  return updated;
+}
+function addMissingDependency(pkg, field, depName, version, messages, { onlyInField = false } = {}) {
+  const otherField = field === "dependencies" ? "devDependencies" : "dependencies";
+  if (pkg[field]?.[depName]) {
+    return false;
+  }
+  const otherVersion = pkg[otherField]?.[depName];
+  if (otherVersion && !onlyInField) {
+    return false;
+  }
+  if (otherVersion) {
+    const { [depName]: _moved, ...otherDeps } = pkg[otherField] ?? {};
+    pkg[otherField] = otherDeps;
+    messages.push(` - ${depName}: moved from ${otherField} to ${field}`);
+  } else {
+    messages.push(` - ${depName}: added at ${version}`);
+  }
+  const deps = { ...pkg[field], [depName]: otherVersion ?? version };
+  pkg[field] = Object.fromEntries(
+    Object.entries(deps).sort(([a], [b]) => a.localeCompare(b))
+  );
+  return true;
+}
+async function updatePrismaDeps(ctx, task, { dryRun, verbose }) {
+  if (!ctx.versionToUpgradeTo) {
+    throw new Error("Failed to upgrade");
+  }
+  const prismaVersion = await fetchPrismaPeerVersion(
+    String(ctx.versionToUpgradeTo)
+  );
+  if (!prismaVersion) {
+    task.skip(
+      `CedarJS ${ctx.versionToUpgradeTo} doesn't declare a Prisma version`
+    );
+    return;
+  }
+  const messages = [];
+  const hasApiSide = fs.existsSync(
+    path.join(getPaths().api.base, "package.json")
+  );
+  const projectPackages = [
+    {
+      basePath: getPaths().base,
+      required: {
+        field: "devDependencies",
+        depName: "prisma",
+        onlyInField: false
+      }
+    },
+    {
+      basePath: getPaths().api.base,
+      // The api side imports the generated Prisma client at runtime
+      required: {
+        field: "dependencies",
+        depName: "@prisma/client",
+        onlyInField: true
+      }
+    }
+  ];
+  for (const { basePath, required } of projectPackages) {
+    const pkgJsonPath = path.join(basePath, "package.json");
+    if (!fs.existsSync(pkgJsonPath)) {
+      continue;
+    }
+    const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+    const pkgMessages = [];
+    const added = hasApiSide && addMissingDependency(
+      pkg,
+      required.field,
+      required.depName,
+      prismaVersion,
+      pkgMessages,
+      { onlyInField: required.onlyInField }
+    );
+    const updated = updatePrismaDependencies(pkg, prismaVersion, pkgMessages, {
+      dryRun,
+      verbose
+    });
+    if (added || updated) {
+      if (pkgMessages.length > 0) {
+        messages.push(`Updating ${pkgJsonPath}`, ...pkgMessages);
+      }
+      if (!dryRun) {
+        fs.writeFileSync(pkgJsonPath, JSON.stringify(pkg, void 0, 2));
+      }
+    }
+  }
+  if (messages.length > 0) {
+    task.title = task.title + "\n" + messages.join("\n");
+  }
+}
 function mergeTemplateDependencies(field, templatePackageJson, localPackageJson, messages, { dryRun, verbose } = {}) {
   const templateDeps = templatePackageJson[field];
   if (!templateDeps) {
@@ -479,6 +611,9 @@ async function dedupeDeps(_task, { verbose }) {
   await packageManagerInstall({ verbose });
 }
 export {
+  addMissingDependency,
+  fetchPrismaPeerVersion,
   handler,
-  mergeTemplateDependencies
+  mergeTemplateDependencies,
+  updatePrismaDependencies
 };

package/dist/telemetry/resource.js

@@ -1,9 +1,9 @@
 import fs from "node:fs";
+import os from "node:os";
 import path from "path";
 import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
 import ci from "ci-info";
 import envinfo from "envinfo";
-import system from "systeminformation";
 import { v4 as uuidv4, validate as validateUUID } from "uuid";
 import { getPaths, getRawConfig } from "@cedarjs/project-config";
 import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
@@ -47,8 +47,8 @@ async function getResources() {
   } else if (shell?.path.match("\\")) {
     info.System.Shell.name = info.System.Shell.path.split("\\").pop();
   }
-  const cpu = await system.cpu();
-  const mem = await system.mem();
+  const cpuCount = os.availableParallelism();
+  const memoryGb = Math.round(os.totalmem() / 1073741824);
   let developmentEnvironment = void 0;
   if (Object.keys(process.env).some((key) => key.startsWith("GITPOD_"))) {
     developmentEnvironment = "gitpod";
@@ -77,8 +77,8 @@ async function getResources() {
     "yarn.version": info.Binaries?.Yarn?.version,
     "npm.version": info.Binaries?.npm?.version,
     "vscode.version": info.IDEs?.VSCode?.version,
-    "cpu.count": cpu.physicalCores,
-    "memory.gb": Math.round(mem.total / 1073741824),
+    "cpu.count": cpuCount,
+    "memory.gb": memoryGb,
     "env.node_env": process.env.NODE_ENV || void 0,
     "ci.redwood": !!process.env.CEDAR_CI,
     "ci.isci": ci.isCI,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3532",
+  "version": "8.0.0-canary.3536",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.10",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "8.0.0-canary.3532",
-    "@cedarjs/babel-config": "8.0.0-canary.3532",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3532",
-    "@cedarjs/internal": "8.0.0-canary.3532",
-    "@cedarjs/prerender": "8.0.0-canary.3532",
-    "@cedarjs/project-config": "8.0.0-canary.3532",
-    "@cedarjs/structure": "8.0.0-canary.3532",
-    "@cedarjs/telemetry": "8.0.0-canary.3532",
-    "@cedarjs/utils": "8.0.0-canary.3532",
-    "@cedarjs/vite": "8.0.0-canary.3532",
-    "@cedarjs/web-server": "8.0.0-canary.3532",
+    "@cedarjs/api-server": "8.0.0-canary.3536",
+    "@cedarjs/babel-config": "8.0.0-canary.3536",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3536",
+    "@cedarjs/internal": "8.0.0-canary.3536",
+    "@cedarjs/prerender": "8.0.0-canary.3536",
+    "@cedarjs/project-config": "8.0.0-canary.3536",
+    "@cedarjs/structure": "8.0.0-canary.3536",
+    "@cedarjs/telemetry": "8.0.0-canary.3536",
+    "@cedarjs/utils": "8.0.0-canary.3536",
+    "@cedarjs/vite": "8.0.0-canary.3536",
+    "@cedarjs/web-server": "8.0.0-canary.3536",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.12.0",
@@ -76,16 +76,15 @@
     "latest-version": "9.0.0",
     "listr2": "10.2.2",
     "lodash": "4.18.1",
+    "package-json": "10.0.1",
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
     "prettier": "3.9.10",
-    "prisma": "7.10.1",
     "prompts": "2.4.2",
     "smol-toml": "1.9.1",
     "srvx": "0.12.8",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.33.16",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -94,15 +93,19 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3532",
+    "@cedarjs/framework-tools": "8.0.0-canary.3536",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",
     "node-ssh": "13.2.1",
+    "prisma": "7.10.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",
     "vitest": "4.1.12"
   },
+  "peerDependencies": {
+    "prisma": "7.10.1"
+  },
   "engines": {
     "node": ">=24"
   },