Skip to content

Commit 3e0c8db

Browse files
committed
Merge branch 'conflictfix' of https://github.com/YashVerma-code/hackpack into conflictfix
2 parents d7328ee + 808aeec commit 3e0c8db

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

lib/authentication/utils/clerkvue.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,9 @@ export default defineConfig({
401401
expressRegex,
402402
language === 'ts'
403403
? `const app: express.Application = express();
404-
app.use('/api/webhooks', webhooksRoute);`
404+
app.use('/api/webhooks', webhooksRouter);`
405405
: `const app = express();
406-
app.use('/api/webhooks', webhooksRoute);`
406+
app.use('/api/webhooks', webhooksRouter);`
407407
);
408408
}
409409

lib/backend/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,12 @@ export async function setupMongoDb(projectName, framework, language) {
354354
envExampleContent()
355355
);
356356

357-
fs.writeFileSync(
358-
path.join(backendPath, "tsconfig.json"),
359-
JSON.stringify(tsConfigContent, null, 2)
360-
);
357+
if(language==="ts"){
358+
fs.writeFileSync(
359+
path.join(backendPath, "tsconfig.json"),
360+
JSON.stringify(tsConfigContent, null, 2)
361+
);
362+
}
361363
// Create all source files
362364
const dbConnectContent2 = dbConnectContent(language);
363365
const indexContent2 = indexContent(language);

0 commit comments

Comments
 (0)