feat: Add pages router

labscommunity · Oct 22, 2023 · bd9243e · bd9243e
1 parent b68d7aa
commit bd9243e
Show file tree

Hide file tree

Showing 18 changed files with 215 additions and 714 deletions.
diff --git a/cli/src/cli/index.ts b/cli/src/cli/index.ts
@@ -26,7 +26,7 @@ const defaultOptions: CliResults = {
     default: false,
     language: "typescript",
     importAlias: "@/",
-    appRouter: false,
+    appRouter: true,
   },
 };
 
@@ -90,7 +90,7 @@ export const runCli = async (): Promise<CliResults> => {
       appRouter: () => {
         return p.confirm({
           message: "Would you like to use Next.js App Router?",
-          initialValue: false,
+          initialValue: true,
         });
       },
       ...(!cliResults.flags.noGit && {

diff --git a/cli/src/helpers/createProject.ts b/cli/src/helpers/createProject.ts
@@ -35,13 +35,11 @@ export const createProject = async ({
     language,
   });
 
-  // Select necessary _app,index / layout,page files
+  // Remove pages/app depending upon appRouter
   if (appRouter) {
-    // Replace next.config
-    // fs.copyFileSync(
-    //   path.join(PKG_ROOT, "template/extras/config/next-config-appdir.mjs"),
-    //   path.join(projectDir, "next.config.mjs")
-    // );
+    fs.rmSync(path.join(projectDir, "pages"), { recursive: true, force: true });
+  } else {
+    fs.rmSync(path.join(projectDir, "app"), { recursive: true, force: true });
   }
 
   return projectDir;

diff --git a/cli/src/index.ts b/cli/src/index.ts
@@ -58,6 +58,18 @@ const main = async () => {
     pkgJson.packageManager = `${pkgManager}@${stdout.trim()}`;
   }
 
+  if (language === "javascript" && pkgJson.devDependencies !== undefined) {
+    pkgJson.devDependencies = Object.keys(pkgJson.devDependencies)
+      .filter((key) => !key.startsWith("@types/"))
+      .reduce(
+        (result, key) => {
+          result[key] = pkgJson.devDependencies?.[key];
+          return result;
+        },
+        {} as Partial<Record<string, string>>
+      );
+  }
+
   fs.writeJSONSync(path.join(projectDir, "package.json"), pkgJson, {
     spaces: 2,
   });

diff --git a/cli/template/next/common/components.json b/cli/template/next/common/components.json
@@ -5,12 +5,12 @@
   "tsx": true,
   "tailwind": {
     "config": "tailwind.config.js",
-    "css": "app/globals.css",
+    "css": "styles/globals.css",
     "baseColor": "slate",
     "cssVariables": true
   },
   "aliases": {
     "components": "@/components",
     "utils": "@/lib/utils"
   }
-}
+}
diff --git a/cli/template/next/javascript/app/favicon.ico → cli/template/next/common/public/favicon.ico b/cli/template/next/javascript/app/favicon.ico → cli/template/next/common/public/favicon.ico
diff --git a/cli/template/next/javascript/app/globals.css → cli/template/next/common/styles/globals.css b/cli/template/next/javascript/app/globals.css → cli/template/next/common/styles/globals.css
diff --git a/cli/template/next/javascript/app/layout.jsx b/cli/template/next/javascript/app/layout.jsx
@@ -1,4 +1,4 @@
-import "./globals.css";
+import "@/styles/globals.css";
 
 import { siteConfig } from "@/config/site";
 import { fontSans } from "@/lib/fonts";

diff --git a/cli/template/next/javascript/app/page.module.css b/cli/template/next/javascript/app/page.module.css