File tree 3 files changed +29
-3
lines changed
3 files changed +29
-3
lines changed Original file line number Diff line number Diff line change
1
+ ---
2
+ " trigger.dev " : patch
3
+ ---
4
+
5
+ Auto-fix /trigger or /src/trigger config.dirs to relative paths to prevent misconfiguration from preventing dev CLI from working
Original file line number Diff line number Diff line change 46
46
"cwd" : " ${workspaceFolder}/references/init-shell" ,
47
47
"sourceMaps" : true
48
48
},
49
+ {
50
+ "type" : " node-terminal" ,
51
+ "request" : " launch" ,
52
+ "name" : " Debug V3 init dev CLI" ,
53
+ "command" : " pnpm exec trigger dev" ,
54
+ "cwd" : " ${workspaceFolder}/references/init-shell" ,
55
+ "sourceMaps" : true
56
+ },
49
57
{
50
58
"type" : " node-terminal" ,
51
59
"request" : " launch" ,
Original file line number Diff line number Diff line change @@ -155,11 +155,11 @@ async function resolveConfig(
155
155
156
156
let dirs = config . dirs ? config . dirs : await autoDetectDirs ( workingDir ) ;
157
157
158
- dirs = dirs . map ( ( dir ) => ( isAbsolute ( dir ) ? relative ( workingDir , dir ) : dir ) ) ;
158
+ dirs = dirs . map ( ( dir ) => resolveTriggerDir ( dir , workingDir ) ) ;
159
159
160
160
const mergedConfig = defu (
161
161
{
162
- workingDir : packageJsonPath ? dirname ( packageJsonPath ) : cwd ,
162
+ workingDir,
163
163
configFile : result . configFile ,
164
164
packageJsonPath,
165
165
tsconfigPath,
@@ -187,11 +187,24 @@ async function resolveConfig(
187
187
188
188
return {
189
189
...mergedConfig ,
190
- dirs : Array . from ( new Set ( mergedConfig . dirs ) ) ,
190
+ dirs : Array . from ( new Set ( dirs ) ) ,
191
191
instrumentedPackageNames : getInstrumentedPackageNames ( mergedConfig ) ,
192
192
} ;
193
193
}
194
194
195
+ function resolveTriggerDir ( dir : string , workingDir : string ) : string {
196
+ if ( isAbsolute ( dir ) ) {
197
+ // If dir is `/trigger` or `/src/trigger`, we should add a `.` to make it relative to the working directory
198
+ if ( dir === "/trigger" || dir === "/src/trigger" ) {
199
+ return `.${ dir } ` ;
200
+ } else {
201
+ return relative ( workingDir , dir ) ;
202
+ }
203
+ }
204
+
205
+ return dir ;
206
+ }
207
+
195
208
async function safeResolveTsConfig ( cwd : string ) {
196
209
try {
197
210
return await resolveTSConfig ( cwd ) ;
You can’t perform that action at this time.
0 commit comments