@cedarjs/cli 2.5.2-next.16 → 2.6.0-rc.28

package/README.md

@@ -101,7 +101,7 @@ how to do this you'll know how to modify one too.
 CedarJS CLI is usually run in a project, this is problematic for contributors,
 because the transpiled files are not in a project, but in the CedarJS framework
 repo. Luckily the path can be modified at run-time via an env-var:
-`RWJS_CWD=../path/to/project`.
+`CEDAR_CWD=../path/to/project`.
 
 We've added a handy yarn alias to test your modified changes to the Cedar CLI
 against the "example-todo-main" fixture (`__fixtures__/example-todo-main`) you

package/dist/cfw.js

@@ -22,7 +22,7 @@ if (!fs.existsSync(CFW_PATH)) {
 const absCfwPath = path.resolve(process.cwd(), CFW_PATH);
 config.set("CFW_PATH", absCfwPath);
 const projectPath = path.dirname(
-  getConfigPath(process.env.RWJS_CWD ?? process.cwd())
+  getConfigPath(process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd())
 );
 console.log("Cedar Framework Tools Path:", terminalLink(absCfwPath, absCfwPath));
 let command = process.argv.slice(2);
@@ -35,7 +35,7 @@ try {
     stdio: "inherit",
     cwd: absCfwPath,
     env: {
-      RWJS_CWD: projectPath
+      CEDAR_CWD: projectPath
     }
   });
 } catch (e) {

package/dist/index.js

@@ -5,7 +5,7 @@ import { trace, SpanStatusCode } from "@opentelemetry/api";
 import { hideBin, Parser } from "yargs/helpers";
 import yargs from "yargs/yargs";
 import { loadEnvFiles, recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-import { projectIsEsm, getConfigPath } from "@cedarjs/project-config";
+import { findUp, projectIsEsm, getConfigPath } from "@cedarjs/project-config";
 import { telemetryMiddleware } from "@cedarjs/telemetry";
 import * as buildCommand from "./commands/build.js";
 import * as checkCommand from "./commands/check.js";
@@ -32,7 +32,6 @@ import * as typeCheckCommand from "./commands/type-check.js";
 import * as upgradeCommand from "./commands/upgrade/upgrade.js";
 import c from "./lib/colors.js";
 import { exitWithError } from "./lib/exit.js";
-import { findUp } from "./lib/index.js";
 import * as updateCheck from "./lib/updateCheck.js";
 import { loadPlugins } from "./plugin.js";
 import { startTelemetry, shutdownTelemetry } from "./telemetry/index.js";
@@ -45,8 +44,10 @@ let { cwd, telemetry, help, version } = Parser(hideBin(process.argv), {
     telemetry: process.env.REDWOOD_DISABLE_TELEMETRY === void 0 || process.env.REDWOOD_DISABLE_TELEMETRY === ""
   }
 });
+cwd ??= process.env.CEDAR_CWD;
 cwd ??= process.env.RWJS_CWD;
 cwd = getTomlDir(cwd);
+process.env.CEDAR_CWD = cwd;
 process.env.RWJS_CWD = cwd;
 if (process.argv[1]?.endsWith("redwood.js")) {
   const tomlPath = getConfigPath(cwd);
@@ -148,13 +149,13 @@ function getTomlDir(cwd2) {
   let tomlDir = "";
   try {
     if (cwd2) {
-      const found = configFiles.some((f) => fs.existsSync(path.join(cwd2, f)));
+      const absCwd = path.resolve(process.cwd(), cwd2);
+      const found = configFiles.some((f) => fs.existsSync(path.join(absCwd, f)));
       if (!found) {
-        throw new Error(
-          `Couldn't find a "cedar.toml" or "redwood.toml" file in ${cwd2}`
-        );
+        const tomls = configFiles.join('" or "');
+        throw new Error(`Couldn't find a "${tomls}" file in ${absCwd}`);
       }
-      tomlDir = cwd2;
+      tomlDir = absCwd;
     } else {
       const configTomlPath = findUp("cedar.toml", process.cwd()) || findUp("redwood.toml", process.cwd());
       if (!configTomlPath) {

package/dist/lib/runTransform.js

@@ -23,8 +23,9 @@ const runTransform = async ({
   parser = "tsx",
   options = {}
 }) => {
-  if (process.env.NODE_ENV === "test" && process.env.RWJS_CWD) {
-    process.chdir(process.env.RWJS_CWD);
+  const cedarCwd = process.env.CEDAR_CWD || process.env.RWJS_CWD;
+  if (process.env.NODE_ENV === "test" && cedarCwd) {
+    process.chdir(cedarCwd);
   }
   const { output, stdoutWrite } = patchStdoutWrite();
   const result = await jscodeshift.run(transformPath, targetPaths, {

package/dist/testLib/runTransform.js

@@ -20,8 +20,9 @@ const runTransform = async ({
   options = {}
 }) => {
   try {
-    if (process.env.NODE_ENV === "test" && process.env.RWJS_CWD) {
-      process.chdir(process.env.RWJS_CWD);
+    const cedarCwd = process.env.CEDAR_CWD || process.env.RWJS_CWD;
+    if (process.env.NODE_ENV === "test" && cedarCwd) {
+      process.chdir(cedarCwd);
     }
     await jscodeshift.run(transformPath, targetPaths, {
       ...defaultJscodeshiftOpts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "2.5.2-next.16+a27a893fb",
+  "version": "2.6.0-rc.28",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "build:pack": "yarn pack -o cedarjs-cli.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
-    "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",
+    "dev": "CEDAR_CWD=../../test-project node dist/index.js",
     "fix:permissions": "chmod +x dist/index.js dist/cfw.js",
     "prepublishOnly": "yarn build",
     "test": "vitest run",
@@ -34,15 +34,15 @@
     "@babel/parser": "7.29.0",
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.29.0",
-    "@cedarjs/api-server": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/cli-helpers": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/fastify-web": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/internal": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/prerender": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/project-config": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/structure": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/telemetry": "2.5.2-next.16+a27a893fb",
-    "@cedarjs/web-server": "2.5.2-next.16+a27a893fb",
+    "@cedarjs/api-server": "2.6.0-rc.28",
+    "@cedarjs/cli-helpers": "2.6.0-rc.28",
+    "@cedarjs/fastify-web": "2.6.0-rc.28",
+    "@cedarjs/internal": "2.6.0-rc.28",
+    "@cedarjs/prerender": "2.6.0-rc.28",
+    "@cedarjs/project-config": "2.6.0-rc.28",
+    "@cedarjs/structure": "2.6.0-rc.28",
+    "@cedarjs/telemetry": "2.6.0-rc.28",
+    "@cedarjs/web-server": "2.6.0-rc.28",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",
@@ -81,7 +81,7 @@
     "prompts": "2.4.2",
     "recast": "0.23.11",
     "rimraf": "6.1.2",
-    "semver": "7.7.3",
+    "semver": "7.7.4",
     "smol-toml": "1.6.0",
     "string-env-interpolation": "1.0.1",
     "systeminformation": "5.30.7",
@@ -106,5 +106,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a27a893fb8f6883f3bf121dad4d3edf7696484fe"
+  "gitHead": "fb5acf1b34fc17ac1c8ea326567df5b5c3c2924a"
 }