@friggframework/devtools 2.0.0--canary.463.e30794c.0 → 2.0.0--canary.464.f9d3fc0.0

package/infrastructure/serverless-template.js

@@ -68,8 +68,7 @@ const getAppEnvironmentVars = (AppDefinition) => {
     }
     if (skippedKeys.length > 0) {
         console.log(
-            `   ⚠️  Skipped ${
-                skippedKeys.length
+            `   ⚠️  Skipped ${skippedKeys.length
             } reserved AWS Lambda variables: ${skippedKeys.join(', ')}`
         );
     }
@@ -675,7 +674,8 @@ const createBaseDefinition = (
             },
         },
         plugins: [
-            'serverless-jetpack',
+            // Temporarily disabled Jetpack - it ignores package.patterns in dependency mode
+            // 'serverless-jetpack',
             'serverless-dotenv-plugin',
             'serverless-offline-sqs',
             'serverless-offline',
@@ -696,9 +696,10 @@ const createBaseDefinition = (
                 secretAccessKey: 'root',
                 skipCacheInvalidation: false,
             },
-            jetpack: {
-                base: '..',
-            },
+            // Jetpack config removed - testing with standard Serverless packaging
+            // jetpack: {
+            //     base: '..',
+            // },
         },
         functions: {
             auth: {
@@ -850,7 +851,7 @@ const applyKmsConfiguration = (
         if (AppDefinition.encryption?.createResourceIfNoneFound !== true) {
             throw new Error(
                 'KMS field-level encryption is enabled but no KMS key was found. ' +
-                    'Either provide an existing KMS key or set encryption.createResourceIfNoneFound to true to create a new key.'
+                'Either provide an existing KMS key or set encryption.createResourceIfNoneFound to true to create a new key.'
             );
         }
 
@@ -889,9 +890,8 @@ const applyKmsConfiguration = (
                             Resource: '*',
                             Condition: {
                                 StringEquals: {
-                                    'kms:ViaService': `lambda.${
-                                        process.env.AWS_REGION || 'us-east-1'
-                                    }.amazonaws.com`,
+                                    'kms:ViaService': `lambda.${process.env.AWS_REGION || 'us-east-1'
+                                        }.amazonaws.com`,
                                 },
                             },
                         },
@@ -1293,13 +1293,13 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
             };
 
             definition.resources.Resources.FriggPublicSubnetRouteTableAssociation =
-                {
-                    Type: 'AWS::EC2::SubnetRouteTableAssociation',
-                    Properties: {
-                        SubnetId: { Ref: 'FriggPublicSubnet' },
-                        RouteTableId: { Ref: 'FriggPublicRouteTable' },
-                    },
-                };
+            {
+                Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                Properties: {
+                    SubnetId: { Ref: 'FriggPublicSubnet' },
+                    RouteTableId: { Ref: 'FriggPublicRouteTable' },
+                },
+            };
 
             definition.resources.Resources.FriggLambdaRouteTable = {
                 Type: 'AWS::EC2::RouteTable',
@@ -1316,22 +1316,22 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
             };
 
             definition.resources.Resources.FriggPrivateSubnet1RouteTableAssociation =
-                {
-                    Type: 'AWS::EC2::SubnetRouteTableAssociation',
-                    Properties: {
-                        SubnetId: { Ref: 'FriggPrivateSubnet1' },
-                        RouteTableId: { Ref: 'FriggLambdaRouteTable' },
-                    },
-                };
+            {
+                Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                Properties: {
+                    SubnetId: { Ref: 'FriggPrivateSubnet1' },
+                    RouteTableId: { Ref: 'FriggLambdaRouteTable' },
+                },
+            };
 
             definition.resources.Resources.FriggPrivateSubnet2RouteTableAssociation =
-                {
-                    Type: 'AWS::EC2::SubnetRouteTableAssociation',
-                    Properties: {
-                        SubnetId: { Ref: 'FriggPrivateSubnet2' },
-                        RouteTableId: { Ref: 'FriggLambdaRouteTable' },
-                    },
-                };
+            {
+                Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                Properties: {
+                    SubnetId: { Ref: 'FriggPrivateSubnet2' },
+                    RouteTableId: { Ref: 'FriggLambdaRouteTable' },
+                },
+            };
         }
     } else if (subnetManagement === 'use-existing') {
         if (
@@ -1348,12 +1348,12 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
             AppDefinition.vpc.subnets?.ids?.length > 0
                 ? AppDefinition.vpc.subnets.ids
                 : discoveredResources.privateSubnetId1 &&
-                  discoveredResources.privateSubnetId2
-                ? [
-                      discoveredResources.privateSubnetId1,
-                      discoveredResources.privateSubnetId2,
-                  ]
-                : [];
+                    discoveredResources.privateSubnetId2
+                    ? [
+                        discoveredResources.privateSubnetId1,
+                        discoveredResources.privateSubnetId2,
+                    ]
+                    : [];
 
         if (vpcConfig.subnetIds.length < 2) {
             if (AppDefinition.vpc.selfHeal) {
@@ -1560,13 +1560,13 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
                     };
 
                     definition.resources.Resources.FriggPublicSubnetRouteTableAssociation =
-                        {
-                            Type: 'AWS::EC2::SubnetRouteTableAssociation',
-                            Properties: {
-                                SubnetId: { Ref: 'FriggPublicSubnet' },
-                                RouteTableId: { Ref: 'FriggPublicRouteTable' },
-                            },
-                        };
+                    {
+                        Type: 'AWS::EC2::SubnetRouteTableAssociation',
+                        Properties: {
+                            SubnetId: { Ref: 'FriggPublicSubnet' },
+                            RouteTableId: { Ref: 'FriggPublicRouteTable' },
+                        },
+                    };
                 }
 
                 definition.resources.Resources.FriggNATGateway = {
@@ -1577,11 +1577,11 @@ const configureVpc = (definition, AppDefinition, discoveredResources) => {
                         AllocationId: useExistingEip
                             ? discoveredResources.existingElasticIpAllocationId
                             : {
-                                  'Fn::GetAtt': [
-                                      'FriggNATGatewayEIP',
-                                      'AllocationId',
-                                  ],
-                              },
+                                'Fn::GetAtt': [
+                                    'FriggNATGatewayEIP',
+                                    'AllocationId',
+                                ],
+                            },
                         SubnetId: discoveredResources.publicSubnetId || {
                             Ref: 'FriggPublicSubnet',
                         },
@@ -1955,11 +1955,34 @@ const attachIntegrations = (definition, AppDefinition) => {
         }
 
         const integrationName = integration.Definition.name;
-        const queueReference = `${
-            integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
-        }Queue`;
+        const queueReference = `${integrationName.charAt(0).toUpperCase() + integrationName.slice(1)
+            }Queue`;
         const queueName = `\${self:service}--\${self:provider.stage}-${queueReference}`;
 
+        // Add webhook handler if enabled (BEFORE catch-all proxy route)
+        const webhookConfig = integration.Definition.webhooks;
+        if (webhookConfig && (webhookConfig === true || webhookConfig.enabled === true)) {
+            const webhookFunctionName = `${integrationName}Webhook`;
+
+            definition.functions[webhookFunctionName] = {
+                handler: `node_modules/@friggframework/core/handlers/routers/integration-webhook-routers.handlers.${integrationName}Webhook.handler`,
+                events: [
+                    {
+                        httpApi: {
+                            path: `/api/${integrationName}-integration/webhooks`,
+                            method: 'POST',
+                        },
+                    },
+                    {
+                        httpApi: {
+                            path: `/api/${integrationName}-integration/webhooks/{integrationId}`,
+                            method: 'POST',
+                        },
+                    },
+                ],
+            };
+        }
+
         definition.functions[integrationName] = {
             handler: `node_modules/@friggframework/core/handlers/routers/integration-defined-routers.handlers.${integrationName}.handler`,
             events: [
@@ -2010,33 +2033,6 @@ const attachIntegrations = (definition, AppDefinition) => {
         };
 
         definition.custom[queueReference] = queueName;
-
-        // Add webhook handler if enabled
-        const webhookConfig = integration.Definition.webhooks;
-        if (
-            webhookConfig &&
-            (webhookConfig === true || webhookConfig.enabled === true)
-        ) {
-            const webhookFunctionName = `${integrationName}Webhook`;
-
-            definition.functions[webhookFunctionName] = {
-                handler: `node_modules/@friggframework/core/handlers/routers/integration-webhook-routers.handlers.${integrationName}Webhook.handler`,
-                events: [
-                    {
-                        httpApi: {
-                            path: `/api/${integrationName}-integration/webhooks`,
-                            method: 'POST',
-                        },
-                    },
-                    {
-                        httpApi: {
-                            path: `/api/${integrationName}-integration/webhooks/{integrationId}`,
-                            method: 'POST',
-                        },
-                    },
-                ],
-            };
-        }
     }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.463.e30794c.0",
+  "version": "2.0.0--canary.464.f9d3fc0.0",
   "dependencies": {
     "@aws-sdk/client-ec2": "^3.835.0",
     "@aws-sdk/client-kms": "^3.835.0",
@@ -9,8 +9,8 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/schemas": "2.0.0--canary.463.e30794c.0",
-    "@friggframework/test": "2.0.0--canary.463.e30794c.0",
+    "@friggframework/schemas": "2.0.0--canary.464.f9d3fc0.0",
+    "@friggframework/test": "2.0.0--canary.464.f9d3fc0.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -32,8 +32,8 @@
     "serverless-http": "^2.7.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.463.e30794c.0",
-    "@friggframework/prettier-config": "2.0.0--canary.463.e30794c.0",
+    "@friggframework/eslint-config": "2.0.0--canary.464.f9d3fc0.0",
+    "@friggframework/prettier-config": "2.0.0--canary.464.f9d3fc0.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e30794cb481bbedf7cf57ef3356ae276e2988320"
+  "gitHead": "f9d3fc0e7c7135c87a6b6b1befc7d7912966f86a"
 }