Feat/replace local database with supabase (#26)

tonik · Nov 12, 2024 · 3292777 · 3292777
1 parent a2752d8
commit 3292777
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 94 deletions.
diff --git a/packages/cli/templates/supabase/files/docker-compose.yml b/packages/cli/templates/supabase/files/docker-compose.yml
diff --git a/packages/cli/templates/supabase/installConfig.ts b/packages/cli/templates/supabase/installConfig.ts
@@ -1,7 +1,7 @@
 export const supabaseFiles = [
   {
     path: 'supabase/src/',
-    files: ['client.ts', 'index.ts', 'middleware.ts', 'server.ts', 'types.ts', 'docker-compose.yml'],
+    files: ['client.ts', 'index.ts', 'middleware.ts', 'server.ts', 'types.ts'],
   },
   {
     path: 'supabase/',

diff --git a/packages/core/installMachine/index.ts b/packages/core/installMachine/index.ts
@@ -14,7 +14,6 @@ import { createDocFiles } from './installSteps/docs/create';
 import { pushToGitHub } from './installSteps/github/repositoryManager';
 import { InstallMachineContext, StepsCompleted } from '../types';
 import { saveStateToRcFile } from '../utils/rcFileManager';
-import { setupDatabaseWithDocker } from './installSteps/supabase/setupDatabaseWithDocker';
 
 const isStepCompleted = (stepName: keyof StepsCompleted) => {
   return ({ context }: { context: InstallMachineContext; event: AnyEventObject }) => {
@@ -71,31 +70,17 @@ const createInstallMachine = (initialContext: InstallMachineContext) => {
         installSupabase: {
           always: [
             {
-              guard: isStepCompleted('installSupabase'),
-              target: 'setupDatabaseWithDocker',
-            },
-          ],
-          invoke: {
-            input: ({ context }) => context,
-            src: 'installSupabaseActor',
-            onDone: 'setupDatabaseWithDocker',
-            onError: 'failed',
-          },
-        },
-        setupDatabaseWithDocker: {
-          always: [
-            {
-              guard: and([isStepCompleted('setupDatabaseWithDocker'), 'shouldInstallPayload']),
+              guard: and([isStepCompleted('installSupabase'), 'shouldInstallPayload']),
               target: 'installPayload',
             },
             {
-              guard: isStepCompleted('setupDatabaseWithDocker'),
+              guard: isStepCompleted('installSupabase'),
               target: 'createDocFiles',
             },
           ],
           invoke: {
             input: ({ context }) => context,
-            src: 'setupDatabaseWithDockerActor',
+            src: 'installSupabaseActor',
             onDone: [{ guard: 'shouldInstallPayload', target: 'installPayload' }, { target: 'createDocFiles' }],
             onError: 'failed',
           },
@@ -286,18 +271,6 @@ const createInstallMachine = (initialContext: InstallMachineContext) => {
             }
           }),
         ),
-        setupDatabaseWithDockerActor: createStepMachine(
-          fromPromise<void, InstallMachineContext, AnyEventObject>(async ({ input }) => {
-            try {
-              setupDatabaseWithDocker();
-              input.stateData.stepsCompleted.setupDatabaseWithDocker = true;
-              saveStateToRcFile(input.stateData, input.projectDir);
-            } catch (error) {
-              console.error('Error in setupDatabaseWithDockerActor:', error);
-              throw error;
-            }
-          }),
-        ),
         installPayloadActor: createStepMachine(
           fromPromise<void, InstallMachineContext, AnyEventObject>(async ({ input }) => {
             try {

diff --git a/packages/core/installMachine/installSteps/payload/install.ts b/packages/core/installMachine/installSteps/payload/install.ts
@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
 import { existsSync } from 'fs';
-import { join } from 'path';
+import path, { join } from 'path';
+import chalk from 'chalk';
 import { preparePayloadConfig } from './preparePayloadConfig';
 import { prepareTsConfig } from './prepareTsConfig';
 import { removeTurboFlag } from './removeTurboFlag';
 import { updatePackages } from './updatePackages';
 import { logWithColoredPrefix } from '../../../utils/logWithColoredPrefix';
-import chalk from 'chalk';
+import { loadEnvFile } from './utils/loadEnvFile';
 
 export const preparePayload = async () => {
   logWithColoredPrefix('payload', 'Initializing...');
@@ -24,10 +25,12 @@ export const preparePayload = async () => {
   );
 
   logWithColoredPrefix('payload', 'Installing to Next.js...');
-  logWithColoredPrefix(
-    'postgres',
-    `Local connection string: ${chalk.cyan('postgresql://user:password@localhost:5432/postgres')}`,
-  );
+
+  // Show the local Supabase connection string
+  loadEnvFile(path.resolve('../../supabase/.env'));
+  logWithColoredPrefix('postgres', `Local connection string: ${chalk.cyan(process.env.DB_URL)}`);
+
+  // Install Payload
   execSync('npx create-payload-app@beta --db postgres', { stdio: 'inherit' });
 
   // Payload doesn't work with Turbopack yet

diff --git a/packages/core/installMachine/installSteps/payload/utils/loadEnvFile.ts b/packages/core/installMachine/installSteps/payload/utils/loadEnvFile.ts
@@ -0,0 +1,11 @@
+import fs from 'fs';
+
+export const loadEnvFile = (filePath: fs.PathOrFileDescriptor) => {
+  const envData = fs.readFileSync(filePath, 'utf-8');
+  envData.split('\n').forEach((line) => {
+    const [key, value] = line.split('=');
+    if (key && value) {
+      process.env[key.trim()] = value.trim();
+    }
+  });
+};
diff --git a/packages/core/installMachine/installSteps/supabase/install.ts b/packages/core/installMachine/installSteps/supabase/install.ts
@@ -1,6 +1,7 @@
 import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
+import chalk from 'chalk';
 import { supabaseFiles } from '../../../templates/supabase/installConfig';
 import { templateGenerator } from '../../../utils/generator/generator';
 import { getTemplateDirectory } from '../../../utils/getTemplateDirectory';
@@ -80,5 +81,34 @@ export const installSupabase = async (destinationDirectory: string) => {
 
   execSync('pnpm i --reporter silent', { stdio: 'inherit' });
 
+  logWithColoredPrefix('supabase', 'Starting local database...');
+
+  try {
+    execSync('npx supabase start', { stdio: 'ignore' });
+  } catch (error) {
+    console.error(
+      `Failed to start local database. Is your ${chalk.hex('#0db7ed')('Docker')} daemon running?`,
+      `\n${error}`,
+    );
+    process.exit(1);
+  }
+
+  logWithColoredPrefix('supabase', 'Writing local variables to .env file...');
+
+  const output = execSync('npx supabase status --output json', {
+    encoding: 'utf-8',
+    stdio: ['ignore', 'pipe', 'ignore'],
+  });
+  // Parse the JSON output
+  const jsonData = JSON.parse(output);
+
+  // Convert JSON data to .env format
+  const envData = Object.entries(jsonData)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n');
+
+  // Write the formatted data to .env file
+  fs.writeFileSync('.env', envData, 'utf8');
+
   process.chdir('..');
 };
diff --git a/packages/core/installMachine/installSteps/supabase/setupDatabaseWithDocker.ts b/packages/core/installMachine/installSteps/supabase/setupDatabaseWithDocker.ts
diff --git a/packages/core/templates/supabase/files/docker-compose.yml b/packages/core/templates/supabase/files/docker-compose.yml
diff --git a/packages/core/templates/supabase/installConfig.ts b/packages/core/templates/supabase/installConfig.ts
@@ -1,7 +1,7 @@
 export const supabaseFiles = [
   {
     path: 'supabase/src/',
-    files: ['client.ts', 'index.ts', 'middleware.ts', 'server.ts', 'types.ts', 'docker-compose.yml'],
+    files: ['client.ts', 'index.ts', 'middleware.ts', 'server.ts', 'types.ts'],
   },
   {
     path: 'supabase/',

diff --git a/packages/core/types.ts b/packages/core/types.ts
@@ -6,7 +6,6 @@ export interface ProjectOptions {
 export interface StepsCompleted {
   initializeProject: boolean;
   installSupabase: boolean;
-  setupDatabaseWithDocker: boolean;
   installPayload: boolean;
   createDocFiles: boolean;
   prettifyCode: boolean;

diff --git a/packages/core/utils/rcFileManager/index.ts b/packages/core/utils/rcFileManager/index.ts
@@ -18,7 +18,6 @@ export const initializeRcFile = (projectDir: string, name: string, usePayload: b
         initializeProject: false,
         installPayload: false,
         installSupabase: false,
-        setupDatabaseWithDocker: false,
         prettifyCode: false,
         createDocFiles: false,
         createSupabaseProject: false,