split out installers

cli/src/installers/eslint.ts

@@ -0,0 +1,15 @@
+import fs from "fs-extra";
+import path from "path";
+import { PKG_ROOT } from "~/consts.js";
+import { type Installer } from "./index.js";
+
+export const eslint: Installer = ({ projectDir, packages }) => {
+ const configDir = path.join(PKG_ROOT, "template/extras/config");
+
+ fs.rmSync(path.join(projectDir, "_eslintrc.cjs"));
+
+ fs.copySync(
+ path.join(configDir, "_prettier.config.cjs"),
+ path.join(projectDir, "prettier.config.cjs"),
+ );
+};

cli/src/installers/index.ts

@@ -1,10 +1,11 @@
 import { envVariablesInstaller } from "~/installers/envVars.js";
 import { nextAuthInstaller } from "~/installers/nextAuth.js";
 import { prismaInstaller } from "~/installers/prisma.js";
-import { strictEsLintAndPrettier } from "~/installers/strictEslintAndPrettier.js";
 import { tailwindInstaller } from "~/installers/tailwind.js";
 import { trpcInstaller } from "~/installers/trpc.js";
 import { type PackageManager } from "~/utils/getUserPkgManager.js";
+import { eslint } from "./eslint.js";
+import { prettier } from "./prettier.js";
 
 // Turning this into a const allows the list to be iterated over for programatically creating prompt options
 // Should increase extensability in the future
@@ -14,7 +15,8 @@ export const availablePackages = [
  "tailwind",
  "trpc",
  "envVariables",
- "strictEslintAndPrettier",
+ "eslint",
+ "prettier",
 ] as const;
 export type AvailablePackages = (typeof availablePackages)[number];
 
@@ -58,8 +60,12 @@ export const buildPkgInstallerMap = (
  inUse: true,
  installer: envVariablesInstaller,
  },
- strictEslintAndPrettier: {
- inUse: packages.includes("strictEslintAndPrettier"),
- installer: strictEsLintAndPrettier,
+ prettier: {
+ inUse: packages.includes("prettier"),
+ installer: prettier,
+ },
+ eslint: {
+ inUse: packages.includes("eslint"),
+ installer: eslint,
  },
 });

cli/src/installers/prettier.ts

@@ -0,0 +1,39 @@
+import fs from "fs-extra";
+import path from "path";
+import { PKG_ROOT } from "~/consts.js";
+import { addPackageDependency } from "~/utils/addPackageDependency.js";
+import { type Installer } from "../installers/index.js";
+import { type AvailableDependencies } from "./dependencyVersionMap.js";
+
+export const prettier: Installer = ({ projectDir, packages }) => {
+ const packeagesToInstall: AvailableDependencies[] = [
+ "prettier",
+ "@types/prettier",
+ "@ianvs/prettier-plugin-sort-imports",
+ ];
+
+ if (packages?.tailwind.inUse) {
+ packeagesToInstall.push("prettier-plugin-tailwindcss");
+ }
+
+ addPackageDependency({
+ projectDir,
+ dependencies: packeagesToInstall,
+ devMode: true,
+ });
+
+ if (packages?.tailwind.inUse) {
+ fs.copySync(
+ path.join(
+ PKG_ROOT,
+ "template/extras/config/prettier-with-tailwind.config.cjs",
+ ),
+ path.join(projectDir, "prettier.config.cjs"),
+ );
+ } else {
+ fs.copySync(
+ path.join(PKG_ROOT, "template/extras/config/prettier.config.cjs"),
+ path.join(projectDir, "prettier.config.cjs"),
+ );
+ }
+};

cli/src/installers/tailwind.ts

@@ -7,14 +7,7 @@ import { addPackageDependency } from "~/utils/addPackageDependency.js";
 export const tailwindInstaller: Installer = ({ projectDir, packages }) => {
  addPackageDependency({
  projectDir,
- dependencies: [
- "tailwindcss",
- "postcss",
- "autoprefixer",
- "prettier",
- "prettier-plugin-tailwindcss",
- "@types/prettier",
- ],
+ dependencies: ["tailwindcss", "postcss", "autoprefixer"],
  devMode: true,
  });
 
@@ -26,24 +19,13 @@ export const tailwindInstaller: Installer = ({ projectDir, packages }) => {
  const postcssCfgSrc = path.join(extrasDir, "config/postcss.config.cjs");
  const postcssCfgDest = path.join(projectDir, "postcss.config.cjs");
 
- const prettierSrc = path.join(
- extrasDir,
- "config/prettier-with-tailwind.config.cjs",
- );
- const prettierDest = path.join(projectDir, "prettier.config.cjs");
-
  const cssSrc = path.join(extrasDir, "src/styles/globals.css");
  const cssDest = path.join(projectDir, "src/styles/globals.css");
 
  fs.copySync(twCfgSrc, twCfgDest);
  fs.copySync(postcssCfgSrc, postcssCfgDest);
  fs.copySync(cssSrc, cssDest);
 
- // Let strictEslintAndPrettier install the prettier config
- if (!packages?.strictEslintAndPrettier.inUse) {
- fs.copySync(prettierSrc, prettierDest);
- }
-
  // Remove vanilla css file
  const indexModuleCss = path.join(projectDir, "src/pages/index.module.css");
  fs.unlinkSync(indexModuleCss);