Merge branch 'main' of github.com:nf-core/website into migrate-redirects

# Conflicts:
#	package.json

.github/workflows/build-json-files-and-md-cache.yml

@@ -9,12 +9,14 @@ jobs:
   build-component-json:
     runs-on: ubuntu-latest
     environment: static-file-build
+    if: (github.event_name == 'schedule' && github.repository == 'nf-core/website') || (github.event_name != 'schedule')
 
     steps:
       # Set up the main website repo
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 # Don't do a shallow clone
+          token: ${{secrets.NF_CORE_BOT_AUTH_TOKEN}} # Needed for pushing back to the repo
 
       # install npm dependencies
       - name: Set up node.js
@@ -71,11 +73,13 @@ jobs:
       # Commit and push the changes if there are not too many lines changed
       - name: Commit and push changes
         if: ${{ !steps.check_lines.outputs.changes }}
-        uses: EndBug/add-and-commit@v9
-        with:
-          default_author: user_info
-          author_name: nf-core-bot
-          author_email: [email protected]
+        run: |
+          git config user.email "[email protected]"
+          git config user.name "nf-core-bot"
+          git config push.default upstream
+          git status
+          git diff --quiet || (git commit -am "[automated] Update json files and markdown cache" && git push)
+
 
       # Create a PR if there are too many lines changed
       - name: Create PR with changes

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: 'v3.0.0'
+    rev: 'v2.7.1'
     hooks:
       - id: prettier
         additional_dependencies:
-          - prettier@3.0.0
-          - prettier-plugin-svelte@^3.0.0
-          - prettier-plugin-astro@^0.11.0
+          - prettier@2.7.1
+          - prettier-plugin-svelte@^2.7.1
+          - prettier-plugin-astro@^0.10.0
         args: [--plugin=prettier-plugin-svelte, --plugin=prettier-plugin-astro]
         files: \.(astro|svelte)$

.prettierrc.cjs

@@ -2,18 +2,24 @@ module.exports = {
     // TODO: REMOVE SINGLE QUOTES CONFIG LATER
     // Leaving it for now to minimise diffs, but double quote is more consistent with the rest of nf-core
     singleQuote: true,
+    trailingComma: 'all',
     //////
 
     printWidth: 120,
 
-    // pnpm support, for VSCode?
-    plugins: [require.resolve('prettier-plugin-astro')],
+    plugins: [require.resolve('prettier-plugin-astro'), require.resolve('prettier-plugin-svelte')],
     overrides: [
         {
             files: '*.astro',
             options: {
                 parser: 'astro',
             },
         },
+        {
+            files: '*.svelte',
+            options: {
+                parser: 'svelte',
+            },
+        },
     ],
 };

astro.config.mjs

@@ -40,7 +40,6 @@ export default defineConfig({
     output: 'hybrid',
     experimental: {
         assets: true,
-        redirects: true,
     },
     adapter: netlify(),
     redirects: {