resolve merge conflicts and update to latest js-dataverse version

IQSS · Dec 16, 2024 · a4a16e6 · a4a16e6
2 parents e2e050c + 66d2a60
commit a4a16e6
Show file tree

Hide file tree

Showing 92 changed files with 9,907 additions and 1,915 deletions.
diff --git a/.github/workflows/deploy-beta-testing.yml b/.github/workflows/deploy-beta-testing.yml
@@ -41,10 +41,11 @@ jobs:
       - name: Build with base path
         run: npm run build -- --base=/spa
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: built-site
           path: ./dist
+          include-hidden-files: true
 
   deploy-to-payara:
     needs: build
@@ -58,7 +59,7 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -61,10 +61,11 @@ jobs:
         if: ${{ github.event.inputs.infra_type == 'Payara' && github.event.inputs.basepath != '' }}
         run: npm run build -- --base=/${{ github.event.inputs.basepath }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: built-site
           path: ./dist
+          include-hidden-files: true
 
   deploy-to-s3:
     needs: build
@@ -84,7 +85,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install awscli
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist
@@ -111,7 +112,7 @@ jobs:
           distribution: 'zulu'
           java-version: '11'
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: built-site
           path: ./dist

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -143,7 +143,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Cypress screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots