@friggframework/devtools 2.0.0--canary.517.9750290.0 → 2.0.0--canary.517.8e1c21c.0

package/infrastructure/domains/admin-scripts/admin-script-builder.js

@@ -129,6 +129,7 @@ class AdminScriptBuilder extends InfrastructureBuilder {
         result.functions.adminScriptExecutor = {
             handler: 'node_modules/@friggframework/admin-scripts/src/infrastructure/script-executor-handler.handler',
             skipEsbuild: true,
+            package: this.skipEsbuildPackageConfig(usePrismaLayer),
             ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
             timeout: 900, // 15 minutes max
             memorySize: 1024,
@@ -148,6 +149,7 @@ class AdminScriptBuilder extends InfrastructureBuilder {
         result.functions.adminScriptRouter = {
             handler: 'node_modules/@friggframework/admin-scripts/src/infrastructure/admin-script-router.handler',
             skipEsbuild: true,
+            package: this.skipEsbuildPackageConfig(usePrismaLayer),
             ...(usePrismaLayer && { layers: [{ Ref: 'PrismaLambdaLayer' }] }),
             timeout: 30,
             events: [
@@ -177,12 +179,55 @@ class AdminScriptBuilder extends InfrastructureBuilder {
         console.log('  ✓ Created adminScriptRouter function');
     }
 
+    // Without this, the skipEsbuild functions package the whole node_modules
+    // closure (aws-sdk, Prisma, dev deps) and blow past Lambda's 250 MB limit.
+    skipEsbuildPackageConfig(usePrismaLayer) {
+        return {
+            exclude: [
+                'node_modules/aws-sdk/**',
+                'node_modules/@aws-sdk/**',
+                ...(usePrismaLayer
+                    ? [
+                          'node_modules/@prisma/**',
+                          'node_modules/.prisma/**',
+                          'node_modules/prisma/**',
+                          'node_modules/@friggframework/core/generated/**',
+                      ]
+                    : []),
+                'node_modules/**/node_modules/**',
+                'node_modules/@friggframework/test/**',
+                'node_modules/@friggframework/eslint-config/**',
+                'node_modules/@friggframework/prettier-config/**',
+                'node_modules/jest/**',
+                'node_modules/prettier/**',
+                'node_modules/eslint/**',
+                'node_modules/esbuild/**',
+                'node_modules/@esbuild/**',
+                'node_modules/typescript/**',
+                'node_modules/webpack/**',
+                'node_modules/osls/**',
+                'node_modules/serverless-esbuild/**',
+                'node_modules/serverless-jetpack/**',
+                'node_modules/serverless-offline/**',
+                'node_modules/serverless-offline-sqs/**',
+                'node_modules/serverless-dotenv-plugin/**',
+                'node_modules/serverless-kms-grants/**',
+                '.env',
+                '.env.*',
+                '**/.env',
+                '**/.env.*',
+                'test/**',
+                'layers/**',
+                'coverage/**',
+                '**/*.test.js',
+                '**/*.spec.js',
+            ],
+        };
+    }
+
     createSchedulerResources(appDefinition, result) {
-        // Reference the executor by a constructed ARN (Fn::Sub) rather than
-        // Fn::GetAtt. GetAtt creates a CloudFormation dependency edge, and an
-        // edge from the scheduler role to the executor closed a cycle through the
-        // shared Lambda execution role (role → executor → IamRoleLambdaExecution
-        // → PassRole → role). The name is deterministic, so a Sub is safe.
+        // Constructed ARN, not Fn::GetAtt: a GetAtt edge to the executor closes a
+        // CloudFormation circular dependency via the shared Lambda execution role.
         const executorArn = {
             'Fn::Sub':
                 'arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${self:service}-${self:provider.stage}-adminScriptExecutor',
@@ -223,18 +268,10 @@ class AdminScriptBuilder extends InfrastructureBuilder {
             },
         };
 
-        // SCHEDULER_PROVIDER is a constant, so it's safe on the shared provider
-        // environment inherited by every function.
         result.environment.SCHEDULER_PROVIDER = 'aws';
 
-        // The remaining vars carry resource references and are consumed ONLY by
-        // the router (it builds the AWS scheduler adapter in the schedule
-        // handlers). Scope them to the router function rather than the shared
-        // provider environment: broadcasting the executor's own ARN into every
-        // function's env made the executor depend on itself, and the role/group
-        // refs made every function depend on the scheduler role — both closed
-        // CloudFormation circular dependencies on deploy. Names must match
-        // admin-script-router.js exactly.
+        // Router-scoped, not shared provider env: broadcasting these resource
+        // references to every function creates CloudFormation circular deps.
         result.functions.adminScriptRouter.environment = {
             ...(result.functions.adminScriptRouter.environment || {}),
             SCHEDULER_ROLE_ARN: {

package/infrastructure/domains/admin-scripts/admin-script-builder.test.js

@@ -257,6 +257,29 @@ describe('AdminScriptBuilder', () => {
             expect(result.functions.adminScriptExecutor.memorySize).toBe(1024);
         });
 
+        it('should exclude aws-sdk/Prisma from the skipEsbuild function packages', async () => {
+            const appDefinition = {
+                adminScripts: [{ Definition: { name: 'test-script' } }],
+            };
+
+            const result = await adminScriptBuilder.build(appDefinition, {});
+
+            // Regression: without a package config the skipEsbuild functions
+            // package the whole node_modules and exceed Lambda's 250 MB limit.
+            for (const fn of [
+                result.functions.adminScriptExecutor,
+                result.functions.adminScriptRouter,
+            ]) {
+                expect(fn.package.exclude).toEqual(
+                    expect.arrayContaining([
+                        'node_modules/aws-sdk/**',
+                        'node_modules/@aws-sdk/**',
+                        'node_modules/@prisma/**',
+                    ])
+                );
+            }
+        });
+
         it('should attach Prisma layer to adminScriptExecutor', async () => {
             const appDefinition = {
                 adminScripts: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.517.9750290.0",
+  "version": "2.0.0--canary.517.8e1c21c.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.517.9750290.0",
-    "@friggframework/schemas": "2.0.0--canary.517.9750290.0",
-    "@friggframework/test": "2.0.0--canary.517.9750290.0",
+    "@friggframework/core": "2.0.0--canary.517.8e1c21c.0",
+    "@friggframework/schemas": "2.0.0--canary.517.8e1c21c.0",
+    "@friggframework/test": "2.0.0--canary.517.8e1c21c.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.18.0",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.517.9750290.0",
-    "@friggframework/prettier-config": "2.0.0--canary.517.9750290.0",
+    "@friggframework/eslint-config": "2.0.0--canary.517.8e1c21c.0",
+    "@friggframework/prettier-config": "2.0.0--canary.517.8e1c21c.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9750290bdb331b5f2d1304d7e64adc3c480f1fb7"
+  "gitHead": "8e1c21cfab6708ab3456516f2e3520eeb12e8c14"
 }