Merge pull request #1 from matthias-wright/fixes

fix: 🐛 Minor fixes and chores

Author: gabrielmpinto

README.md

@@ -36,24 +36,31 @@ export const runtime = 'edge';
 2. **Set environment variables**
 
 ```sh
-export FLEEK_PROJECT_ID=<your project id>
-export FLEEK_PAT=<your personal access token>
+export FLEEK_TOKEN=<your personal access token>
 ```
 
-3. **Build and Deploy**
+3. Add `fleek.json` to your project's root dir:
+
+```json
+{
+  "FLEEK_PROJECT_ID": "<your project id>"
+}
+```
+
+4. **Build and Deploy**
 
 Use the Fleek Next.js adapter to build and deploy your application via the command line:
 
 ```sh
-npx fleek-next build
+npx fleek-next deploy
 # or if installed globally
-fleek-next build
+fleek-next deploy
 ```
 
 If you are running the command outside of your project's root dir, you can set the path to it with the project path flag `-p`/`--projectPath`:
 
 ```sh
-fleek-next build -p path/to/my/repo
+fleek-next deploy -p path/to/my/repo
 ```
 
 ## Login to Fleek
@@ -92,7 +99,7 @@ fleek projects list | grep '<name of your project>' | awk '{print $1}'
 
 ## Additional Options
 
-The `build` command supports several options to customize the build and deployment process:
+The `deploy` command supports several options to customize the build and deployment process:
 
 - `-d, --dryrun`: Builds the Next.js app without deploying it to Fleek. Defaults to `false`.
 - `-p, --project-path <path>`: The path to your Next.js project's root directory. Defaults to the path where the command is run.

src/cli.ts

@@ -3,7 +3,7 @@
 import { Command } from 'commander';
 import { t } from './utils/translation.js';
 import { Output } from './output/Output.js';
-import cmdBuild from './commands/build/index.js';
+import cmdBuild from './commands/deploy/index.js';
 
 const isDebugging = process.argv.includes('--verbose');
 export const output = new Output({

src/commands/build/prompts/getProjectIdOrPrompt.ts

@@ -20,13 +20,18 @@ type BuildArgs = {
   clean?: boolean;
 };
 
-export async function sdkClient() {
-  output.spinner(`${t('fleekSdkAuth')}`);
-  const sdk = await getSdkClient();
+type projectPath = {
+  path?: string;
+};
+
+export async function sdkClient({ path }: projectPath) {
+  const sdk = await getSdkClient({ path: path });
   if (!sdk) {
+    output.spinner(`${t('fleekSdkAuth')}`);
     output.error(t('fleekSdkAuthError'));
     throw new UnauthenticatedError();
   }
+  output.spinner(`${t('fleekSdkAuth')}`);
   output.success(t('fleekSdkAuthSuccess'));
   return sdk;
 }
@@ -71,7 +76,7 @@ export const buildAction = async (args: BuildArgs) => {
 
   // Instantiate SDK client
   // Make sure we have the needed credentials
-  const sdk = await sdkClient();
+  const sdk = await sdkClient({ path: projectPath });
 
   // Clean previous build artifacts
   if (clean) {

src/commands/build/action.ts renamed to src/commands/deploy/action.ts

@@ -5,7 +5,7 @@ import { buildAction } from './action.js';
 
 export default (program: Command) => {
   const cmd = program
-    .command('build')
+    .command('deploy')
     .option('-d, --dryRun', t('dryRun'))
     .option('-p, --projectPath <path>', t('path'))
     .option('-s, --skipBuild', t('skipBuild'))

src/commands/build/fleek/index.ts renamed to src/commands/deploy/fleek/index.ts

@@ -0,0 +1,23 @@
+import { textPrompt } from '../../../prompts/textPrompt.js';
+import { t } from '../../../utils/translation.js';
+import { getProjectPathOrPrompt } from '../prompts/getProjectPathOrPrompt.js';
+import { loadJSONFromPath } from '../../../utils/json.js';
+import nodePath from 'node:path';
+
+type projectPath = {
+  path?: string;
+};
+
+export const getProjectIdOrPrompt = async ({ path }: projectPath) => {
+  const projectPath = await getProjectPathOrPrompt({ path: path });
+  if (!projectPath) {
+    return await textPrompt({
+      message: `${t('enterProjectId')}:`,
+    });
+  }
+
+  const configPath = nodePath.join(projectPath, 'fleek.json');
+  const config: Record<string, string> = loadJSONFromPath(configPath);
+
+  return config.FLEEK_PROJECT_ID;
+};

src/commands/build/fleek/types.ts renamed to src/commands/deploy/fleek/types.ts

@@ -1,17 +1,21 @@
 import { FleekSdk, PersonalAccessTokenService } from '@fleekxyz/sdk';
-import { getPersonalAccessTokenOrPrompt } from '../commands/build/prompts/getPersonalAccessTokenOrPrompt.js';
-import { getProjectIdOrPrompt } from '../commands/build/prompts/getProjectIdOrPrompt.js';
+import { getPersonalAccessTokenOrPrompt } from '../commands/deploy/prompts/getPersonalAccessTokenOrPrompt.js';
+import { getProjectIdOrPrompt } from '../commands/deploy/prompts/getProjectIdOrPrompt.js';
 import { MissingPersonalAccessTokenError } from '../errors/MissingPersonalAccessTokenError.js';
 import { MissingProjectIdError } from '../errors/MissingProjectIdError.js';
 
-export async function getSdkClient(): Promise<FleekSdk> {
+type projectPath = {
+  path?: string;
+};
+
+export async function getSdkClient({ path }: projectPath): Promise<FleekSdk> {
   const personalAccessToken = await getPersonalAccessTokenOrPrompt();
 
   if (!personalAccessToken) {
     throw new MissingPersonalAccessTokenError();
   }
 
-  const projectId = await getProjectIdOrPrompt();
+  const projectId = await getProjectIdOrPrompt({ path: path });
 
   if (!projectId) {
     throw new MissingProjectIdError();

src/commands/build/index.ts renamed to src/commands/deploy/index.ts

@@ -2,8 +2,8 @@ import { readFileSync } from 'node:fs';
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 
-import { MiddlewareManifest } from './commands/build/next/types.js';
-import { OpenNextOutput } from './commands/build/open-next/types.js';
+import { MiddlewareManifest } from './commands/deploy/next/types.js';
+import { OpenNextOutput } from './commands/deploy/open-next/types.js';
 
 export async function copyDir(props: { src: string; dest: string }) {
   const { src, dest } = props;

src/commands/build/next/index.ts renamed to src/commands/deploy/next/index.ts

@@ -25,7 +25,7 @@ export function findPackageManager(opts: { projectPath: string }) {
 
 export function getBuildCommand(opts: { packageManager: string }) {
   const { packageManager } = opts;
-  return `${packageManager} build`;
+  return `${packageManager} run build`;
 }
 
 export function getInstallCommand(opts: { packageManager: string }) {