@friggframework/devtools 2.0.0-next.20 → 2.0.0-next.21

package/frigg-cli/index.js

@@ -16,6 +16,7 @@ program
     .command('start')
     .description('Run the backend and optional frontend')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
+    .option('-v, --verbose', 'enable verbose output')
     .action(startCommand);
 
 program
@@ -29,6 +30,7 @@ program
     .command('deploy')
     .description('Deploy the serverless application')
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
+    .option('-v, --verbose', 'enable verbose output')
     .action(deployCommand);
 
 program.parse(process.argv);

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

@@ -1,7 +1,11 @@
-const { spawn } = require('child_process');
-const path = require('path');
+const { spawn } = require('node:child_process');
+const path = require('node:path');
 
 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;
@@ -17,6 +21,16 @@ function startCommand(options) {
         options.stage
     ];
 
+    // Add verbose flag to serverless if verbose option is enabled
+    if (options.verbose) {
+        args.push('--verbose');
+    }
+
+    if (options.verbose) {
+        console.log(`Executing command: ${command} ${args.join(' ')}`);
+        console.log(`Working directory: ${backendPath}`);
+    }
+
     const childProcess = spawn(command, args, {
         cwd: backendPath,
         stdio: 'inherit',

package/infrastructure/serverless-template.js

@@ -1,6 +1,107 @@
 const path = require('path');
 const fs = require('fs');
 
+// Function to find the actual path to node_modules
+const findNodeModulesPath = () => {
+    try {
+        // Method 1: Try to find node_modules by traversing up from current directory
+        let currentDir = process.cwd();
+        let nodeModulesPath = null;
+        
+        // Traverse up to 5 levels to find node_modules
+        for (let i = 0; i < 5; i++) {
+            const potentialPath = path.join(currentDir, 'node_modules');
+            if (fs.existsSync(potentialPath)) {
+                nodeModulesPath = potentialPath;
+                console.log(`Found node_modules at: ${nodeModulesPath} (method 1)`);
+                break;
+            }
+            // Move up one directory
+            const parentDir = path.dirname(currentDir);
+            if (parentDir === currentDir) {
+                // We've reached the root
+                break;
+            }
+            currentDir = parentDir;
+        }
+        
+        // Method 2: If method 1 fails, try using npm root command
+        if (!nodeModulesPath) {
+            try {
+                // This requires child_process, so let's require it here
+                const { execSync } = require('node:child_process');
+                const npmRoot = execSync('npm root', { encoding: 'utf8' }).trim();
+                if (fs.existsSync(npmRoot)) {
+                    nodeModulesPath = npmRoot;
+                    console.log(`Found node_modules at: ${nodeModulesPath} (method 2)`);
+                }
+            } catch (npmError) {
+                console.error('Error executing npm root:', npmError);
+            }
+        }
+        
+        // Method 3: If all else fails, check for a package.json and assume node_modules is adjacent
+        if (!nodeModulesPath) {
+            currentDir = process.cwd();
+            for (let i = 0; i < 5; i++) {
+                const packageJsonPath = path.join(currentDir, 'package.json');
+                if (fs.existsSync(packageJsonPath)) {
+                    const potentialNodeModules = path.join(currentDir, 'node_modules');
+                    if (fs.existsSync(potentialNodeModules)) {
+                        nodeModulesPath = potentialNodeModules;
+                        console.log(`Found node_modules at: ${nodeModulesPath} (method 3)`);
+                        break;
+                    }
+                }
+                // Move up one directory
+                const parentDir = path.dirname(currentDir);
+                if (parentDir === currentDir) {
+                    // We've reached the root
+                    break;
+                }
+                currentDir = parentDir;
+            }
+        }
+        
+        if (nodeModulesPath) {
+            return nodeModulesPath;
+        }
+        
+        console.warn('Could not find node_modules path, falling back to default');
+        return path.resolve(process.cwd(), '../node_modules');
+    } catch (error) {
+        console.error('Error finding node_modules path:', error);
+        return path.resolve(process.cwd(), '../node_modules');
+    }
+};
+
+// Function to modify handler paths to point to the correct node_modules
+const modifyHandlerPaths = (functions) => {
+    // Check if we're running in offline mode
+    const isOffline = process.argv.includes('offline');
+    console.log('isOffline', isOffline);
+    
+    if (!isOffline) {
+        console.log('Not in offline mode, skipping handler path modification');
+        return functions;
+    }
+
+    const nodeModulesPath = findNodeModulesPath();
+    const modifiedFunctions = { ...functions };
+    
+    for (const functionName of Object.keys(modifiedFunctions)) {
+        console.log('functionName', functionName);
+        const functionDef = modifiedFunctions[functionName];
+        if (functionDef?.handler?.includes('node_modules/')) {
+            // Replace node_modules/ with the actual path to node_modules/
+            functionDef.handler = functionDef.handler.replace('node_modules/', '../node_modules/');
+            console.log(`Updated handler for ${functionName}: ${functionDef.handler}`);
+        }
+    }
+    
+    return modifiedFunctions;
+};
+
 const composeServerlessDefinition = (AppDefinition) => {
     const definition = {
         frameworkVersion: '>=3.17.0',
@@ -273,6 +374,9 @@ const composeServerlessDefinition = (AppDefinition) => {
         definition.custom[queueReference] = queueName;
     }
 
+    // Modify handler paths to point to the correct node_modules location
+    definition.functions = modifyHandlerPaths(definition.functions);
+    
     return definition;
 };
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.20",
+  "version": "2.0.0-next.21",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/test": "2.0.0-next.20",
+    "@friggframework/test": "2.0.0-next.21",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -27,8 +27,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.20",
-    "@friggframework/prettier-config": "2.0.0-next.20",
+    "@friggframework/eslint-config": "2.0.0-next.21",
+    "@friggframework/prettier-config": "2.0.0-next.21",
     "prettier": "^2.7.1",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fc1be6e5b653e9f77116226781dc1be8899de00f"
+  "gitHead": "ad1d397f60175576cb2d939ae6c75533ee5a4c2a"
 }