@cedarjs/cli 5.0.0-canary.2384 → 5.0.0-canary.2386

package/dist/commands/destroy/scaffold/scaffoldHandler.js

@@ -28,12 +28,12 @@ const removeSetImport = () => {
   if (routesContent.match("<Set")) {
     return "Skipping removal of Set import in Routes.{jsx,tsx}";
   }
-  const [redwoodRouterImport] = routesContent.match(
+  const [cedarRouterImport] = routesContent.match(
     /import {[^]*} from '@cedarjs\/router'/
   );
-  const removedSetImport = redwoodRouterImport.replace(/,*\s*Set,*/, "");
+  const removedSetImport = cedarRouterImport.replace(/,*\s*Set,*/, "");
   const newRoutesContent = routesContent.replace(
-    redwoodRouterImport,
+    cedarRouterImport,
     removedSetImport
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });

package/dist/commands/generate/realtime/realtimeHandler.js

@@ -36,7 +36,7 @@ const templateVariables = (name) => {
   };
 };
 async function handler({ name, type, force, verbose, silent }) {
-  const redwoodPaths = getPaths();
+  const cedarPaths = getPaths();
   const ts = isTypeScriptProject();
   name = pluralize.singular(name.toLowerCase());
   let functionType = type;
@@ -80,7 +80,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.sdl.ts.template`
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `${name}.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -92,7 +92,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.service.ts.template`
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -105,7 +105,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.ts.template`
           );
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -156,7 +156,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.sdl.ts.template`
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `${name}.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -168,7 +168,7 @@ async function handler({ name, type, force, verbose, silent }) {
             "blank.service.ts.template"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -508,10 +508,10 @@ const addHelperPackages = async (task) => {
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  const [redwoodRouterImport, importStart, spacing, importContent, importEnd] = routesContent.match(
+  const [cedarRouterImport, importStart, spacing, importContent, importEnd] = routesContent.match(
     /(import {)(\s*)([^]*)(} from ['"]@cedarjs\/router['"])/
   ) || [];
-  if (!redwoodRouterImport) {
+  if (!cedarRouterImport) {
     task.skip(
       "Couldn't add Set import from @cedarjs/router to Routes.{jsx,tsx}"
     );
@@ -522,7 +522,7 @@ const addSetImport = (task) => {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
-    redwoodRouterImport,
+    cedarRouterImport,
     importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -33,10 +33,10 @@ async function handleExamplesPreference(includeExamples) {
   return incl;
 }
 async function handler(args) {
-  const redwoodPaths = getPaths();
+  const cedarPaths = getPaths();
   const ts = isTypeScriptProject();
   const realtimeLibFilePath = path.join(
-    redwoodPaths.api.lib,
+    cedarPaths.api.lib,
     `realtime.${isTypeScriptProject() ? "ts" : "js"}`
   );
   const force = args.force || false;
@@ -94,7 +94,7 @@ async function handler(args) {
             );
           }
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             "countdown",
             `countdown.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -124,7 +124,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `rooms.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -139,7 +139,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "rooms",
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -161,7 +161,7 @@ async function handler(args) {
             );
           }
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             "newMessage",
             `newMessage.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -197,7 +197,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `auctions.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -212,7 +212,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "auctions",
             `auctions.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -242,7 +242,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `fastAndSlowFields.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -257,7 +257,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "fastAndSlowFields",
             `fastAndSlowFields.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -287,7 +287,7 @@ async function handler(args) {
             "utf-8"
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `alphabet.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -302,7 +302,7 @@ async function handler(args) {
             "utf-8"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             "alphabet",
             `alphabet.${isTypeScriptProject() ? "ts" : "js"}`
           );

package/dist/lib/index.js

@@ -280,8 +280,8 @@ const wrapWithSet = (routesContent, layout, routes, newLineAndIndent, props = {}
   ].join(newLineAndIndent);
 };
 const addRoutesToRouterTask = (routes, layout, setProps = {}) => {
-  const redwoodPaths = getPaths();
-  const routesContent = readFile(redwoodPaths.web.routes).toString();
+  const cedarPaths = getPaths();
+  const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
   if (newRoutes.length) {
     const [routerStart, routerParams, newLineAndIndent] = routesContent.match(
@@ -307,7 +307,7 @@ ${route}`);
       routerStart,
       `${routerStart + routesBatch + newLineAndIndent}`
     );
-    writeFile(redwoodPaths.web.routes, newRoutesContent, {
+    writeFile(cedarPaths.web.routes, newRoutesContent, {
       overwriteExisting: true
     });
   }
@@ -340,14 +340,14 @@ const removeEmtpySet = (routesContent, layout) => {
   return routesContent.replace(setWithLayoutReg, "");
 };
 const removeRoutesFromRouterTask = (routes, layout) => {
-  const redwoodPaths = getPaths();
-  const routesContent = readFile(redwoodPaths.web.routes).toString();
+  const cedarPaths = getPaths();
+  const routesContent = readFile(cedarPaths.web.routes).toString();
   const newRoutesContent = routes.reduce((content, route) => {
     const matchRouteByName = new RegExp(`\\s*<Route[^>]*name="${route}"[^>]*/>`);
     return content.replace(matchRouteByName, "");
   }, routesContent);
   const routesWithoutEmptySet = layout ? removeEmtpySet(newRoutesContent, layout) : newRoutesContent;
-  writeFile(redwoodPaths.web.routes, routesWithoutEmptySet, {
+  writeFile(cedarPaths.web.routes, routesWithoutEmptySet, {
     overwriteExisting: true
   });
 };
@@ -428,8 +428,8 @@ const getDefaultArgs = (builder) => {
   );
 };
 const usingVSCode = () => {
-  const redwoodPaths = getPaths();
-  const VS_CODE_PATH = path.join(redwoodPaths.base, ".vscode");
+  const cedarPaths = getPaths();
+  const VS_CODE_PATH = path.join(cedarPaths.base, ".vscode");
   return fs.existsSync(VS_CODE_PATH);
 };
 const printSetupNotes = (notes) => {

package/dist/lib/packages.js

@@ -8,7 +8,7 @@ async function installModule(name, version = void 0) {
     return false;
   }
   if (version === void 0) {
-    return installRedwoodModule(name);
+    return installCedarModule(name);
   } else {
     await execa.command(`yarn add -D ${name}@${version}`, {
       stdio: "inherit",
@@ -17,7 +17,7 @@ async function installModule(name, version = void 0) {
   }
   return true;
 }
-async function installRedwoodModule(module) {
+async function installCedarModule(module) {
   const packageJson = await import("@cedarjs/cli/package.json", { with: { type: "json" } });
   let version = packageJson.default.version;
   if (!isModuleInstalled(module)) {
@@ -73,7 +73,7 @@ function isModuleInstalled(module) {
   }) ?? false;
 }
 export {
+  installCedarModule,
   installModule,
-  installRedwoodModule,
   isModuleInstalled
 };

package/dist/telemetry/resource.js

@@ -83,7 +83,7 @@ async function getResources() {
     "cpu.count": cpu.physicalCores,
     "memory.gb": Math.round(mem.total / 1073741824),
     "env.node_env": process.env.NODE_ENV || null,
-    "ci.redwood": !!process.env.REDWOOD_CI,
+    "ci.redwood": !!process.env.CEDAR_CI,
     "ci.isci": ci.isCI,
     "dev.environment": developmentEnvironment,
     complexity,

package/package.json

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