Merge pull request #3270 from tloncorp/develop

Staging to develop
tloncorp · Feb 21, 2024 · ea61efb · ea61efb
2 parents 3063494 + 840dddb
commit ea61efb
Show file tree

Hide file tree

Showing 1,103 changed files with 69,854 additions and 42,005 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,40 +5,40 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.0
+        uses: actions/checkout@v4
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3.1.1
+        uses: actions/setup-node@v4
         with:
-          node-version-file: ./ui/.nvmrc
+          node-version-file: .nvmrc
 
       - name: Install Dependencies
         run: npm ci
-        working-directory: ./ui
 
       - name: Run Lint
-        run: npm run lint
-        working-directory: ./ui
+        run: npm run lint --workspaces --if-present
+
+      - name: Check Types
+        run: npm run tsc --workspaces --if-present
 
       - name: Run Tests
-        run: npm run test -- run
-        working-directory: ./ui
+        run: npm run test --workspaces --if-present -- run
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
-        working-directory: ./ui
+        working-directory: ./apps/tlon-web
 
       - name: Run E2E Tests for Groups
         run: npm run e2e
-        working-directory: ./ui
+        working-directory: ./apps/tlon-web
 
       - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: playwright-report
-          path: ./ui/playwright-report/
+          path: ./apps/tlon-web/playwright-report/
           retention-days: 30
 
       - name: Build
         run: npm run build
-        working-directory: ./ui
+        working-directory: ./apps/tlon-web
diff --git a/.github/workflows/deploy-canary-talk.yml b/.github/workflows/deploy-canary-talk.yml
diff --git a/.github/workflows/deploy-canary-groups.yml → .github/workflows/deploy-canary.yml b/.github/workflows/deploy-canary-groups.yml → .github/workflows/deploy-canary.yml
@@ -22,15 +22,15 @@ jobs:
           ref: ${{ env.tag }}
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./ui/.nvmrc
-      - working-directory: ./ui
+          node-version-file: .nvmrc
+      - working-directory: ./apps/tlon-web
         run: |
           npm ci
           npm run build
       - uses: actions/upload-artifact@v3
         with:
           name: 'ui-dist'
-          path:  ui/dist
+          path:  apps/tlon-web/dist
   glob:
     runs-on: ubuntu-latest
     name: 'Make a glob'
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/download-artifact@v3
         with:
           name: 'ui-dist'
-          path: ui/dist
+          path: apps/tlon-web/dist
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'
         with:
@@ -52,7 +52,7 @@ jobs:
       - name: 'glob'
         uses: ./.github/actions/glob
         with:
-          folder: 'ui/dist/*'
+          folder: 'apps/tlon-web/dist/*'
           docket: 'desk/desk.docket-0'
       - name: Commit and Push Glob
         run: |

diff --git a/.github/workflows/deploy-external-groups.yml → .github/workflows/deploy-external.yml b/.github/workflows/deploy-external-groups.yml → .github/workflows/deploy-external.yml
diff --git a/.github/workflows/deploy-internal-groups.yml → .github/workflows/deploy-internal.yml b/.github/workflows/deploy-internal-groups.yml → .github/workflows/deploy-internal.yml
diff --git a/.github/workflows/deploy-kernel-talk.yml b/.github/workflows/deploy-kernel-talk.yml
diff --git a/.github/workflows/deploy-kernel-groups.yml → .github/workflows/deploy-kernel.yml b/.github/workflows/deploy-kernel-groups.yml → .github/workflows/deploy-kernel.yml
diff --git a/.github/workflows/deploy-livenet-groups.yml → .github/workflows/deploy-livenet.yml b/.github/workflows/deploy-livenet-groups.yml → .github/workflows/deploy-livenet.yml
diff --git a/.github/workflows/deploy-talk.yml b/.github/workflows/deploy-talk.yml
@@ -7,51 +7,48 @@ on:
         required: false
         default: develop
         description: Enter the tag to deploy
-  push:
-    branches:
-      - 'develop'
 jobs:
   build-frontend:
     runs-on: ubuntu-latest
-    name: 'Build Frontend'
+    name: "Build Frontend"
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./ui/.nvmrc
-      - working-directory: ./ui
-        run: |
-          npm ci
-          npm run build:chat
+          node-version-file: .nvmrc
+      - name: Install Dependencies
+        run: npm ci
+      - working-directory: ./apps/tlon-web
+        run: npm run build:chat
       - uses: actions/upload-artifact@v3
         with:
-          name: 'ui-dist'
-          path:  ui/dist
+          name: "ui-dist"
+          path: apps/tlon-web/dist
   glob:
     runs-on: ubuntu-latest
-    name: 'Make a glob'
+    name: "Make a glob"
     needs: build-frontend
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.tag }}
       - uses: actions/download-artifact@v3
         with:
-          name: 'ui-dist'
-          path: ui/dist
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v1'
+          name: "ui-dist"
+          path: apps/tlon-web/dist
+      - id: "auth"
+        uses: "google-github-actions/auth@v1"
         with:
-          credentials_json: '${{ secrets.GCP_SERVICE_KEY }}'
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
-      - name: 'glob'
+          credentials_json: "${{ secrets.GCP_SERVICE_KEY }}"
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
+      - name: "glob"
         uses: ./.github/actions/glob
         with:
-          folder: 'ui/dist/*'
-          docket: 'talk/desk.docket-0'
+          folder: "apps/tlon-web/dist/*"
+          docket: "talk/desk.docket-0"
       - name: Commit and Push Glob
         run: |
           git config --global user.name github-actions
@@ -71,16 +68,15 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.tag }}
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v1'
+      - id: "auth"
+        uses: "google-github-actions/auth@v1"
         with:
-          credentials_json: '${{ secrets.GCP_SERVICE_KEY }}'
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
+          credentials_json: "${{ secrets.GCP_SERVICE_KEY }}"
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
       - id: deploy
         name: Deploy
-        run:
-          ./.github/helpers/deploy.sh tloncorp/landscape-apps talk wannec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ github.event.inputs.tag }}
+        run: ./.github/helpers/deploy.sh tloncorp/landscape-apps talk wannec-dozzod-marnus us-central1-a mainnet-tlon-other-2d ${{ github.event.inputs.tag }}
         env:
           SSH_SEC_KEY: ${{ secrets.GCP_SSH_SEC_KEY }}
           SSH_PUB_KEY: ${{ secrets.GCP_SSH_PUB_KEY }}

diff --git a/.github/workflows/deploy-groups.yml → .github/workflows/deploy.yml b/.github/workflows/deploy-groups.yml → .github/workflows/deploy.yml
@@ -9,51 +9,51 @@ on:
         description: Enter the tag to deploy
   push:
     branches:
-      - 'develop'
-env: 
+      - "develop"
+env:
   tag: ${{ github.event.inputs.tag || 'develop' }}
 jobs:
   build-frontend:
     runs-on: ubuntu-latest
-    name: 'Build Frontend'
+    name: "Build Frontend"
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ env.tag }}
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./ui/.nvmrc
-      - working-directory: ./ui
-        run: |
-          npm ci
-          npm run build
+          node-version-file: .nvmrc
+      - name: Install Dependencies
+        run: npm ci
+      - working-directory: ./apps/tlon-web
+        run: npm run build
       - uses: actions/upload-artifact@v3
         with:
-          name: 'ui-dist'
-          path:  ui/dist
+          name: "ui-dist"
+          path: apps/tlon-web/dist
   glob:
     runs-on: ubuntu-latest
-    name: 'Make a glob'
+    name: "Make a glob"
     needs: build-frontend
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ env.tag }}
       - uses: actions/download-artifact@v3
         with:
-          name: 'ui-dist'
-          path: ui/dist
-      - id: 'auth'
-        uses: 'google-github-actions/auth@v1'
+          name: "ui-dist"
+          path: apps/tlon-web/dist
+      - id: "auth"
+        uses: "google-github-actions/auth@v1"
         with:
-          credentials_json: '${{ secrets.GCP_SERVICE_KEY }}'
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
-      - name: 'glob'
+          credentials_json: "${{ secrets.GCP_SERVICE_KEY }}"
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
+      - name: "glob"
         uses: ./.github/actions/glob
         with:
-          folder: 'ui/dist/*'
-          docket: 'desk/desk.docket-0'
+          folder: "apps/tlon-web/dist/*"
+          docket: "desk/desk.docket-0"
       - name: Commit and Push Glob
         run: |
           git config --global user.name github-actions
@@ -75,9 +75,9 @@ jobs:
       - id: 'auth'
         uses: 'google-github-actions/auth@v1'
         with:
-          credentials_json: '${{ secrets.GCP_SERVICE_KEY }}'
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
+          credentials_json: "${{ secrets.GCP_SERVICE_KEY }}"
+      - name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v1"
       - id: deploy
         name: Deploy
         run: