canopycms 0.0.66-int.82 → 0.0.66-int.83

package/dist/cli/template-files/cms-stack.ts.template

@@ -16,6 +16,15 @@ import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
 import { Platform } from 'aws-cdk-lib/aws-ecr-assets'
 import { CanopyCmsService, CanopyCmsDistribution } from 'canopycms-cdk'
+// The SAME config file the CMS Lambda reads at request time -- imported here,
+// at synth time, so `baseBranch`/`settingsBranch` below can never drift from
+// `defaultBaseBranch`/`settingsBranch` in canopycms.config.ts the way a
+// hand-copied literal could. As generated by `canopycms init`,
+// `canopycms.config.ts` only imports `defineCanopyConfig` from `canopycms`,
+// which is what makes this safe from a plain `tsx` synth -- if you add
+// server-only or Next.js-specific imports to your own canopycms.config.ts
+// later, this synth-time import pulls those in too.
+import canopyConfig from '../../canopycms.config'
 
 export interface CmsStackProps extends StackProps {
   /** GitHub repository the EC2 worker pushes branches and opens PRs against. */
@@ -91,6 +100,16 @@ export class CmsStack extends Stack {
       githubRepo: props.githubRepo,
       deploymentName: props.deploymentName,
 
+      // Derived from canopycms.config.ts (imported above), not hardcoded or
+      // left to CanopyCmsService's own 'main' default. A wrong baseBranch
+      // crash-loops the worker forever: verifyBaseBranchExists throws when the
+      // named branch doesn't exist in the cloned remote, and systemd restarts
+      // into the same failure indefinitely. See CanopyCmsServiceProps.baseBranch's
+      // doc comment (packages/canopycms-cdk) for the full mechanism, and
+      // .settingsBranch's for the [SYNC-M3] warning this also prevents.
+      baseBranch: canopyConfig.server.defaultBaseBranch,
+      settingsBranch: canopyConfig.server.settingsBranch,
+
       // Secrets the EC2 worker reads. The Lambda needs none of them.
       secretsArns: [githubToken.secretArn, clerkSecretKey.secretArn],
       githubTokenSecretArn: githubToken.secretArn,
@@ -113,14 +132,13 @@ export class CmsStack extends Stack {
     //   2. uncomment the block below, moving it ABOVE `cmsService` (it has to
     //      exist before you can pass its bucket);
     //   3. pass `assetBucket: assetSupport.bucket` to CanopyCmsService;
-    //   4. pass the behaviors to CanopyCmsDistribution, `/assets/t/*` FIRST
-    //      (CloudFront matches in order, so the general pattern would
-    //      otherwise swallow the transform one):
-    //
-    //        additionalBehaviors: {
-    //          '/assets/t/*': assetSupport.assetBehaviors().assetsTransform,
-    //          '/assets/*': assetSupport.assetBehaviors().assets,
-    //        },
+    //   4. pass `assetSupport` to CanopyCmsDistribution below - it attaches
+    //      both CloudFront behaviors in the only order that is safe
+    //      (`/assets/t/*` before `/assets/*`; CloudFront matches path
+    //      patterns in order, so the general pattern would otherwise
+    //      swallow the transform one). `cdk synth` fails loudly if a
+    //      hand-written `additionalBehaviors` ever gets that order wrong
+    //      instead.
     //
     // `editorOrigins` is REQUIRED: it is the S3 CORS allowlist for the
     // editor's presigned uploads, so it must list the origin the editor is
@@ -151,6 +169,8 @@ export class CmsStack extends Stack {
         // here so that raising `timeout` above cannot silently leave
         // CloudFront answering 504 at the edge on requests that succeed.
         originReadTimeout: cmsService.timeout,
+        // Uncomment alongside the `assetSupport` block above to enable media.
+        // assetSupport,
       })
     }
   }

package/dist/cli/template-files/deploy-cms.yml.template

@@ -49,10 +49,12 @@
 #          the otherwise-obvious GITHUB_TOKEN_SECRET_ARN cannot be created at all.
 #          The env var handed to CDK below keeps the unprefixed name.
 #        CLERK_SECRET_KEY_SECRET_ARN    FULL Secrets Manager ARN (with suffix)
-#        CLERK_JWT_KEY                  Clerk's public JWKS PEM
 #   5. Set these repository variables (same page -> Variables):
 #        AWS_REGION                          e.g. us-east-1
 #        NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY   or the editor ships unable to sign in
+#        CLERK_JWT_KEY                       Clerk's PUBLIC JWKS PEM. A variable,
+#                                            not a secret: it is public key material,
+#                                            and the CMS Lambda takes public values only
 #        CANOPY_BOOTSTRAP_ADMIN_IDS          comma-separated Clerk user IDs
 #      Optional:
 #        CANOPYCMS_DEPLOYMENT_NAME           defaults to 'prod'
@@ -153,7 +155,7 @@ jobs:
         env:
           GITHUB_TOKEN_SECRET_ARN: ${{ secrets.CANOPY_GITHUB_TOKEN_SECRET_ARN }}
           CLERK_SECRET_KEY_SECRET_ARN: ${{ secrets.CLERK_SECRET_KEY_SECRET_ARN }}
-          CLERK_JWT_KEY: ${{ secrets.CLERK_JWT_KEY }}
+          CLERK_JWT_KEY: ${{ vars.CLERK_JWT_KEY }}
           NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ vars.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}
           CANOPY_BOOTSTRAP_ADMIN_IDS: ${{ vars.CANOPY_BOOTSTRAP_ADMIN_IDS }}
           CANOPYCMS_DEPLOYMENT_NAME: ${{ vars.CANOPYCMS_DEPLOYMENT_NAME }}

package/dist/operating-mode/deployment-name-fixtures.d.ts

@@ -4,8 +4,10 @@
  * The rule that decides whether a `deploymentName` is usable exists TWICE, by
  * necessity: once at runtime (`deployment-name.ts`'s `isValidDeploymentName`)
  * and once at synth time (`canopycms-cdk`'s `constructs/cms-service.ts`).
- * `canopycms-cdk` publishes without a runtime dependency on `canopycms`, so
- * the construct cannot import the real thing.
+ * The construct deliberately does not import the real thing — see
+ * `isValidDeploymentName`'s doc comment in cms-service.ts for why (not, as
+ * this comment used to say, that the published construct lacks a runtime
+ * dependency on `canopycms` — it doesn't).
  *
  * The dangerous drift is asymmetric: a rule TIGHTENED at runtime but not at
  * synth produces a stack that synths clean and then crash-loops the Lambda at

package/dist/operating-mode/deployment-name-fixtures.js

@@ -4,8 +4,10 @@
  * The rule that decides whether a `deploymentName` is usable exists TWICE, by
  * necessity: once at runtime (`deployment-name.ts`'s `isValidDeploymentName`)
  * and once at synth time (`canopycms-cdk`'s `constructs/cms-service.ts`).
- * `canopycms-cdk` publishes without a runtime dependency on `canopycms`, so
- * the construct cannot import the real thing.
+ * The construct deliberately does not import the real thing — see
+ * `isValidDeploymentName`'s doc comment in cms-service.ts for why (not, as
+ * this comment used to say, that the published construct lacks a runtime
+ * dependency on `canopycms` — it doesn't).
  *
  * The dangerous drift is asymmetric: a rule TIGHTENED at runtime but not at
  * synth produces a stack that synths clean and then crash-loops the Lambda at

package/dist/operating-mode/deployment-name.d.ts

@@ -25,9 +25,12 @@
 /**
  * Exported so `canopycms-cdk`'s suite can assert that its own synth-time copy
  * of this rule (constructs/cms-service.ts) still agrees with this one. The
- * construct itself must NOT import this: `canopycms-cdk` publishes without a
- * runtime dependency on `canopycms`, so a source-level import would break the
- * published construct. The drift check is therefore test-only — see
+ * construct deliberately does not import this directly — see
+ * `isValidDeploymentName`'s doc comment in cms-service.ts for the real reason
+ * (not, as this comment used to say, that the published construct lacks a
+ * runtime dependency on `canopycms` — it doesn't: `canopycms` is a
+ * non-optional peerDependency there, and the package's own main entry already
+ * imports it at runtime). The drift check is therefore test-only — see
  * `deployment-name-fixtures.ts`.
  */
 export declare const isValidDeploymentName: (name: string) => boolean;

package/dist/operating-mode/deployment-name.js

@@ -42,9 +42,12 @@ const VALID_DEPLOYMENT_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 /**
  * Exported so `canopycms-cdk`'s suite can assert that its own synth-time copy
  * of this rule (constructs/cms-service.ts) still agrees with this one. The
- * construct itself must NOT import this: `canopycms-cdk` publishes without a
- * runtime dependency on `canopycms`, so a source-level import would break the
- * published construct. The drift check is therefore test-only — see
+ * construct deliberately does not import this directly — see
+ * `isValidDeploymentName`'s doc comment in cms-service.ts for the real reason
+ * (not, as this comment used to say, that the published construct lacks a
+ * runtime dependency on `canopycms` — it doesn't: `canopycms` is a
+ * non-optional peerDependency there, and the package's own main entry already
+ * imports it at runtime). The drift check is therefore test-only — see
  * `deployment-name-fixtures.ts`.
  */
 export const isValidDeploymentName = (name) => VALID_DEPLOYMENT_NAME.test(name) &&

package/package.json

@@ -1,7 +1,7 @@
 {
   "//": "@codemirror/language, @lezer/highlight: workaround — @mdxeditor/editor uses cm6-theme-basic-light which peer-requires these but mdxeditor doesn't declare them as dependencies",
   "name": "canopycms",
-  "version": "0.0.66-int.82",
+  "version": "0.0.66-int.83",
   "description": "CanopyCMS core package: schema-driven content, branch-aware editing, and editor UI for Next.js.",
   "license": "MIT",
   "repository": {