@cedarjs/cli-helpers 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/auth/authFiles.d.ts

@@ -1,6 +1,14 @@
 interface FilesArgs {
     basedir: string;
     webAuthn: boolean;
+    /**
+     * Selects the `*.oauth.*` template variant, the same way `webAuthn` selects
+     * the `*.webAuthn.*` variant. When both are true, the most specific
+     * template available is preferred (`*.webAuthn.oauth.*`), falling back to
+     * a single-variant or the base template when a more specific one doesn't
+     * exist for a given template file.
+     */
+    oauth?: boolean;
 }
 /**
  * Get the api side file paths and file contents to write
@@ -14,7 +22,7 @@ interface FilesArgs {
  * }
  * ```
  */
-export declare const apiSideFiles: ({ basedir, webAuthn }: FilesArgs) => Promise<Record<string, string>>;
+export declare const apiSideFiles: ({ basedir, webAuthn, oauth, }: FilesArgs) => Promise<Record<string, string>>;
 /**
  * Loops through the keys in `filesRecord` and generates unique file paths if
  * they conflict with existing files

package/dist/auth/authFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authFiles.d.ts","sourceRoot":"","sources":["../../src/auth/authFiles.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAU,uBAAuB,SAAS,oCAmElE,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,QAAQ,EAAE,MAAM,0BAwCjB"}
+{"version":3,"file":"authFiles.d.ts","sourceRoot":"","sources":["../../src/auth/authFiles.ts"],"names":[],"mappings":"AASA,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AA+DD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,YAAY,GAAU,+BAIhC,SAAS,oCA4CX,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACnC,QAAQ,EAAE,MAAM,0BAwCjB"}

package/dist/auth/authFiles.js

@@ -4,37 +4,59 @@ import pascalcase from "pascalcase";
 import { transformTSToJS } from "../lib/index.js";
 import { getPaths } from "../lib/paths.js";
 import { isTypeScriptProject } from "../lib/project.js";
-const apiSideFiles = async ({ basedir, webAuthn }) => {
+const VARIANT_TAGS = ["webAuthn", "oauth"];
+function parseTemplateFileName(fileName) {
+  const parts = fileName.split(".");
+  const baseName = parts[0];
+  const ext = parts.at(-2);
+  const tags = parts.slice(1, -2).filter((part) => VARIANT_TAGS.includes(part));
+  return { baseName, tags, ext };
+}
+function pickTemplateVariants(templateFiles, activeTags) {
+  const candidatesByKey = /* @__PURE__ */ new Map();
+  for (const fileName of templateFiles) {
+    const { baseName, tags, ext } = parseTemplateFileName(fileName);
+    const key = `${baseName}.${ext}`;
+    const candidates = candidatesByKey.get(key) ?? [];
+    candidates.push({ fileName, tags });
+    candidatesByKey.set(key, candidates);
+  }
+  const picked = [];
+  for (const candidates of candidatesByKey.values()) {
+    const applicable = candidates.filter(
+      (candidate) => candidate.tags.every((tag) => activeTags.includes(tag))
+    );
+    const mostSpecific = applicable.reduce(
+      (best, candidate) => candidate.tags.length > best.tags.length ? candidate : best
+    );
+    picked.push(mostSpecific);
+  }
+  return picked;
+}
+const apiSideFiles = async ({
+  basedir,
+  webAuthn,
+  oauth = false
+}) => {
   const apiSrcPath = getPaths().api.src;
   const apiBaseTemplatePath = path.join(basedir, "templates", "api");
   const templateDirectories = fs.readdirSync(apiBaseTemplatePath);
   let filesRecord = {};
+  const activeTags = [
+    ...webAuthn ? ["webAuthn"] : [],
+    ...oauth ? ["oauth"] : []
+  ];
   for (const dir of templateDirectories) {
     const templateFiles = fs.readdirSync(path.join(apiBaseTemplatePath, dir));
-    const filePaths = templateFiles.filter((fileName) => {
-      const fileNameParts = fileName.split(".");
-      return fileNameParts.length <= 3 || fileNameParts.at(-3) !== "webAuthn";
-    }).map((fileName) => {
-      let outputFileName = fileName.replace(/\.template$/, "");
+    const pickedVariants = pickTemplateVariants(templateFiles, activeTags);
+    const filePaths = pickedVariants.map(({ fileName }) => {
+      const { baseName, ext } = parseTemplateFileName(fileName);
+      let outputFileName = `${baseName}.${ext}`;
       if (!isTypeScriptProject()) {
         outputFileName = outputFileName.replace(/\.ts(x?)$/, ".js$1");
       }
-      if (!webAuthn) {
-        return { templateFileName: fileName, outputFileName };
-      }
-      const webAuthnFileName = fileName.split(".").reverse().map((part, i) => i === 1 ? "webAuthn." + part : part).reverse().join(".");
-      if (templateFiles.includes(webAuthnFileName)) {
-        return { templateFileName: webAuthnFileName, outputFileName };
-      } else {
-        return { templateFileName: fileName, outputFileName };
-      }
-    }).map((f) => {
-      const templateFilePath = path.join(
-        apiBaseTemplatePath,
-        dir,
-        f.templateFileName
-      );
-      const outputFilePath = path.join(apiSrcPath, dir, f.outputFileName);
+      const templateFilePath = path.join(apiBaseTemplatePath, dir, fileName);
+      const outputFilePath = path.join(apiSrcPath, dir, outputFileName);
       return { templateFilePath, outputFilePath };
     });
     for (const paths of filePaths) {

package/dist/auth/authTasks.d.ts

@@ -31,7 +31,7 @@ export declare const addConfigToRoutes: () => {
  *
  * @returns Listr task
  */
-export declare const generateAuthApiFiles: <Renderer extends typeof ListrRenderer>(basedir: string, webAuthn: boolean) => ListrTask<AuthGeneratorCtx, Renderer>;
+export declare const generateAuthApiFiles: <Renderer extends typeof ListrRenderer>(basedir: string, webAuthn: boolean, oauth?: boolean) => ListrTask<AuthGeneratorCtx, Renderer>;
 export declare const addAuthConfigToGqlApi: <Renderer extends typeof ListrRenderer, FallbackRenderer extends typeof ListrRenderer>(authDecoderImport?: string) => {
     title: string;
     task: (ctx: AuthGeneratorCtx, _task: ListrTaskWrapper<AuthGeneratorCtx, Renderer, FallbackRenderer>) => void;

package/dist/auth/authTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AAmBxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAoED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA0CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,KAChB,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}
+{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AA2BxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAuED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,EACjB,eAAa,KACZ,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}

package/dist/auth/authTasks.js

@@ -13,6 +13,10 @@ import {
 import { apiSideFiles, generateUniqueFileNames } from "./authFiles.js";
 const AUTH_PROVIDER_HOOK_IMPORT = `import { AuthProvider, useAuth } from './auth.js'`;
 const AUTH_HOOK_IMPORT = `import { useAuth } from './auth.js'`;
+const APOLLO_PROVIDER_COMPONENT_NAMES = [
+  "CedarApolloProvider",
+  "RedwoodApolloProvider"
+];
 const getWebAppPath = () => getPaths().web.app;
 function addAuthDecoderToCreateGraphQLHandler(content) {
   if (!new RegExp("(?=(^.*?createGraphQLHandler))\\1.*\\bauthDecoder", "s").test(
@@ -128,10 +132,10 @@ const addAuthProviderToApp = (content, setupMode) => {
     content = removeAuthProvider(content);
   }
   const match = content.match(
-    /(\s+)(<RedwoodProvider.*?>)(.*)(<\/RedwoodProvider>)/s
+    /(\s+)(<(?:Cedar|Redwood)Provider.*?>)(.*)(<\/(?:Cedar|Redwood)Provider>)/s
   );
   if (!match) {
-    throw new Error("Could not find <RedwoodProvider> in App.{jsx,tsx}");
+    throw new Error("Could not find <CedarProvider> in App.{jsx,tsx}");
   }
   if (/\s+<AuthProvider>/.test(content)) {
     return content;
@@ -139,16 +143,16 @@ const addAuthProviderToApp = (content, setupMode) => {
   const [
     _,
     newlineAndIndent,
-    redwoodProviderOpen,
-    redwoodProviderChildren,
-    redwoodProviderClose
+    cedarProviderOpen,
+    cedarProviderChildren,
+    cedarProviderClose
   ] = match;
-  const redwoodProviderChildrenLines = redwoodProviderChildren.split("\n").map((line, index) => {
+  const cedarProviderChildrenLines = cedarProviderChildren.split("\n").map((line, index) => {
     return `${index === 0 ? "" : "  "}` + line;
   });
-  const renderContent = newlineAndIndent + redwoodProviderOpen + newlineAndIndent + `  <AuthProvider>` + redwoodProviderChildrenLines.join("\n") + `</AuthProvider>` + newlineAndIndent + redwoodProviderClose;
+  const renderContent = newlineAndIndent + cedarProviderOpen + newlineAndIndent + `  <AuthProvider>` + cedarProviderChildrenLines.join("\n") + `</AuthProvider>` + newlineAndIndent + cedarProviderClose;
   return content.replace(
-    /\s+<RedwoodProvider.*?>.*<\/RedwoodProvider>/s,
+    /\s+<(?:Cedar|Redwood)Provider.*?>.*<\/(?:Cedar|Redwood)Provider>/s,
     renderContent
   );
 };
@@ -184,13 +188,16 @@ const addConfigToWebApp = () => {
         );
       }
       content = addAuthProviderToApp(content, ctx.setupMode);
-      if (/\s*<RedwoodApolloProvider/.test(content)) {
-        if (!hasUseAuthHook("RedwoodApolloProvider", content)) {
-          content = addUseAuthHook("RedwoodApolloProvider", content);
+      const apolloProviderComponentName = APOLLO_PROVIDER_COMPONENT_NAMES.find(
+        (componentName) => new RegExp(`\\s*<${componentName}`).test(content)
+      );
+      if (apolloProviderComponentName) {
+        if (!hasUseAuthHook(apolloProviderComponentName, content)) {
+          content = addUseAuthHook(apolloProviderComponentName, content);
         }
       } else {
         task.output = colors.warning(
-          "Could not find <RedwoodApolloProvider>.\nIf you are using a custom GraphQL Client you will have to make sure it gets access to your `useAuth`, if it needs it."
+          "Could not find <CedarApolloProvider>.\nIf you are using a custom GraphQL Client you will have to make sure it gets access to your `useAuth`, if it needs it."
         );
       }
       fs.writeFileSync(webAppPath, content);
@@ -257,7 +264,7 @@ const addConfigToRoutes = () => {
     }
   };
 };
-const generateAuthApiFiles = (basedir, webAuthn) => {
+const generateAuthApiFiles = (basedir, webAuthn, oauth = false) => {
   return {
     title: "Generating auth api side files...",
     task: async (ctx, task) => {
@@ -266,7 +273,7 @@ const generateAuthApiFiles = (basedir, webAuthn) => {
           "Could not find api/src directory. Cannot continue setup!"
         );
       }
-      let filesRecord = await apiSideFiles({ basedir, webAuthn });
+      let filesRecord = await apiSideFiles({ basedir, webAuthn, oauth });
       let existingFiles = "FAIL";
       if (ctx.setupMode === "FORCE") {
         existingFiles = "OVERWRITE";

package/dist/auth/setupHelpers.d.ts

@@ -1,6 +1,7 @@
 import type { ListrTask } from 'listr2';
 import type { Argv } from 'yargs';
 import type { AuthGeneratorCtx } from './authTasks.js';
+export type { AuthGeneratorCtx };
 export declare const standardAuthBuilder: (yargs: Argv) => Argv<{
     force: boolean;
 } & {
@@ -12,6 +13,7 @@ export interface AuthHandlerArgs {
     provider: string;
     authDecoderImport?: string;
     webAuthn?: boolean;
+    oauth?: boolean;
     webPackages?: string[];
     apiPackages?: string[];
     extraTasks?: (ListrTask<AuthGeneratorCtx> | undefined)[];
@@ -22,5 +24,5 @@ export interface AuthHandlerArgs {
  * basedir assumes that you must have a templates folder in that directory.
  * See folder structure of auth providers in packages/auth-providers/<provider>/setup/src
  */
-export declare const standardAuthHandler: ({ basedir, forceArg, provider, authDecoderImport, webAuthn, webPackages, apiPackages, extraTasks, notes, verbose, }: AuthHandlerArgs) => Promise<void>;
+export declare const standardAuthHandler: ({ basedir, forceArg, provider, authDecoderImport, webAuthn, oauth, webPackages, apiPackages, extraTasks, notes, verbose, }: AuthHandlerArgs) => Promise<void>;
 //# sourceMappingURL=setupHelpers.d.ts.map

package/dist/auth/setupHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupHelpers.d.ts","sourceRoot":"","sources":["../../src/auth/setupHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAWjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAUtD,eAAO,MAAM,mBAAmB,GAAI,OAAO,IAAI;;;;EAoB9C,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;IACxD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AASD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,qHAWvC,eAAe,kBAiFjB,CAAA"}
+{"version":3,"file":"setupHelpers.d.ts","sourceRoot":"","sources":["../../src/auth/setupHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAGvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAWjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAUtD,YAAY,EAAE,gBAAgB,EAAE,CAAA;AAEhC,eAAO,MAAM,mBAAmB,GAAI,OAAO,IAAI;;;;EAoB9C,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAAC,EAAE,CAAA;IACxD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AASD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,4HAYvC,eAAe,kBAiFjB,CAAA"}

package/dist/auth/setupHelpers.js

@@ -42,6 +42,7 @@ const standardAuthHandler = async ({
   provider,
   authDecoderImport,
   webAuthn = false,
+  oauth = false,
   webPackages = [],
   apiPackages = [],
   extraTasks,
@@ -51,7 +52,7 @@ const standardAuthHandler = async ({
   const tasks = new Listr(
     [
       setAuthSetupMode(forceArg),
-      generateAuthApiFiles(basedir, webAuthn),
+      generateAuthApiFiles(basedir, webAuthn, oauth),
       addConfigToWebApp(),
       createWebAuth(basedir, webAuthn),
       addConfigToRoutes(),

package/dist/lib/colors.d.ts

@@ -1,9 +1,11 @@
 /**
- * To keep a consistent color/style palette between cli packages, such as
- * @redwood/cli and @redwood/create-cedar-app, please only use the colors
- * defined here. If you *really* can't find a color that fits your needs,
- * it's better to add it here than to introduce a new one-off color in whatever
- * package you're going to use it in.
+ * Canonical color/style palette for all Cedar CLI packages.
+ *
+ * Import from here rather than defining local copies:
+ *   import { colors } from '@cedarjs/cli-helpers/colors'
+ *
+ * If you need a color that isn't here, add it here rather than
+ * introducing a one-off in another package.
  */
 export declare const colors: {
     error: import("ansis").Ansis;

package/dist/lib/colors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"colors.d.ts","sourceRoot":"","sources":["../../src/lib/colors.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;CAalB,CAAA"}
+{"version":3,"file":"colors.d.ts","sourceRoot":"","sources":["../../src/lib/colors.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;CAalB,CAAA"}

package/dist/lib/index.d.ts

@@ -18,5 +18,5 @@ export declare const writeFile: <Renderer extends typeof ListrRenderer>(target:
  */
 export declare const writeFilesTask: <Renderer extends typeof ListrRenderer>(files: Record<string, string>, options: {
     existingFiles: ExistingFiles;
-}) => Listr<never, Renderer, "simple">;
+}) => Listr<never, Renderer, Renderer>;
 //# sourceMappingURL=index.d.ts.map

package/dist/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAU9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BA8BhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAoB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EAEd,MAAM,QAAQ,CAAA;AACf,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAW9B,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,6BAgBhE,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,oBAsB9B,CAAA;AAED,eAAO,MAAM,QAAQ,GACnB,kBAAkB,MAAM,EACxB,kBAAkB,MAAM,KACvB,OAAO,CAAC,MAAM,CAwBhB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzD,eAAO,MAAM,SAAS,GAAI,QAAQ,SAAS,OAAO,aAAa,EAC7D,QAAQ,MAAM,EACd,UAAU,MAAM,EAChB,oBAA4B;IAAE,aAAa,CAAC,EAAE,aAAa,CAAA;CAAO,EAGlE,OAAM,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAI/C,SAoBF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,QAAQ,SAAS,OAAO,aAAa,EAClE,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,SAAS;IAAE,aAAa,EAAE,aAAa,CAAA;CAAE,qCAuB1C,CAAA"}

package/dist/lib/index.js

@@ -1,43 +1,30 @@
 import fs from "node:fs";
+import { pathToFileURL } from "node:url";
 import path from "path";
-import * as babel from "@babel/core";
 import { Listr } from "listr2";
 import { format } from "prettier";
 import { colors } from "./colors.js";
 import { getPaths } from "./paths.js";
+import { transpileTSToJS } from "./transpileTSToJS.js";
 const transformTSToJS = (filename, content) => {
   if (!content) {
     return content;
   }
-  const babelFileResult = babel.transform(content, {
-    filename,
-    // If you ran `yarn cedar generate` in `./web` transformSync would import the `.babelrc.js` file,
-    // in `./web`? despite us setting `configFile: false`.
-    cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
-    configFile: false,
-    plugins: [
-      [
-        "@babel/plugin-transform-typescript",
-        {
-          isTSX: true,
-          allExtensions: true
-        }
-      ]
-    ],
-    retainLines: true
-  });
-  if (!babelFileResult?.code) {
-    console.error(colors.error(`Could not transform ${filename} to JS`));
+  let code;
+  try {
+    code = transpileTSToJS(filename, content);
+  } catch (e) {
+    console.error(colors.error(e instanceof Error ? e.message : String(e)));
     process.exit(1);
   }
-  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), babelFileResult.code);
+  return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), code);
 };
 const getPrettierOptions = async () => {
   try {
     const cjsPath = path.join(getPaths().base, "prettier.config.cjs");
     const mjsPath = path.join(getPaths().base, "prettier.config.mjs");
     const prettierConfigPath = fs.existsSync(cjsPath) ? cjsPath : mjsPath;
-    const { default: options } = await import(`file://${prettierConfigPath}`);
+    const { default: options } = await import(pathToFileURL(prettierConfigPath).href);
     if (options.tailwindConfig?.startsWith(".")) {
       options.tailwindConfig = path.join(
         process.env.CEDAR_CWD ?? process.env.RWJS_CWD ?? process.cwd(),

package/dist/lib/installHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAKlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CAQxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAK3B,CAAA"}
+{"version":3,"file":"installHelpers.d.ts","sourceRoot":"","sources":["../../src/lib/installHelpers.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,cAAc,GAAI,aAAa,MAAM,EAAE;;;CAMlD,CAAA;AAEF,eAAO,MAAM,eAAe,GAAI,UAAU,MAAM,EAAE,EAAE,uBAAqB;;;CAQxE,CAAA;AAED,eAAO,MAAM,eAAe;;;CAM3B,CAAA"}

package/dist/lib/installHelpers.js

@@ -1,30 +1,37 @@
-import execa from "execa";
+import {
+  addWorkspacePackages,
+  addRootPackages as pmAddRootPackages,
+  installPackages as pmInstallPackages
+} from "../packageManager/packages.js";
 import { getPaths } from "./paths.js";
 const addWebPackages = (webPackages) => ({
-  title: "Adding required web packages...",
+  title: `Adding required web packages...`,
   task: async () => {
-    await execa("yarn", ["add", ...webPackages], { cwd: getPaths().web.base });
+    const cwd = getPaths().web.base;
+    await addWorkspacePackages("web", webPackages, { cwd });
   }
 });
 const addApiPackages = (apiPackages) => ({
   title: "Adding required api packages...",
   task: async () => {
-    await execa("yarn", ["add", ...apiPackages], { cwd: getPaths().api.base });
+    const cwd = getPaths().api.base;
+    await addWorkspacePackages("api", apiPackages, { cwd });
   }
 });
 const addRootPackages = (packages, devDependency = false) => {
-  const addMode = devDependency ? ["add", "-D"] : ["add"];
   return {
     title: "Installing packages...",
     task: async () => {
-      await execa("yarn", [...addMode, ...packages], { cwd: getPaths().base });
+      const cwd = getPaths().base;
+      await pmAddRootPackages(packages, { cwd, dev: devDependency });
     }
   };
 };
 const installPackages = {
   title: "Installing packages...",
   task: async () => {
-    await execa("yarn", ["install"], { cwd: getPaths().base });
+    const cwd = getPaths().base;
+    await pmInstallPackages({ cwd });
   }
 };
 export {

package/dist/lib/loadEnvFiles.js

@@ -6,7 +6,7 @@ import { hideBin } from "yargs/helpers";
 import parser from "yargs-parser";
 import { getPaths } from "@cedarjs/project-config";
 function loadEnvFiles() {
-  if (process.env.REDWOOD_ENV_FILES_LOADED) {
+  if (process.env.CEDAR_ENV_FILES_LOADED) {
     return;
   }
   const { base } = getPaths();
@@ -21,7 +21,7 @@ function loadEnvFiles() {
   if (loadEnvFiles2.length > 0) {
     loadUserSpecifiedEnvFiles(base, loadEnvFiles2);
   }
-  process.env.REDWOOD_ENV_FILES_LOADED = "true";
+  process.env.CEDAR_ENV_FILES_LOADED = "true";
 }
 function loadDefaultEnvFiles(cwd) {
   dotenvDefaultsConfig({

package/dist/lib/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAQtC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAmDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAoCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/lib/project.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAWrD,eAAO,MAAM,cAAc,qBAE1B,CAAA;AAED,eAAO,MAAM,sBAAsB,2BAGlC,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,0BAA0B,WAStC,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,SAkDnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM;;;CAOvD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM;;;CAOzE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,OAAO,MAAM,EAAE,SAAS,MAAM,kBAqCrE,CAAA;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,MAAM,QAmCzC;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,QA0HjC"}

package/dist/lib/project.js

@@ -23,7 +23,8 @@ const isTypeScriptProject = () => {
 };
 const getInstalledRedwoodVersion = () => {
   try {
-    const packageJson = require("../../package.json");
+    const packageJsonPath = path.join(import.meta.dirname, "../../package.json");
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
     return packageJson.version;
   } catch {
     console.error(colors.error("Could not find installed Cedar version"));
@@ -34,7 +35,7 @@ const updateTomlConfig = (packageName) => {
   const configTomlPath = getConfigPath();
   const originalTomlContent = fs.readFileSync(configTomlPath, "utf-8");
   let tomlToAppend = {};
-  const config = getConfig(configTomlPath);
+  const config = getConfig();
   const cliSection = config.experimental?.cli;
   if (!cliSection) {
     tomlToAppend = {
@@ -137,13 +138,12 @@ function setRedwoodCWD(cwd) {
     cwd = path.dirname(configTomlPath);
   }
   process.env.CEDAR_CWD = cwd;
-  process.env.RWJS_CWD = cwd;
 }
 function setTomlSetting(section, setting, value) {
-  const redwoodTomlPath = getConfigPath();
-  const originalTomlContent = fs.readFileSync(redwoodTomlPath, "utf-8");
-  const redwoodTomlObject = toml.parse(originalTomlContent);
-  const sectionValue = redwoodTomlObject[section];
+  const cedarTomlPath = getConfigPath();
+  const originalTomlContent = fs.readFileSync(cedarTomlPath, "utf-8");
+  const cedarTomlObject = toml.parse(originalTomlContent);
+  const sectionValue = cedarTomlObject[section];
   const existingValue = (
     // I don't like this type cast, but I couldn't come up with a much better
     // solution
@@ -156,9 +156,9 @@ function setTomlSetting(section, setting, value) {
 
 [${section}]
   ${setting} = ${value}`;
-  const hasExistingSettingSection = !!redwoodTomlObject?.[section];
+  const hasExistingSettingSection = !!cedarTomlObject?.[section];
   if (hasExistingSettingSection) {
-    const existingSectionSettings = Object.keys(redwoodTomlObject[section]);
+    const existingSectionSettings = Object.keys(cedarTomlObject[section]);
     let inSection = false;
     let indentation = "";
     let insertionIndex = 1;
@@ -215,7 +215,7 @@ function setTomlSetting(section, setting, value) {
     );
     newTomlContent = tomlLines.join("\n");
   }
-  fs.writeFileSync(redwoodTomlPath, newTomlContent);
+  fs.writeFileSync(cedarTomlPath, newTomlContent);
 }
 export {
   addEnvVar,

package/dist/lib/transpileTSToJS.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Strips the TypeScript syntax from `content` and returns the resulting
+ * JavaScript source. Everything that is not TypeScript syntax, including JSX,
+ * comments, blank lines and indentation, is kept byte-for-byte, so the output
+ * only needs formatting.
+ *
+ * `import type` statements, `type` specifiers and imports whose bindings are
+ * only used as types are removed. Lines that only held removed syntax (for
+ * example an `import type` line or an `interface` body) are dropped so they
+ * do not turn into stray blank lines.
+ *
+ * `filename` is used for error messages. The content is always parsed as TSX
+ * because templates can contain JSX regardless of their extension.
+ *
+ * Throws when sucrase reports a syntax error.
+ */
+export declare function transpileTSToJS(filename: string, content: string): string;
+//# sourceMappingURL=transpileTSToJS.d.ts.map

package/dist/lib/transpileTSToJS.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transpileTSToJS.d.ts","sourceRoot":"","sources":["../../src/lib/transpileTSToJS.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAwBhE"}

package/dist/lib/transpileTSToJS.js

@@ -0,0 +1,38 @@
+import { transform } from "sucrase";
+const BLANK_LINE_REGEX = /^[ \t]*$/;
+function transpileTSToJS(filename, content) {
+  let code;
+  try {
+    code = transform(content, {
+      // `jsx` is required to parse JSX at all. `jsxRuntime: 'preserve'` keeps
+      // the JSX untouched so the project's own build compiles it.
+      transforms: ["typescript", "jsx"],
+      jsxRuntime: "preserve",
+      // Keep modern ECMAScript syntax (optional chaining, class fields, ...)
+      // as written.
+      disableESTransforms: true,
+      keepUnusedImports: false,
+      filePath: filename
+    }).code;
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    throw new Error(
+      `Could not transform ${filename} from TypeScript to JavaScript:
+${message}`
+    );
+  }
+  return dropEmptiedLines(content, code);
+}
+function dropEmptiedLines(input, output) {
+  const inputLines = input.split("\n");
+  const outputLines = output.split("\n");
+  if (inputLines.length !== outputLines.length) {
+    return output;
+  }
+  return outputLines.filter(
+    (line, index) => !BLANK_LINE_REGEX.test(line) || BLANK_LINE_REGEX.test(inputLines[index])
+  ).join("\n");
+}
+export {
+  transpileTSToJS
+};

package/dist/lib/tty.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Prompting libraries (e.g. `prompts`) hang indefinitely when stdin isn't a
+ * TTY - piped input, CI, or a backgrounded process never sends a keypress,
+ * so the prompt neither resolves nor throws.
+ *
+ * Call this immediately before any interactive confirm/prompt that's only
+ * reached when a flag was left unset, so a non-interactive invocation exits
+ * with a clear, actionable error instead of hanging.
+ */
+export declare function requireTTYOrExit(flagHint: string): void;
+//# sourceMappingURL=tty.d.ts.map

package/dist/lib/tty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tty.d.ts","sourceRoot":"","sources":["../../src/lib/tty.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAYvD"}

package/dist/lib/tty.js

@@ -0,0 +1,16 @@
+import { errorTelemetry } from "@cedarjs/telemetry";
+import { colors } from "./colors.js";
+function requireTTYOrExit(flagHint) {
+  if (process.stdin.isTTY) {
+    return;
+  }
+  const error = new Error(
+    `Cannot prompt for confirmation in a non-interactive terminal. Please pass ${flagHint} explicitly.`
+  );
+  errorTelemetry(process.argv, error.message);
+  console.error(colors.error(error.message));
+  process.exit(1);
+}
+export {
+  requireTTYOrExit
+};

package/dist/lib/version.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "path";
-import semver from "semver";
+import { rangesIntersect, sort, tryParse } from "verkit";
 import { getPaths } from "@cedarjs/project-config";
 function getCorrespondingTag(version, distTags) {
   return Object.entries(distTags).find(([_, v]) => v === version)?.[0];
@@ -12,7 +12,7 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
     })
   );
   const projectRedwoodVersion = projectPackageJson.devDependencies["@cedarjs/core"];
-  const semverVersion = semver.parse(preferredVersionOrTag);
+  const semverVersion = tryParse(preferredVersionOrTag);
   const isUsingTag = semverVersion === null;
   const res = await fetch(`https://registry.npmjs.org/${packageName}`);
   const packument = await res.json();
@@ -34,7 +34,7 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
   }
   const preferredVersion = isUsingTag ? packument["dist-tags"][preferredVersionOrTag] : preferredVersionOrTag;
   const packageRedwoodSpecification = packument.versions[preferredVersion].engines?.redwoodjs;
-  if (packageRedwoodSpecification !== void 0 && semver.intersects(projectRedwoodVersion, packageRedwoodSpecification)) {
+  if (packageRedwoodSpecification !== void 0 && rangesIntersect(projectRedwoodVersion, packageRedwoodSpecification)) {
     const tag = getCorrespondingTag(preferredVersion, packument["dist-tags"]);
     return {
       preferred: {
@@ -47,13 +47,13 @@ async function getCompatibilityData(packageName, preferredVersionOrTag) {
       }
     };
   }
-  const versions = semver.sort(Object.keys(packument.versions));
+  const versions = sort(Object.keys(packument.versions));
   for (let i = versions.length - 1; i >= 0; i--) {
     const redwoodVersionRequired = packument.versions[versions[i]].engines?.redwoodjs;
     if (redwoodVersionRequired === void 0) {
       continue;
     }
-    if (semver.intersects(projectRedwoodVersion, redwoodVersionRequired)) {
+    if (rangesIntersect(projectRedwoodVersion, redwoodVersionRequired)) {
       return {
         preferred: {
           tag: getCorrespondingTag(preferredVersion, packument["dist-tags"]),