@haystackeditor/cli 0.6.0 → 0.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/utils/detect.js +65 -4
- package/package.json +1 -1
package/dist/utils/detect.js
CHANGED
|
@@ -27,7 +27,12 @@ export async function detectProject(rootDir = process.cwd()) {
|
|
|
27
27
|
}
|
|
28
28
|
// Detect framework
|
|
29
29
|
result.framework = await detectFramework(rootDir);
|
|
30
|
-
//
|
|
30
|
+
// Extract custom port from config if framework supports it
|
|
31
|
+
const customPort = await extractPortFromConfig(rootDir, result.framework);
|
|
32
|
+
if (customPort) {
|
|
33
|
+
result.suggestedPort = customPort;
|
|
34
|
+
}
|
|
35
|
+
// Set suggestions based on framework (won't override customPort if set)
|
|
31
36
|
setSuggestions(result);
|
|
32
37
|
// Detect auth bypass from .env.example
|
|
33
38
|
result.suggestedAuthBypass = await detectAuthBypass(rootDir);
|
|
@@ -188,12 +193,14 @@ async function detectService(rootDir, servicePath) {
|
|
|
188
193
|
else if (await hasFile(fullPath, 'vite.config.ts') || await hasFile(fullPath, 'vite.config.js')) {
|
|
189
194
|
framework = 'vite';
|
|
190
195
|
suggestedCommand = 'pnpm dev';
|
|
191
|
-
|
|
196
|
+
// Try to extract custom port from vite config, fallback to default
|
|
197
|
+
suggestedPort = await extractPortFromConfig(fullPath, 'vite') ?? 5173;
|
|
192
198
|
}
|
|
193
199
|
else if (await hasFile(fullPath, 'next.config.js') || await hasFile(fullPath, 'next.config.ts')) {
|
|
194
200
|
framework = 'nextjs';
|
|
195
201
|
suggestedCommand = 'pnpm dev';
|
|
196
|
-
|
|
202
|
+
// Try to extract custom port from next config, fallback to default
|
|
203
|
+
suggestedPort = await extractPortFromConfig(fullPath, 'nextjs') ?? 3000;
|
|
197
204
|
}
|
|
198
205
|
else if (scripts.dev) {
|
|
199
206
|
suggestedCommand = 'pnpm dev';
|
|
@@ -280,6 +287,7 @@ async function detectAuthBypass(rootDir) {
|
|
|
280
287
|
}
|
|
281
288
|
/**
|
|
282
289
|
* Set suggestions based on detected framework
|
|
290
|
+
* Note: This is sync, so custom port extraction happens in detectProject
|
|
283
291
|
*/
|
|
284
292
|
function setSuggestions(result) {
|
|
285
293
|
const frameworkDefaults = {
|
|
@@ -294,7 +302,8 @@ function setSuggestions(result) {
|
|
|
294
302
|
};
|
|
295
303
|
const defaults = result.framework ? frameworkDefaults[result.framework] : null;
|
|
296
304
|
result.suggestedDevCommand = defaults?.command || `${result.packageManager} dev`;
|
|
297
|
-
|
|
305
|
+
// suggestedPort may already be set from custom config extraction
|
|
306
|
+
result.suggestedPort = result.suggestedPort || defaults?.port || 3000;
|
|
298
307
|
result.suggestedReadyPattern = defaults?.ready || 'ready|started|listening|Local:';
|
|
299
308
|
}
|
|
300
309
|
/**
|
|
@@ -309,6 +318,58 @@ async function hasFile(dir, file) {
|
|
|
309
318
|
return false;
|
|
310
319
|
}
|
|
311
320
|
}
|
|
321
|
+
/**
|
|
322
|
+
* Extract custom port from framework config files
|
|
323
|
+
*
|
|
324
|
+
* Parses vite.config.ts, next.config.js, etc. to find custom port settings
|
|
325
|
+
* Returns undefined if no custom port is configured (use framework default)
|
|
326
|
+
*/
|
|
327
|
+
async function extractPortFromConfig(rootDir, framework) {
|
|
328
|
+
if (!framework)
|
|
329
|
+
return undefined;
|
|
330
|
+
// Config files to check based on framework
|
|
331
|
+
const configFiles = {
|
|
332
|
+
vite: ['vite.config.ts', 'vite.config.js', 'vite.config.mjs'],
|
|
333
|
+
nextjs: ['next.config.js', 'next.config.ts', 'next.config.mjs'],
|
|
334
|
+
nuxt: ['nuxt.config.ts', 'nuxt.config.js'],
|
|
335
|
+
sveltekit: ['svelte.config.js', 'svelte.config.ts'],
|
|
336
|
+
astro: ['astro.config.mjs', 'astro.config.ts'],
|
|
337
|
+
};
|
|
338
|
+
const files = configFiles[framework];
|
|
339
|
+
if (!files)
|
|
340
|
+
return undefined;
|
|
341
|
+
let configContent = null;
|
|
342
|
+
for (const file of files) {
|
|
343
|
+
try {
|
|
344
|
+
configContent = await fs.readFile(path.join(rootDir, file), 'utf-8');
|
|
345
|
+
break;
|
|
346
|
+
}
|
|
347
|
+
catch {
|
|
348
|
+
// File not found, try next
|
|
349
|
+
}
|
|
350
|
+
}
|
|
351
|
+
if (!configContent)
|
|
352
|
+
return undefined;
|
|
353
|
+
// Patterns to match port configuration
|
|
354
|
+
// Vite: server: { port: 3000 } or server.port = 3000
|
|
355
|
+
// Next: env: { PORT: 3000 } or experimental.serverPort
|
|
356
|
+
const patterns = [
|
|
357
|
+
/server\s*:\s*\{[^}]*port\s*:\s*(\d+)/s, // server: { port: 3000 }
|
|
358
|
+
/server\s*\.\s*port\s*[=:]\s*(\d+)/, // server.port = 3000
|
|
359
|
+
/port\s*:\s*(\d+)/, // port: 3000 (generic)
|
|
360
|
+
/PORT\s*[=:]\s*['"]?(\d+)['"]?/, // PORT = 3000
|
|
361
|
+
];
|
|
362
|
+
for (const pattern of patterns) {
|
|
363
|
+
const match = configContent.match(pattern);
|
|
364
|
+
if (match) {
|
|
365
|
+
const port = parseInt(match[1], 10);
|
|
366
|
+
if (port > 0 && port < 65536) {
|
|
367
|
+
return port;
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
return undefined;
|
|
372
|
+
}
|
|
312
373
|
/**
|
|
313
374
|
* Detect proxy dependencies from vite.config.ts/js
|
|
314
375
|
*
|