Refactor package dependency management and environment setup

This commit is contained in:
Aman Varshney
2025-03-20 16:31:09 +05:30
parent 938ddda351
commit 3172b5bebb
6 changed files with 93 additions and 113 deletions

View File

@@ -27,12 +27,10 @@ export async function setupAuth(
}
addPackageDependency({
dependencies: ["better-auth"],
devDependencies: false,
projectDir: serverDir,
});
addPackageDependency({
dependencies: ["better-auth"],
devDependencies: false,
projectDir: clientDir,
});
} catch (error) {

View File

@@ -62,64 +62,7 @@ export async function createProject(options: ProjectConfig): Promise<string> {
await setupAddons(projectDir, options.addons);
}
const rootPackageJsonPath = path.join(projectDir, "package.json");
if (await fs.pathExists(rootPackageJsonPath)) {
const packageJson = await fs.readJson(rootPackageJsonPath);
packageJson.name = options.projectName;
if (options.packageManager !== "bun") {
packageJson.packageManager =
options.packageManager === "npm"
? "npm@10.9.2"
: options.packageManager === "pnpm"
? "pnpm@10.6.4"
: options.packageManager === "yarn"
? "yarn@4.1.0"
: "bun@1.2.5";
}
await fs.writeJson(rootPackageJsonPath, packageJson, { spaces: 2 });
}
const serverPackageJsonPath = path.join(
projectDir,
"packages/server/package.json",
);
if (await fs.pathExists(serverPackageJsonPath)) {
const serverPackageJson = await fs.readJson(serverPackageJsonPath);
if (options.database !== "none") {
if (options.database === "sqlite") {
serverPackageJson.scripts["db:local"] =
"turso dev --db-file local.db";
}
if (options.auth) {
serverPackageJson.scripts["auth:generate"] =
"npx @better-auth/cli generate --output ./src/db/auth-schema.ts";
if (options.orm === "prisma") {
serverPackageJson.scripts["db:push"] = "prisma db push";
serverPackageJson.scripts["db:studio"] = "prisma studio";
} else if (options.orm === "drizzle") {
serverPackageJson.scripts["db:push"] = "drizzle-kit push";
serverPackageJson.scripts["db:studio"] = "drizzle-kit studio";
}
} else {
if (options.orm === "prisma") {
serverPackageJson.scripts["db:push"] = "prisma db push";
serverPackageJson.scripts["db:studio"] = "prisma studio";
} else if (options.orm === "drizzle") {
serverPackageJson.scripts["db:push"] = "drizzle-kit push";
serverPackageJson.scripts["db:studio"] = "drizzle-kit studio";
}
}
}
await fs.writeJson(serverPackageJsonPath, serverPackageJson, {
spaces: 2,
});
}
await updatePackageConfigurations(projectDir, options);
await createReadme(projectDir, options);
@@ -142,6 +85,61 @@ export async function createProject(options: ProjectConfig): Promise<string> {
}
}
async function updatePackageConfigurations(
projectDir: string,
options: ProjectConfig,
) {
const rootPackageJsonPath = path.join(projectDir, "package.json");
if (await fs.pathExists(rootPackageJsonPath)) {
const packageJson = await fs.readJson(rootPackageJsonPath);
packageJson.name = options.projectName;
if (options.packageManager !== "bun") {
packageJson.packageManager =
options.packageManager === "npm"
? "npm@10.9.2"
: options.packageManager === "pnpm"
? "pnpm@10.6.4"
: options.packageManager === "yarn"
? "yarn@4.1.0"
: "bun@1.2.5";
}
await fs.writeJson(rootPackageJsonPath, packageJson, { spaces: 2 });
}
const serverPackageJsonPath = path.join(
projectDir,
"packages/server/package.json",
);
if (await fs.pathExists(serverPackageJsonPath)) {
const serverPackageJson = await fs.readJson(serverPackageJsonPath);
if (options.database !== "none") {
if (options.database === "sqlite") {
serverPackageJson.scripts["db:local"] = "turso dev --db-file local.db";
}
if (options.auth) {
serverPackageJson.scripts["auth:generate"] =
"npx @better-auth/cli generate --output ./src/db/auth-schema.ts";
}
if (options.orm === "prisma") {
serverPackageJson.scripts["db:push"] = "prisma db push";
serverPackageJson.scripts["db:studio"] = "prisma studio";
} else if (options.orm === "drizzle") {
serverPackageJson.scripts["db:push"] = "drizzle-kit push";
serverPackageJson.scripts["db:studio"] = "drizzle-kit studio";
}
}
await fs.writeJson(serverPackageJsonPath, serverPackageJson, {
spaces: 2,
});
}
}
function getOrmTemplateDir(orm: ProjectOrm, database: ProjectDatabase): string {
if (orm === "drizzle") {
return database === "sqlite"

View File

@@ -69,10 +69,10 @@ ${generateScriptsList(packageManagerRunCmd, database, orm, auth)}
}
function generateFeaturesList(
database: string,
database: ProjectDatabase,
auth: boolean,
features: string[],
orm: string,
orm: ProjectOrm,
): string {
const featuresList = [
"- **TypeScript** - For type safety and improved developer experience",

View File

@@ -2,13 +2,14 @@ import path from "node:path";
import { log, spinner } from "@clack/prompts";
import fs from "fs-extra";
import pc from "picocolors";
import type { ProjectDatabase, ProjectOrm } from "../types";
import { addPackageDependency } from "../utils/add-package-deps";
import { setupTurso } from "./turso-setup";
export async function setupDatabase(
projectDir: string,
databaseType: string,
orm: string,
databaseType: ProjectDatabase,
orm: ProjectOrm,
setupTursoDb = true,
): Promise<void> {
const s = spinner();
@@ -23,49 +24,32 @@ export async function setupDatabase(
if (databaseType === "sqlite") {
if (orm === "drizzle") {
addPackageDependency({
dependencies: ["drizzle-orm", "drizzle-kit", "@libsql/client"],
devDependencies: false,
dependencies: ["drizzle-orm", "@libsql/client"],
devDependencies: ["drizzle-kit"],
projectDir: serverDir,
});
if (setupTursoDb) {
await setupTurso(projectDir, true);
}
} else if (orm === "prisma") {
addPackageDependency({
dependencies: ["@prisma/client"],
devDependencies: false,
devDependencies: ["prisma"],
projectDir: serverDir,
});
addPackageDependency({
dependencies: ["prisma"],
devDependencies: true,
projectDir: serverDir,
});
if (setupTursoDb) {
await setupTurso(projectDir, true);
}
}
if (setupTursoDb) {
await setupTurso(projectDir, true);
}
} else if (databaseType === "postgres") {
if (orm === "drizzle") {
addPackageDependency({
dependencies: ["drizzle-orm", "postgres"],
devDependencies: false,
projectDir: serverDir,
});
addPackageDependency({
dependencies: ["drizzle-kit"],
devDependencies: true,
devDependencies: ["drizzle-kit"],
projectDir: serverDir,
});
} else if (orm === "prisma") {
addPackageDependency({
dependencies: ["@prisma/client"],
devDependencies: false,
projectDir: serverDir,
});
addPackageDependency({
dependencies: ["prisma"],
devDependencies: true,
devDependencies: ["prisma"],
projectDir: serverDir,
});
}

View File

@@ -29,6 +29,12 @@ export async function setupEnvironmentVariables(
if (!envContent.includes("CORS_ORIGIN")) {
envContent += "\nCORS_ORIGIN=http://localhost:3001";
}
const clientEnvPath = path.join(clientDir, ".env");
if (!(await fs.pathExists(clientEnvPath))) {
const clientEnvContent = "VITE_SERVER_URL=http://localhost:3000\n";
await fs.writeFile(clientEnvPath, clientEnvContent);
}
}
if (options.database !== "none") {
@@ -40,22 +46,12 @@ export async function setupEnvironmentVariables(
envContent += databaseUrlLine;
}
if (options.database === "sqlite") {
if (options.database === "sqlite" && !options.turso) {
if (!envContent.includes("TURSO_CONNECTION_URL")) {
if (!options.turso) {
envContent += "\nTURSO_CONNECTION_URL=http://127.0.0.1:8080";
}
envContent += "\nTURSO_CONNECTION_URL=http://127.0.0.1:8080";
}
}
}
await fs.writeFile(envPath, envContent.trim());
if (options.auth) {
const clientEnvPath = path.join(clientDir, ".env");
if (!(await fs.pathExists(clientEnvPath))) {
const clientEnvContent = "VITE_SERVER_URL=http://localhost:3000\n";
await fs.writeFile(clientEnvPath, clientEnvContent);
}
}
}

View File

@@ -4,25 +4,29 @@ import fs from "fs-extra";
import { type AvailableDependencies, dependencyVersionMap } from "../constants";
export const addPackageDependency = (opts: {
dependencies: AvailableDependencies[];
devDependencies: boolean;
dependencies?: AvailableDependencies[];
devDependencies?: AvailableDependencies[];
projectDir: string;
}) => {
const { dependencies, devDependencies, projectDir } = opts;
const { dependencies = [], devDependencies = [], projectDir } = opts;
const pkgJson = fs.readJSONSync(path.join(projectDir, "package.json"));
const pkgJsonPath = path.join(projectDir, "package.json");
const pkgJson = fs.readJSONSync(pkgJsonPath);
if (!pkgJson.dependencies) pkgJson.dependencies = {};
if (!pkgJson.devDependencies) pkgJson.devDependencies = {};
for (const pkgName of dependencies) {
const version = dependencyVersionMap[pkgName];
if (devDependencies && pkgJson.devDependencies) {
pkgJson.devDependencies[pkgName] = version;
} else if (pkgJson.dependencies) {
pkgJson.dependencies[pkgName] = version;
}
pkgJson.dependencies[pkgName] = version;
}
fs.writeJSONSync(path.join(projectDir, "package.json"), pkgJson, {
for (const pkgName of devDependencies) {
const version = dependencyVersionMap[pkgName];
pkgJson.devDependencies[pkgName] = version;
}
fs.writeJSONSync(pkgJsonPath, pkgJson, {
spaces: 2,
});
};