Skip to content

Auto-fix config.dirs of /trigger and /src/trigger #1665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Conversation

ericallam
Copy link
Member

@ericallam ericallam commented Feb 5, 2025

Summary by CodeRabbit

  • New Features
    • Enhanced development tool configuration now automatically adjusts directory paths, reducing potential misconfigurations.
    • Added a new debugging option for launching node processes with improved source map support for an easier troubleshooting experience.

Copy link

changeset-bot bot commented Feb 5, 2025

🦋 Changeset detected

Latest commit: 0421b9c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 12 packages
Name Type
trigger.dev Patch
@trigger.dev/build Patch
@trigger.dev/core Patch
@trigger.dev/react-hooks Patch
@trigger.dev/rsc Patch
@trigger.dev/sdk Patch
@trigger.dev/database Patch
@trigger.dev/otlp-importer Patch
@internal/redis-worker Patch
@internal/zod-worker Patch
references-nextjs-realtime Patch
@internal/testcontainers Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link
Contributor

coderabbitai bot commented Feb 5, 2025

Warning

There were issues while running some tools. Please review the errors and either fix the tool’s configuration or disable the tool if it’s a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

packages/cli-v3/src/config.ts

Oops! Something went wrong! :(

ESLint: 8.45.0

ESLint couldn't find the config "custom" to extend from. Please check that the name of the config is correct.

The config "custom" was referenced from the config file in "/.eslintrc.js".

If you still have problems, please stop by https://eslint.org/chat/help to chat with the team.

Walkthrough

This pull request introduces changes that improve the configuration handling for the development CLI. A new changeset document adds an auto-fix mechanism for resolving trigger directories as relative paths. Additionally, a new VS Code launch configuration is added for debugging the dev CLI, and modifications to the CLI configuration logic include a new function to ensure unique and correctly resolved directory paths.

Changes

File(s) Change Summary
.changeset/lovely-toys-obey.md Added a changeset file that patches the development CLI configuration for /trigger and /src/trigger directories by implementing an auto-fix mechanism to adjust paths to be relative.
.vscode/launch.json Introduced a new debugging configuration ("Debug V3 init dev CLI") for launching a terminal node process with pnpm exec trigger dev, setting the CWD to ${workspaceFolder}/references/init-shell, and enabling source maps.
packages/cli-v3/src/config.ts Added a new function resolveTriggerDir to handle directory path resolution. Updated the resolveConfig function to use this new logic and directly assign the workingDir value while ensuring the final configuration contains unique directory paths.

Sequence Diagram(s)

sequenceDiagram
    participant Dev as Developer
    participant VS as VS Code
    participant CLI as Dev CLI
    participant RC as resolveConfig
    participant RT as resolveTriggerDir

    Dev->>VS: Launch "Debug V3 init dev CLI"
    VS->>CLI: Execute "pnpm exec trigger dev" (cwd: init-shell)
    CLI->>RC: Load configuration
    RC->>RT: Process directory paths for /trigger and /src/trigger
    RT-->>RC: Return adjusted relative paths
    RC-->>CLI: Return unique configuration
    CLI-->>VS: Start debugging session
Loading

Possibly related PRs

Poem

In fields of code I hop with glee,
Adjusting paths so perfectly free.
Debug configs now shine so bright,
Each trigger fixed brings pure delight.
With every step, a clever fix in sight—
A rabbit’s cheer for code done right!
🐇✨

Tip

🌐 Web search-backed reviews and chat
  • We have enabled web search-based reviews and chat for all users. This feature allows CodeRabbit to access the latest documentation and information on the web.
  • You can disable this feature by setting web_search: false in the knowledge_base settings.
  • Please share any feedback in the Discord discussion.
✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
packages/cli-v3/src/config.ts (1)

195-206: Consider enhancing the function's readability.

The function logic is correct, but could be improved:

 function resolveTriggerDir(dir: string, workingDir: string): string {
   if (isAbsolute(dir)) {
-    // If dir is `/trigger` or `/src/trigger`, we should add a `.` to make it relative to the working directory
+    // Special case: Convert root-level trigger directories to be relative to working directory
+    // This prevents misconfiguration when users specify absolute paths like `/trigger` or `/src/trigger`
     if (dir === "/trigger" || dir === "/src/trigger") {
       return `.${dir}`;
-    } else {
-      return relative(workingDir, dir);
     }
+    return relative(workingDir, dir);
   }

   return dir;
 }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e35b6f5 and 0421b9c.

📒 Files selected for processing (3)
  • .changeset/lovely-toys-obey.md (1 hunks)
  • .vscode/launch.json (1 hunks)
  • packages/cli-v3/src/config.ts (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (6)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - pnpm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (windows-latest - npm)
  • GitHub Check: e2e / 🧪 CLI v3 tests (ubuntu-latest - npm)
  • GitHub Check: units / 🧪 Unit Tests
  • GitHub Check: typecheck / typecheck
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (4)
packages/cli-v3/src/config.ts (2)

158-158: LGTM! Good improvements to directory handling.

The changes effectively:

  1. Ensure consistent handling of trigger directories
  2. Prevent duplicate directories in the final configuration

Also applies to: 162-162, 190-190


158-190: Verify impact on existing configurations.

Let's ensure these changes don't affect existing valid configurations.

✅ Verification successful

🏁 Script executed:

#!/bin/bash
# Search for any trigger.config.ts files and their directory configurations
echo "Searching for trigger.config.ts files..."
fd "trigger\.config\.ts$" --exec rg -A 5 "dirs:|triggerDirectories:" {}

Length of output: 863


No impact on valid configurations detected.

The shell script output confirms that trigger configuration files continue to define valid directory paths (e.g. ["./src/trigger"] or ["./src"]), and our modifications in packages/cli-v3/src/config.ts—mapping each directory via resolveTriggerDir and deduplicating them—preserve the intended behavior without introducing misconfiguration.

  • The processing of dirs resolves them relative to the working directory.
  • Existing trigger configuration files remain correct and produce expected directory values.
.changeset/lovely-toys-obey.md (1)

1-6: LGTM! Clear and concise changeset.

The changeset accurately describes the purpose and impact of the changes.

.vscode/launch.json (1)

49-56: Verify if this new configuration is necessary.

There appears to be overlap with the existing "Debug V3 Dev CLI" configuration at line 60. The main difference is the working directory. Please confirm if both configurations are needed.

Could you clarify the specific use case that requires a separate configuration for references/init-shell?

Copy link

pkg-pr-new bot commented Feb 5, 2025

@trigger.dev/build

npm i https://pkg.pr.new/triggerdotdev/trigger.dev/@trigger.dev/build@1665

trigger.dev

npm i https://pkg.pr.new/triggerdotdev/trigger.dev@1665

@trigger.dev/react-hooks

npm i https://pkg.pr.new/triggerdotdev/trigger.dev/@trigger.dev/react-hooks@1665

@trigger.dev/rsc

npm i https://pkg.pr.new/triggerdotdev/trigger.dev/@trigger.dev/rsc@1665

@trigger.dev/core

npm i https://pkg.pr.new/triggerdotdev/trigger.dev/@trigger.dev/core@1665

@trigger.dev/sdk

npm i https://pkg.pr.new/triggerdotdev/trigger.dev/@trigger.dev/sdk@1665

commit: 0421b9c

@ericallam ericallam merged commit 99d3815 into main Feb 5, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant