npm - stackkit - Versions diffs - 0.3.2 → 0.3.4 - Mend

stackkit 0.3.2 → 0.3.4

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.

Files changed (13) hide show

package/dist/lib/pm/package-manager.js CHANGED Viewed

@@ -66,30 +66,62 @@ async function detectPackageManager(cwd) {
 async function installDependencies(cwd, pm, maxRetries = 2) {
     const args = ["install"];
     const stdio = "pipe";
+    const packageInstallTimeout = Number(process.env.STACKKIT_INSTALL_TIMEOUT_MS) || constants_1.TIMEOUTS.PACKAGE_INSTALL;
+    const envFallback = process.env.STACKKIT_FALLBACK_PMS
+        ? process.env.STACKKIT_FALLBACK_PMS.split(",")
+            .map((s) => s.trim())
+            .filter(Boolean)
+        : [];
+    const defaultOrder = ["pnpm", "npm", "yarn", "bun"];
+    const preferredOrder = Array.from(new Set([pm, ...envFallback, ...defaultOrder].map((s) => s)));
     let lastError = null;
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    async function isAvailable(pmCheck) {
         try {
-            if (attempt > 0) {
-                logger_1.logger.debug(`Retry attempt ${attempt} for installing dependencies`);
-                await new Promise((resolve) => setTimeout(resolve, constants_1.TIMEOUTS.RETRY_DELAY_BASE * attempt));
-            }
-            await (0, execa_1.default)(pm, args, { cwd, stdio, timeout: constants_1.TIMEOUTS.PACKAGE_INSTALL });
-            return;
+            await (0, execa_1.default)(pmCheck, ["--version"], { cwd, stdio: "pipe", timeout: 2000 });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    for (const pmCandidate of preferredOrder) {
+        if (!["pnpm", "npm", "yarn", "bun"].includes(pmCandidate))
+            continue;
+        const available = await isAvailable(pmCandidate);
+        if (!available) {
+            logger_1.logger.debug(`${pmCandidate} not found on PATH, skipping`);
+            continue;
         }
-        catch (error) {
-            lastError = error;
-            logger_1.logger.debug(`Installation attempt ${attempt + 1} failed: ${lastError.message}`);
-            const err = error;
-            const errorMsg = err.message || "";
-            if (errorMsg.includes("ECONNRESET") ||
-                errorMsg.includes("ETIMEDOUT") ||
-                errorMsg.includes("ENOTFOUND")) {
-                continue;
+        logger_1.logger.debug(`Attempting install with ${pmCandidate}`);
+        let succeeded = false;
+        for (let attempt = 0; attempt <= maxRetries; attempt++) {
+            try {
+                if (attempt > 0) {
+                    logger_1.logger.debug(`Retry attempt ${attempt} for ${pmCandidate}`);
+                    await new Promise((resolve) => setTimeout(resolve, constants_1.TIMEOUTS.RETRY_DELAY_BASE * attempt));
+                }
+                await (0, execa_1.default)(pmCandidate, args, { cwd, stdio, timeout: packageInstallTimeout });
+                succeeded = true;
+                break;
+            }
+            catch (error) {
+                lastError = error;
+                logger_1.logger.debug(`Installation attempt ${attempt + 1} with ${pmCandidate} failed: ${lastError.message}`);
+                const err = error;
+                const errorMsg = err.message || "";
+                if (errorMsg.includes("ECONNRESET") ||
+                    errorMsg.includes("ETIMEDOUT") ||
+                    errorMsg.includes("ENOTFOUND")) {
+                    continue;
+                }
+                break;
             }
-            throw error;
         }
+        if (succeeded)
+            return;
+        logger_1.logger.debug(`${pmCandidate} failed after retries, trying next fallback`);
     }
-    throw new Error(`Failed to install dependencies after ${maxRetries + 1} attempts: ${lastError?.message || "Unknown error"}`);
+    throw new Error(`Failed to install dependencies after trying fallback package managers: ${lastError?.message || "Unknown error"}`);
 }
 async function addDependencies(cwd, pm, packages, dev = false) {
     if (packages.length === 0) {

package/modules/auth/better-auth/files/express/templates/google-redirect.ejs CHANGED Viewed

@@ -1,91 +1,24 @@
 <!doctype html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <title>
-        <%= appName || "Your App" %> - Continue with Google
-    </title>
+    <title>Continue Sign-in</title>
 </head>
-<body style="margin:0; padding:0; background-color:#f3f4f6;">
-    <div style="display:none; max-height:0; overflow:hidden; opacity:0; color:transparent;">
-        Continue your Google sign-in securely.
-    </div>
-<table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0"
-    style="background-color:#f3f4f6; padding:24px 12px;">
-    <tr>
-        <td align="center">
-            <table role="presentation" width="100%" cellspacing="0" cellpadding="0" border="0"
-                style="max-width:600px; background:#ffffff; border:1px solid #e5e7eb; border-radius:12px; overflow:hidden;">
-                <tr>
-                    <td style="padding:28px 24px 16px 24px; font-family:Arial, Helvetica, sans-serif; color:#111827;">
-                        <h1 style="margin:0; font-size:22px; line-height:30px; font-weight:700;">Continue with
-                            Google</h1>
-                        <p style="margin:14px 0 0; font-size:15px; line-height:24px; color:#374151;">
-                            Hi <%= userName || "there" %>,
-                        </p>
-                        <p style="margin:10px 0 0; font-size:15px; line-height:24px; color:#374151;">
-                            We received a request to continue authentication with Google for your <strong>
-                                <%= appName || "account" %>
-                            </strong>.
-                        </p>
-                    </td>
-                </tr>
+<body style="font-family: Arial, Helvetica, sans-serif; padding: 24px;">
+    <p>Redirecting to <%= provider %> login...</p>
-                <tr>
-                    <td style="padding:0 24px 24px 24px; font-family:Arial, Helvetica, sans-serif;">
-                        <table role="presentation" cellspacing="0" cellpadding="0" border="0">
-                            <tr>
-                                <td align="center" bgcolor="#111827" style="border-radius:8px;">
-                                    <a href="<%= redirectUrl %>" target="_blank"
-                                        style="display:inline-block; padding:12px 22px; font-size:15px; line-height:20px; font-weight:600; color:#ffffff; text-decoration:none;">
-                                        Continue Sign-in
-                                    </a>
-                                </td>
-                            </tr>
-                        </table>
+    <form id="social-login-form" method="POST" action="<%= signInEndpoint %>">
+        <input type="hidden" name="provider" value="<%= provider %>" />
+        <input type="hidden" name="callbackURL" value="<%= callbackURL %>" />
+        <button type="submit">Continue</button>
+    </form>
-                        <p
-                            style="margin:14px 0 0; font-size:13px; line-height:20px; color:#6b7280; word-break:break-word;">
-                            Button not working? Copy and paste this URL into your browser:<br />
-                            <a href="<%= redirectUrl %>" target="_blank"
-                                style="color:#2563eb; text-decoration:underline;">
-                                <%= redirectUrl %>
-                            </a>
-                        </p>
-                    </td>
-                </tr>
-                    <tr>
-                        <td style="padding:0 24px 24px 24px; font-family:Arial, Helvetica, sans-serif; color:#4b5563;">
-                            <p style="margin:0; font-size:14px; line-height:22px;">
-                                If you didn’t request this, you can safely ignore this email. No changes will be made
-                                unless you continue.
-                            </p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td
-                            style="padding:16px 24px 24px 24px; border-top:1px solid #e5e7eb; font-family:Arial, Helvetica, sans-serif; color:#6b7280;">
-                            <p style="margin:0; font-size:12px; line-height:18px;">
-                                Need help? Contact us at
-                                <a href="mailto:<%= supportEmail || " support@example.com" %>" style="color:#2563eb;
-                                    text-decoration:underline;"><%= supportEmail || "support@example.com" %></a>.
-                            </p>
-                            <p style="margin:6px 0 0; font-size:12px; line-height:18px;">
-                                © <%= year || new Date().getFullYear() %>
-                                    <%= appName || "Your App" %>. All rights reserved.
-                            </p>
-                        </td>
-                        </tr>
-                        </table>
-                        </td>
-                        </tr>
-                        </table>
-                        </body>
+    <script>
+        document.getElementById("social-login-form")?.submit();
+    </script>
+    </body>
 </html>

package/modules/auth/better-auth/files/express/types/express.d.ts CHANGED Viewed

@@ -1,3 +1,5 @@
+import { Role } from "@prisma/client";
 declare global {
     namespace Express {
         interface Request {
@@ -5,7 +7,7 @@ declare global {
             id: string;
             name: string;
             email: string;
-            role: string;
+            role: Role;
           };
         }
     }

package/modules/auth/better-auth/files/shared/config/env.ts CHANGED Viewed

@@ -8,9 +8,12 @@ dotenv.config({ path: path.join(process.cwd(), ".env") });
 {{/if}}
 interface EnvConfig {
-  APP_URL?: string;
+  APP_URL: string;
+  {{#if framework == "nextjs"}}
+  API_URL: string;
+  {{/if}}
   DATABASE_URL: string;
-  FRONTEND_URL?: string;
+  FRONTEND_URL: string;
   BETTER_AUTH_URL: string;
   BETTER_AUTH_SECRET: string;
   GOOGLE_CLIENT_ID: string;
@@ -40,6 +43,9 @@ interface EnvConfig {
 const loadEnvVars = (): EnvConfig => {
   const requiredEnvVars = [
     "APP_URL",
+    {{#if framework == "nextjs"}}
+    "API_URL",
+    {{/if}}
     "DATABASE_URL",
     "FRONTEND_URL",
     "BETTER_AUTH_URL",
@@ -83,6 +89,9 @@ const loadEnvVars = (): EnvConfig => {
   return {
     APP_URL: process.env.APP_URL as string,
+    {{#if framework == "nextjs"}}
+    API_URL: process.env.API_URL as string,
+    {{/if}}
     DATABASE_URL: process.env.DATABASE_URL as string,
     FRONTEND_URL: process.env.FRONTEND_URL as string,
     BETTER_AUTH_URL: process.env.BETTER_AUTH_URL as string,

package/modules/auth/better-auth/files/shared/lib/auth.ts CHANGED Viewed

@@ -9,7 +9,7 @@ import { prismaAdapter } from "better-auth/adapters/prisma";
 {{/if}}
 {{#if combo == "prisma:nextjs"}}
 import { Role, UserStatus } from "@prisma/client";
-import { sendEmail } from "../service/email/email-service";
+import { sendEmail } from "@/lib/utils/email";
 import { prisma } from "../database/prisma";
 import { envVars } from "@/lib/env";
 import { prismaAdapter } from "better-auth/adapters/prisma";
@@ -48,7 +48,10 @@ export const auth = betterAuth({
   baseURL: envVars.BETTER_AUTH_URL,
   secret: envVars.BETTER_AUTH_SECRET,
   trustedOrigins: [
-    envVars.FRONTEND_URL || envVars.BETTER_AUTH_URL || "http://localhost:3000",
+    envVars.APP_URL!,
+    envVars.FRONTEND_URL!,
+     envVars.BETTER_AUTH_URL!,
+    "http://localhost:3000",
   ],
   emailAndPassword: {
     enabled: true,

package/modules/auth/better-auth/files/shared/utils/email.ts CHANGED Viewed

@@ -65,6 +65,10 @@ export const sendEmail = async ({
       })),
     });
   } catch {
-    throw new AppError(status.INTERNAL_SERVER_ERROR, "Failed to send email");
+    {{#if framework == "express"}}
+    throw new AppError(status.INTERNAL_SERVER_ERROR, `Failed to send email to ${to}`);
+    {{else}}
+    throw new Error(`Failed to send email to ${to}`);
+    {{/if}}
   }
 };

package/modules/database/prisma/files/lib/prisma.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { PrismaClient } from "@prisma/client";
 import 'dotenv/config';
+import { PrismaClient } from "@prisma/client";
 const globalForPrisma = globalThis as unknown as {
   prisma: PrismaClient | undefined

package/modules/database/prisma/files/prisma/schema.prisma CHANGED Viewed

@@ -1,6 +1,5 @@
 generator client {
   provider = "prisma-client-js"
-  output   = "../src/generated/prisma"
 }
 datasource db {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Production-ready CLI to create and extend JavaScript or TypeScript apps with modular stacks.",
   "main": "dist/index.js",
   "bin": {

package/templates/nextjs/README.md CHANGED Viewed

@@ -35,21 +35,6 @@ npm run dev
 - `npm run start` - Start production server
 - `npm run lint` - Run linter
-## Project Structure
-```
-app/
-├── globals.css    # Global styles
-├── layout.tsx     # Root layout
-├── page.tsx       # Home page
-└── api/           # API routes
-lib/
-└── utils.ts       # Utility functions
-public/            # Static assets
-```
 ## Recommended Folder & File Structure
 ```text

package/templates/nextjs/lib/api/http.ts CHANGED Viewed

@@ -12,16 +12,8 @@ const api = axios.create({
 });
 api.interceptors.request.use(
-  (config) => {
-    const token = localStorage.getItem("auth_token");
-    if (token) {
-      (config.headers as Record<string, string>).Authorization = `Bearer ${token}`;
-    }
-    return config;
-  },
-  (error: AxiosError) => {
-    return Promise.reject(error);
-  },
+  (config) => config,
+  (error: AxiosError) => Promise.reject(error),
 );
 api.interceptors.response.use(

package/templates/react/README.md CHANGED Viewed

@@ -48,19 +48,6 @@ VITE_API_URL=http://localhost:3000/api
 VITE_APP_NAME=My App
 ```
-## Project Structure
-```
-src/
-├── api/          # API client
-├── components/   # UI components
-├── hooks/        # Custom hooks
-├── lib/          # Utilities
-├── pages/        # Route pages
-├── types/        # TypeScript types
-└── utils/        # Helper functions
-```
 ## Recommended Folder & File Structure
 ```text

package/templates/react/src/shared/api/http.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import axios, { AxiosError } from "axios";
 import toast from "react-hot-toast";
 const api = axios.create({
-  baseURL: import.meta.env.VITE_API_URL || "http://localhost:3000/api",
+  baseURL: import.meta.env.VITE_API_URL || "http://localhost:5000/api",
   timeout: 10000,
   headers: {
     "Content-Type": "application/json",
@@ -11,16 +11,8 @@ const api = axios.create({
 });
 api.interceptors.request.use(
-  (config) => {
-    const token = localStorage.getItem("auth_token");
-    if (token) {
-      (config.headers as Record<string, string>).Authorization = `Bearer ${token}`;
-    }
-    return config;
-  },
-  (error: AxiosError) => {
-    return Promise.reject(error);
-  },
+  (config) => config,
+  (error: AxiosError) => Promise.reject(error),
 );
 api.interceptors.response.use(