@friggframework/devtools 2.0.0--canary.400.bed3308.0 → 2.0.0--canary.404.e9d4980.0

package/frigg-cli/build-command/index.js

@@ -1,25 +1,10 @@
 const { spawnSync } = require('child_process');
 const path = require('path');
-const { AppResolver } = require('../utils/app-resolver');
 
-async function buildCommand(options) {
+function buildCommand(options) {
     console.log('Building the serverless application...');
-
-    // AWS discovery is now handled directly in serverless-template.js
-    console.log('📦 Packaging serverless application...');
-
-    // Resolve app path using AppResolver
-    const appResolver = new AppResolver();
-    let backendPath;
-    try {
-        backendPath = await appResolver.resolveAppPath(options);
-        if (options.verbose) {
-            console.log('Resolved app path:', backendPath);
-        }
-    } catch (error) {
-        console.error('Error:', error.message);
-        process.exit(1);
-    }
+    console.log('Hello from npm link world')
+    const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
     const serverlessArgs = [

package/frigg-cli/deploy-command/index.js

@@ -1,25 +1,9 @@
-const { spawn, spawnSync } = require('child_process');
+const { spawn } = require('child_process');
 const path = require('path');
-const { AppResolver } = require('../utils/app-resolver');
 
-async function deployCommand(options) {
+function deployCommand(options) {
     console.log('Deploying the serverless application...');
-
-    // AWS discovery is now handled directly in serverless-template.js
-    console.log('🚀 Deploying serverless application...');
-
-    // Resolve app path using AppResolver
-    const appResolver = new AppResolver();
-    let backendPath;
-    try {
-        backendPath = await appResolver.resolveAppPath(options);
-        if (options.verbose) {
-            console.log('Resolved app path:', backendPath);
-        }
-    } catch (error) {
-        console.error('Error:', error.message);
-        process.exit(1);
-    }
+    const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
     const serverlessArgs = [

package/frigg-cli/index.js

@@ -1,42 +1,15 @@
 #!/usr/bin/env node
 
-// Check if we're running the generate command without all options
-// If so, we need to restart with proper NODE_OPTIONS to suppress warnings
-const args = process.argv.slice(2);
-if (args[0] === 'generate' && (!args.includes('--provider') || !args.includes('--format'))) {
-    // If NODE_OPTIONS isn't set, restart the process with it
-    if (!process.env.NODE_OPTIONS || !process.env.NODE_OPTIONS.includes('--no-warnings')) {
-        const { spawn } = require('child_process');
-        const nodeOptions = process.env.NODE_OPTIONS ?
-            `${process.env.NODE_OPTIONS} --no-deprecation --no-warnings` :
-            '--no-deprecation --no-warnings';
-        const child = spawn(process.execPath, process.argv.slice(1), {
-            stdio: 'inherit',
-            env: { ...process.env, NODE_OPTIONS: nodeOptions }
-        });
-
-        child.on('exit', (code) => {
-            process.exit(code || 0);
-        });
-        return;
-    }
-}
-
 const { Command } = require('commander');
 const { installCommand } = require('./install-command');
 const { startCommand } = require('./start-command'); // Assuming you have a startCommand module
 const { buildCommand } = require('./build-command');
 const { deployCommand } = require('./deploy-command');
-const generateCommand = require('./generate-command');
-const { uiCommand } = require('./ui-command');
 
 const program = new Command();
 program
     .command('install [apiModuleName]')
     .description('Install an API module')
-    .option('--app-path <path>', 'path to Frigg application directory')
-    .option('--config <path>', 'path to Frigg configuration file')
-    .option('--app <path>', 'alias for --app-path')
     .action(installCommand);
 
 program
@@ -44,9 +17,6 @@ program
     .description('Run the backend and optional frontend')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .option('-v, --verbose', 'enable verbose output')
-    .option('--app-path <path>', 'path to Frigg application directory')
-    .option('--config <path>', 'path to Frigg configuration file')
-    .option('--app <path>', 'alias for --app-path')
     .action(startCommand);
 
 program
@@ -54,9 +24,6 @@ program
     .description('Build the serverless application')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .option('-v, --verbose', 'enable verbose output')
-    .option('--app-path <path>', 'path to Frigg application directory')
-    .option('--config <path>', 'path to Frigg configuration file')
-    .option('--app <path>', 'alias for --app-path')
     .action(buildCommand);
 
 program
@@ -64,47 +31,8 @@ program
     .description('Deploy the serverless application')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .option('-v, --verbose', 'enable verbose output')
-    .option('--app-path <path>', 'path to Frigg application directory')
-    .option('--config <path>', 'path to Frigg configuration file')
-    .option('--app <path>', 'alias for --app-path')
     .action(deployCommand);
 
-program
-    .command('generate')
-    .description('Generate deployment credentials for cloud providers')
-    .option('-p, --provider <provider>', 'cloud provider (aws, azure, gcp)')
-    .option('-f, --format <format>', 'output format (cloudformation, terraform, pulumi, arm, deployment-manager)')
-    .option('-o, --output <path>', 'output directory', 'backend/infrastructure')
-    .option('-u, --user <name>', 'deployment user name', 'frigg-deployment-user')
-    .option('-s, --stack-name <name>', 'stack name (for CloudFormation)', 'frigg-deployment-iam')
-    .option('-v, --verbose', 'enable verbose output')
-    .action(generateCommand);
-
-// Legacy command for backward compatibility
-program
-    .command('generate-iam')
-    .description('[DEPRECATED] Use "generate" command instead')
-    .option('-o, --output <path>', 'output directory', 'backend/infrastructure')
-    .option('-u, --user <name>', 'deployment user name', 'frigg-deployment-user')
-    .option('-s, --stack-name <name>', 'CloudFormation stack name', 'frigg-deployment-iam')
-    .option('-v, --verbose', 'enable verbose output')
-    .action((options) => {
-        console.log('⚠️  The generate-iam command is deprecated. Using "generate" with AWS CloudFormation...');
-        generateCommand({ ...options, provider: 'aws', format: 'cloudformation' });
-    });
-
-program
-    .command('ui')
-    .description('Start the Frigg Management UI')
-    .option('-p, --port <number>', 'port number', '3001')
-    .option('--no-open', 'do not open browser automatically')
-    .option('-r, --repo <path>', 'path to Frigg repository')
-    .option('--dev', 'run in development mode')
-    .option('--app-path <path>', 'path to Frigg application directory')
-    .option('--config <path>', 'path to Frigg configuration file')
-    .option('--app <path>', 'alias for --app-path')
-    .action(uiCommand);
-
 program.parse(process.argv);
 
-module.exports = { installCommand, startCommand, buildCommand, deployCommand, generateCommand, uiCommand };
+module.exports = { installCommand, startCommand, buildCommand, deployCommand };

package/frigg-cli/install-command/index.js

@@ -11,25 +11,12 @@ const {
 } = require('./validate-package');
 const { findNearestBackendPackageJson, validateBackendPath } = require('@friggframework/core');
 
-const installCommand = async (apiModuleName, options = {}) => {
+const installCommand = async (apiModuleName) => {
     try {
         const packageNames = await searchAndSelectPackage(apiModuleName);
         if (!packageNames || packageNames.length === 0) return;
 
-        // If app path options are provided, use AppResolver, otherwise fall back to existing logic
-        let backendPath;
-        if (options.appPath || options.config || options.app || process.env.FRIGG_APP_PATH) {
-            const { AppResolver } = require('../utils/app-resolver');
-            const appResolver = new AppResolver();
-            try {
-                backendPath = await appResolver.resolveAppPath(options);
-            } catch (error) {
-                logError(`Error resolving app path: ${error.message}`);
-                process.exit(1);
-            }
-        } else {
-            backendPath = findNearestBackendPackageJson();
-        }
+        const backendPath = findNearestBackendPackageJson();
         validateBackendPath(backendPath);
 
         for (const packageName of packageNames) {

package/frigg-cli/start-command/index.js

@@ -1,30 +1,15 @@
 const { spawn } = require('node:child_process');
 const path = require('node:path');
-const { AppResolver } = require('../utils/app-resolver');
 
-async function startCommand(options) {
+function startCommand(options) {
     if (options.verbose) {
         console.log('Verbose mode enabled');
         console.log('Options:', options);
     }
     console.log('Starting backend and optional frontend...');
-    
     // Suppress AWS SDK warning message about maintenance mode
     process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = 1;
-    
-    // Resolve app path using AppResolver
-    const appResolver = new AppResolver();
-    let backendPath;
-    
-    try {
-        backendPath = await appResolver.resolveAppPath(options);
-        if (options.verbose) {
-            console.log('Resolved app path:', backendPath);
-        }
-    } catch (error) {
-        console.error('Error:', error.message);
-        process.exit(1);
-    }
+    const backendPath = path.resolve(process.cwd());
     console.log(`Starting backend in ${backendPath}...`);
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';

package/infrastructure/create-frigg-infrastructure.js

@@ -4,7 +4,7 @@ const { composeServerlessDefinition } = require('./serverless-template');
 
 const { findNearestBackendPackageJson } = require('@friggframework/core');
 
-async function createFriggInfrastructure() {
+function createFriggInfrastructure() {
     const backendPath = findNearestBackendPackageJson();
     if (!backendPath) {
         throw new Error('Could not find backend package.json');
@@ -23,7 +23,7 @@ async function createFriggInfrastructure() {
     //     __dirname,
     //     './serverless-template.js'
     // ));
-    const definition = await composeServerlessDefinition(
+    const definition = composeServerlessDefinition(
         appDefinition,
         backend.IntegrationFactory
     );