Merge branch 'master' into fix/security-postmessage-origin-and-slack-middleware

Author: harikakondur

.circleci/config.yml

@@ -36,7 +36,7 @@ commands:
       - run:
           name: Run allow-scripts (lifecycle scripts for whitelisted packages)
           command: |
-            for pkg in apps/bedrock-content-generator; do
+            for pkg in apps/bedrock-content-generator apps/ai-content-generator apps/vercel/frontend apps/graphql-playground; do
               if [ -f "$pkg/package.json" ] && grep -q '"allow-scripts"' "$pkg/package.json" && [ -d "$pkg/node_modules/@lavamoat/allow-scripts" ]; then
                 (cd "$pkg" && npm run allow-scripts)
               fi
@@ -124,6 +124,7 @@ jobs:
             REACT_APP_SLACK_CLIENT_ID=$SLACK_CLIENT_ID_TEST \
             VITE_GOOGLE_PICKER_API_KEY=$VITE_GOOGLE_PICKER_API_KEY \
             VITE_GOOGLE_APP_ID=$VITE_GOOGLE_APP_ID \
+            VITE_LD_CLIENT_ID='588a047044b03e0b3211298d' \
             NODE_ENV='staging' \
             npm run build
       - run:
@@ -135,6 +136,9 @@ jobs:
             VITE_ENV='test' \
             REACT_APP_BACKEND_BASE_URL=$BACKEND_BASE_URL_TEST \
             REACT_APP_SLACK_CLIENT_ID=$SLACK_CLIENT_ID_TEST \
+            VITE_GOOGLE_PICKER_API_KEY=$VITE_GOOGLE_PICKER_API_KEY \
+            VITE_GOOGLE_APP_ID=$VITE_GOOGLE_APP_ID \
+            VITE_LD_CLIENT_ID='588a047044b03e0b3211298d' \
             GOOGLE_DOCS_TEST_CLOUDFRONT_DIST_ID=$GOOGLE_DOCS_TEST_CLOUDFRONT_DIST_ID \
             STAGE='test' npm run deploy:test
       - run:
@@ -169,6 +173,7 @@ jobs:
             REACT_APP_SLACK_CLIENT_ID=$SLACK_CLIENT_ID_PROD \
             VITE_GOOGLE_PICKER_API_KEY=$VITE_GOOGLE_PICKER_API_KEY \
             VITE_GOOGLE_APP_ID=$VITE_GOOGLE_APP_ID \
+            VITE_LD_CLIENT_ID='588a047044b03e0b3211298e' \
             NODE_ENV='production' \
             npm run build
       - publish
@@ -180,6 +185,9 @@ jobs:
             STATIC_KLAVIYO_S3_BASE="s3://cf-apps-klaviyo/apps" \
             REACT_APP_BACKEND_BASE_URL=$APP_SLACK_BACKEND_BASE_URL_PROD \
             REACT_APP_SLACK_CLIENT_ID=$SLACK_CLIENT_ID_PROD \
+            VITE_GOOGLE_PICKER_API_KEY=$VITE_GOOGLE_PICKER_API_KEY \
+            VITE_GOOGLE_APP_ID=$VITE_GOOGLE_APP_ID \
+            VITE_LD_CLIENT_ID='588a047044b03e0b3211298e' \
             GOOGLE_DOCS_PROD_CLOUDFRONT_DIST_ID=$GOOGLE_DOCS_PROD_CLOUDFRONT_DIST_ID \
             STAGE='prd' npm run deploy
       - run:

.contentful/vault-secrets.yaml

@@ -1,8 +1,5 @@
 version: 1
 services:
-  github-action:
-    policies:
-      - dependabot
   circleci:
     policies:
       - semantic-release-ecosystem

.github/CODEOWNERS

@@ -1,11 +1,11 @@
 # team marketplace, extensibility, and 10 pines own all code in this repository by default
 
-* @contentful/team-extensibility @contentful/team-marketplace @contentful/team-10-pines
+* @contentful/group-applied-ai-solutions @contentful/team-10-pines
 
 # team tundra co-owns examples and function examples
 
-examples @contentful/team-extensibility @contentful/team-marketplace @contentful/team-10-pines
-function-examples @contentful/team-extensibility
+examples @contentful/group-applied-ai-solutions @contentful/team-10-pines
+function-examples @contentful/group-applied-ai-solutions
 
 # team entity-architecture co-owns delivery function examples
 
@@ -16,7 +16,7 @@ examples/native-external-references-mockshop @contentful/team-entity-architectur
 examples/native-external-references-tmdb @contentful/team-entity-architecture
 function-examples/external-references @contentful/team-entity-architecture
 
-# package.json and package-lock.json should be unowned so that dependabot can automatically update dependencies
+# package.json and package-lock.json should be unowned so that Renovate can automatically update dependencies
 
 **/package.json
-**/package-lock.json
+**/package-lock.json