Merge pull request #32 from Ebyte-Lab/fix/templates

Josephat-S · web-flow · commit 1c68de34f59c · 2026-05-25T16:00:25.000+02:00
Fix dependency injection and TypeScript comparison in templates
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,16 +2,20 @@ name: CI
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, dev]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: '20'
           cache: 'npm'
-      - run: npm install
-      - run: npm run lint
+
+      - run: npm ci
+
+      - run: npm run lint
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/generate.js b/src/generate.js
@@ -101,7 +101,10 @@ export async function generateProject(config) {
     const configFilePath = path.join(projectPath, 'opusify.config.json');
     fs.writeFileSync(configFilePath, JSON.stringify(config, null, 2));
 
-    // 5. AUTOMATION PHASE: Install Dependencies
+    // 5. Resolve dynamic dependencies based on user choices
+    resolveDependencies(projectPath, config);
+
+    // 6. AUTOMATION PHASE: Install Dependencies
     const installSpinner = ora({
       text: 'Installing dependencies (this might take a minute)...',
       spinner: 'squareCorners',
diff --git a/templates/blog/nextjs-monolith/app/layout.tsx b/templates/blog/nextjs-monolith/app/layout.tsx
@@ -92,7 +92,7 @@ export default function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const useSidebar = '{{includeSidebar}}' === 'true';
+  const useSidebar = ('{{includeSidebar}}' as string) === 'true';
 
   return (
     <html lang="en" data-theme="{{design}}">
diff --git a/templates/ecommerce/nextjs-monolith/app/layout.tsx b/templates/ecommerce/nextjs-monolith/app/layout.tsx
@@ -77,7 +77,7 @@ export default function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const useSidebar = '{{includeSidebar}}' === 'true';
+  const useSidebar = ('{{includeSidebar}}' as string) === 'true';
 
   return (
     <html lang="en" data-theme="{{design}}">
diff --git a/templates/saas/nextjs-monolith/app/layout.tsx b/templates/saas/nextjs-monolith/app/layout.tsx
@@ -96,7 +96,7 @@ export default function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const useSidebar = '{{includeSidebar}}' === 'true';
+  const useSidebar = ('{{includeSidebar}}' as string) === 'true';
 
   return (
     <html lang="en" data-theme="{{design}}">
diff --git a/templates/saas/vite-react/src/components/Layout.tsx b/templates/saas/vite-react/src/components/Layout.tsx
@@ -73,7 +73,7 @@ function Sidebar() {
 }
 
 export default function Layout() {
-  const useSidebar = '{{includeSidebar}}' === 'true';
+  const useSidebar = ('{{includeSidebar}}' as string) === 'true';
 
   if (useSidebar) {
     return (
diff --git a/templates/school/nextjs-monolith/app/layout.tsx b/templates/school/nextjs-monolith/app/layout.tsx
@@ -92,7 +92,7 @@ export default function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const useSidebar = '{{includeSidebar}}' === 'true';
+  const useSidebar = ('{{includeSidebar}}' as string) === 'true';
 
   return (
     <html lang="en" data-theme="{{design}}">

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ function Sidebar() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`export default function Layout() {`
`76`		`- const useSidebar = '{{includeSidebar}}' === 'true';`
	`76`	`+ const useSidebar = ('{{includeSidebar}}' as string) === 'true';`
`77`	`77`
`78`	`78`	`if (useSidebar) {`
`79`	`79`	`return (`