Merge branch 'main' of github.com:tonik/stapler

packages/cli/index.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { Command } from "commander";
-import inquirer from "inquirer";
-import chalk from "chalk";
-import { createProject } from "@create-stapler-app/core";
+import { Command } from 'commander';
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+import { createProject } from '@create-stapler-app/core';
 
 const asciiArt = `
 .&&&%                                                         &&&&                                    
@@ -17,32 +17,32 @@ const asciiArt = `
 `;
 
 function displayHeader() {
-  console.log(chalk.hex("#3100F5").bold(asciiArt));
-  console.log(chalk.bold("\n🍸 Welcome to Stapler!\n"));
+  console.log(chalk.hex('#3100F5').bold(asciiArt));
+  console.log(chalk.bold('\n🍸 Welcome to Stapler!\n'));
 }
 
 const program = new Command();
 
 program
-  .name("create-stapler-app")
-  .description("CLI to bootstrap a new tonik-infused app")
-  .version("0.1.0")
-  .hook("preAction", () => {
+  .name('create-stapler-app')
+  .description('CLI to bootstrap a new tonik-infused app')
+  .version('0.1.0')
+  .hook('preAction', () => {
     displayHeader();
   });
 
 const createAction = async () => {
   const answers = await inquirer.prompt([
     {
-      type: "input",
-      name: "name",
-      message: "What is your project named?",
-      default: "my-stapled-app",
+      type: 'input',
+      name: 'name',
+      message: 'What is your project named?',
+      default: 'my-stapled-app',
     },
     {
-      type: "confirm",
-      name: "usePayload",
-      message: "Would you like to add Payload to your app?",
+      type: 'confirm',
+      name: 'usePayload',
+      message: 'Would you like to add Payload to your app?',
       default: true,
     },
     // we dont support Inngest yet
@@ -57,10 +57,7 @@ const createAction = async () => {
   await createProject(answers);
 };
 
-program
-  .command("create")
-  .description("Create a new tonik-infused app")
-  .action(createAction);
+program.command('create').description('Create a new tonik-infused app').action(createAction);
 
 // Set "create" as the default command
 program.action(createAction);

packages/core/index.ts

@@ -1,9 +1,9 @@
-import { execSync } from "child_process";
-import { createEnvFile } from "./utils/env/createEnvFile";
-import { preparePayload } from "./utils/payload/install";
-import { installSupabase } from "./utils/supabase/install";
-import { prettify } from "./utils/prettier/prettify";
-import { prepareDrink } from "./utils/bar/prepareDrink";
+import { execSync } from 'child_process';
+import { createEnvFile } from './utils/env/createEnvFile';
+import { preparePayload } from './utils/payload/install';
+import { installSupabase } from './utils/supabase/install';
+import { prettify } from './utils/prettier/prettify';
+import { prepareDrink } from './utils/bar/prepareDrink';
 
 interface ProjectOptions {
   name: string;
@@ -16,7 +16,7 @@ export async function createProject(options: ProjectOptions) {
 
   console.log(`🍸 Stapling ${name}...`);
   execSync(`npx create-turbo@latest ${name} -m pnpm`, {
-    stdio: "inherit",
+    stdio: 'inherit',
   });
 
   process.chdir(name);

packages/core/templates/supabase/files/client.ts

@@ -1,14 +1,11 @@
-import { createBrowserClient } from "@supabase/ssr";
+import { createBrowserClient } from '@supabase/ssr';
 
-import type { Database } from "./types";
+import type { Database } from './types';
 
 interface CreateClientOptions {
   supabaseUrl: string;
   supabaseAnonKey: string;
 }
 
-export const createClient = ({
-  supabaseUrl,
-  supabaseAnonKey,
-}: CreateClientOptions) =>
+export const createClient = ({ supabaseUrl, supabaseAnonKey }: CreateClientOptions) =>
   createBrowserClient<Database>(supabaseUrl, supabaseAnonKey);

packages/core/templates/supabase/files/index.ts

@@ -1,8 +1,8 @@
-import type * as supabase from "@supabase/supabase-js";
+import type * as supabase from '@supabase/supabase-js';
 
-import type { Database } from "./types";
+import type { Database } from './types';
 
-export type { CookieStore } from "./types";
+export type { CookieStore } from './types';
 export type Session = supabase.Session;
 export type SupabaseClient = supabase.SupabaseClient<Database>;
 export type User = supabase.User;

packages/core/templates/supabase/files/middleware.ts

@@ -1,62 +1,55 @@
-import type { CookieOptions } from "@supabase/ssr";
-import type { NextRequest } from "next/server";
-import { createServerClient } from "@supabase/ssr";
+import type { CookieOptions } from '@supabase/ssr';
+import type { NextRequest } from 'next/server';
+import { createServerClient } from '@supabase/ssr';
 
-import type { Database } from "./types";
+import type { Database } from './types';
 
 interface CreateMiddlewareOptions {
   supabaseUrl: string;
   supabaseAnonKey: string;
 }
 
-export const createMiddleware = ({
-  supabaseAnonKey,
-  supabaseUrl,
-}: CreateMiddlewareOptions) =>
+export const createMiddleware = ({ supabaseAnonKey, supabaseUrl }: CreateMiddlewareOptions) =>
   async function middleware(request: NextRequest) {
     const cookiesToSet: {
       name: string;
       value: string;
     }[] = [];
 
-    const supabase = createServerClient<Database>(
-      supabaseUrl,
-      supabaseAnonKey,
-      {
-        cookies: {
-          get(name: string) {
-            const cookieValue = request.cookies.get(name)?.value;
-            return cookieValue;
-          },
-          set(name: string, value: string, options: CookieOptions) {
-            request.cookies.set({
-              name,
-              value,
-              ...options,
-            });
-
-            cookiesToSet.push({
-              name,
-              value,
-              ...options,
-            });
-          },
-          remove(name: string, options: CookieOptions) {
-            request.cookies.set({
-              name,
-              value: "",
-              ...options,
-            });
-
-            cookiesToSet.push({
-              name,
-              value: "",
-              ...options,
-            });
-          },
+    const supabase = createServerClient<Database>(supabaseUrl, supabaseAnonKey, {
+      cookies: {
+        get(name: string) {
+          const cookieValue = request.cookies.get(name)?.value;
+          return cookieValue;
+        },
+        set(name: string, value: string, options: CookieOptions) {
+          request.cookies.set({
+            name,
+            value,
+            ...options,
+          });
+
+          cookiesToSet.push({
+            name,
+            value,
+            ...options,
+          });
+        },
+        remove(name: string, options: CookieOptions) {
+          request.cookies.set({
+            name,
+            value: '',
+            ...options,
+          });
+
+          cookiesToSet.push({
+            name,
+            value: '',
+            ...options,
+          });
         },
       },
-    );
+    });
 
     const { data } = await supabase.auth.getUser();
 

packages/core/templates/supabase/files/next_api_endpoint.ts

@@ -1,11 +1,8 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-import { supabase } from "../../lib/supabase";
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { supabase } from '../../lib/supabase';
 
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse,
-) {
-  const { data, error } = await supabase.from("your_table").select("*");
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { data, error } = await supabase.from('your_table').select('*');
 
   if (error) {
     return res.status(500).json({ error: error.message });

packages/core/templates/supabase/files/server.ts

@@ -1,7 +1,7 @@
-import type { CookieOptions } from "@supabase/ssr";
-import { createServerClient } from "@supabase/ssr";
+import type { CookieOptions } from '@supabase/ssr';
+import { createServerClient } from '@supabase/ssr';
 
-import type { CookieStore, Database } from "./types";
+import type { CookieStore, Database } from './types';
 
 interface BaseOptions {
   supabaseApiUrl: string;
@@ -14,34 +14,30 @@ interface BaseOptions {
 }
 
 export function createClient(configOptions: BaseOptions) {
-  return createServerClient<Database>(
-    configOptions.supabaseApiUrl,
-    configOptions.supabaseKey,
-    {
-      cookies: {
-        get(name: string) {
-          return configOptions.cookieStore?.get(name)?.value;
-        },
-        set(name: string, value: string, options: CookieOptions) {
-          try {
-            configOptions.cookieStore?.set({ name, value, ...options });
-          } catch (error) {
-            // The `set` method was called from a Server Component.
-            // This can be ignored if you have middleware refreshing
-            // user sessions.
-          }
-        },
-        remove(name: string, options: CookieOptions) {
-          try {
-            configOptions.cookieStore?.set({ name, value: "", ...options });
-          } catch (error) {
-            // The `set` method was called from a Server Component.
-            // The `delete` method was called from a Server Component.
-            // This can be ignored if you have middleware refreshing
-            // user sessions.
-          }
-        },
+  return createServerClient<Database>(configOptions.supabaseApiUrl, configOptions.supabaseKey, {
+    cookies: {
+      get(name: string) {
+        return configOptions.cookieStore?.get(name)?.value;
+      },
+      set(name: string, value: string, options: CookieOptions) {
+        try {
+          configOptions.cookieStore?.set({ name, value, ...options });
+        } catch (error) {
+          // The `set` method was called from a Server Component.
+          // This can be ignored if you have middleware refreshing
+          // user sessions.
+        }
+      },
+      remove(name: string, options: CookieOptions) {
+        try {
+          configOptions.cookieStore?.set({ name, value: '', ...options });
+        } catch (error) {
+          // The `set` method was called from a Server Component.
+          // The `delete` method was called from a Server Component.
+          // This can be ignored if you have middleware refreshing
+          // user sessions.
+        }
       },
     },
-  );
+  });
 }

packages/core/templates/supabase/files/types.ts

@@ -1,4 +1,4 @@
-export type * from "./types.gen";
+export type * from './types.gen';
 export interface CookieStore {
   get(name: string): { value: string } | undefined;
   set(options: { name: string; value: string }): void;

packages/core/templates/supabase/installConfig.ts

@@ -1,15 +1,15 @@
 export const supabaseFiles = [
   {
-    path: "supabase/src/",
-    files: ["client.ts", "index.ts", "middleware.ts", "server.ts", "types.ts"],
+    path: 'supabase/src/',
+    files: ['client.ts', 'index.ts', 'middleware.ts', 'server.ts', 'types.ts'],
   },
   {
-    path: "supabase/",
-    files: ["package"],
+    path: 'supabase/',
+    files: ['package'],
     rename: [
       {
-        from: "package",
-        to: "package.json",
+        from: 'package',
+        to: 'package.json',
       },
     ],
   },

packages/core/tsconfig.json

@@ -10,10 +10,6 @@
     "declaration": true, // Ensure TypeScript generates declaration files
     "emitDeclarationOnly": true // Only emit declaration files without compiling the code
   },
-  "include": [
-    "index.ts",
-    "utils/**/*.ts",
-    "templates/supabase/installConfig.ts"
-  ],
+  "include": ["index.ts", "utils/**/*.ts", "templates/supabase/installConfig.ts"],
   "exclude": ["node_modules", "dist", "templates/supabase/files/**/*"]
 }

packages/core/utils/bar/prepareDrink.ts

@@ -1,31 +1,24 @@
 const getName = (name: string) => {
   if (!name) {
-    return ".";
+    return '.';
   }
 
   return name;
 };
 
 export const prepareDrink = (name: string) => {
   setTimeout(() => {
-    console.log("🍸 Filling a high ball glass with ice...");
+    console.log('🍸 Filling a high ball glass with ice...');
     setTimeout(() => {
-      console.log("🍸 Adding gin and lime juice...");
+      console.log('🍸 Adding gin and lime juice...');
       setTimeout(() => {
-        console.log("🍸 Topping with", "\x1b[34mTonik\x1b[0m...");
+        console.log('🍸 Topping with', '\x1b[34mTonik\x1b[0m...');
         setTimeout(() => {
-          console.log("🍸 Garnishing with lime wedge...");
+          console.log('🍸 Garnishing with lime wedge...');
           setTimeout(() => {
-            console.log(
-              `\x1b[32m%s\x1b[0m`,
-              `🍸 Your Stapled ${getName(name)} is ready!`,
-              `\x1b[0m`,
-            );
+            console.log(`\x1b[32m%s\x1b[0m`, `🍸 Your Stapled ${getName(name)} is ready!`, `\x1b[0m`);
             // I'm too lazy to mess with modules building to allow coloring library to be installed lol
-            console.log(
-              `🍸 You can now run:`,
-              `\x1b[36mcd ${name} && pnpm dev\x1b[0m`,
-            );
+            console.log(`🍸 You can now run:`, `\x1b[36mcd ${name} && pnpm dev\x1b[0m`);
           }, 1000);
         }, 1000);
       }, 1000);