Merge remote-tracking branch 'origin/main' into docker

vivid-planet · Dec 2, 2024 · f3a7074 · f3a7074
2 parents 0e9e3a8 + 68f4588
commit f3a7074
Show file tree

Hide file tree

Showing 60 changed files with 9,898 additions and 8,367 deletions.
diff --git a/.digitalocean/comet-starter-cms.tpl.yaml b/.digitalocean/comet-starter-cms.tpl.yaml
@@ -44,7 +44,7 @@ services:
       - key: POSTGRESQL_PASSWORD
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:VJWKcWvicy4ClCPNzpPOSwiZB0p8/gZq:SZK9hwGdXBqcCEApIdFWuSLWS//rvY/VEfyJ2WWwM/agjP+BLUOiew==]
+        value: ${POSTGRESQL_PASSWORD}
       - key: POSTGRESQL_USER
         scope: RUN_AND_BUILD_TIME
         value: starter
@@ -60,18 +60,18 @@ services:
       - key: IMGPROXY_SALT
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:DpbiOlcKj5C5taV+27VGP0Wc2GFFu0Cu:I8RNxsSOqaGk12doCtjeIT9hUNWTM6rAr7kMX6X+JlE4VyYH5kd1XFZ9SozGmADqFKEkI//BIJQ00XAq6dkXr6amsH7AtVJSxkl4WjBBs24sW/jnSIjebEYDq4n9oQbptdhrQcNwTYaAy/VZm1KzgzxdXaQHDsLmbtYWXLKUue/VldiCajnRExZjiTdk/x8Y]
+        value: ${IMGPROXY_SALT}
       - key: IMGPROXY_URL
         scope: RUN_AND_BUILD_TIME
         value: https://comet-starter-imgproxy-ovgzu.ondigitalocean.app
       - key: IMGPROXY_KEY
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:wD77N9Aop33RXd8qv/pUCyIyItqY877u:DeExUMZXlI96dabfE09kuc/Kj54FZmVrjuTb2VMLajK1B+fxuNIHecelUdFX1wo1lrYm+jRFBotC8nWh4uhEYfC4KVS6QdjeKIXAxhuZ7cGI848/VAzkWKoEgYoSUYTXNTbpETptNFWQ1XFzJxDKZiYFaW8LmknvxUixuaxULsobxjFhH/S+fTlHt6j9DN9K]
+        value: ${IMGPROXY_KEY}
       - key: DAM_SECRET
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:cN8JQAPIBnJqXpO8RGBqx9tvzArnSMFz:tQ2EW+BE5XWg2rPUvXqCjbXKNxIYLRGLdsAKk+CVhaDRWhc=]
+        value: ${DAM_SECRET}
       - key: BLOB_STORAGE_DRIVER
         scope: RUN_AND_BUILD_TIME
         value: s3
@@ -90,11 +90,11 @@ services:
       - key: S3_ACCESS_KEY_ID
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:MoPtts0J/3qbPVcLpNbJDQncPsvQBWmG:sseL7FpcEps7IV5v/uqBctUwp+tSMBAzJl3XkZjMCLZ69PUt]
+        value: ${S3_ACCESS_KEY_ID}
       - key: S3_SECRET_ACCESS_KEY
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:GNjlve0WqXUtZr2TVaxvI9UTcv6a0Mta:zK4fpoWTpwDHO6MfYEWLoOsw3Kq3W3N9FvGAIuHRc1I6FF6zeZOULOIxzOXgLJPb6xIIiUKB8dAOu7Y=]
+        value: ${S3_SECRET_ACCESS_KEY}
       - key: POSTGRESQL_CA_CERT
         scope: RUN_AND_BUILD_TIME
         value: |-
@@ -135,7 +135,7 @@ services:
       - key: BASIC_AUTH_SYSTEM_USER_PASSWORD
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:RRBCV3yOi07TjXxGcad36RGJAJ2DnHbw:mmzqyMwl9gtfoiNigjj/0GrZTduEp6LtgJKV/5a3geMwKSk=]
+        value: ${API_BASIC_AUTH_SYSTEM_USER_PASSWORD}
       - key: IDP_CLIENT_ID
         scope: RUN_AND_BUILD_TIME
         value: 59e44de5-0431-4413-b50b-7e52740a6d7b
@@ -151,6 +151,10 @@ services:
       - key: ACL_ALL_PERMISSIONS_DOMAINS
         scope: RUN_AND_BUILD_TIME
         value: "vivid-planet.com"
+      - key: SITE_PREVIEW_SECRET
+        scope: RUN_AND_BUILD_TIME
+        type: SECRET
+        value: ${SITE_PREVIEW_SECRET}
     github:
       branch: main
       deploy_on_push: false
@@ -204,14 +208,14 @@ services:
       - key: OAUTH2_PROXY_CLIENT_SECRET
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:uQi0YzdSCPn4w2obTTkdFOiUmYC0onNR:NEwKBNspvye4T0NkL6QpCP5PiTduvpyfnF/JjvKbX8Aec0s=]
+        value: ${OAUTH2_PROXY_CLIENT_SECRET}
       - key: OAUTH2_PROXY_CLIENT_ID
         scope: RUN_AND_BUILD_TIME
         value: 59e44de5-0431-4413-b50b-7e52740a6d7b
       - key: OAUTH2_PROXY_COOKIE_SECRET
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:nG0XBGrISwLqRYdFFELwYeszfQ0vMCjC:XBISzF+YWffV1LA25rTvp4v6iLhjVL4a3VGkd2v7Iiw=]
+        value: ${OAUTH2_PROXY_COOKIE_SECRET}
       - key: OAUTH2_PROXY_PROVIDER
         scope: RUN_AND_BUILD_TIME
         value: oidc
@@ -266,7 +270,7 @@ services:
         value: "{{ site://configs/public/dev }}"
       - key: PREVIEW_URL
         scope: RUN_AND_BUILD_TIME
-        value: https://comet-starter-site-preview-jespg.ondigitalocean.app # TODO
+        value: https://comet-starter-site-preview-jespg.ondigitalocean.app
     github:
       branch: main
       deploy_on_push: false
@@ -275,5 +279,5 @@ services:
     instance_count: 1
     instance_size_slug: apps-s-1vcpu-0.5gb
     name: admin
-    run_command: npm run serve
+    run_command: cd server && npm i && node server.js # Workaround for missing node_modules in cache (only parent node_mdoules are cached)
     source_dir: admin
diff --git a/.digitalocean/comet-starter-imgproxy.yaml b/.digitalocean/comet-starter-imgproxy.yaml
@@ -17,11 +17,11 @@ services:
       - key: IMGPROXY_KEY
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:caLHr/u1NkMWvW8NG5nn0+JvpBW+NMNu:yhmQi6RpvAt58666wyk3IzIMFg7ALTeIhruXpPFabcQgSkmAaBXzj08oAYuhv6u0tnWabUIHDkvzyY0CnoYpHD3vE1R5tWLUQwOoEgzGKHqiO7f5zdeuTzFUxG7ctCFfsXedzL2e4R7+u3FmLox0woPk0DhbiYiA8+qSNnVEKWMXJTkAkfQkwdtovgskqdz5]
+        value: ${IMGPROXY_KEY}
       - key: IMGPROXY_SALT
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:yCE1f0mZPV+uFFs96/SmFsbvWXH3pfDn:1dt+Waq2vALvR7qXaC3Lh2VONtDjgmBzSuPyn+6kpk3DN9xzmbSPhV3G1pCZ+NRA16TOL3jhfiIgWD4QbCAs5y2JM2EOcptDQKpuQ6YYGvB9Gb2dBgrJS7WG5pKqSIuI3g+YKKa/ns5HWzH/CdIsieVdvmlb4PFasdhdCIMOHCIhwNONChz0yIO7XsV8vLJl]
+        value: ${IMGPROXY_SALT}
       - key: IMGPROXY_USE_S3
         scope: RUN_AND_BUILD_TIME
         value: "true"
@@ -34,11 +34,11 @@ services:
       - key: AWS_ACCESS_KEY_ID
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:utFAK7Ej0e07tb6cQhWCCLlRUSKJy6DU:rGoIItdercf5JSs2oSEanA11liimnDjdLxwmhcBjO9UCeHaM]
+        value: ${S3_ACCESS_KEY_ID}
       - key: AWS_SECRET_ACCESS_KEY
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:xupjwXwlpZv8VeQyLx9nKJTrw1BipI3a:Lkws9OWy+b5a20BNHCHiFv8H2M99aYNirhY+eGBZsCoUkLvCYoJvKDaVpHLz7N+CCC3Hfgycd4Ix008=]
+        value: ${S3_SECRET_ACCESS_KEY}
     http_port: 8080
     image:
       registry: darthsim

diff --git a/.digitalocean/comet-starter-site-main.tpl.yaml b/.digitalocean/comet-starter-site-main.tpl.yaml
@@ -38,14 +38,14 @@ services:
       - key: SITE_PREVIEW_SECRET
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:/Nf0VXO5XP5SJY9Y/JAFyZttB4Z1B6po:xL4pWQaF02cU4y1QCahqXdvD94A+QOJxXVVGDea4TYFVPQ==]
+        value: ${SITE_PREVIEW_SECRET}
       - key: PUBLIC_SITE_CONFIGS
         scope: RUN_AND_BUILD_TIME
         value: "{{ site://configs/public/dev }}"
       - key: API_BASIC_AUTH_SYSTEM_USER_PASSWORD
         scope: RUN_AND_BUILD_TIME
         type: SECRET
-        value: EV[1:qkU44a+IP3BfIT4YvfGdrOj505b+mdu2:aD7wKJCkMvTng/HGtOjuXg2QjP2KGUn8FHghsVmZpptr4JA=]
+        value: ${API_BASIC_AUTH_SYSTEM_USER_PASSWORD}
     github:
       branch: main
       deploy_on_push: false

diff --git a/.digitalocean/deploy.sh b/.digitalocean/deploy.sh
@@ -6,10 +6,10 @@ doctl apps update <imgproxy-app-id> --spec .digitalocean/comet-starter-imgproxy.
 
 sed -i '' 's/dev\.comet\-dxp\.com/comet-starter-site-tyqqf.ondigitalocean.app/g' site-configs/main.ts
 
-APP_ENV=dev npx -y @comet/cli inject-site-configs -f ../../../../../site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
+APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
 doctl apps update <cms-app-id> --spec .digitalocean/comet-starter-cms.yaml # configuration changes
 doctl apps create-deployment xxxx # code changes
 
-APP_ENV=dev npx -y @comet/cli inject-site-configs -f ../../../../../site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
+APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
 doctl apps update <site-main-app-id> --spec .digitalocean/comet-starter-site-main.yaml # configuration changes
 doctl apps create-deployment yyyy # code changes
diff --git a/.env b/.env
@@ -69,3 +69,5 @@ REDIS_ENABLED=false # activate redis service in docker-compose.yml if set to tru
 REDIS_PORT=6379
 REDIS_HOST=localhost
 REDIS_PASSWORD=vivid
+
+SITE_PREVIEW_SECRET=5b67e073dbc2434e
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -8,6 +8,10 @@ reviewers:
   - johnnyomair
   - nsams
   - thomasdax98
+  - manuelblum
 
 skipKeywords:
   - Merge main into next
+
+skipUsers:
+  - renovate[bot]
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -49,10 +49,10 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: "site/lang/starter-lang"
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
           registry-url: "https://registry.npmjs.org"

diff --git a/.github/workflows/publish-create-app.yml b/.github/workflows/publish-create-app.yml
@@ -25,10 +25,10 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
           cache-dependency-path: "create-app/package-lock.json"
           registry-url: "https://registry.npmjs.org"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,10 +28,10 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
           cache-dependency-path: "**/package-lock.json"
           registry-url: "https://registry.npmjs.org"
@@ -46,7 +46,7 @@ jobs:
         run: npm run test:ci
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: test-results

diff --git a/.github/workflows/update-digital-ocean-deployment.yml b/.github/workflows/update-digital-ocean-deployment.yml
@@ -11,22 +11,27 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js 22.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Install dependencies
         run: npm install
 
       - name: Inject Site Configurations
         run: |
           sed -i 's/dev\.comet\-dxp\.com/comet-starter-site-tyqqf.ondigitalocean.app/g' site-configs/main.ts
-          APP_ENV=dev npx -y @comet/cli inject-site-configs -f ../../../../../site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
-          APP_ENV=dev npx -y @comet/cli inject-site-configs -f ../../../../../site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
+          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-cms.tpl.yaml -o .digitalocean/comet-starter-cms.yaml
+          APP_ENV=dev npx -y @comet/cli inject-site-configs -f site-configs/site-configs.ts -i .digitalocean/comet-starter-site-main.tpl.yaml -o .digitalocean/comet-starter-site-main.yaml
 
       - name: Update DigitalOcean comet-starter-imgproxy Deployment
         uses: digitalocean/app_action/deploy@v2
+        env:
+          IMGPROXY_KEY: ${{ secrets.IMGPROXY_KEY }}
+          IMGPROXY_SALT: ${{ secrets.IMGPROXY_SALT }}
+          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
         with:
           token: ${{ secrets.DIGITALOCEAN_API_KEY }}
           print_deploy_logs: true
@@ -35,6 +40,17 @@ jobs:
 
       - name: Update DigitalOcean comet-starter-cms Deployment
         uses: digitalocean/app_action/deploy@v2
+        env:
+          POSTGRESQL_PASSWORD: ${{ secrets.POSTGRESQL_PASSWORD }}
+          IMGPROXY_SALT: ${{ secrets.IMGPROXY_SALT }}
+          IMGPROXY_KEY: ${{ secrets.IMGPROXY_KEY }}
+          DAM_SECRET: ${{ secrets.DAM_SECRET }}
+          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
+          API_BASIC_AUTH_SYSTEM_USER_PASSWORD: ${{ secrets.API_BASIC_AUTH_SYSTEM_USER_PASSWORD }}
+          OAUTH2_PROXY_CLIENT_SECRET: ${{ secrets.OAUTH2_PROXY_CLIENT_SECRET }}
+          OAUTH2_PROXY_COOKIE_SECRET: ${{ secrets.OAUTH2_PROXY_COOKIE_SECRET }}
+          SITE_PREVIEW_SECRET: ${{ secrets.SITE_PREVIEW_SECRET }}
         with:
           token: ${{ secrets.DIGITALOCEAN_API_KEY }}
           print_deploy_logs: true
@@ -43,6 +59,9 @@ jobs:
 
       - name: Update DigitalOcean comet-starter-site-main Deployment
         uses: digitalocean/app_action/deploy@v2
+        env:
+          SITE_PREVIEW_SECRET: ${{ secrets.SITE_PREVIEW_SECRET }}
+          API_BASIC_AUTH_SYSTEM_USER_PASSWORD: ${{ secrets.API_BASIC_AUTH_SYSTEM_USER_PASSWORD }}
         with:
           token: ${{ secrets.DIGITALOCEAN_API_KEY }}
           print_deploy_logs: true

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20
+22
diff --git a/README.md b/README.md
@@ -34,3 +34,6 @@ In use by `@comet/create-app` to create new Comet DXP projects. Find more inform
 
     // import fixtures
     npm run --prefix api fixtures
+
+    // start repl
+    npm run --prefix api repl
diff --git a/admin/cspell.config.yaml b/admin/cspell.config.yaml