Merge main and fix conflicts

Author: fernandinand

.github/workflows/checks.yml

@@ -1,17 +1,18 @@
 name: Checks
 # Triggered when code is pushed to any branch in a repository
-on: push
+on: 
+  push:
+    branches:
+      - '**'
 
 jobs:
   spellcheck:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
 
     - name: Generate dist
       run: |
@@ -33,12 +34,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
-
+        node-version: 20
+        cache: 'yarn'
     - name: Generate dist
       run: |
         yarn install
@@ -60,6 +59,13 @@ jobs:
       run: |
         EXCLUDE_LIST=$(cat scripts/broken-link-exceptions.txt)
         echo "EXCLUDE_LIST=$EXCLUDE_LIST" >> $GITHUB_ENV
+
+    - name: Do not check Github links on dev branches
+      if: ${{ github.ref_name != 'main' }}
+      run: |
+        # Do not check GH on every commit, their rate limits are too small
+        EXCLUDE_LIST="$EXCLUDE_LIST --exclude=https://github.com/*"
+        echo "EXCLUDE_LIST=$EXCLUDE_LIST" >> $GITHUB_ENV
      
     - name: Check broken links
       uses: ruzickap/action-my-broken-link-checker@v2

.github/workflows/dist-dev.yml

@@ -8,6 +8,7 @@ on:
     paths-ignore:
       - 'scripts/**'
       - 'README.md'
+  workflow_dispatch:
 
 concurrency: 
   group: dist-dev-${{ github.head_ref }}
@@ -18,18 +19,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
+        cache: 'yarn'
 
     - name: Install
       run: |
        yarn install
 
     - name: Generate dist
+      env:
+          SMARTLOOK_KEY: ${{ secrets.SMARTLOOK_KEY }}
       run: |
+        echo "VITE_SMARTLOOK_KEY=$SMARTLOOK_KEY" > ./src/.env
         yarn build
 
     - name: "Check dist dir consistency"

.github/workflows/dist-prod.yml

@@ -15,18 +15,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
+        cache: 'yarn'
 
     - name: Install
       run: |
        yarn install
 
     - name: Generate dist
+      env:
+          SMARTLOOK_KEY: ${{ secrets.SMARTLOOK_KEY }}
       run: |
+        echo "VITE_SMARTLOOK_KEY=$SMARTLOOK_KEY" > ./src/.env
         yarn build
 
     - name: "Check dist dir consistency"

.github/workflows/status-dev.yml

@@ -1,15 +1,12 @@
 name: Status PROD
 
-# runs at minute 0 of the 2rd,5th,8th and 11th hour
+# runs 6:00 AM every day
 on:
-  push:
-    branches:
-      - main
   schedule:
-    - cron:  '0 2,5,8,11 * * *'
+    - cron:  '0 6 * * *'
 
 jobs:
-  dev_status_check:
+  status_check:
     runs-on: ubuntu-latest
     env:
       URL: "https://merginmaps.com/docs"
@@ -29,4 +26,4 @@ jobs:
         uses: ruzickap/action-my-broken-link-checker@v2
         with:
           url: ${{ env.URL }}
-          cmd_params: --buffer-size=8192 --max-connections=10 --color=always --skip-tls-verification --ignore-fragments --timeout=60 ${{ env.EXCLUDE_LIST }}
+          cmd_params: --buffer-size=8192 --max-connections=10 --rate-limit=1 --color=always --skip-tls-verification --ignore-fragments --timeout=60 ${{ env.EXCLUDE_LIST }}

.github/workflows/status-prod.yml

@@ -18,4 +18,7 @@ git-output.txt
 .node-version
 .vscode
 *-snippet.txt
-redirect_test.txt
+redirect_test.txt
+
+src/.vitepress/cache
+src/.vitepress/dist

.gitignore

@@ -1,10 +1,5 @@
 MIT License
 
-Copyright (c) 2020 Nuxt.js with the contributions of:
-- Sebastien Chopin (NuxtJS Company)
-- Alexandre Chopin (NuxtJS Company)
-- Benjamin Canac (NuxtJS Company)
-- Sergey Bedritsky (NuxtJS Company)
 Copyright (c) 2021 Lutra Consulting Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

LICENSE-CODE

@@ -1,8 +1,7 @@
-[![Checks](https://github.com/MerginMaps/docs/actions/workflows/checks.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/checks.yml)
-[![Deploy DEV](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml)
-[![Status DEV](https://github.com/MerginMaps/docs/actions/workflows/status-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/status-dev.yml)
 [![Deploy PROD](https://github.com/MerginMaps/docs/actions/workflows/dist-prod.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-prod.yml)
 [![Status PROD](https://github.com/MerginMaps/docs/actions/workflows/status-prod.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/status-prod.yml)
+[![Deploy DEV](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/dist-dev.yml)
+[![Checks](https://github.com/MerginMaps/docs/actions/workflows/checks.yml/badge.svg)](https://github.com/MerginMaps/docs/actions/workflows/checks.yml)
 
 # Mergin Maps Documentation
 
@@ -17,7 +16,7 @@ Use GitHub Pull Requests to propose changes, we will review and merge your chang
 - Check official [vuepress documentation](https://vuepress.vuejs.org/)
 - Check the [Mergin Maps Documentation Guidelines](https://merginmaps.com/docs/misc/write-docs/)
 
-<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/.vuepress/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
+<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
 
 # Development
 
@@ -49,6 +48,8 @@ You can also spin-up a node Docker container using the provided compose file
 docker compose up mm-docs
 ```
 
+The minimum required version of Node.js is 18.
+
 ## Translations
 
 At the moment we do not support translations, see https://github.com/MerginMaps/docs/issues/133
@@ -65,20 +66,6 @@ yarn build
 
 and see the result in `dist` folder
 
-### Error for nodejs 17
-
-If you get `opensslErrorStack: [ 'error:03000086:digital envelope routines::initialization error' ]`, run
- ```bash
- export NODE_OPTIONS=--openssl-legacy-provider
- ```
- 
- or on Windows
- ```bash
- set NODE_OPTIONS=--openssl-legacy-provider
- ```
-  
- or downgrade `nodejs` to 16 or less. More here: https://github.com/webpack/webpack/issues/14532
-
 # License
 
 The Mergin Maps product documentation in the `src` are licensed under a [CC-BY license](LICENSE).