@cedarjs/cli 7.0.0-canary.3260 → 7.0.0-rc.123

package/dist/commands/prerenderHandler.js

@@ -1,10 +1,9 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
-import { getConfig, getParsedScalars, getPaths } from "@cedarjs/project-config";
+import { getConfig, getPaths, projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { runScriptFunction } from "../lib/exec.js";
 import { configureBabel } from "../lib/execBabel.js";
@@ -94,7 +93,7 @@ async function expandRouteParameters(route) {
   return [route];
 }
 const getTasks = async (dryrun, routerPathFilter = null) => {
-  const detector = await import("@cedarjs/prerender/detection");
+  const detector = projectIsEsm() ? await import("@cedarjs/prerender/detection") : await import("@cedarjs/prerender/cjs/detection");
   const detectedRoutes = detector.detectPrerenderRoutes();
   const prerenderRoutes = detectedRoutes.filter(hasPath).map(normalizeRoute);
   if (prerenderRoutes.length === 0) {
@@ -106,12 +105,6 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
     );
     return [];
   }
-  const parsedScalars = Object.keys(getParsedScalars());
-  if (parsedScalars.length > 0) {
-    throw new Error(
-      "Prerendering does not support `graphql.parsedScalars` yet. A prerendered Cell gets the raw GraphQL response, so " + parsedScalars.join(", ") + " would be a string when prerendering and parsed in the browser. Either remove the `prerender` prop from your routes, or remove `graphql.parsedScalars` from cedar.toml."
-    );
-  }
   const indexHtmlPath = path.join(getPaths().web.dist, "index.html");
   if (!fs.existsSync(indexHtmlPath)) {
     console.error(
@@ -123,7 +116,7 @@ const getTasks = async (dryrun, routerPathFilter = null) => {
   const expandedRouteParameters = await Promise.all(
     prerenderRoutes.map((route) => expandRouteParameters(route))
   );
-  const prerenderer = await import("@cedarjs/prerender");
+  const prerenderer = projectIsEsm() ? await import("@cedarjs/prerender") : await import("@cedarjs/prerender/cjs");
   const listrTasks = expandedRouteParameters.flatMap((routesToPrerender) => {
     const queryCache = {};
     const shouldFold = routesToPrerender.length > 16;

package/dist/commands/prismaHandler.js

@@ -1,13 +1,12 @@
 import fs from "node:fs";
 import boxen from "boxen";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import {
   formatCedarCommand,
   formatRunBinCommand,
   formatRunTransitiveBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
 import { runTransitiveBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths } from "../lib/index.js";
 const getErrorMessage = (error) => {
@@ -63,11 +62,7 @@ const handler = async ({
   try {
     runTransitiveBinSync("prisma", args, {
       cwd: cedarPaths.base,
-      stdio: [
-        process.stdin.isTTY && !process.env.CI ? "inherit" : "pipe",
-        "inherit",
-        "inherit"
-      ]
+      stdio: "inherit"
     });
     if (hasHelpOption || args.length === 0) {
       printWrapInfo();

package/dist/commands/record/init.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const handler = async (_argv) => {
   recordTelemetryAttributes({
     command: "record"

package/dist/commands/serve.js

@@ -5,8 +5,7 @@ import { serve as serveSrvx } from "srvx";
 import { terminalLink } from "termi-link";
 import * as apiServerCLIConfig from "@cedarjs/api-server/apiCliConfig";
 import * as bothServerCLIConfig from "@cedarjs/api-server/bothCliConfig";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import * as webServerCLIConfig from "@cedarjs/web-server";
 import { getPaths, getConfig } from "../lib/index.js";
 import { serverFileExists } from "../lib/project.js";

package/dist/commands/setup/auth/auth.js

@@ -1,9 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 import { terminalLink } from "termi-link";
-import { standardAuthBuilder } from "@cedarjs/cli-helpers/auth/setupHelpers";
+import {
+  recordTelemetryAttributes,
+  standardAuthBuilder
+} from "@cedarjs/cli-helpers";
 import { addRootPackages } from "@cedarjs/cli-helpers/packageManager/packages";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths } from "../../../lib/index.js";
 const command = "auth <provider>";
 const description = "Set up an auth configuration";

package/dist/commands/setup/cache/cache.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "cache <client>";
 const description = "Sets up an init file for service caching";
 const builder = (yargs) => {

package/dist/commands/setup/cache/cacheHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addEnvVarTask } from "@cedarjs/cli-helpers/project";
+import { addEnvVarTask, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { addPackagesTask, getPaths, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";

package/dist/commands/setup/database/postgres.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "postgres";
 const description = "Switch your project from SQLite to PostgreSQL (schema, dependencies, and database adapter)";
 function builder(yargs) {

package/dist/commands/setup/database/postgresHandler.js

@@ -2,11 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { installPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
 import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
 import { resolveFile } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 function checkProjectShape(cedarPaths) {

package/dist/commands/setup/deploy/providers/baremetalHandler.js

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

package/dist/commands/setup/deploy/providers/coherence.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "coherence";
 const description = "Setup Coherence deploy";
 function builder(yargs) {

package/dist/commands/setup/deploy/providers/coherenceHandler.js

@@ -3,17 +3,16 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import * as toml from "smol-toml";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import {
+  colors as c,
+  isTypeScriptProject,
+  getConfigPath
+} from "@cedarjs/cli-helpers";
 import {
   formatCedarCommand,
   formatRunBinCommand
 } from "@cedarjs/cli-helpers/packageManager/display";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
-import {
-  getConfigPath,
-  getPaths,
-  getPrismaSchemas
-} from "@cedarjs/project-config";
+import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 import { serverFileExists } from "../../../../lib/project.js";

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -3,9 +3,8 @@ import { EOL } from "os";
 import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

package/dist/commands/setup/deploy/providers/renderHandler.js

@@ -2,8 +2,7 @@ import path from "path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getPaths, getPrismaSchemas } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { writeFilesTask, printSetupNotes } from "../../../../lib/index.js";

package/dist/commands/setup/deploy/providers/serverlessHandler.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { getSchemaPath, getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {

package/dist/commands/setup/deploy/providers/universalDeployHandler.js

@@ -1,10 +1,12 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import {
+  colors as c,
+  getPaths,
+  isTypeScriptProject,
+  recordTelemetryAttributes
+} from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { printSetupNotes } from "../../../../lib/index.js";
 const notes = [

package/dist/commands/setup/deploy/providers/vercelHandler.js

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addPackagesTask,

package/dist/commands/setup/docker/docker.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "docker";
 const description = "Setup the default Cedar Dockerfile";
 function builder(yargs) {

package/dist/commands/setup/docker/dockerHandler.js

@@ -3,8 +3,7 @@ import { createRequire } from "node:module";
 import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { writeFile } from "@cedarjs/cli-helpers/fileHelpers";
+import { writeFile, colors as c } from "@cedarjs/cli-helpers";
 import { dedupe } from "@cedarjs/cli-helpers/packageManager";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";

package/dist/commands/setup/generator/generator.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "generator <name>";
 const description = "Copies generator templates locally for customization";
 const EXCLUDE_GENERATORS = ["dataMigration", "dbAuth", "generator", "secret"];

package/dist/commands/setup/generator/generatorHandler.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { getPaths } from "../../../lib/index.js";
 const SIDE_MAP = {
   web: ["cell", "component", "layout", "page", "scaffold"],

package/dist/commands/setup/graphql/features/fragments/fragments.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "fragments";
 const description = "Set up Fragments for GraphQL";
 function builder(yargs) {

package/dist/commands/setup/graphql/features/fragments/fragmentsHandler.js

@@ -2,10 +2,12 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import {
+  colors,
+  getPrettierOptions,
+  setTomlSetting
+} from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 const command = "fragments";

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocuments.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "trusted-documents";
 const description = "Set up Trusted Documents for GraphQL";
 function builder(yargs) {

package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js

@@ -2,9 +2,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
+import { getPrettierOptions, setTomlSetting } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
-import { setTomlSetting } from "@cedarjs/cli-helpers/project";
 import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { runTransform } from "../../../../../lib/runTransform.js";
 async function handler({ force }) {

package/dist/commands/setup/i18n/i18n.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "i18n";
 const description = "Set up i18n";
 const builder = (yargs) => {

package/dist/commands/setup/i18n/i18nHandler.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { colors as c } from "@cedarjs/cli-helpers";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import extendStorybookConfiguration from "../../../lib/configureStorybook.js";

package/dist/commands/setup/jobs/jobs.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "jobs";
 const description = "Sets up the config file and parent directory for background jobs";
 const builder = (yargs) => {

package/dist/commands/setup/jobs/jobsHandler.js

@@ -3,8 +3,7 @@ import * as path from "node:path";
 import prismaInternals from "@prisma/internals";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { getSchemaPath, getPrismaSchemas } from "@cedarjs/project-config";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";

package/dist/commands/setup/mailer/mailer.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "mailer";
 const description = "Setup the Cedar mailer. This will install the required packages and add the required initial configuration to your Cedar app.";
 const builder = (yargs) => {

package/dist/commands/setup/mailer/mailerHandler.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "og-image";
 const aliases = ["ogImage", "ogimage"];
 const description = "Set up OG Image generation middleware";

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

@@ -2,8 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
 import { format } from "prettier";
-import { getPrettierOptions } from "@cedarjs/cli-helpers/fileHelpers";
-import { addWebPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addWebPackages, getPrettierOptions } from "@cedarjs/cli-helpers";
 import { getConfig, getPaths } from "@cedarjs/project-config";
 import { runTransform } from "../../../../lib/runTransform.js";
 async function handler({ force }) {

package/dist/commands/setup/monitoring/sentry/sentry.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "sentry";
 const description = "Setup Sentry error and performance tracking";
 const builder = (yargs) => {

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -1,17 +1,16 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { prettify, writeFilesTask } from "@cedarjs/cli-helpers/fileHelpers";
 import {
   addApiPackages,
-  addWebPackages
-} from "@cedarjs/cli-helpers/installHelpers";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import {
   addEnvVarTask,
-  isTypeScriptProject
-} from "@cedarjs/cli-helpers/project";
+  addWebPackages,
+  colors,
+  getPaths,
+  isTypeScriptProject,
+  prettify,
+  writeFilesTask
+} from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 const rwPaths = getPaths();

package/dist/commands/setup/neon/neon.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "neon";
 const description = "Provision a Neon Postgres database and configure your project";
 function builder(yargs) {

package/dist/commands/setup/neon/neonHandler.js

@@ -3,11 +3,8 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { installPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
 import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import { requireTTYOrExit } from "@cedarjs/cli-helpers/tty";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   checkProjectShape,
@@ -57,7 +54,14 @@ async function handler({ force, migrations, verbose }) {
   }
   let runMigrations = migrations;
   if (!skipProvisioning && runMigrations === void 0) {
-    requireTTYOrExit("--migrations or --no-migrations");
+    if (!process.stdin.isTTY) {
+      const error = new Error(
+        "Cannot prompt for confirmation in a non-interactive terminal. Please pass --migrations or --no-migrations explicitly."
+      );
+      errorTelemetry(process.argv, error.message);
+      console.error(colors.error(error.message));
+      process.exit(1);
+    }
     const response = await prompts({
       type: "toggle",
       name: "runMigrations",

package/dist/commands/setup/package/package.js

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "package <npm-package>";
 const description = "Run a bin from an NPM package with version compatibility checks";
 const builder = (yargs) => {

package/dist/commands/setup/package/packageHandler.js

@@ -1,7 +1,7 @@
 import enq from "enquirer";
-import { isGreaterThanOrEqual, isLessThan, tryParse } from "verkit";
+import semver from "semver";
+import { getCompatibilityData } from "@cedarjs/cli-helpers";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
 import { getPaths } from "@cedarjs/project-config";
 async function handler({
   npmPackage,
@@ -16,7 +16,7 @@ async function handler({
     console.log(
       "No compatibility check will be performed because you used the --force flag."
     );
-    if (tryParse(packageVersion) !== null && isLessThan(packageVersion, "1.0.0")) {
+    if (semver.parse(packageVersion) !== null && semver.lt(packageVersion, "1.0.0")) {
       console.log(
         "Be aware that this package is under version 1.0.0 and so should be considered experimental."
       );
@@ -86,7 +86,7 @@ The latest version compatible with your project is ${latestCompatibleVersionText
   await runPackage(packageName, versionToUse, additionalOptionsToForward);
 }
 async function showExperimentalWarning(version) {
-  if (version === void 0 || tryParse(version) === null || isGreaterThanOrEqual(version, "1.0.0")) {
+  if (version === void 0 || semver.parse(version) === null || semver.gte(version, "1.0.0")) {
     return;
   }
   const decision = await promptWithChoices(

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

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers";
 import { getPaths } from "@cedarjs/project-config";
 function addRealtimeToGraphqlHandler(ctx, task, force) {
   const graphqlHandlerPath = path.join(

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

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "realtime";
 const description = "Setup RedwoodJS Realtime";
 function builder(yargs) {

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

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../../lib/project.js";
@@ -77,7 +77,7 @@ async function handler(args) {
         title: "Adding Countdown example subscription...",
         enabled: () => includeExamples,
         task: async () => {
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -87,6 +87,12 @@ async function handler(args) {
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "countdown",
@@ -138,7 +144,7 @@ async function handler(args) {
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const serviceContent = ts ? exampleServiceTemplateContent : await transformTSToJS(serviceFile, exampleServiceTemplateContent);
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -148,6 +154,12 @@ async function handler(args) {
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "newMessage",

package/dist/commands/setup/realtime/templates/subscriptions/countdown/countdown.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import { Repeater } from '@cedarjs/realtime'
 

package/dist/commands/setup/realtime/templates/subscriptions/newMessage/newMessage.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import type { PubSub } from '@cedarjs/realtime'