@friggframework/devtools 2.0.0-next.6 → 2.0.0-next.8

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

@@ -1,12 +1,18 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
-function buildCommand(...args) {
+function buildCommand(options) {
     console.log('Building the serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
-    const serverlessArgs = ['package', '--config', infrastructurePath, ...args.filter(arg => arg !== 'build')];
+    const serverlessArgs = [
+        'package',
+        '--config',
+        infrastructurePath,
+        '--stage',
+        options.stage
+    ];
 
     const childProcess = spawn(command, serverlessArgs, {
         cwd: backendPath,
@@ -22,6 +28,6 @@ function buildCommand(...args) {
             console.log(`Child process exited with code ${code}`);
         }
     });
-} 
+}
 
 module.exports = { buildCommand };

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

@@ -1,12 +1,18 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
-function deployCommand(...args) {
+function deployCommand(options) {
     console.log('Deploying the serverless application...');
     const backendPath = path.resolve(process.cwd());
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
-    const serverlessArgs = ['deploy', '--config', infrastructurePath, ...args.filter(arg => arg !== 'deploy')];
+    const serverlessArgs = [
+        'deploy',
+        '--config',
+        infrastructurePath,
+        '--stage',
+        options.stage
+    ];
 
     const childProcess = spawn(command, serverlessArgs, {
         cwd: backendPath,

package/frigg-cli/index.js

@@ -15,16 +15,19 @@ program
 program
     .command('start')
     .description('Run the backend and optional frontend')
+    .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .action(startCommand);
 
 program
     .command('build')
     .description('Build the serverless application')
+    .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .action(buildCommand);
 
 program
     .command('deploy')
     .description('Deploy the serverless application')
+    .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .action(deployCommand);
 
 program.parse(process.argv);

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

@@ -1,7 +1,7 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
-function startCommand() {
+function startCommand(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;
@@ -9,7 +9,13 @@ function startCommand() {
     console.log(`Starting backend in ${backendPath}...`);
     const infrastructurePath = 'infrastructure.js';
     const command = 'serverless';
-    const args = ['offline', '--config', infrastructurePath, '--stage=dev'];
+    const args = [
+        'offline',
+        '--config',
+        infrastructurePath,
+        '--stage',
+        options.stage
+    ];
 
     const childProcess = spawn(command, args, {
         cwd: backendPath,

package/infrastructure/serverless-template.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 
-const composeServerlessDefinition = (AppDefinition, IntegrationFactory) => {
+const composeServerlessDefinition = (AppDefinition) => {
     const definition = {
         frameworkVersion: '>=3.17.0',
         service: AppDefinition.name || 'create-frigg-app',
@@ -213,7 +213,7 @@ const composeServerlessDefinition = (AppDefinition, IntegrationFactory) => {
     };
 
     // Add integration-specific functions and resources
-    AppDefinition.integrations.forEach((integration) => {
+    for (const integration of AppDefinition.integrations) {
         const integrationName = integration.Definition.name;
 
         // Add function for the integration
@@ -229,7 +229,7 @@ const composeServerlessDefinition = (AppDefinition, IntegrationFactory) => {
             events: [
                 {
                     http: {
-                        path: `/api/${integrationName}-integration/{proxy*}`,
+                        path: `/api/${integrationName}-integration/{proxy+}`,
                         method: 'ANY',
                         cors: true,
                     },
@@ -277,13 +277,13 @@ const composeServerlessDefinition = (AppDefinition, IntegrationFactory) => {
         // Add Queue URL for the integration to the ENVironment variables
         definition.provider.environment = {
             ...definition.provider.environment,
-            [integrationName.toUpperCase() + '_QUEUE_URL']: {
+            [`${integrationName.toUpperCase()}_QUEUE_URL`]: {
                 Ref: queueReference,
             },
         };
 
         definition.custom[queueReference] = queueName;
-    });
+    }
 
     return definition;
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0-next.6",
+  "version": "2.0.0-next.8",
   "dependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0-next.6",
-    "@friggframework/test": "2.0.0-next.6",
+    "@friggframework/core": "2.0.0-next.8",
+    "@friggframework/test": "2.0.0-next.8",
     "@hapi/boom": "^7.4.11",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -28,8 +28,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0-next.6",
-    "@friggframework/prettier-config": "2.0.0-next.6",
+    "@friggframework/eslint-config": "2.0.0-next.8",
+    "@friggframework/prettier-config": "2.0.0-next.8",
     "serverless": "3.39.0",
     "serverless-dotenv-plugin": "^6.0.0",
     "serverless-offline": "^13.8.0",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "14d7f856430f95bc0367246089713540e1c23a86"
+  "gitHead": "60b7a6f92954ad165186861a35fba66e40f60a42"
 }