From 0b1897a11c58af175fa15e56acb7cadcd629d75c Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Wed, 26 Jul 2023 20:30:55 +0000 Subject: [PATCH 1/6] update cli init to create index file in examples folder --- packages/cli/src/commands/init.ts | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 88004499802..ba4f10a3e54 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -453,6 +453,7 @@ async function createTriggerAppRoute( const extension = isTypescriptProject ? ".ts" : ".js" const triggerFileName = `trigger${extension}` const examplesFileName = `examples${extension}` + const examplesIndex = `index${extension}` const routeFileName = `route${extension}` const pathAlias = getPathAlias(tsconfig, usesSrcDir); @@ -463,7 +464,7 @@ import { createAppRoute } from "@trigger.dev/nextjs"; import { client } from "${routePathPrefix}trigger"; // Replace this with your own jobs -import "${routePathPrefix}jobs/examples"; +import "${routePathPrefix}jobs"; //this route is used to send and receive data with Trigger.dev export const { POST, dynamic } = createAppRoute(client); @@ -503,6 +504,10 @@ client.defineJob({ }); `; + const examplesIndexContent = ` + export * from "./examples" + ` + const directories = pathModule.join(path, "app", "api", "trigger"); await fs.mkdir(directories, { recursive: true }); @@ -544,6 +549,11 @@ client.defineJob({ jobsContent ); + await fs.writeFile( + pathModule.join(exampleDirectories, examplesIndex), + examplesIndexContent + ); + logger.success( `✅ Created example job at ${ usesSrcDir ? "src/" : "" @@ -569,6 +579,7 @@ async function createTriggerPageRoute( const extension = isTypescriptProject ? ".ts" : ".js" const triggerFileName = `trigger${extension}` const examplesFileName = `examples${extension}` + const examplesIndex = `index${extension}` const routeContent = ` import { createPagesRoute } from "@trigger.dev/nextjs"; @@ -615,6 +626,10 @@ client.defineJob({ }); `; + const examplesIndexContent = ` + export * from "./examples" + ` + const directories = pathModule.join(path, "pages", "api"); await fs.mkdir(directories, { recursive: true }); @@ -656,6 +671,11 @@ client.defineJob({ jobsContent ); + await fs.writeFile( + pathModule.join(exampleDirectories, examplesIndex), + examplesIndexContent + ); + logger.success( `✅ Created example job at ${ usesSrcDir ? "src/" : "" From d57abdf02151cd931d371974ba00f1c8c72d5e8b Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Wed, 26 Jul 2023 20:38:00 +0000 Subject: [PATCH 2/6] add patch changeset --- .changeset/nasty-fireants-knock.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nasty-fireants-knock.md diff --git a/.changeset/nasty-fireants-knock.md b/.changeset/nasty-fireants-knock.md new file mode 100644 index 00000000000..5f76716d469 --- /dev/null +++ b/.changeset/nasty-fireants-knock.md @@ -0,0 +1,5 @@ +--- +"@trigger.dev/cli": patch +--- + +introduce index file in jobs folder. Modify related code to import from module From 4a8ba77af76e817c22272890ed8cafb2fc119a97 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Wed, 26 Jul 2023 21:39:29 +0100 Subject: [PATCH 3/6] Create silly-baboons-join.md --- .changeset/silly-baboons-join.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/silly-baboons-join.md diff --git a/.changeset/silly-baboons-join.md b/.changeset/silly-baboons-join.md new file mode 100644 index 00000000000..944f557d67a --- /dev/null +++ b/.changeset/silly-baboons-join.md @@ -0,0 +1,5 @@ +--- +"@trigger.dev/cli": patch +--- + +The cli init command creates a jobs/index file and that is used to import jobs From 1017fef127d98ef3d62b3f72eb9202dcb929069f Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Wed, 26 Jul 2023 21:14:48 +0000 Subject: [PATCH 4/6] remove comment in router file add comment in jobs index to instruct them to --- packages/cli/src/commands/init.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index ba4f10a3e54..8e0bb365113 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -463,7 +463,7 @@ async function createTriggerAppRoute( import { createAppRoute } from "@trigger.dev/nextjs"; import { client } from "${routePathPrefix}trigger"; -// Replace this with your own jobs + import "${routePathPrefix}jobs"; //this route is used to send and receive data with Trigger.dev @@ -505,8 +505,10 @@ client.defineJob({ `; const examplesIndexContent = ` - export * from "./examples" - ` +// import all your job files here + +export * from "./examples" +` const directories = pathModule.join(path, "app", "api", "trigger"); await fs.mkdir(directories, { recursive: true }); @@ -627,7 +629,9 @@ client.defineJob({ `; const examplesIndexContent = ` - export * from "./examples" +// import all your job files here + +export * from "./examples" ` const directories = pathModule.join(path, "pages", "api"); From b7bb9a53ff02cfb6f1a6e0f3820b8983e8287200 Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Wed, 26 Jul 2023 22:14:09 +0000 Subject: [PATCH 5/6] rename examplesIndex to examplesIndexFileName --- packages/cli/src/commands/init.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 8e0bb365113..7c790241930 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -453,7 +453,7 @@ async function createTriggerAppRoute( const extension = isTypescriptProject ? ".ts" : ".js" const triggerFileName = `trigger${extension}` const examplesFileName = `examples${extension}` - const examplesIndex = `index${extension}` + const examplesIndexFileName = `index${extension}` const routeFileName = `route${extension}` const pathAlias = getPathAlias(tsconfig, usesSrcDir); @@ -552,7 +552,7 @@ export * from "./examples" ); await fs.writeFile( - pathModule.join(exampleDirectories, examplesIndex), + pathModule.join(exampleDirectories, examplesIndexFileName), examplesIndexContent ); @@ -581,7 +581,7 @@ async function createTriggerPageRoute( const extension = isTypescriptProject ? ".ts" : ".js" const triggerFileName = `trigger${extension}` const examplesFileName = `examples${extension}` - const examplesIndex = `index${extension}` + const examplesIndexFileName = `index${extension}` const routeContent = ` import { createPagesRoute } from "@trigger.dev/nextjs"; @@ -676,7 +676,7 @@ export * from "./examples" ); await fs.writeFile( - pathModule.join(exampleDirectories, examplesIndex), + pathModule.join(exampleDirectories, examplesIndexFileName), examplesIndexContent ); From 3fe872658ccaba0f3999a47073c3d74ebbae373f Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Mon, 31 Jul 2023 17:38:12 +0000 Subject: [PATCH 6/6] import jobs module in routeContent for createTriggerPageRoute just as we did for createTriggerAppRoute --- packages/cli/src/commands/init.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 7c790241930..8ec12c3132c 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -587,6 +587,8 @@ async function createTriggerPageRoute( import { createPagesRoute } from "@trigger.dev/nextjs"; import { client } from "${routePathPrefix}trigger"; +import "${routePathPrefix}jobs"; + //this route is used to send and receive data with Trigger.dev const { handler, config } = createPagesRoute(client); export { config };