Merge "Link SP to Audius Profile" feature branch to main (#7298)

Co-authored-by: Nikki Kang <kangaroo233@gmail.com> Co-authored-by: Theo Ilie <theoilie.ti@gmail.com> Co-authored-by: Michelle Brier <michelle.brier4@gmail.com> Co-authored-by: Raymond Jacobson <ray@audius.co> Co-authored-by: audius-infra <audius-infra@audius.co> Co-authored-by: Andrew Mendelsohn <andrew.j.mendelsohn@gmail.com> Co-authored-by: Steve Perkins <steve@audius.co> Co-authored-by: Dylan Jeffers <dylan@audius.co> Co-authored-by: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com> Co-authored-by: isaac <isaac@audius.co> Co-authored-by: Kyle Shanks <kyle.j.shanks@gmail.com> Co-authored-by: sliptype <sliptype@gmail.com>
AudiusProject · Jan 25, 2024 · 3540e14 · 3540e14
1 parent c49b8fc
commit 3540e14
Show file tree

Hide file tree

Showing 53 changed files with 9,927 additions and 22,510 deletions.
diff --git a/.circleci/src/jobs/@protocol-dashboard-jobs.yml b/.circleci/src/jobs/@protocol-dashboard-jobs.yml
@@ -1,49 +1,42 @@
 protocol-dashboard-init:
   working_directory: ~/audius-protocol
   docker:
-    - image: cimg/ruby:2.6-node
+    - image: cimg/node:18.17
 
   steps:
     - checkout
+    - attach_workspace:
+        at: ./
 
-    - run: echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > protocol-dashboard/.npmrc
+    - create_concatenated_patch_file:
+        filename: combined-patch-file.txt
 
     # Download and cache dependencies
     - restore_cache:
         keys:
-          - dependency-cache-{{ checksum "protocol-dashboard/package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - dependency-cache-
-
-    - run:
-        name: npm ci
-        command: |
-          cd protocol-dashboard
-          npm ci
-
-    - save_cache:
-        key: dependency-cache-{{ checksum "protocol-dashboard/package.json" }}
-        paths:
-          - protocol-dashboard/node_modules
+          - cache-{{ checksum "package-lock.json" }}-{{ checksum "combined-patch-file.txt" }}
 
     # Lint
     - run:
         name: lint
         command: |
           cd protocol-dashboard
-          npm run lint
+          npx turbo run verify --filter=audius-protocol-dashboard
 
     # Persist node modules
     - persist_to_workspace:
         root: ./
         paths:
-          - protocol-dashboard/node_modules
+          - node_modules
+          - packages/harmony/node_modules
+          - packages/common/node_modules
+          - packages/libs/node_modules
 
 protocol-dashboard-build-staging:
   working_directory: ~/audius-protocol
   resource_class: xlarge
   docker:
-    - image: cimg/ruby:2.6-node
+    - image: cimg/node:18.17
   steps:
     - checkout
     - attach_workspace:
@@ -52,6 +45,7 @@ protocol-dashboard-build-staging:
         name: build
         command: |
           cd protocol-dashboard
+          npm install dotenv@16.3.1
           npm run build:stage
     - run:
         name: armada bundle
@@ -104,7 +98,7 @@ protocol-dashboard-deploy-staging:
 protocol-dashboard-build-prod:
   working_directory: ~/audius-protocol
   docker:
-    - image: cimg/ruby:2.6-node
+    - image: cimg/node:18.17
   resource_class: xlarge
   steps:
     - checkout
@@ -114,6 +108,7 @@ protocol-dashboard-build-prod:
         name: build
         command: |
           cd protocol-dashboard
+          npm install dotenv@16.3.1
           npm run build:prod
     - run:
         name: zip dist

diff --git a/.circleci/src/workflows/protocol-dashboard.yml b/.circleci/src/workflows/protocol-dashboard.yml
@@ -1,7 +1,11 @@
 when: << pipeline.parameters.run-protocol-dashboard-workflow >>
 jobs:
-  - protocol-dashboard-init
+  - protocol-dashboard-init:
+      context:
+        - Vercel
   - protocol-dashboard-build-staging:
+      context:
+        - Vercel
       requires:
         - protocol-dashboard-init
   - protocol-dashboard-pin-staging:
@@ -21,6 +25,8 @@ jobs:
         branches:
           only: /^main$/
   - protocol-dashboard-build-prod:
+      context:
+        - Vercel
       requires:
         - protocol-dashboard-init
   - protocol-dashboard-hold-deploy-prod:

diff --git a/dev-tools/compose/docker-compose.protocol-dashboard.dev.yml b/dev-tools/compose/docker-compose.protocol-dashboard.dev.yml
@@ -1,11 +1,14 @@
-version: "3.9"
+version: '3.9'
 
 services:
   dashboard:
     container_name: dashboard
     build:
-      context: ${PROJECT_ROOT}/protocol-dashboard
+      context: ${PROJECT_ROOT}
       dockerfile: ${PROJECT_ROOT}/protocol-dashboard/Dockerfile.dev
+      args:
+        TURBO_TEAM: '${TURBO_TEAM}'
+        TURBO_TOKEN: '${TURBO_TOKEN}'
     ports:
       - 5173:5173
     deploy:

diff --git a/dev-tools/compose/docker-compose.protocol-dashboard.prod.yml b/dev-tools/compose/docker-compose.protocol-dashboard.prod.yml
@@ -1,11 +1,14 @@
-version: "3.9"
+version: '3.9'
 
 services:
   dashboard:
     container_name: dashboard
     build:
-      context: ${PROJECT_ROOT}/protocol-dashboard
+      context: ${PROJECT_ROOT}
       dockerfile: ${PROJECT_ROOT}/protocol-dashboard/Dockerfile.prod
+      args:
+        TURBO_TEAM: '${TURBO_TEAM}'
+        TURBO_TOKEN: '${TURBO_TOKEN}'
     ports:
       - 5173:5173
     deploy:

diff --git a/dev-tools/compose/docker-compose.protocol-dashboard.stage.yml b/dev-tools/compose/docker-compose.protocol-dashboard.stage.yml
@@ -1,11 +1,14 @@
-version: "3.9"
+version: '3.9'
 
 services:
   dashboard:
     container_name: dashboard
     build:
-      context: ${PROJECT_ROOT}/protocol-dashboard
+      context: ${PROJECT_ROOT}
       dockerfile: ${PROJECT_ROOT}/protocol-dashboard/Dockerfile.stage
+      args:
+        TURBO_TEAM: '${TURBO_TEAM}'
+        TURBO_TOKEN: '${TURBO_TOKEN}'
     ports:
       - 5173:5173
     deploy: