canopycms 0.0.61-int.75 → 0.0.62

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

@@ -0,0 +1,130 @@
+/**
+ * CanopyCMS infrastructure: VPC + EFS + CMS Lambda + EC2 worker, and
+ * optionally CloudFront + Route53 in front of the Lambda's Function URL.
+ *
+ * This file is yours to edit -- `canopycms init-deploy aws` will not overwrite
+ * it without `--force`. The comments below mark the settings that have a
+ * silent-failure mode; the rest is ordinary CDK.
+ *
+ * See docs/deploying-to-aws.md for the full walkthrough, including the media
+ * (AssetSupport) and multi-deployment cases.
+ */
+
+import { Stack, StackProps } from 'aws-cdk-lib'
+import { Construct } from 'constructs'
+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'
+
+export interface CmsStackProps extends StackProps {
+  /** GitHub repository the EC2 worker pushes branches and opens PRs against. */
+  githubOwner: string
+  githubRepo: string
+  /** FULL Secrets Manager ARN, including the random six-character suffix. */
+  githubTokenSecretArn: string
+  /** FULL Secrets Manager ARN, including the random six-character suffix. */
+  clerkSecretKeySecretArn: string
+  /** Clerk's public JWKS PEM, for networkless session verification. */
+  clerkJwtKey: string
+  /** Clerk publishable key, baked into the client bundle at image-build time. */
+  clerkPublishableKey: string
+  /** Comma-separated Clerk user IDs granted admin on first boot. */
+  bootstrapAdminIds: string
+  /** Namespaces this deployment's settings branch (`canopycms-settings-{name}`). */
+  deploymentName: string
+  /** Optional CloudFront domain, e.g. 'cms.docs.example.org'. */
+  domainName?: string
+  /** Optional Route53 hosted zone domain, e.g. 'example.org'. */
+  hostedZoneDomain?: string
+}
+
+export class CmsStack extends Stack {
+  constructor(scope: Construct, id: string, props: CmsStackProps) {
+    super(scope, id, props)
+
+    // fromSecretCompleteArn, NOT fromSecretNameV2: `secretsArns` below is
+    // written verbatim into the worker's IAM policy, so a partial or
+    // name-based ARN never matches the real secret and the worker fails with
+    // AccessDenied at boot rather than at deploy.
+    const githubToken = secretsmanager.Secret.fromSecretCompleteArn(
+      this,
+      'GitHubToken',
+      props.githubTokenSecretArn,
+    )
+    const clerkSecretKey = secretsmanager.Secret.fromSecretCompleteArn(
+      this,
+      'ClerkSecret',
+      props.clerkSecretKeySecretArn,
+    )
+
+    const cmsService = new CanopyCmsService(this, 'CmsService', {
+      // `cdk deploy` builds this image and publishes it to the CDK bootstrap
+      // assets repository -- it is the ONLY thing that ships CMS code. Do not
+      // pair it with a separate ECR push plus `aws lambda
+      // update-function-code`: that builds the image twice and leaves the
+      // function's image URI out of sync with CloudFormation, so the next
+      // `cdk deploy` touching the function silently reverts your code.
+      cmsDockerImage: lambda.DockerImageCode.fromImageAsset('.', {
+        file: 'Dockerfile.cms',
+        // The image platform and the Lambda architecture must agree, or the
+        // function fails at invoke with an exec-format error. Building on
+        // Apple Silicon defaults to arm64, so arm64 is the pairing that works
+        // both locally and on an x86 CI runner.
+        platform: Platform.LINUX_ARM64,
+        // Next.js inlines NEXT_PUBLIC_* into the CLIENT bundle during
+        // `next build`, so these have to reach the image BUILD. A Lambda
+        // environment variable would be far too late.
+        buildArgs: {
+          NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: props.clerkPublishableKey,
+          // The browser half of the operating mode. The server half is the
+          // Lambda's CANOPY_MODE, set by CanopyCmsService; this one decides
+          // what the editor bundle believes (Clerk auth rather than dev auth,
+          // and the prod feature flags). The image's own `next build` stays in
+          // dev mode either way -- see Dockerfile.cms.
+          NEXT_PUBLIC_CANOPY_MODE: 'prod',
+        },
+      }),
+      architecture: lambda.Architecture.ARM_64,
+
+      githubOwner: props.githubOwner,
+      githubRepo: props.githubRepo,
+      deploymentName: props.deploymentName,
+
+      // Secrets the EC2 worker reads. The Lambda needs none of them.
+      secretsArns: [githubToken.secretArn, clerkSecretKey.secretArn],
+      githubTokenSecretArn: githubToken.secretArn,
+      clerkSecretKeySecretArn: clerkSecretKey.secretArn,
+
+      // Lambda environment: public config only, never secrets.
+      environment: {
+        CANOPY_AUTH_MODE: 'clerk',
+        CLERK_JWT_KEY: props.clerkJwtKey,
+        CANOPY_BOOTSTRAP_ADMIN_IDS: props.bootstrapAdminIds,
+      },
+
+      memorySize: 2048,
+      reservedConcurrency: 10,
+    })
+
+    // Media support (uploads, on-demand image transforms). Uncomment to give
+    // the deployed editor an asset backend, pass `assetBucket:
+    // assetSupport.bucket` to CanopyCmsService above, and wire
+    // `assetSupport.cloudFrontBehaviors` into the distribution below. See the
+    // assets section of docs/deploying-to-aws.md.
+    //
+    // const assetSupport = new AssetSupport(this, 'Assets', {})
+
+    // CloudFront + Route53, only when a domain is configured. Skipping this
+    // leaves `cmsService.functionUrl` as the entry point, which is enough to
+    // exercise the editor and is what keeps a credential-free `cdk synth`
+    // working -- HostedZone.fromLookup below needs real AWS context.
+    if (props.domainName && props.hostedZoneDomain) {
+      new CanopyCmsDistribution(this, 'CmsDist', {
+        functionUrl: cmsService.functionUrl,
+        domainName: props.domainName,
+        hostedZoneDomain: props.hostedZoneDomain,
+      })
+    }
+  }
+}

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

@@ -1,35 +1,147 @@
-# CanopyCMS deployment workflow
-# Customize this for your CI/CD setup
+# CanopyCMS deployment workflow.
+#
+# `cdk deploy` is the ONLY thing that ships code here, deliberately.
+#
+# The generated CDK stack passes the CMS image to CanopyCmsService as
+# `lambda.DockerImageCode.fromImageAsset('.', { file: 'Dockerfile.cms' })` -- a
+# CDK-built asset. `cdk deploy` builds that image, publishes it to the CDK
+# bootstrap assets repository, and points the Lambda at it as part of the
+# CloudFormation change set.
+#
+# So do NOT add a separate `docker build` + push to your own ECR repo followed
+# by `aws lambda update-function-code`. That builds the image twice and leaves
+# the function's image URI out of sync with CloudFormation's view of it -- the
+# next `cdk deploy` that touches the function silently reverts your code to the
+# CDK asset. If you want to control the image tag yourself, switch the stack to
+# `DockerImageCode.fromEcr(repo, { tagOrDigest })` and keep `cdk deploy` as the
+# single deployer; don't run both mechanisms.
+#
+# `cdk deploy` also rolls the EC2 worker (CanopyCmsService gives its Auto
+# Scaling Group a rolling UpdatePolicy), so a worker code change reaches the
+# running instance. Expect a short worker outage during the replacement; the
+# task queue and branch workspaces live on EFS and are picked up on boot.
+#
+# This workflow deploys the stack BY NAME rather than with `--all`. If you keep
+# other CDK stacks in this repository, `--all` would deploy those too, on every
+# content merge -- so if you rename the stack in infrastructure/bin/app.ts,
+# rename it in the Deploy step below as well.
+#
+# Before this workflow can run:
+#   1. Bootstrap CDK in the target account/region: `cdk bootstrap`.
+#      `cdk deploy` needs it; `aws lambda update-function-code` did not, so
+#      this is easy to miss when migrating from an update-only pipeline.
+#   2. Create an IAM role your repo can assume via GitHub OIDC, trusted for
+#      this repository, able to assume the CDK bootstrap roles
+#      (cdk-hnb659fds-*-deploy-role, -file-publishing-role,
+#      -image-publishing-role, -lookup-role). This is a broader grant than an
+#      update-function-code pipeline needed -- `cdk deploy` mutates
+#      infrastructure.
+#   3. Install the CDK dependencies the app entry point needs:
+#      `{{ADD_DEV}} canopycms-cdk aws-cdk-lib constructs tsx aws-cdk`
+#   4. Set these repository secrets (Settings -> Secrets and variables ->
+#      Actions -> Secrets). Every one of them is read by `required()` in
+#      infrastructure/bin/app.ts, so a missing value fails the deploy at synth:
+#        AWS_DEPLOY_ROLE_ARN            OIDC role ARN from step 2
+#        GITHUB_TOKEN_SECRET_ARN        FULL Secrets Manager ARN (with suffix)
+#        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
+#        CANOPY_BOOTSTRAP_ADMIN_IDS          comma-separated Clerk user IDs
+#      Optional:
+#        CANOPYCMS_DEPLOYMENT_NAME           defaults to 'prod'
+#        CMS_DOMAIN_NAME                     enables CloudFront + Route53
+#        CMS_HOSTED_ZONE_DOMAIN              required alongside CMS_DOMAIN_NAME
 
 name: Deploy CMS
+
 on:
   push:
+    branches: [{{DEFAULT_BRANCH}}]
     paths:
       - 'app/**'
       - 'src/**'
       - 'content/**'
       - 'canopycms.config.ts'
       - 'Dockerfile.cms'
+      - 'infrastructure/**'
+      - 'cdk.json'
+      # A dependency bump alone changes what the image contains, so it has to
+      # trigger a deploy too -- otherwise the Lambda keeps running the old
+      # dependency tree until the next content change happens to ship it.
+      - 'package.json'
+      - '{{LOCKFILE}}'
   workflow_dispatch:
 
+concurrency:
+  # Two overlapping `cdk deploy` runs against one stack fail on
+  # UPDATE_IN_PROGRESS. Queue rather than cancel: cancelling mid-deploy leaves
+  # the stack in an in-progress state that needs manual recovery.
+  group: deploy-cms
+  cancel-in-progress: false
+
 jobs:
-  build-and-deploy:
+  deploy:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write # required for OIDC
+      contents: read
+
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      # TODO: Configure your ECR login, Docker build, push, and Lambda update
-      # See https://canopycms.dev/deploy/aws for details
+      - name: Install dependencies
+        run: {{CI_INSTALL}}
+
+      # cdk.json runs `node --import tsx infrastructure/bin/app.ts`, which
+      # imports canopycms-cdk, aws-cdk-lib and constructs. Missing any of them
+      # otherwise surfaces as an ERR_MODULE_NOT_FOUND buried in `cdk deploy`
+      # output, several minutes in.
       #
-      # Dockerfile.cms declares ARG NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY, baked into
-      # the client bundle at build time — set a repository variable named
-      # NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY (Settings -> Secrets and variables ->
-      # Actions -> Variables) or the client ships with an empty publishable key.
-      - name: Build CMS image
+      # aws-cdk is checked too even though nothing imports it: it is the CLI
+      # the Deploy step invokes as `npx cdk`. Absent from node_modules, npx
+      # silently fetches whatever version is current that day instead of
+      # failing -- so the deploy still runs, just not reproducibly. Keep this
+      # list in step with CDK_DEPENDENCIES in cli/project-detect.ts, which is
+      # what `canopycms init-deploy` tells adopters to install.
+      - name: Check CDK dependencies are installed
         run: |
-          docker build \
-            --build-arg NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY="${{ vars.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}" \
-            -f Dockerfile.cms -t cms:latest .
+          missing=""
+          for pkg in tsx aws-cdk-lib constructs canopycms-cdk aws-cdk; do
+            [ -e "node_modules/$pkg" ] || missing="$missing $pkg"
+          done
+          if [ -n "$missing" ]; then
+            echo "::error::Missing CDK dependencies:$missing"
+            echo "::error::Install them with: {{ADD_DEV}} canopycms-cdk aws-cdk-lib constructs tsx aws-cdk"
+            exit 1
+          fi
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_DEPLOY_ROLE_ARN }}
+          aws-region: ${{ vars.AWS_REGION }}
+
+      # Builds the CMS image, publishes it to the CDK assets repository, and
+      # applies the change set -- Lambda, EFS, CloudFront and the worker ASG
+      # in one operation.
+      #
+      # Every variable below is consumed by infrastructure/bin/app.ts. Keep
+      # this block in step with the `required()` calls there: a variable added
+      # in one place and not the other fails the deploy at synth.
+      - name: Deploy
+        env:
+          GITHUB_TOKEN_SECRET_ARN: ${{ secrets.GITHUB_TOKEN_SECRET_ARN }}
+          CLERK_SECRET_KEY_SECRET_ARN: ${{ secrets.CLERK_SECRET_KEY_SECRET_ARN }}
+          CLERK_JWT_KEY: ${{ secrets.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 }}
+          CMS_DOMAIN_NAME: ${{ vars.CMS_DOMAIN_NAME }}
+          CMS_HOSTED_ZONE_DOMAIN: ${{ vars.CMS_HOSTED_ZONE_DOMAIN }}
+        run: npx cdk deploy {{STACK_NAME}} --require-approval never

package/dist/cli/template-files/dockerignore.template

@@ -10,4 +10,5 @@ cdk.out
 .env*
 
 # Do NOT ignore vendor/ -- file: dependencies (vendored tarballs) must reach
-# the Docker build context, or `npm ci` will fail to resolve them.
+# the Docker build context, or the install step in Dockerfile.cms will fail to
+# resolve them.

package/dist/cli/templates.d.ts

@@ -28,7 +28,31 @@ export declare function middleware(options: {
 export declare function nextConfig(options: {
     staticBuild: boolean;
 }): Promise<string>;
-export declare function dockerfileCms(): Promise<string>;
+/**
+ * CloudFormation stack id used by the scaffolded CDK app.
+ *
+ * Shared rather than written twice: `infrastructure/bin/app.ts` names the
+ * stack, and the deploy workflow deploys it BY NAME (not `--all`, which would
+ * also deploy any unrelated stacks an adopter keeps in the same repo). Those
+ * two must agree, so they read the same constant.
+ */
+export declare const SCAFFOLD_STACK_NAME = "CanopyCms";
+export declare function dockerfileCms(options: {
+    copy: string;
+    install: string;
+    build: string;
+}): Promise<string>;
 export declare function dockerignore(): Promise<string>;
-export declare function githubWorkflowCms(): Promise<string>;
+export declare function githubWorkflowCms(options: {
+    defaultBranch: string;
+    lockfile: string;
+    ciInstall: string;
+    addDev: string;
+}): Promise<string>;
+export declare function cdkJson(): Promise<string>;
+export declare function cdkApp(options: {
+    githubOwner: string;
+    githubRepo: string;
+}): Promise<string>;
+export declare function cmsStack(): Promise<string>;
 //# sourceMappingURL=templates.d.ts.map

package/dist/cli/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,CAYlB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAgClB;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAGjF;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IACtC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAKlB;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAGhF;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI5F;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,WAAW,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAKnF;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAErD;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAEpD;AAED,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEzD"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAaH,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,GAAG,OAAO,CAAC,MAAM,CAAC,CAYlB;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAgClB;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAGjF;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE;IACtC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAC9B,GAAG,OAAO,CAAC,MAAM,CAAC,CAKlB;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAGhF;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,YAAY,EAAE,OAAO,GAAG,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAI5F;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,WAAW,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAKnF;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,cAAc,CAAA;AAE9C,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;CACd,GAAG,OAAO,CAAC,MAAM,CAAC,CAMlB;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAEpD;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlB;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAE/C;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,OAAO,CAAC,MAAM,CAAC,CAMlB;AAED,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhD"}

package/dist/cli/templates.js

@@ -80,13 +80,45 @@ export async function nextConfig(options) {
         : 'next.config.ts.template';
     return readTemplate(templateName);
 }
-export async function dockerfileCms() {
-    return readTemplate('Dockerfile.cms.template');
+/**
+ * CloudFormation stack id used by the scaffolded CDK app.
+ *
+ * Shared rather than written twice: `infrastructure/bin/app.ts` names the
+ * stack, and the deploy workflow deploys it BY NAME (not `--all`, which would
+ * also deploy any unrelated stacks an adopter keeps in the same repo). Those
+ * two must agree, so they read the same constant.
+ */
+export const SCAFFOLD_STACK_NAME = 'CanopyCms';
+export async function dockerfileCms(options) {
+    const template = await readTemplate('Dockerfile.cms.template');
+    return template
+        .replace('{{DOCKER_COPY}}', options.copy)
+        .replace('{{DOCKER_INSTALL}}', options.install)
+        .replace('{{DOCKER_BUILD}}', options.build);
 }
 export async function dockerignore() {
     return readTemplate('dockerignore.template');
 }
-export async function githubWorkflowCms() {
-    return readTemplate('deploy-cms.yml.template');
+export async function githubWorkflowCms(options) {
+    const template = await readTemplate('deploy-cms.yml.template');
+    return template
+        .replace('{{DEFAULT_BRANCH}}', options.defaultBranch)
+        .replace('{{LOCKFILE}}', options.lockfile)
+        .replace('{{CI_INSTALL}}', options.ciInstall)
+        .replaceAll('{{ADD_DEV}}', options.addDev)
+        .replace('{{STACK_NAME}}', SCAFFOLD_STACK_NAME);
+}
+export async function cdkJson() {
+    return readTemplate('cdk.json.template');
+}
+export async function cdkApp(options) {
+    const template = await readTemplate('cdk-app.ts.template');
+    return template
+        .replace('{{STACK_NAME}}', SCAFFOLD_STACK_NAME)
+        .replace('{{GITHUB_OWNER}}', options.githubOwner)
+        .replace('{{GITHUB_REPO}}', options.githubRepo);
+}
+export async function cmsStack() {
+    return readTemplate('cms-stack.ts.template');
 }
 //# sourceMappingURL=templates.js.map

package/dist/cli/templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACjC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;AAE5D,KAAK,UAAU,YAAY,CAAC,IAAY;IACtC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAGrC;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,8BAA8B,CAAC,CAAA;IACnE,6EAA6E;IAC7E,6EAA6E;IAC7E,2EAA2E;IAC3E,kEAAkE;IAClE,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW;QACpC,CAAC,CAAC,+FAA+F;YAC/F,6DAA6D;YAC7D,8EAA8E;QAChF,CAAC,CAAC,EAAE,CAAA;IACN,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAA;AAC1F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAGnC;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,oBAAoB,CAAC,CAAA;IAEzD,MAAM,WAAW,GACf,OAAO,CAAC,YAAY,KAAK,OAAO;QAC9B,CAAC,CAAC,wHAAwH;QAC1H,CAAC,CAAC,0DAA0D,CAAA;IAEhE,uFAAuF;IACvF,yFAAyF;IACzF,qFAAqF;IACrF,8EAA8E;IAC9E,MAAM,eAAe,GACnB,OAAO,CAAC,YAAY,KAAK,OAAO;QAC9B,CAAC,CAAC;YACE,qFAAqF;YACrF,uFAAuF;YACvF,oFAAoF;YACpF,sFAAsF;YACtF,8EAA8E;YAC9E,8BAA8B;YAC9B,oBAAoB;YACpB,6EAA6E;YAC7E,iEAAiE;YACjE,6BAA6B;SAC9B,CAAC,IAAI,CAAC,IAAI,CAAC;QACd,CAAC,CAAC,0CAA0C,CAAA;IAEhD,OAAO,QAAQ;SACZ,OAAO,CAAC,kBAAkB,EAAE,WAAW,CAAC;SACxC,OAAO,CAAC,uBAAuB,EAAE,eAAe,CAAC;SACjD,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,OAAO,YAAY,CAAC,qBAAqB,CAAC,CAAA;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAiC;IAC9D,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,mBAAmB,CAAC,CAAA;IACxD,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAG9B;IACC,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,KAAK,KAAK,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,wBAAwB,CAAA;IAC1F,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,CAAA;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,OAAO,YAAY,CAAC,uBAAuB,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAiC;IAC7D,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,sBAAsB,CAAC,CAAA;IAC3D,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAA0C;IACzE,MAAM,YAAY,GAChB,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,wBAAwB,CAAA;IAC9F,OAAO,YAAY,CAAC,YAAY,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAiC;IAChE,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW;QACtC,CAAC,CAAC,gCAAgC;QAClC,CAAC,CAAC,yBAAyB,CAAA;IAC7B,OAAO,YAAY,CAAC,YAAY,CAAC,CAAA;AACnC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAA;AAE9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAInC;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,yBAAyB,CAAC,CAAA;IAC9D,OAAO,QAAQ;SACZ,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC;SACxC,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC;SAC9C,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY;IAChC,OAAO,YAAY,CAAC,uBAAuB,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAKvC;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,yBAAyB,CAAC,CAAA;IAC9D,OAAO,QAAQ;SACZ,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,aAAa,CAAC;SACpD,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC;SACzC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,SAAS,CAAC;SAC5C,UAAU,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;SACzC,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,YAAY,CAAC,mBAAmB,CAAC,CAAA;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAG5B;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,qBAAqB,CAAC,CAAA;IAC1D,OAAO,QAAQ;SACZ,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;SAC9C,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,WAAW,CAAC;SAChD,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,OAAO,YAAY,CAAC,uBAAuB,CAAC,CAAA;AAC9C,CAAC"}

package/dist/client.d.ts

@@ -1,4 +1,5 @@
 export type { CanopyClientConfig } from './config';
+export type { CustomFieldRenderers, CustomFieldRenderProps } from './editor/FormRenderer';
 export * from './editor/EditorPanes';
 export * from './editor/EntryNavigator';
 export * from './editor/Editor';

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAClF,YAAY,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAClD,YAAY,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACzF,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAClF,YAAY,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA"}

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAGZ,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAIZ,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,yBAAyB,CAAA;AACvC,cAAc,sBAAsB,CAAA;AACpC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA"}

package/dist/config/schemas/config.d.ts

@@ -197,6 +197,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
     dev?: {
         contentSync?: "off" | "warn" | undefined;
     } | undefined;
+    settingsBranch?: string | undefined;
     media?: {
         adapter: "local";
         publicBaseUrl?: string | undefined;
@@ -217,7 +218,6 @@ export declare const CanopyConfigSchema: z.ZodObject<{
     defaultRemoteUrl?: string | undefined;
     githubTokenEnvVar?: string | undefined;
     allowNetworkRemoteInProd?: boolean | undefined;
-    settingsBranch?: string | undefined;
     autoCreateSettingsPR?: boolean | undefined;
     deploymentName?: string | undefined;
     sourceRoot?: string | undefined;
@@ -240,6 +240,7 @@ export declare const CanopyConfigSchema: z.ZodObject<{
     dev?: {
         contentSync?: "off" | "warn" | undefined;
     } | undefined;
+    settingsBranch?: string | undefined;
     media?: {
         adapter: "local";
         publicBaseUrl?: string | undefined;
@@ -267,7 +268,6 @@ export declare const CanopyConfigSchema: z.ZodObject<{
     githubTokenEnvVar?: string | undefined;
     deployedAs?: "static" | "server" | undefined;
     allowNetworkRemoteInProd?: boolean | undefined;
-    settingsBranch?: string | undefined;
     autoCreateSettingsPR?: boolean | undefined;
     deploymentName?: string | undefined;
     contentRoot?: string | undefined;
@@ -311,7 +311,6 @@ export declare const getConfigDefaults: () => {
     branchAccess: "allow" | "deny";
     contentRoot: string;
     githubTokenEnvVar: string;
-    deploymentName: string;
     prodWorkspace: string;
 };
 //# sourceMappingURL=config.d.ts.map

package/dist/config/schemas/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/schemas/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAKjD,eAAO,MAAM,yBAAyB,4CAA4C,CAAA;AAClF,eAAO,MAAM,4BAA4B,8BAA4B,CAAA;AAIrE,eAAO,MAAM,6BAA6B;;;;;;;;;;;;EAM/B,CAAA;AACX,eAAO,MAAM,uBAAuB;;;;;;;;;;;;KAElB,CAAA;AAClB,eAAO,MAAM,uBAAuB,2BAA6B,CAAA;AACjE,eAAO,MAAM,uBAAuB,2BAA+B,CAAA;AACnE,eAAO,MAAM,sBAAsB,aAAoB,CAAA;AACvD,eAAO,MAAM,sBAAsB,aAAoB,CAAA;AACvD,eAAO,MAAM,uBAAuB,aAAqB,CAAA;AACzD,eAAO,MAAM,uBAAuB,2BAAyC,CAAA;AAC7E,eAAO,MAAM,mBAAmB,4BAA0B,CAAA;AAC1D,eAAO,MAAM,gBAAgB,+CAAiD,CAAA;AAC9E,eAAO,MAAM,iBAAiB,qHAAwC,CAAA;AACtE,eAAO,MAAM,gBAAgB,4BAA+B,CAAA;AAC5D,eAAO,MAAM,oBAAoB,2BAA6B,CAAA;AAC9D,eAAO,MAAM,oBAAoB,0CAA0C,CAAA;AAG3E,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAGF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;EAU7B,CAAA;AAGF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0CpB,CAAA;AAEX;;;GAGG;AACH;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,uBAAuB,CAAA;AAI1D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;CAS5B,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/config/schemas/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AAKjD,eAAO,MAAM,yBAAyB,4CAA4C,CAAA;AAClF,eAAO,MAAM,4BAA4B,8BAA4B,CAAA;AAIrE,eAAO,MAAM,6BAA6B;;;;;;;;;;;;EAM/B,CAAA;AACX,eAAO,MAAM,uBAAuB;;;;;;;;;;;;KAElB,CAAA;AAClB,eAAO,MAAM,uBAAuB,2BAA6B,CAAA;AACjE,eAAO,MAAM,uBAAuB,2BAA+B,CAAA;AACnE,eAAO,MAAM,sBAAsB,aAAoB,CAAA;AACvD,eAAO,MAAM,sBAAsB,aAAoB,CAAA;AACvD,eAAO,MAAM,uBAAuB,aAAqB,CAAA;AACzD,eAAO,MAAM,uBAAuB,2BAAyC,CAAA;AAC7E,eAAO,MAAM,mBAAmB,4BAA0B,CAAA;AAC1D,eAAO,MAAM,gBAAgB,+CAAiD,CAAA;AAC9E,eAAO,MAAM,iBAAiB,qHAAwC,CAAA;AACtE,eAAO,MAAM,gBAAgB,4BAA+B,CAAA;AAC5D,eAAO,MAAM,oBAAoB,2BAA6B,CAAA;AAC9D,eAAO,MAAM,oBAAoB,0CAA0C,CAAA;AAG3E,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAGF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;EAU7B,CAAA;AAGF,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoDpB,CAAA;AAEX;;;GAGG;AACH;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,uBAAuB,CAAA;AAe1D,eAAO,MAAM,iBAAiB;;;;;;;;;;;;CAQ5B,CAAA"}

package/dist/config/schemas/config.js

@@ -82,6 +82,16 @@ export const CanopyConfigSchema = z
     allowNetworkRemoteInProd: z.boolean().optional(),
     settingsBranch: z.string().optional(),
     autoCreateSettingsPR: z.boolean().optional(),
+    // Deliberately `deploymentNameSchema.optional()`, NOT `deploymentNameSchema` alone.
+    // deploymentNameSchema.default('prod') would make `parse(undefined)` resolve to
+    // the literal 'prod' instead of staying `undefined` — collapsing the
+    // env > config > modeDefault precedence chain that resolveDeploymentName
+    // (operating-mode/deployment-name.ts) implements: config would then always
+    // "win" over modeDefault (masking dev's real default of 'local'), and the env
+    // var would just be racing config's baked-in 'prod' instead of a true absence.
+    // `.optional()` here is what keeps an omitted deploymentName reaching
+    // resolveDeploymentName as `undefined`, so it can fall through to modeDefault.
+    // Do not "fix" this by removing `.optional()`.
     deploymentName: deploymentNameSchema.optional(),
     contentRoot: contentRootSchema.default('content'),
     sourceRoot: sourceRootSchema.optional(),
@@ -109,6 +119,17 @@ export const CanopyConfigSchema = z
 export const DEFAULT_PROD_WORKSPACE = '/mnt/efs/workspace';
 // Note: `mode` has no default by design (SEC-C1) and is intentionally omitted here —
 // operatingModeSchema.parse(undefined) would throw.
+//
+// `deploymentName` is ALSO deliberately omitted here (checked every caller,
+// 2026-07-30: only packages/canopycms/src/services.ts reads from this return
+// value, and only `.remoteName`; nothing ever read `.deploymentName`). Unlike
+// the defaults below, deploymentName's real default is mode-dependent — 'prod'
+// for ProdStrategy, 'local' for DevStrategy (see
+// operating-mode/client-unsafe-strategy.ts's getSettingsBranchName, which
+// resolves it via resolveDeploymentName) — and this accessor has no mode to
+// select between them. Emitting `deploymentNameSchema.parse(undefined)`
+// ('prod') here would silently lie for dev mode; better to have no caller of
+// this than a mode-blind one.
 export const getConfigDefaults = () => ({
     baseBranch: defaultBaseBranchSchema.parse(undefined),
     remoteName: defaultRemoteNameSchema.parse(undefined),
@@ -116,7 +137,6 @@ export const getConfigDefaults = () => ({
     branchAccess: defaultBranchAccessSchema.parse(undefined),
     contentRoot: contentRootSchema.parse(undefined),
     githubTokenEnvVar: githubTokenEnvVarSchema.parse(undefined),
-    deploymentName: deploymentNameSchema.parse(undefined),
     prodWorkspace: DEFAULT_PROD_WORKSPACE,
 });
 //# sourceMappingURL=config.js.map

package/dist/config/schemas/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/schemas/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/schemas/config.ts"],"names":[],"mappings":"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"}