Merge branch 'main' into backup-performance-changelog

Author: ebenezerdon

.github/workflows/tests.yml

@@ -35,7 +35,51 @@ jobs:
               run: pnpm install --frozen-lockfile
             - name: Check formatting
               run: pnpm format:check
-
+    tests:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.event.pull_request.head.sha }}
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+            - name: Install corepack
+              run: npm i -g corepack@latest
+            - name: Install pnpm
+              run: corepack enable
+            - name: Get pnpm store directory
+              shell: bash
+              run: |
+                  echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+            - uses: actions/cache@v4
+              name: Setup pnpm cache
+              with:
+                  path: ${{ env.STORE_PATH }}
+                  key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  restore-keys: |
+                      ${{ runner.os }}-pnpm-store-
+            - name: Install dependencies
+              run: pnpm install --frozen-lockfile
+            - name: Install playwright dependencies
+              run: pnpm exec playwright install --with-deps chromium
+            - name: Run tests
+              env:
+                  PUBLIC_APPWRITE_ENDPOINT: ${{ vars.PUBLIC_APPWRITE_ENDPOINT }}
+                  PUBLIC_APPWRITE_DASHBOARD: ${{ vars.PUBLIC_APPWRITE_DASHBOARD }}
+                  PUBLIC_APPWRITE_PROJECT_ID: ${{ vars.PUBLIC_APPWRITE_PROJECT_ID }}
+                  PUBLIC_APPWRITE_DB_MAIN_ID: ${{ vars.PUBLIC_APPWRITE_DB_MAIN_ID }}
+                  PUBLIC_APPWRITE_COL_THREADS_ID: ${{ vars.PUBLIC_APPWRITE_COL_THREADS_ID }}
+                  PUBLIC_APPWRITE_COL_MESSAGES_ID: ${{ vars.PUBLIC_APPWRITE_COL_MESSAGES_ID }}
+                  PUBLIC_APPWRITE_FN_TLDR_ID: ${{ vars.PUBLIC_APPWRITE_FN_TLDR_ID }}
+                  PUBLIC_APPWRITE_PROJECT_INIT_ID: ${{ vars.PUBLIC_APPWRITE_PROJECT_INIT_ID }}
+                  PUBLIC_GROWTH_ENDPOINT: ${{ vars.PUBLIC_GROWTH_ENDPOINT }}
+                  PUBLIC_POSTHOG_API_KEY: ${{ vars.PUBLIC_POSTHOG_API_KEY }}
+                  APPWRITE_DB_INIT_ID: ${{ secrets.APPWRITE_DB_INIT_ID }}
+                  APPWRITE_COL_INIT_ID: ${{ secrets.APPWRITE_COL_INIT_ID }}
+                  APPWRITE_API_KEY_INIT: ${{ secrets.APPWRITE_API_KEY_INIT }}
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: pnpm test
     build:
         runs-on: ubuntu-latest
         steps:

.gitignore

@@ -21,3 +21,4 @@ terraform/**/.t*
 terraform/**/.env
 terraform/**/**/*.tfstate*
 /.cache
+/test-results

package.json

@@ -17,7 +17,7 @@
         "icons:optimize": "node ./src/icons/optimize.js",
         "lint": "prettier --check . && eslint .",
         "preview": "vite preview",
-        "test": "npm run test:integration && npm run test:unit",
+        "test": "npm run test:integration",
         "test:integration": "playwright test",
         "test:unit": "vitest",
         "optimize": "node ./scripts/optimize-assets.js",
@@ -96,5 +96,16 @@
         "vite-plugin-image-optimizer": "^1.1.8",
         "vite-plugin-manifest-sri": "^0.2.0",
         "vitest": "^1.6.0"
+    },
+    "pnpm": {
+        "onlyBuiltDependencies": [
+            "@parcel/watcher",
+            "@sentry/cli",
+            "core-js",
+            "esbuild",
+            "sharp",
+            "svelte-preprocess",
+            "ttf2woff2"
+        ]
     }
 }

playwright.config.ts

@@ -2,9 +2,10 @@ import type { PlaywrightTestConfig } from '@playwright/test';
 
 const config: PlaywrightTestConfig = {
     webServer: {
-        command: 'npm run build && npm run preview',
-        port: 4173
+        command: 'pnpm run dev',
+        port: 5173
     },
+    fullyParallel: true,
     testDir: 'tests',
     testMatch: /(.+\.)?(test|spec)\.[jt]s/
 };

src/hooks.server.ts

@@ -53,6 +53,7 @@ const securityheaders: Handle = async ({ event, resolve }) => {
             "'unsafe-eval'",
             'https://*.posthog.com',
             'https://*.plausible.io',
+            'https://*.reo.dev',
             'https://plausible.io',
             'https://js.zi-scripts.com',
             'https://ws.zoominfo.com'
@@ -74,6 +75,7 @@ const securityheaders: Handle = async ({ event, resolve }) => {
             'https://*.sentry.io',
             'https://*.plausible.io',
             'https://plausible.io',
+            'https://*.reo.dev',
             'https://js.zi-scripts.com',
             'https://aorta.clickagy.com',
             'https://hemsync.clickagy.com',

src/lib/components/blog/table-of-contents.svelte

@@ -1,19 +1,46 @@
+<script lang="ts" context="module">
+    export type TocItem = {
+        title: string;
+        href: string;
+        step?: number;
+        selected?: boolean;
+        level?: number;
+        children?: Array<{
+            title: string;
+            href: string;
+            selected: boolean;
+            level?: number;
+        }>;
+    };
+</script>
+
 <script lang="ts">
-    import type { TocItem } from '$lib/layouts/DocsArticle.svelte';
     import { classNames } from '$lib/utils/classnames';
+    import { fade } from 'svelte/transition';
 
     const backToTop = () => {
         window.scrollTo({ top: 0 });
     };
 
+    let isScrolled: boolean = false;
+
+    const handleIsScrolled = () => {
+        isScrolled = !!window.scrollY;
+    };
+
     export let toc: Array<TocItem> = [];
+    export let heading: string = 'Table of Contents';
 </script>
 
+<svelte:window on:scroll={handleIsScrolled} />
+
 <nav class="sticky top-32 col-span-3 mt-2 -ml-4 hidden h-[800px] flex-col gap-6 lg:flex">
-    <span class="text-micro text-primary ps-6 uppercase tracking-tighter">Table of Contents</span>
+    <span class="text-micro tracking-loose text-primary font-aeonik-fono ps-6 uppercase"
+        >{heading}</span
+    >
     <div class="relative">
         <ul
-            class="border-smooth mask text-caption flex max-h-[600px] flex-col gap-4 overflow-scroll border-b pb-11 [scrollbar-width:none]"
+            class="mask text-caption flex max-h-[600px] flex-col gap-4 overflow-scroll pb-11 [scrollbar-width:none]"
         >
             {#each toc as parent (parent.href)}
                 <li
@@ -24,7 +51,7 @@
                         {
                             'font-medium': parent.level && parent.level === 1,
                             'ps-6': parent.level && parent.level === 2,
-                            'pl-10': parent.level && parent.level >= 3,
+                            'ps-12': parent.level && parent.level >= 3,
                             'before:opacity-100': parent.selected
                         }
                     )}
@@ -33,7 +60,7 @@
 
                     {#if parent.children}
                         <ul
-                            class="border-smooth mt-11 ml-9 flex flex-col gap-7 border-b pb-11 text-xs"
+                            class="border-smooth text-caption mt-11 ml-9 flex flex-col gap-7 border-b pb-10"
                         >
                             {#each parent.children as child}
                                 <li
@@ -58,11 +85,15 @@
         </ul>
     </div>
 
-    <button
-        class="text-primary group mt-8 flex cursor-pointer items-center gap-2 pl-7 transition-all active:scale-95"
-        on:click={backToTop}
-    >
-        <span class="web-icon-arrow-up transition group-hover:-translate-y-0.5" />
-        Back to Top
-    </button>
+    {#if isScrolled}
+        <button
+            class="text-primary group border-smooth text-caption ms-6 -mt-4 flex cursor-pointer items-center gap-2 border-t pt-10 font-medium transition-all"
+            on:click={backToTop}
+            out:fade
+            in:fade
+        >
+            <span class="web-icon-arrow-up transition group-hover:-translate-y-0.5" />
+            Back to Top
+        </button>
+    {/if}
 </nav>

src/lib/layouts/DocsArticle.svelte

@@ -18,7 +18,7 @@
     import { setContext } from 'svelte';
     import { writable } from 'svelte/store';
     import { Feedback } from '$lib/components';
-    import { scrollToTop } from '$lib/actions/scrollToTop';
+    import TableOfContents from '$lib/components/blog/table-of-contents.svelte';
 
     export let title: string;
     export let toc: Array<TocItem>;
@@ -72,45 +72,7 @@
         <aside class="web-references-menu ps-6">
             <div class="web-references-menu-content">
                 {#if toc && toc.length > 0}
-                    <div class="flex items-center justify-between gap-4">
-                        <h5 class="web-references-menu-title text-micro uppercase">On This Page</h5>
-                    </div>
-                    <ol class="web-references-menu-list">
-                        {#each toc as parent (parent.href)}
-                            <li class="web-references-menu-item">
-                                <a
-                                    href={parent.href}
-                                    class="web-references-menu-link"
-                                    class:is-selected={parent.selected}
-                                >
-                                    {#if parent?.step}
-                                        <span class="web-numeric-badge">{parent.step}</span>
-                                    {/if}
-                                    <span class="text-caption">{parent.title}</span>
-                                </a>
-                                {#if parent.children}
-                                    <ol class="web-references-menu-list mt-4 ml-8">
-                                        {#each parent.children as child}
-                                            <li class="web-references-menu-item">
-                                                <a
-                                                    href={child.href}
-                                                    class="web-references-menu-link"
-                                                >
-                                                    <span class="text-caption">{child.title}</span>
-                                                </a>
-                                            </li>
-                                        {/each}
-                                    </ol>
-                                {/if}
-                            </li>
-                        {/each}
-                    </ol>
-                    <div class="border-greyscale-900/4 border-t pt-5">
-                        <button class="web-link inline-flex items-center gap-2" use:scrollToTop>
-                            <span class="web-icon-arrow-up" aria-hidden="true" />
-                            <span class="text-caption">Back to top</span>
-                        </button>
-                    </div>
+                    <TableOfContents heading="On This Page" {toc} />
                 {/if}
             </div>
         </aside>

src/redirects.json

@@ -139,10 +139,6 @@
         "link": "/docs/authentication-management",
         "redirect": "/docs/products/auth/users"
     },
-    {
-        "link": "/docs/authentication-server",
-        "redirect": "/docs/authentication-server"
-    },
     {
         "link": "/docs/authentication-security",
         "redirect": "/docs/products/auth/security"
@@ -265,7 +261,7 @@
     },
     {
         "link": "/docs/debugging",
-        "redirect": "/docs/advanced/self-hosting/debugging"
+        "redirect": "/docs/advanced/self-hosting/debug"
     },
     {
         "link": "/docs/upgrade",
@@ -467,10 +463,6 @@
         "link": "/docs/models/collection",
         "redirect": "/docs/references/cloud/models/collection"
     },
-    {
-        "link": "/docs/models/attribute",
-        "redirect": "/docs/references/cloud/models/attribute"
-    },
     {
         "link": "/docs/models/index",
         "redirect": "/docs/references/cloud/models/index"
@@ -659,10 +651,6 @@
         "link": "/keyboard",
         "redirect": "/docs/tooling/appwriter"
     },
-    {
-        "link": "/careers",
-        "redirect": "https://appwrite.careers"
-    },
     {
         "link": "/policy/terms",
         "redirect": "/terms"
@@ -671,10 +659,7 @@
         "link": "/policy/privacy",
         "redirect": "/privacy"
     },
-    {
-        "link": "/cli/install.sh",
-        "redirect": "https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/install.sh"
-    },
+
     {
         "link": "/case-studies",
         "redirect": "/customer-stories"

src/routes/+layout.svelte

@@ -178,6 +178,22 @@
                           document.body.appendChild(zi);
                       });
         </script>
+
+        <!-- Reo.dev -->
+        <script type="text/javascript">
+            !(function () {
+                var e, t, n;
+                (e = '144fa7eaa4904e8'),
+                    (t = function () {
+                        Reo.init({ clientID: '144fa7eaa4904e8' });
+                    }),
+                    ((n = document.createElement('script')).src =
+                        'https://static.reo.dev/' + e + '/reo.js'),
+                    (n.defer = !0),
+                    (n.onload = t),
+                    document.head.appendChild(n);
+            })();
+        </script>
     {/if}
 
     <!-- canonical url -->

src/routes/careers/+page.server.ts

@@ -0,0 +1,5 @@
+import { redirect } from '@sveltejs/kit';
+
+export function load() {
+    redirect(301, 'https://careers.appwrite.io');
+}