init using templates again but downloaded from the repo this time

Author: ericallam

.vscode/launch.json

@@ -29,6 +29,14 @@
       "cwd": "${workspaceFolder}/references/job-catalog",
       "sourceMaps": true
     },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug V3 init CLI",
+      "command": "pnpm exec triggerdev init",
+      "cwd": "${workspaceFolder}/references/init-shell",
+      "sourceMaps": true
+    },
     {
       "type": "node-terminal",
       "request": "launch",

packages/build/package.json

@@ -149,4 +149,4 @@
   "main": "./dist/commonjs/index.js",
   "types": "./dist/commonjs/index.d.ts",
   "module": "./dist/esm/index.js"
-}
+}

packages/cli-v3/src/commands/init.ts

@@ -23,13 +23,17 @@ import {
 import { loadConfig } from "../config.js";
 import { CLOUD_API_URL } from "../consts.js";
 import { cliLink, prettyError } from "../utilities/cliOutput.js";
-import { createFileFromTemplate } from "../utilities/createFileFromTemplate.js";
+import {
+  createFileFromTemplate,
+  generateTemplateUrl,
+} from "../utilities/createFileFromTemplate.js";
 import { createFile, pathExists, readFile } from "../utilities/fileSystem.js";
 import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
 import { logger } from "../utilities/logger.js";
 import { cliRootPath } from "../utilities/resolveInternalFilePath.js";
 import { spinner } from "../utilities/windows.js";
 import { login } from "./login.js";
+import { resolveTSConfig } from "pkg-types";
 
 const InitCommandOptions = CommonCommandOptions.extend({
   projectRef: z.string().optional(),
@@ -54,7 +58,7 @@ export function configureInitCommand(program: Command) {
       .option(
         "-t, --tag <package tag>",
         "The version of the @trigger.dev/sdk package to install",
-        "latest"
+        "beta"
       )
       .option("--skip-package-install", "Skip installing the @trigger.dev/sdk package")
       .option("--override-config", "Override the existing config file if it exists")
@@ -81,8 +85,7 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
 
   intro("Initializing project");
 
-  // Detect tsconfig.json and exit if not found
-  await detectTsConfig(dir, options);
+  const cwd = resolve(process.cwd(), dir);
 
   const authorization = await login({
     embedded: true,
@@ -107,18 +110,22 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
     "cli.config.profile": authorization.profile,
   });
 
+  const tsconfigPath = await tryResolveTsConfig(cwd);
+
   if (!options.overrideConfig) {
     try {
       // check to see if there is an existing trigger.dev config file in the project directory
-      const result = await loadConfig({ cwd: dir });
+      const result = await loadConfig({ cwd });
 
-      outro(
-        result.configFile
-          ? `Project already initialized: Found config file at ${result.configFile}. Pass --override-config to override`
-          : "Project already initialized"
-      );
+      if (result.configFile && result.configFile !== "trigger.config") {
+        outro(
+          result.configFile
+            ? `Project already initialized: Found config file at ${result.configFile}. Pass --override-config to override`
+            : "Project already initialized"
+        );
 
-      return;
+        return;
+      }
     } catch (e) {
       // continue
     }
@@ -154,7 +161,9 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
   await writeConfigFile(dir, selectedProject, options, triggerDir);
 
   // Add trigger.config.ts to tsconfig.json
-  await addConfigFileToTsConfig(dir, options);
+  if (tsconfigPath) {
+    await addConfigFileToTsConfig(tsconfigPath, options);
+  }
 
   // Ignore .trigger dir
   await gitIgnoreDotTriggerDir(dir, options);
@@ -175,7 +184,7 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
   );
   log.info(`   2. Visit your ${projectDashboard} to view your newly created tasks.`);
   log.info(
-    `   3. Head over to our ${cliLink("v3 docs", "https://trigger.dev/docs/v3")} to learn more.`
+    `   3. Head over to our ${cliLink("v3 docs", "https://trigger.dev/docs")} to learn more.`
   );
   log.info(
     `   4. Need help? Join our ${cliLink(
@@ -246,11 +255,11 @@ async function createTriggerDir(dir: string, options: InitCommandOptions) {
         return { location, isCustomValue: location !== defaultValue };
       }
 
-      const templatePath = join(cliRootPath(), "templates", "examples", `${example}.ts.template`);
+      const templateUrl = generateTemplateUrl(`examples/${example}.ts`);
       const outputPath = join(triggerDir, "example.ts");
 
       await createFileFromTemplate({
-        templatePath,
+        templateUrl,
         outputPath,
         replacements: {},
       });
@@ -324,52 +333,10 @@ async function gitIgnoreDotTriggerDir(dir: string, options: InitCommandOptions)
   });
 }
 
-async function detectTsConfig(dir: string, options: InitCommandOptions) {
-  return await tracer.startActiveSpan("detectTsConfig", async (span) => {
-    try {
-      const projectDir = resolve(process.cwd(), dir);
-      const tsconfigPath = join(projectDir, "tsconfig.json");
-
-      span.setAttributes({
-        "cli.projectDir": projectDir,
-        "cli.tsconfigPath": tsconfigPath,
-      });
-
-      const tsconfigExists = await pathExists(tsconfigPath);
-
-      if (!tsconfigExists) {
-        prettyError(
-          "No tsconfig.json found",
-          `The init command needs to be run in a TypeScript project. You can create one like this:`,
-          `npm install typescript --save-dev\nnpx tsc --init\n`
-        );
-
-        throw new Error("TypeScript required");
-      }
-
-      logger.debug("tsconfig.json exists", { tsconfigPath });
-
-      span.end();
-    } catch (e) {
-      if (!(e instanceof SkipCommandError)) {
-        recordSpanException(span, e);
-      }
-
-      span.end();
-
-      throw e;
-    }
-  });
-}
-
-async function addConfigFileToTsConfig(dir: string, options: InitCommandOptions) {
+async function addConfigFileToTsConfig(tsconfigPath: string, options: InitCommandOptions) {
   return await tracer.startActiveSpan("addConfigFileToTsConfig", async (span) => {
     try {
-      const projectDir = resolve(process.cwd(), dir);
-      const tsconfigPath = join(projectDir, "tsconfig.json");
-
       span.setAttributes({
-        "cli.projectDir": projectDir,
         "cli.tsconfigPath": tsconfigPath,
       });
 
@@ -481,21 +448,21 @@ async function writeConfigFile(
       spnnr.start("Creating config file");
 
       const projectDir = resolve(process.cwd(), dir);
-      const templatePath = join(cliRootPath(), "templates", "trigger.config.ts.template");
       const outputPath = join(projectDir, "trigger.config.ts");
+      const templateUrl = generateTemplateUrl("trigger.config.ts");
 
       span.setAttributes({
         "cli.projectDir": projectDir,
-        "cli.templatePath": templatePath,
+        "cli.templatePath": templateUrl,
         "cli.outputPath": outputPath,
       });
 
       const result = await createFileFromTemplate({
-        templatePath,
+        templateUrl,
         replacements: {
           projectRef: project.externalRef,
           triggerDirectoriesOption: triggerDir.isCustomValue
-            ? `\n  triggerDirectories: ["${triggerDir.location}"],`
+            ? `\n  dirs: ["${triggerDir.location}"],`
             : "",
         },
         outputPath,
@@ -608,3 +575,12 @@ async function selectProject(apiClient: CliApiClient, dashboardUrl: string, proj
     }
   });
 }
+
+async function tryResolveTsConfig(cwd: string) {
+  try {
+    const tsconfigPath = await resolveTSConfig(cwd);
+    return tsconfigPath;
+  } catch (e) {
+    return;
+  }
+}

packages/cli-v3/src/utilities/createFileFromTemplate.ts

@@ -13,21 +13,25 @@ type Result =
     };
 
 export async function createFileFromTemplate(params: {
-  templatePath: string;
+  templateUrl: string;
   replacements: Record<string, string>;
   outputPath: string;
   override?: boolean;
 }): Promise<Result> {
-  let template = await readFile(params.templatePath);
+  try {
+    const response = await fetch(params.templateUrl);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch template: ${response.statusText}`);
+    }
+    const template = await response.text();
 
-  if ((await pathExists(params.outputPath)) && !params.override) {
-    return {
-      success: true,
-      alreadyExisted: true,
-    };
-  }
+    if ((await pathExists(params.outputPath)) && !params.override) {
+      return {
+        success: true,
+        alreadyExisted: true,
+      };
+    }
 
-  try {
     const output = replaceAll(template, params.replacements);
 
     const directoryName = path.dirname(params.outputPath);
@@ -60,3 +64,7 @@ export function replaceAll(input: string, replacements: Record<string, string>)
   }
   return output;
 }
+
+export function generateTemplateUrl(templateName: string) {
+  return `https://raw.githubusercontent.com/triggerdotdev/trigger.dev/main/packages/cli-v3/templates/${templateName}.template`;
+}

packages/cli-v3/templates/examples/simple.ts.template

@@ -0,0 +1,14 @@
+import { logger, task, wait } from "@trigger.dev/sdk/v3";
+
+export const helloWorldTask = task({
+  id: "hello-world",
+  run: async (payload: any, { ctx }) => {
+    logger.log("Hello, world!", { payload, ctx });
+
+    await wait.for({ seconds: 5 });
+
+    return {
+      message: "Hello, world!",
+    }
+  },
+});

packages/cli-v3/templates/trigger.config.ts.template

@@ -0,0 +1,16 @@
+import { defineConfig } from "@trigger.dev/sdk/v3";
+
+export default defineConfig({
+  project: "${projectRef}",
+  logLevel: "log",
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },${triggerDirectoriesOption}
+});

pnpm-lock.yaml

@@ -0,0 +1,9 @@
+{
+  "name": "references-init-shell",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*",
+    "typescript": "^5.5.4"
+  }
+}

references/init-shell/package.json

@@ -0,0 +1 @@
+export {};

references/init-shell/src/index.ts

@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts"]
+}