Merge branch 'master' into feature-new-measurement-tools

seasketch · Oct 9, 2023 · 7c367d7 · 7c367d7
2 parents 293f7d1 + e4bcc8f
commit 7c367d7
Show file tree

Hide file tree

Showing 492 changed files with 160,360 additions and 168,710 deletions.
diff --git a/.github/workflows/deploy-server.yml b/.github/workflows/deploy-server.yml
@@ -65,24 +65,10 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-server-deploy-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
@@ -91,7 +77,7 @@ jobs:
           npm install -g aws-cdk typescript
       - name: Install dependencies
         run: |
-          lerna bootstrap --scope=infra
+          npx lerna bootstrap --scope=infra
       - name: Deploy server
         working-directory: ./packages/infra
         env:
@@ -105,7 +91,9 @@ jobs:
           R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+          R2_FILE_UPLOADS_BUCKET: ${{ secrets.R2_FILE_UPLOADS_BUCKET }}
           CLOUDFLARE_IMAGES_ACCOUNT: ${{ secrets.CLOUDFLARE_IMAGES_ACCOUNT }}
           CLOUDFLARE_IMAGES_TOKEN: ${{ secrets.CLOUDFLARE_IMAGES_TOKEN }}
+          CLOUDFLARE_IMAGES_ACCOUNT_HASH: ${{ secrets.CLOUDFLARE_IMAGES_ACCOUNT_HASH }}
         run: |
           cdk deploy --require-approval never -e SeaSketchGraphQLServer
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -119,24 +119,10 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-server-deploy-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
@@ -145,7 +131,7 @@ jobs:
           npm install -g aws-cdk typescript
       - name: Install dependencies
         run: |
-          lerna bootstrap --scope=infra
+          npx lerna bootstrap --scope=infra
       - name: Deploy server
         working-directory: ./packages/infra
         env:
@@ -159,9 +145,15 @@ jobs:
           R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
           R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
           R2_ENDPOINT: ${{ secrets.R2_ENDPOINT }}
+          R2_FILE_UPLOADS_BUCKET: ${{ secrets.R2_FILE_UPLOADS_BUCKET }}
           CLOUDFLARE_IMAGES_ACCOUNT: ${{ secrets.CLOUDFLARE_IMAGES_ACCOUNT }}
           CLOUDFLARE_IMAGES_TOKEN: ${{ secrets.CLOUDFLARE_IMAGES_TOKEN }}
+          CLOUDFLARE_IMAGES_ACCOUNT_HASH: ${{ secrets.CLOUDFLARE_IMAGES_ACCOUNT_HASH }}
           SCREENSHOTTER_FUNCTION_ARN: ${{ secrets.SCREENSHOTTER_FUNCTION_ARN }}
+          UPLOADS_BASE_URL: ${{ secrets.UPLOADS_BASE_URL }}
+          RESOURCES_REMOTE: ${{ secrets.RESOURCES_REMOTE }}
+          TILES_REMOTE: ${{ secrets.TILES_REMOTE }}
+          TILES_BASE_URL: ${{ secrets.TILES_BASE_URL }}
         run: |
           cdk deploy --require-approval never -e SeaSketchGraphQLServer
   deploy_client:
@@ -180,27 +172,13 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-client-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Build client
         working-directory: ./packages/client
         env:

diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml
@@ -10,30 +10,16 @@ jobs:
       url: ${{ steps.wrangler.outputs.preview_url }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-client-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Build client
         working-directory: ./packages/client
         env:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -17,30 +17,16 @@ jobs:
           - "6379:6379"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-server-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Init docker db
         working-directory: ./packages/api
         env:
@@ -77,30 +63,16 @@ jobs:
           - "6379:6379"
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-server-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Initialize database
         working-directory: ./packages/api
         env:
@@ -131,30 +103,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-client-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: "npm"
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Test client
         working-directory: ./packages/client
         env:
@@ -174,34 +132,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "18.6"
+          cache: "npm"
       - id: short_sha
         run: |
           echo `git rev-parse HEAD`
           echo "::set-output name=sha::`git rev-parse --short HEAD`"
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-client-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: |
-            node_modules
-            */*/node_modules
-            ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
       - name: Install lerna
         run: |
           npm install
       - name: Install dependencies
         run: |
-          lerna bootstrap
+          npx lerna bootstrap --ci
       - name: Build client
         working-directory: ./packages/client
         env: