Merge branch 'master' into chore/npm-audit-fix

Resolve conflicts by accepting master's deletion of Dashboard/package-lock.json
and StatusPage/package-lock.json.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.github/workflows/build.yml

@@ -10,29 +10,6 @@ on:
 
 jobs:
 
-  docker-build-accounts:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-      
-      # build image for accounts service
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Accounts/Dockerfile .
-
   docker-build-home:
     runs-on: ubuntu-latest
     env:
@@ -102,30 +79,6 @@ jobs:
           max_attempts: 3
           command: sudo docker build --no-cache -f ./Workflow/Dockerfile .
 
-  docker-build-docs:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-      
-      # build image for accounts service
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Docs/Dockerfile .
-
-
   docker-build-otel-collector:
     runs-on: ubuntu-latest
     env:
@@ -198,52 +151,6 @@ jobs:
           max_attempts: 3
           command: sudo docker build --no-cache -f ./E2E/Dockerfile .
 
-  docker-build-admin-dashboard:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-
-      # build image for home
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./AdminDashboard/Dockerfile .
-
-  docker-build-dashboard:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-
-      # build image for home
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./Dashboard/Dockerfile .
-
   docker-build-probe:
     runs-on: ubuntu-latest
     env:
@@ -290,29 +197,6 @@ jobs:
           max_attempts: 3
           command: sudo docker build --no-cache -f ./Telemetry/Dockerfile .
 
-  docker-build-status-page:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v4
-
-      - name: Preinstall 
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 10
-          max_attempts: 3
-          command: npm run prerun
-        
-      # build image for home
-      - name: build docker image
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 45
-          max_attempts: 3
-          command: sudo docker build --no-cache -f ./StatusPage/Dockerfile .
-
   docker-build-test-server:
     runs-on: ubuntu-latest
     env:

.github/workflows/compile.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd Accounts && npm install && npm run compile && npm run dep-check
+          command: cd App/FeatureSet/Accounts && npm install && npm run compile && npm run dep-check
 
   compile-common:
     runs-on: ubuntu-latest
@@ -111,23 +111,6 @@ jobs:
           max_attempts: 3
           command: cd Workflow && npm install && npm run compile && npm run dep-check
 
-  compile-docs-reference:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-      - run: cd Common && npm install
-      - name: Compile Docs Reference
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 30
-          max_attempts: 3
-          command: cd Docs && npm install && npm run compile && npm run dep-check
-
   compile-nginx:
     runs-on: ubuntu-latest
     env:
@@ -178,7 +161,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd AdminDashboard && npm install && npm run compile && npm run dep-check
+          command: cd App/FeatureSet/AdminDashboard && npm install && npm run compile && npm run dep-check
 
   compile-dashboard:
     runs-on: ubuntu-latest
@@ -196,7 +179,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd Dashboard && npm install && npm run compile && npm run dep-check
+          command: cd App/FeatureSet/Dashboard && npm install && npm run compile && npm run dep-check
 
 
   compile-e2e:
@@ -268,7 +251,7 @@ jobs:
         with:
           timeout_minutes: 30
           max_attempts: 3
-          command: cd StatusPage && npm install && npm run compile && npm run dep-check
+          command: cd App/FeatureSet/StatusPage && npm install && npm run compile && npm run dep-check
 
   compile-test-server:
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -493,74 +493,6 @@ jobs:
 
 
 
-  status-page-docker-image-deploy:
-    needs: [generate-build-number, read-version]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/status-page
-            ghcr.io/oneuptime/status-page
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=${{needs.read-version.outputs.major_minor}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy status-page.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image status-page \
-            --version "${{needs.read-version.outputs.major_minor}}" \
-            --dockerfile ./StatusPage/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}"
-
   test-docker-image-deploy:
     needs: [generate-build-number, read-version]
     runs-on: ubuntu-latest
@@ -766,143 +698,6 @@ jobs:
             --platforms linux/amd64,linux/arm64 \
             --git-sha "${{ github.sha }}"
 
-  admin-dashboard-docker-image-deploy:
-    needs: [generate-build-number, read-version]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/admin-dashboard
-            ghcr.io/oneuptime/admin-dashboard
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=${{needs.read-version.outputs.major_minor}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy admin-dashboard.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image admin-dashboard \
-            --version "${{needs.read-version.outputs.major_minor}}" \
-            --dockerfile ./AdminDashboard/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}"
-
-
-  dashboard-docker-image-deploy:
-    needs: [generate-build-number, read-version]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/dashboard
-            ghcr.io/oneuptime/dashboard
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=${{needs.read-version.outputs.major_minor}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy dashboard.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image dashboard \
-            --version "${{needs.read-version.outputs.major_minor}}" \
-            --dockerfile ./Dashboard/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}"
-
   app-docker-image-deploy:
     needs: [generate-build-number, read-version]
     runs-on: ubuntu-latest
@@ -972,74 +767,6 @@ jobs:
             --git-sha "${{ github.sha }}"
 
 
-  accounts-docker-image-deploy:
-    needs: [generate-build-number, read-version]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/accounts
-            ghcr.io/oneuptime/accounts
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=${{needs.read-version.outputs.major_minor}},pattern={{version}},enable=true
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-
-
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy accounts.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image accounts \
-            --version "${{needs.read-version.outputs.major_minor}}" \
-            --dockerfile ./Accounts/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}"
-
   ai-agent-docker-image-deploy:
     needs: [generate-build-number, read-version]
     runs-on: ubuntu-latest
@@ -1132,78 +859,6 @@ jobs:
       - name: Publish NPM Packages
         run: bash ./Scripts/NPM/PublishAllPackages.sh
 
-  
-  docs-docker-image-deploy:
-    needs: [generate-build-number, read-version]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/docs
-            ghcr.io/oneuptime/docs
-          tags: |
-            type=raw,value=release,enable=true
-            type=semver,value=${{needs.read-version.outputs.major_minor}},pattern={{version}},enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy nginx.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image docs \
-            --version "${{needs.read-version.outputs.major_minor}}" \
-            --dockerfile ./Docs/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}"
-
-
-
   worker-docker-image-deploy:
     needs: [generate-build-number, read-version]
     runs-on: ubuntu-latest
@@ -1416,16 +1071,11 @@ jobs:
       - home-docker-image-deploy
       - test-server-docker-image-deploy
       - otel-collector-docker-image-deploy
-      - status-page-docker-image-deploy
       - test-docker-image-deploy
       - telemetry-docker-image-deploy
       - probe-docker-image-deploy
-      - admin-dashboard-docker-image-deploy
-      - dashboard-docker-image-deploy
       - app-docker-image-deploy
-      - accounts-docker-image-deploy
       - ai-agent-docker-image-deploy
-      - docs-docker-image-deploy
       - worker-docker-image-deploy
       - workflow-docker-image-deploy
       - test-e2e-release-saas
@@ -1441,16 +1091,11 @@ jobs:
           "home",
           "test-server",
           "otel-collector",
-          "status-page",
           "test",
           "telemetry",
           "probe",
-          "admin-dashboard",
-          "dashboard",
           "app",
-          "accounts",
           "ai-agent",
-          "docs",
           "worker",
           "workflow"
         ]
@@ -1499,7 +1144,7 @@ jobs:
 
   test-e2e-release-saas:
     runs-on: ubuntu-latest
-    needs: [telemetry-docker-image-deploy, docs-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, ai-agent-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
+    needs: [telemetry-docker-image-deploy, workflow-docker-image-deploy, ai-agent-docker-image-deploy, app-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -1630,7 +1275,7 @@ jobs:
   test-e2e-release-self-hosted:
     runs-on: ubuntu-latest
     # After all the jobs runs
-    needs: [telemetry-docker-image-deploy, docs-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, ai-agent-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
+    needs: [telemetry-docker-image-deploy, workflow-docker-image-deploy, ai-agent-docker-image-deploy, app-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

.github/workflows/test-release.yaml

@@ -439,78 +439,6 @@ jobs:
 
 
 
-  status-page-docker-image-deploy:
-    needs: [read-version, generate-build-number]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/status-page
-            ghcr.io/oneuptime/status-page
-          tags: |
-            type=raw,value=test,enable=true
-            type=raw,value=${{needs.read-version.outputs.major_minor}}-test,enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy status-page.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image status-page \
-            --version "${{needs.read-version.outputs.major_minor}}-test" \
-            --dockerfile ./StatusPage/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}" \
-            --extra-tags test \
-            --extra-enterprise-tags enterprise-test
-
-
-
   test-docker-image-deploy:
     needs: [read-version, generate-build-number]
     runs-on: ubuntu-latest
@@ -722,146 +650,6 @@ jobs:
             --extra-tags test \
             --extra-enterprise-tags enterprise-test
 
-  dashboard-docker-image-deploy:
-    needs: [read-version, generate-build-number]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/dashboard
-            ghcr.io/oneuptime/dashboard
-          tags: |
-            type=raw,value=test,enable=true
-            type=raw,value=${{needs.read-version.outputs.major_minor}}-test,enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy dashboard.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image dashboard \
-            --version "${{needs.read-version.outputs.major_minor}}-test" \
-            --dockerfile ./Dashboard/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}" \
-            --extra-tags test \
-            --extra-enterprise-tags enterprise-test
-
-  admin-dashboard-docker-image-deploy:
-    needs: [read-version, generate-build-number]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/admin-dashboard
-            ghcr.io/oneuptime/admin-dashboard
-          tags: |
-            type=raw,value=test,enable=true
-            type=raw,value=${{needs.read-version.outputs.major_minor}}-test,enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy admin-dashboard.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image admin-dashboard \
-            --version "${{needs.read-version.outputs.major_minor}}-test" \
-            --dockerfile ./AdminDashboard/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}" \
-            --extra-tags test \
-            --extra-enterprise-tags enterprise-test
-
   app-docker-image-deploy:
     needs: [read-version, generate-build-number]
     runs-on: ubuntu-latest
@@ -935,76 +723,6 @@ jobs:
 
 
 
-  accounts-docker-image-deploy:
-    needs: [read-version, generate-build-number]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/accounts
-            ghcr.io/oneuptime/accounts
-          tags: |
-            type=raw,value=test,enable=true
-            type=raw,value=${{needs.read-version.outputs.major_minor}}-test,enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy accounts.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image accounts \
-            --version "${{needs.read-version.outputs.major_minor}}-test" \
-            --dockerfile ./Accounts/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}" \
-            --extra-tags test \
-            --extra-enterprise-tags enterprise-test
-
   ai-agent-docker-image-deploy:
     needs: [read-version, generate-build-number]
     runs-on: ubuntu-latest
@@ -1215,77 +933,6 @@ jobs:
             --extra-tags test \
             --extra-enterprise-tags enterprise-test
 
-
-  docs-docker-image-deploy:
-    needs: [read-version, generate-build-number]
-    runs-on: ubuntu-latest
-    env:
-      QEMU_CPU: max
-    steps:
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Docker Meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            oneuptime/docs
-            ghcr.io/oneuptime/docs
-          tags: |
-            type=raw,value=test,enable=true
-            type=raw,value=${{needs.read-version.outputs.major_minor}}-test,enable=true
-            
-
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref }}
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: latest
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          image: tonistiigi/binfmt:qemu-v10.0.4
-          
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Generate Dockerfile from Dockerfile.tpl
-        run: npm run prerun
-
-      # Build and deploy accounts.
-
-      - name: Login to Docker Hub
-        run: |
-          echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login --username "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-
-      - name: Login to GitHub Container Registry
-        run: |
-          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io --username "${{ github.repository_owner }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          bash ./Scripts/GHA/build_docker_images.sh \
-            --image docs \
-            --version "${{needs.read-version.outputs.major_minor}}-test" \
-            --dockerfile ./Docs/Dockerfile \
-            --context . \
-            --platforms linux/amd64,linux/arm64 \
-            --git-sha "${{ github.sha }}" \
-            --extra-tags test \
-            --extra-enterprise-tags enterprise-test
-
   publish-terraform-provider:
     runs-on: ubuntu-latest
     needs: [read-version, generate-build-number]
@@ -1302,7 +949,7 @@ jobs:
 
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [infrastructure-agent-deploy, publish-terraform-provider, telemetry-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy, workflow-docker-image-deploy, home-docker-image-deploy, test-server-docker-image-deploy, test-docker-image-deploy, probe-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, ai-agent-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy]
+    needs: [infrastructure-agent-deploy, publish-terraform-provider, telemetry-docker-image-deploy, worker-docker-image-deploy, workflow-docker-image-deploy, home-docker-image-deploy, test-server-docker-image-deploy, test-docker-image-deploy, probe-docker-image-deploy, app-docker-image-deploy, ai-agent-docker-image-deploy, otel-collector-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:

.gitignore

@@ -65,7 +65,7 @@ secret.env
 
 # This file is autogenerated from the template
 */.env
-*/Dockerfile
+**/Dockerfile
 config.env
 config.env.tmp
 config.env.temp
@@ -127,6 +127,7 @@ MCP/build/
 MCP/.env
 MCP/node_modules 
 Dashboard/public/sw.js
+App/Dashboard/public/sw.js
 .claude/settings.local.json
 Common/.claude/settings.local.json
 E2E/Terraform/e2e-tests/test-env.sh

Accounts/Dockerfile.tpl

@@ -1,93 +0,0 @@
-#
-# Accounts Dockerfile
-#
-
-# Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
-RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
-
-RUN npm config set fetch-retries 5
-RUN npm config set fetch-retry-mintimeout 20000
-RUN npm config set fetch-retry-maxtimeout 60000
-
-
-
-ARG GIT_SHA
-ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false
-
-ENV GIT_SHA=${GIT_SHA}
-ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-
-
-# IF APP_VERSION is not set, set it to 1.0.0
-RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
-
-
-# Install bash. 
-RUN apk add bash && apk add curl
-
-#Use bash shell by default
-SHELL ["/bin/bash", "-c"]
-
-
-RUN mkdir /usr/src
-
-WORKDIR /usr/src/Common
-COPY ./Common/package*.json /usr/src/Common/
-# Set version in ./Common/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
-RUN npm install
-COPY ./Common /usr/src/Common
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ENV PRODUCTION=true
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-
-WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY ./Accounts/package*.json /usr/src/app/
-RUN npm install  
-
-# Expose ports.
-#   - 3003:  accounts
-EXPOSE 3003
-
-
-
-{{ if eq .Env.ENVIRONMENT "development" }}
-
-
-
-#Run the app
-CMD [ "npm", "run", "dev" ]
-{{ else }}
-# Copy app source
-COPY ./Accounts /usr/src/app
-# Bundle app source
-
-RUN npm run build
-# Set permission to write logs and cache in case container run as non root
-RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
-#Run the app
-CMD [ "npm", "start" ]
-{{ end }}

AdminDashboard/Dockerfile.tpl

@@ -1,89 +0,0 @@
-#
-# AdminDashboard Dockerfile
-#
-
-# Pull base image nodejs image.
-FROM public.ecr.aws/docker/library/node:24.9-alpine3.21
-RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
-
-RUN npm config set fetch-retries 5
-RUN npm config set fetch-retry-mintimeout 20000
-RUN npm config set fetch-retry-maxtimeout 60000
-
-
-
-ARG GIT_SHA
-ARG APP_VERSION
-ARG IS_ENTERPRISE_EDITION=false
-
-ENV GIT_SHA=${GIT_SHA}
-ENV APP_VERSION=${APP_VERSION}
-ENV IS_ENTERPRISE_EDITION=${IS_ENTERPRISE_EDITION}
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-
-
-# IF APP_VERSION is not set, set it to 1.0.0
-RUN if [ -z "$APP_VERSION" ]; then export APP_VERSION=1.0.0; fi
-
-
-# Install bash. 
-RUN apk add bash && apk add curl
-
-#Use bash shell by default
-SHELL ["/bin/bash", "-c"]
-
-
-RUN mkdir /usr/src
-
-WORKDIR /usr/src/Common
-COPY ./Common/package*.json /usr/src/Common/
-# Set version in ./Common/package.json to the APP_VERSION
-RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/Common/package.json
-RUN npm install
-COPY ./Common /usr/src/Common
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ENV PRODUCTION=true
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-
-WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY ./AdminDashboard/package*.json /usr/src/app/
-RUN npm install  
-
-# Expose ports.
-#   - 3158:  AdminDashboard
-EXPOSE 3158
-
-
-
-{{ if eq .Env.ENVIRONMENT "development" }}
-#Run the app
-
-
-CMD [ "npm", "run", "dev" ]
-{{ else }}
-# Copy app source
-COPY ./AdminDashboard /usr/src/app
-# Bundle app source
-RUN npm run build
-# Set permission to write logs and cache in case container run as non root
-RUN chown -R 1000:1000 "/tmp/npm" && chmod -R 2777 "/tmp/npm"
-#Run the app
-CMD [ "npm", "start" ]
-{{ end }}

App/Dockerfile.tpl

@@ -56,6 +56,24 @@ COPY ./App/package*.json /usr/src/app/
 RUN sed -i "s/\"version\": \".*\"/\"version\": \"$APP_VERSION\"/g" /usr/src/app/package.json
 RUN npm install
 
+WORKDIR /usr/src/app/FeatureSet/Accounts
+COPY ./App/FeatureSet/Accounts/package*.json /usr/src/app/FeatureSet/Accounts/
+RUN npm install
+
+WORKDIR /usr/src/app/FeatureSet/Dashboard
+COPY ./App/FeatureSet/Dashboard/package*.json /usr/src/app/FeatureSet/Dashboard/
+RUN npm install
+
+WORKDIR /usr/src/app/FeatureSet/AdminDashboard
+COPY ./App/FeatureSet/AdminDashboard/package*.json /usr/src/app/FeatureSet/AdminDashboard/
+RUN npm install
+
+WORKDIR /usr/src/app/FeatureSet/StatusPage
+COPY ./App/FeatureSet/StatusPage/package*.json /usr/src/app/FeatureSet/StatusPage/
+RUN npm install
+
+WORKDIR /usr/src/app
+
 # Expose ports.
 #   - 3002: OneUptime-backend
 EXPOSE 3002
@@ -66,6 +84,13 @@ CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
 COPY ./App /usr/src/app
+# Copy frontend sources
+COPY ./App/FeatureSet/Accounts /usr/src/app/FeatureSet/Accounts
+COPY ./App/FeatureSet/Dashboard /usr/src/app/FeatureSet/Dashboard
+COPY ./App/FeatureSet/AdminDashboard /usr/src/app/FeatureSet/AdminDashboard
+COPY ./App/FeatureSet/StatusPage /usr/src/app/FeatureSet/StatusPage
+# Bundle frontend source
+RUN npm run build-frontends:prod
 # Bundle app source
 RUN npm run compile
 # Set permission to write logs and cache in case container run as non root