refactor: turborepo next

.prettierignore

@@ -1,3 +1,4 @@
 node_modules
 build/
-dist/
+dist/
+.docusaurus

cli/src/helpers/createProject.ts

@@ -4,7 +4,6 @@ import { installPackages } from "~/helpers/installPackages.js";
 import { scaffoldProject } from "~/helpers/scaffoldProject.js";
 import { selectAppFile, selectIndexFile } from "~/helpers/selectBoilerplate.js";
 import { getUserPkgManager } from "~/utils/getUserPkgManager.js";
-import { curryRunPkgManagerInstall } from "~/utils/runPkgManagerInstall.js";
 
 interface CreateProjectOptions {
   projectName: string;
@@ -19,34 +18,26 @@ export const createProject = async ({
 }: CreateProjectOptions) => {
   const pkgManager = getUserPkgManager();
   const projectDir = path.resolve(process.cwd(), projectName);
-  const runPkgManagerInstall = curryRunPkgManagerInstall({
-    projectDir,
-    pkgManager,
-    devMode: false,
-    noInstallMode: noInstall,
-  });
 
   // Bootstraps the base Next.js application
   await scaffoldProject({
     projectName,
     projectDir,
     pkgManager,
     noInstall,
-    runPkgManagerInstall,
   });
 
   // Install the selected packages
-  await installPackages({
+  installPackages({
     projectDir,
     pkgManager,
     packages,
     noInstall,
-    runPkgManagerInstall,
   });
 
   // TODO: Look into using handlebars or other templating engine to scaffold without needing to maintain multiple copies of the same file
-  await selectAppFile({ projectDir, packages });
-  await selectIndexFile({ projectDir, packages });
+  selectAppFile({ projectDir, packages });
+  selectIndexFile({ projectDir, packages });
 
   return projectDir;
 };

cli/src/helpers/initGit.ts

@@ -1,25 +1,25 @@
+import { execSync } from "child_process";
 import chalk from "chalk";
 import ora from "ora";
-import { execa } from "~/utils/execAsync.js";
 import { logger } from "~/utils/logger.js";
 
 // This initializes the Git-repository for the project
-export const initializeGit = async (projectDir: string) => {
+export const initializeGit = (projectDir: string) => {
   logger.info("Initializing Git...");
   const spinner = ora("Creating a new git repo...\n").start();
   try {
     let initCmd = "git init --initial-branch=main";
 
     // --initial-branch flag was added in git v2.28.0
-    const { stdout: gitVersionOutput } = await execa("git --version"); // git version 2.32.0 ...
+    const gitVersionOutput = execSync("git --version").toString(); // git version 2.32.0 ...
     const gitVersionTag = gitVersionOutput.split(" ")[2];
     const major = gitVersionTag?.split(".")[0];
     const minor = gitVersionTag?.split(".")[1];
     if (Number(major) < 2 || Number(minor) < 28) {
       initCmd = "git init && git branch -m main";
     }
 
-    await execa(initCmd, { cwd: projectDir });
+    execSync(initCmd, { cwd: projectDir });
     spinner.succeed(
       `${chalk.green("Successfully initialized")} ${chalk.green.bold("git")}\n`,
     );

cli/src/helpers/installDependencies.ts

@@ -0,0 +1,15 @@
+import { execSync } from "child_process";
+import ora from "ora";
+import { getUserPkgManager } from "~/utils/getUserPkgManager.js";
+import { logger } from "~/utils/logger.js";
+
+export const installDependencies = (projectDir: string) => {
+  logger.info("Installing dependencies...");
+  const pkgManager = getUserPkgManager();
+  const command = `${pkgManager} install`;
+  const spinner = ora(`Running ${command}...\n`).start();
+
+  execSync(command, { cwd: projectDir });
+
+  spinner.succeed("Successfully installed dependencies!\n");
+};

cli/src/helpers/installPackages.ts

@@ -1,4 +1,4 @@
-import type { InstallerOptions, PkgInstallerMap } from "../installers/index.js";
+import type { InstallerOptions, PkgInstallerMap } from "~/installers/index.js";
 import chalk from "chalk";
 import ora from "ora";
 import { logger } from "~/utils/logger.js";
@@ -7,21 +7,17 @@ type InstallPackagesOptions = {
   packages: PkgInstallerMap;
 } & InstallerOptions;
 // This runs the installer for all the packages that the user has selected
-export const installPackages = async (options: InstallPackagesOptions) => {
-  const { packages, noInstall } = options;
-  logger.info(`${noInstall ? "Adding" : "Installing"} packages...`);
+export const installPackages = (options: InstallPackagesOptions) => {
+  const { packages } = options;
+  logger.info("Adding boilerplate...");
 
   for (const [name, pkgOpts] of Object.entries(packages)) {
     if (pkgOpts.inUse) {
-      const spinner = ora(
-        `${noInstall ? "Adding" : "Installing"} ${name}...`,
-      ).start();
-      await pkgOpts.installer(options);
+      const spinner = ora(`Boilerplating ${name}...`).start();
+      pkgOpts.installer(options);
       spinner.succeed(
         chalk.green(
-          `Successfully ${noInstall ? "added" : "installed"} ${chalk.green.bold(
-            name,
-          )}`,
+          `Successfully setup boilerplate for ${chalk.green.bold(name)}`,
         ),
       );
     }

cli/src/helpers/scaffoldProject.ts

@@ -5,7 +5,6 @@ import inquirer from "inquirer";
 import ora from "ora";
 import { PKG_ROOT } from "~/consts.js";
 import { InstallerOptions } from "~/installers/index.js";
-import { execa } from "~/utils/execAsync.js";
 import { logger } from "~/utils/logger.js";
 
 // This bootstraps the base Next.js application
@@ -56,14 +55,11 @@ export const scaffoldProject = async ({
 
   spinner.start();
 
-  await fs.copy(srcDir, projectDir);
-  await fs.rename(
+  fs.copySync(srcDir, projectDir);
+  fs.renameSync(
     path.join(projectDir, "_gitignore"),
     path.join(projectDir, ".gitignore"),
   );
 
-  if (!noInstall) {
-    await execa(`${pkgManager} install`, { cwd: projectDir });
-  }
   spinner.succeed(`${chalk.cyan.bold(projectName)} scaffolded successfully!\n`);
 };

cli/src/helpers/selectBoilerplate.ts

@@ -7,7 +7,7 @@ type SelectBoilerplateProps = Required<
   Pick<InstallerOptions, "projectDir" | "packages">
 >;
 // This generates the _app.tsx file that is used to render the app
-export const selectAppFile = async ({
+export const selectAppFile = ({
   projectDir,
   packages,
 }: SelectBoilerplateProps) => {
@@ -28,12 +28,12 @@ export const selectAppFile = async ({
   if (appFile !== "") {
     const appSrc = path.join(appFileDir, appFile);
     const appDest = path.join(projectDir, "src/pages/_app.tsx");
-    await fs.copy(appSrc, appDest);
+    fs.copySync(appSrc, appDest);
   }
 };
 
 // This selects the proper index.tsx to be used that showcases the chosen tech
-export const selectIndexFile = async ({
+export const selectIndexFile = ({
   projectDir,
   packages,
 }: SelectBoilerplateProps) => {
@@ -61,6 +61,6 @@ export const selectIndexFile = async ({
   if (indexFile !== "") {
     const indexSrc = path.join(indexFileDir, indexFile);
     const indexDest = path.join(projectDir, "src/pages/index.tsx");
-    await fs.copy(indexSrc, indexDest);
+    fs.copySync(indexSrc, indexDest);
   }
 };

cli/src/index.ts

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
+import type { PackageJson } from "type-fest";
 import path from "path";
 import fs from "fs-extra";
-import { PackageJson } from "type-fest";
-import { getVersion } from "./utils/getT3Version.js";
 import { runCli } from "~/cli/index.js";
 import { createProject } from "~/helpers/createProject.js";
 import { initializeGit } from "~/helpers/initGit.js";
@@ -11,6 +10,8 @@ import { buildPkgInstallerMap } from "~/installers/index.js";
 import { logger } from "~/utils/logger.js";
 import { parseNameAndPath } from "~/utils/parseNameAndPath.js";
 import { renderTitle } from "~/utils/renderTitle.js";
+import { installDependencies } from "./helpers/installDependencies.js";
+import { getVersion } from "./utils/getT3Version.js";
 
 type CT3APackageJSON = PackageJson & {
   ct3aMetadata?: {
@@ -38,17 +39,23 @@ const main = async () => {
     noInstall,
   });
 
+  if (!noInstall) {
+    installDependencies(projectDir);
+  }
+
   if (!noGit) {
-    await initializeGit(projectDir);
+    initializeGit(projectDir);
   }
 
   logNextSteps({ projectName: appDir, packages: usePackages, noInstall });
-  const pkgJson = (await fs.readJSON(
+
+  // Write name to package.json
+  const pkgJson = fs.readJSONSync(
     path.join(projectDir, "package.json"),
-  )) as CT3APackageJSON;
+  ) as CT3APackageJSON;
   pkgJson.name = scopedAppName;
   pkgJson.ct3aMetadata = { initVersion: getVersion() };
-  await fs.writeJSON(path.join(projectDir, "package.json"), pkgJson, {
+  fs.writeJSONSync(path.join(projectDir, "package.json"), pkgJson, {
     spaces: 2,
   });
 

cli/src/installers/envVars.ts

@@ -3,10 +3,7 @@ import path from "path";
 import fs from "fs-extra";
 import { PKG_ROOT } from "~/consts.js";
 
-export const envVariablesInstaller: Installer = async ({
-  projectDir,
-  packages,
-}) => {
+export const envVariablesInstaller: Installer = ({ projectDir, packages }) => {
   const usingAuth = packages?.nextAuth.inUse;
   const usingPrisma = packages?.prisma.inUse;
 
@@ -31,11 +28,9 @@ export const envVariablesInstaller: Installer = async ({
   const envSchemaSrc = path.join(envAssetDir, envFile);
   const envSchemaDest = path.join(projectDir, "src/env/schema.mjs");
 
-  const envExampleSrc = path.join(projectDir, ".env-example");
+  const envExample = path.join(projectDir, ".env-example");
   const envDest = path.join(projectDir, ".env");
 
-  await Promise.all([
-    fs.copy(envSchemaSrc, envSchemaDest, { overwrite: true }),
-    fs.rename(envExampleSrc, envDest),
-  ]);
+  fs.copySync(envSchemaSrc, envSchemaDest);
+  fs.renameSync(envExample, envDest);
 };

cli/src/installers/index.ts

@@ -1,6 +1,5 @@
 import type { PackageManager } from "~/utils/getUserPkgManager.js";
-import type { CurriedRunPkgManagerInstallOptions } from "~/utils/runPkgManagerInstall.js";
-import { envVariablesInstaller as envVariablesInstaller } from "~/installers/envVars.js";
+import { envVariablesInstaller } from "~/installers/envVars.js";
 import { nextAuthInstaller } from "~/installers/nextAuth.js";
 import { prismaInstaller } from "~/installers/prisma.js";
 import { tailwindInstaller } from "~/installers/tailwind.js";
@@ -15,21 +14,45 @@ export const availablePackages = [
   "trpc",
   "envVariables",
 ] as const;
-
 export type AvailablePackages = typeof availablePackages[number];
 
+/*
+ * This maps the necessary packages to a version.
+ * This improves performance significantly over fetching it from the npm registry.
+ */
+export const dependencyVersionMap = {
+  // NextAuth.js
+  "next-auth": "^4.10.2",
+  "@next-auth/prisma-adapter": "^1.0.4",
+
+  // Prisma
+  prisma: "^4.1.0",
+  "@prisma/client": "^4.1.0",
+
+  // TailwindCSS
+  tailwindcss: "^3.1.6",
+  autoprefixer: "^10.4.7",
+  postcss: "^8.4.14",
+
+  // tRPC
+  "@trpc/client": "10.0.0-alpha.41",
+  "@trpc/server": "10.0.0-alpha.41",
+  "@trpc/react": "10.0.0-alpha.41",
+  "@trpc/next": "10.0.0-alpha.41",
+  "react-query": "^3.39.2",
+  superjson: "^1.9.1",
+} as const;
+export type AvailableDependencies = keyof typeof dependencyVersionMap;
+
 export interface InstallerOptions {
   projectDir: string;
   pkgManager: PackageManager;
   noInstall: boolean;
   packages?: PkgInstallerMap;
   projectName?: string;
-  runPkgManagerInstall: (
-    opts: CurriedRunPkgManagerInstallOptions,
-  ) => Promise<void>;
 }
 
-export type Installer = (opts: InstallerOptions) => Promise<void>;
+export type Installer = (opts: InstallerOptions) => void;
 
 export type PkgInstallerMap = {
   [pkg in AvailablePackages]: {

cli/src/installers/nextAuth.ts

@@ -1,18 +1,17 @@
-import type { Installer } from "~/installers/index.js";
+import type { Installer, AvailableDependencies } from "~/installers/index.js";
 import path from "path";
 import fs from "fs-extra";
 import { PKG_ROOT } from "~/consts.js";
+import { addPackageDependency } from "~/utils/addPackageDependency.js";
 
-export const nextAuthInstaller: Installer = async ({
-  projectDir,
-  runPkgManagerInstall,
-  packages,
-}) => {
-  await runPkgManagerInstall({
-    packages: [
-      "next-auth",
-      packages?.prisma.inUse ? "@next-auth/prisma-adapter" : "",
-    ],
+export const nextAuthInstaller: Installer = ({ projectDir, packages }) => {
+  const deps: AvailableDependencies[] = ["next-auth"];
+  if (packages?.prisma.inUse) deps.push("@next-auth/prisma-adapter");
+
+  addPackageDependency({
+    projectDir,
+    dependencies: deps,
+    devMode: false,
   });
 
   const nextAuthAssetDir = path.join(PKG_ROOT, "template/addons/next-auth");
@@ -38,9 +37,7 @@ export const nextAuthInstaller: Installer = async ({
     "src/types/next-auth.d.ts",
   );
 
-  await Promise.all([
-    fs.copy(apiHandlerSrc, apiHandlerDest),
-    fs.copy(restrictedApiSrc, restrictedApiDest),
-    fs.copy(nextAuthDefinitionSrc, nextAuthDefinitionDest),
-  ]);
+  fs.copySync(apiHandlerSrc, apiHandlerDest);
+  fs.copySync(restrictedApiSrc, restrictedApiDest);
+  fs.copySync(nextAuthDefinitionSrc, nextAuthDefinitionDest);
 };