From 97eb929cfd5396ea66078d013e2fe895baae1ea9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 03:40:13 +0000
Subject: [PATCH 01/14] [npm] Bump typescript from 5.5.4 to 5.6.2

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.6.2.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 64f136f3..b36ac403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,7 +49,7 @@
         "svelte-eslint-parser": "^0.40.0",
         "tailwindcss": "3.3.6",
         "tslib": "^2.6.3",
-        "typescript": "^5.5.4",
+        "typescript": "^5.6.2",
         "vite": "^5.4.8",
         "vite-plugin-tailwind-purgecss": "0.3.0",
         "vitest": "^1.5.0"
@@ -5515,9 +5515,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
+      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index e4f224ff..924ee1c8 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "svelte-eslint-parser": "^0.40.0",
     "tailwindcss": "3.3.6",
     "tslib": "^2.6.3",
-    "typescript": "^5.5.4",
+    "typescript": "^5.6.2",
     "vite": "^5.4.8",
     "vite-plugin-tailwind-purgecss": "0.3.0",
     "vitest": "^1.5.0"

From 5c64a73984421fb0a847a017b6037074589f9cb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 03:40:06 +0000
Subject: [PATCH 02/14] [npm] Bump postcss from 8.4.39 to 8.4.47

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.39 to 8.4.47.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.39...8.4.47)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 40 ++++++----------------------------------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b36ac403..e1e2a047 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "eslint": "^8.28.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-svelte": "^2.30.0",
-        "postcss": "8.4.39",
+        "postcss": "8.4.47",
         "prettier": "^3.3.3",
         "prettier-plugin-svelte": "^3.1.2",
         "svelte": "^4.2.19",
@@ -4171,9 +4171,9 @@
       "integrity": "sha512-HKAXTm+cFLNPxNllGIZGgVwX4OCd2SCnLLveUUOk4P27EKz/aPKeGLAcnGXegH3IKZKhvcbmreiwC+vK5vPlXw=="
     },
     "node_modules/postcss": {
-      "version": "8.4.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
-      "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
       "funding": [
         {
@@ -4191,8 +4191,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -5730,34 +5730,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/vite/node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/vitefu": {
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-0.2.5.tgz",
diff --git a/package.json b/package.json
index 924ee1c8..e873e0ef 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "eslint": "^8.28.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-svelte": "^2.30.0",
-    "postcss": "8.4.39",
+    "postcss": "8.4.47",
     "prettier": "^3.3.3",
     "prettier-plugin-svelte": "^3.1.2",
     "svelte": "^4.2.19",

From 4c0925a9c0b6d690b1aef8baf1c710992f5bad29 Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Wed, 16 Oct 2024 15:45:48 -0400
Subject: [PATCH 03/14] [ALS-6967] Updates for all in one integration (#262)

---
 Dockerfile      | 7 +------
 Dockerfile.prod | 6 +-----
 vite.config.ts  | 5 +++++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4cea24ed..66ab24ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,22 +12,17 @@ RUN npm ci --omit dev
 FROM httpd:2.4.62-alpine
 
 RUN apk add --update openssl sed nodejs supervisor
-#TODO: volume mount the certs
+
 RUN mkdir -p ${HTTPD_PREFIX}/cert
-COPY cert ${HTTPD_PREFIX}/cert
-COPY httpd-vhosts.conf ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf
 
 RUN sed -i '/^#Include conf.extra.httpd-vhosts.conf/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule proxy_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i  '/^#LoadModule proxy_http_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule proxy_connect_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule ssl_module modules\/mod_ssl.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule rewrite_module modules\/mod_rewrite.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule socache_shmcb_module modules\/mod_socache_shmcb.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN mkdir -p /usr/local/apache2/logs/ssl_mutex
-
 RUN sed -i 's/Options Indexes FollowSymLinks/Options -Indexes +FollowSymLinks/' ${HTTPD_PREFIX}/conf/httpd.conf
 
 WORKDIR /app
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 94647d17..58322156 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -12,17 +12,13 @@ RUN npm ci --omit dev
 FROM httpd:2.4.62-alpine
 
 RUN apk add --update openssl sed nodejs supervisor
-#TODO: volume mount the certs
+
 RUN mkdir -p ${HTTPD_PREFIX}/cert
-COPY cert ${HTTPD_PREFIX}/cert
-COPY httpd-vhosts.conf ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf
 
 RUN sed -i '/^#Include conf.extra.httpd-vhosts.conf/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule proxy_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i  '/^#LoadModule proxy_http_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule proxy_connect_module/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
-
 RUN sed -i '/^#LoadModule ssl_module modules\/mod_ssl.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule rewrite_module modules\/mod_rewrite.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
 RUN sed -i '/^#LoadModule socache_shmcb_module modules\/mod_socache_shmcb.so/s/^#//' ${HTTPD_PREFIX}/conf/httpd.conf
diff --git a/vite.config.ts b/vite.config.ts
index 6ea69b82..529e4f26 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,5 +5,10 @@ import { defineConfig } from 'vite';
 export default () => {
   return defineConfig({
     plugins: [sveltekit(), purgeCss()],
+    build: {
+      rollupOptions: {
+        maxParallelFileOps: 10,
+      },
+    },
   });
 };

From ef877417477245feac7c48cef8fd2e12c1890d10 Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Wed, 16 Oct 2024 15:48:39 -0400
Subject: [PATCH 04/14] [ALS-7439] Add loading indicator to searches (#255)

---
 src/lib/components/datatable/RemoteTable.svelte | 13 ++++++++++++-
 src/lib/components/explorer/Explorer.svelte     | 17 +++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/datatable/RemoteTable.svelte b/src/lib/components/datatable/RemoteTable.svelte
index 77b1a647..f59e32d6 100644
--- a/src/lib/components/datatable/RemoteTable.svelte
+++ b/src/lib/components/datatable/RemoteTable.svelte
@@ -12,9 +12,12 @@
   import RowsPerPage from '$lib/components/datatable/accessories/Rows.svelte';
   import RowCount from '$lib/components/datatable/accessories/Count.svelte';
   import Pagination from '$lib/components/datatable/accessories/Pagination.svelte';
+  import { ProgressRadial } from '@skeletonlabs/skeleton';
+  import type { Writable } from 'svelte/store';
 
   export let tableName: string = 'ExplorerTable';
   export let handler: DataHandler;
+  export let isLoading: Writable<boolean>;
   export let searchable = false;
   export let title = '';
   export let fullWidth: boolean = false;
@@ -87,7 +90,15 @@
       </tr>
     </thead>
     <tbody>
-      {#if $rows.length > 0}
+      {#if $isLoading}
+        <tr>
+          <td colspan={columns.length} class="text-center py-8">
+            <div class="flex justify-center items-center">
+              <ProgressRadial width="w-12" />
+            </div>
+          </td>
+        </tr>
+      {:else if $rows.length > 0}
         {#each $rows as row, i}
           <ExpandableRow {tableName} {cellOverides} {columns} index={i} {row} {rowClickHandler} />
         {/each}
diff --git a/src/lib/components/explorer/Explorer.svelte b/src/lib/components/explorer/Explorer.svelte
index 7a346ca3..6a27e808 100644
--- a/src/lib/components/explorer/Explorer.svelte
+++ b/src/lib/components/explorer/Explorer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onDestroy, onMount } from 'svelte';
   import { DataHandler, type State } from '@vincjo/datatables/remote';
-  import type { Unsubscriber } from 'svelte/store';
+  import { type Unsubscriber, writable } from 'svelte/store';
 
   import { page } from '$app/stores';
   import { goto } from '$app/navigation';
@@ -20,6 +20,8 @@
   /* eslint-disable @typescript-eslint/no-explicit-any */
   export let tourConfig: any;
 
+  const isLoading = writable(false);
+
   let { searchTerm, search, selectedFacets, error } = SearchStore;
   let searchInput = $page.url.searchParams.get('search') || $searchTerm || '';
   const tableName = 'ExplorerTable';
@@ -39,9 +41,15 @@
   };
 
   const handler = new DataHandler([] as SearchResult[], { rowsPerPage: 10 });
-  handler.onChange((state: State) => {
+  handler.onChange(async (state: State) => {
     doDisableTour();
-    return search($searchTerm, $selectedFacets, state);
+    isLoading.set(true);
+    try {
+      const results = await search($searchTerm, $selectedFacets, state);
+      return results;
+    } finally {
+      isLoading.set(false);
+    }
   });
 
   let unsubSelectedFacets: Unsubscriber;
@@ -49,6 +57,7 @@
 
   onMount(() => {
     unsubSelectedFacets = selectedFacets.subscribe(() => {
+      handler.setPage(1);
       handler.invalidate();
     });
 
@@ -126,7 +135,7 @@
         <p>{$error}</p>
       </ErrorAlert>
     {:else if $searchTerm || $selectedFacets.length > 0}
-      <SearchDatatable {tableName} {handler} {columns} {cellOverides} />
+      <SearchDatatable {tableName} {handler} {columns} {cellOverides} {isLoading} />
     {/if}
     {#if features.explorer.enableTour && tourEnabled}
       <div id="explorer-tour" class="text-center mt-4">

From f5df143890bf5ed5a8f711002e75e1dcd83e7401 Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Wed, 16 Oct 2024 15:49:46 -0400
Subject: [PATCH 05/14] [ALS-7572] Only show option cards when enabled (#254)

Co-authored-by: Gcolon021 <34667267+Gcolon021@users.noreply.github.com>
---
 .../explorer/genome-filter/+page.svelte            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte b/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
index 311468bd..583691c6 100644
--- a/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
+++ b/src/routes/(picsure)/(authorized)/explorer/genome-filter/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
 
-  import { branding } from '$lib/configuration';
+  import { branding, features } from '$lib/configuration';
 
   import { goto } from '$app/navigation';
   import { page } from '$app/stores';
@@ -30,7 +30,11 @@
   import { addFilter, getFiltersByType } from '$lib/stores/Filter';
 
   let edit = $page.url.searchParams.get('edit') || '';
-  let selectedOption: Option = ['snp', 'genomic'].includes(edit) ? (edit as Option) : Option.None;
+  let selectedOption: Option = (() => {
+    if (features.enableGENEQuery && !features.enableSNPQuery) return Option.Genomic;
+    if (!features.enableGENEQuery && features.enableSNPQuery) return Option.SNP;
+    return ['snp', 'genomic'].includes(edit) ? (edit as Option) : Option.None;
+  })();
 
   function clearFilters() {
     clearGeneFilters();
@@ -80,10 +84,10 @@
   backTitle="Back to Explore"
   transition={true}
 >
-  {#if selectedOption === Option.None}
-    <FilterType class="my-4" on:select={onSelectFilterType} active={selectedOption} />
-  {:else}
+  {#if features.enableGENEQuery && features.enableSNPQuery}
     <FilterType class="my-4" on:select={onSelectFilterType} active={selectedOption} />
+  {/if}
+  {#if selectedOption !== Option.None}
     {#if selectedOption === Option.Genomic}
       <GeneSearch class="mb-0 mt-6" />
     {:else}

From 65abd33a1886c53f58fe15277f9ffc9eda478e11 Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Wed, 16 Oct 2024 15:50:12 -0400
Subject: [PATCH 06/14] [ALS-7501] Refactor and fix tool suite conditions
 (#252)

---
 .../explorer/results/ResultsPanel.svelte      | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/explorer/results/ResultsPanel.svelte b/src/lib/components/explorer/results/ResultsPanel.svelte
index ce99bb49..27fa8bbb 100644
--- a/src/lib/components/explorer/results/ResultsPanel.svelte
+++ b/src/lib/components/explorer/results/ResultsPanel.svelte
@@ -102,6 +102,22 @@
     totalPatients !== 0 &&
     hasFilterOrExport;
 
+  $: showExplorerDistributions =
+    !isOpenAccess &&
+    features.explorer.distributionExplorer &&
+    $filters.length !== 0 &&
+    !$filters.every((filter) => filter.filterType === 'genomic' || filter.filterType === 'snp');
+
+  $: showDiscoverDistributions =
+    isOpenAccess && features.discoverFeautures.distributionExplorer && $filters.length !== 0;
+
+  $: showVariantExplorer = !isOpenAccess && features.explorer.variantExplorer && $hasGenomicFilter;
+
+  $: showToolSuite =
+    totalPatients !== 0 &&
+    ($filters.length !== 0 || $exports.length !== 0) &&
+    (showExplorerDistributions || showDiscoverDistributions || showVariantExplorer);
+
   onMount(async () => {
     unsubFilters = filters.subscribe(() => {
       triggerRefreshCount = getCount();
@@ -196,12 +212,12 @@
       </div>
     {/if}
   </div>
-  {#if totalPatients !== 0 && ($filters.length !== 0 || $exports.length !== 0)}
+  {#if showToolSuite}
     <div class="flex flex-col items-center mt-7">
       <hr class="!border-t-2" />
       <h5 class="text-center text-xl mt-7">Tool Suite</h5>
       <div class="flex flex-row flex-wrap justify-items-center gap-4 w-80 justify-center">
-        {#if !isOpenAccess && features.explorer.distributionExplorer && $filters.length !== 0}
+        {#if showExplorerDistributions}
           <CardButton
             href="/explorer/distributions"
             data-testid="distributions-btn"
@@ -210,7 +226,7 @@
             size="md"
           />
         {/if}
-        {#if isOpenAccess && features.discoverFeautures.distributionExplorer && $filters.length !== 0}
+        {#if showDiscoverDistributions}
           <CardButton
             href="/discover/distributions"
             data-testid="distributions-btn"
@@ -219,7 +235,7 @@
             size="md"
           />
         {/if}
-        {#if !isOpenAccess && features.explorer.variantExplorer && $hasGenomicFilter}
+        {#if showVariantExplorer}
           <CardButton
             href="/explorer/variant"
             data-testid="variant-explorer-btn"

From d464aa357d87adead4fb02a2f9f304c64917612b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:50:59 -0400
Subject: [PATCH 07/14] [npm] Bump @playwright/test from 1.46.1 to 1.48.0
 (#261)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [@playwright/test](https://github.com/microsoft/playwright) from
1.46.1 to 1.48.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/microsoft/playwright/releases"><code>@​playwright/test</code>'s
releases</a>.</em></p>
<blockquote>
<h2>v1.48.0</h2>
<h2>WebSocket routing</h2>
<p>New methods <a
href="https://playwright.dev/docs/api/class-page#page-route-web-socket">page.routeWebSocket()</a>
and <a
href="https://playwright.dev/docs/api/class-browsercontext#browser-context-route-web-socket">browserContext.routeWebSocket()</a>
allow to intercept, modify and mock WebSocket connections initiated in
the page. Below is a simple example that mocks WebSocket communication
by responding to a <code>&quot;request&quot;</code> with a
<code>&quot;response&quot;</code>.</p>
<pre lang="js"><code>await page.routeWebSocket('/ws', ws =&gt; {
  ws.onMessage(message =&gt; {
    if (message === 'request')
      ws.send('response');
  });
});
</code></pre>
<p>See <a
href="https://playwright.dev/docs/api/class-websocketroute">WebSocketRoute</a>
for more details.</p>
<h2>UI updates</h2>
<ul>
<li>New &quot;copy&quot; buttons for annotations and test location in
the HTML report.</li>
<li>Route method calls like <a
href="https://playwright.dev/docs/api/class-route#route-fulfill">route.fulfill()</a>
are not shown in the report and trace viewer anymore. You can see which
network requests were routed in the network tab instead.</li>
<li>New &quot;Copy as cURL&quot; and &quot;Copy as fetch&quot; buttons
for requests in the network tab.</li>
</ul>
<h2>Miscellaneous</h2>
<ul>
<li>Option <a
href="https://playwright.dev/docs/api/class-apirequestcontext#api-request-context-fetch-option-form"><code>form</code></a>
and similar ones now accept <a
href="https://playwright.dev/docs/api/class-formdata">FormData</a>.</li>
<li>New method <a
href="https://playwright.dev/docs/api/class-page#page-request-gc">page.requestGC()</a>
may help detect memory leaks.</li>
<li>New option <a
href="https://playwright.dev/docs/api/class-test#test-step-option-location"><code>location</code></a>
to pass custom step location.</li>
<li>Requests made by <a
href="https://playwright.dev/docs/api/class-apirequestcontext">APIRequestContext</a>
now record detailed timing and security information in the HAR.</li>
</ul>
<h2>Browser Versions</h2>
<ul>
<li>Chromium 130.0.6723.19</li>
<li>Mozilla Firefox 130.0</li>
<li>WebKit 18.0</li>
</ul>
<p>This version was also tested against the following stable
channels:</p>
<ul>
<li>Google Chrome 129</li>
<li>Microsoft Edge 129</li>
</ul>
<h2>v1.47.2</h2>
<h3>Highlights</h3>
<p><a
href="https://redirect.github.com/microsoft/playwright/pull/32699-">microsoft/playwright#32699</a>
[REGRESSION]: fix(codegen): use content_frame property in python/.NET
<a
href="https://redirect.github.com/microsoft/playwright/issues/32706-">microsoft/playwright#32706</a>
[REGRESSION]: page.pause() does not pause test timeout after 1.47
<a
href="https://redirect.github.com/microsoft/playwright/pull/32661">microsoft/playwright#32661</a>
- fix(trace-viewer): time delta between local and remote actions</p>
<h2>Browser Versions</h2>
<ul>
<li>Chromium 129.0.6668.29</li>
<li>Mozilla Firefox 130.0</li>
<li>WebKit 18.0</li>
</ul>
<p>This version was also tested against the following stable
channels:</p>
<ul>
<li>Google Chrome 128</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/microsoft/playwright/commit/0cdbb11068f86671c05d57391ac3701610f853df"><code>0cdbb11</code></a>
chore: mark v1.48.0 (<a
href="https://redirect.github.com/microsoft/playwright/issues/33009">#33009</a>)</li>
<li><a
href="https://github.com/microsoft/playwright/commit/ca368d43fa310e80067faca73afe18fc52949ed1"><code>ca368d4</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32991">#32991</a>):
fix(routeWebSocket): do not show in the trace (<a
href="https://redirect.github.com/microsoft/playwright/issues/33004">#33004</a>)</li>
<li><a
href="https://github.com/microsoft/playwright/commit/c329c5c1ec6e7bddc7f8f67dcf27c8cc6769d7af"><code>c329c5c</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/33005">#33005</a>):
chore(driver): roll driver to recent Node.js LTS version</li>
<li><a
href="https://github.com/microsoft/playwright/commit/97aaa12be46f211d94559c8dcadc33052c45bac2"><code>97aaa12</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32956">#32956</a>):
fix(fetch): listener leaks on Socket</li>
<li><a
href="https://github.com/microsoft/playwright/commit/0c17732e91a7400fd11030b57ff60e624ff5a814"><code>0c17732</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32949">#32949</a>):
feat(chromium): roll to r1140</li>
<li><a
href="https://github.com/microsoft/playwright/commit/530f04304e90bbab73128b4601d449dadc4aa3cb"><code>530f043</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32938">#32938</a>):
feat(firefox): roll to r1465</li>
<li><a
href="https://github.com/microsoft/playwright/commit/1054930edd066847d2a6a2e1fa9b9164855d3f6c"><code>1054930</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32924">#32924</a>):
docs: fix Java/.NET types for docs rolling</li>
<li><a
href="https://github.com/microsoft/playwright/commit/e732f68eeeef74fe843fed45ad0e59390cb030fb"><code>e732f68</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32906">#32906</a>):
feat(chromium): roll to r1139</li>
<li><a
href="https://github.com/microsoft/playwright/commit/dfa0e8bf356e8d9ff636e4bb239c6a648822cb85"><code>dfa0e8b</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32905">#32905</a>):
chore: remove 'screenshot instead of snapshot' usages</li>
<li><a
href="https://github.com/microsoft/playwright/commit/7155356e3cee47eb51d7cb1c2bc42e82cdfc8dcf"><code>7155356</code></a>
cherry-pick(<a
href="https://redirect.github.com/microsoft/playwright/issues/32880">#32880</a>):
chore: unflake 'should record'</li>
<li>Additional commits viewable in <a
href="https://github.com/microsoft/playwright/compare/v1.46.1...v1.48.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@playwright/test&package-manager=npm_and_yarn&previous-version=1.46.1&new-version=1.48.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: James <Jamestp19@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-release.yml | 60 ++++++++++++++++++++++++++++++
 package-lock.json                  | 24 ++++++------
 package.json                       |  2 +-
 3 files changed, 73 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/sync-release.yml

diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml
new file mode 100644
index 00000000..6044038a
--- /dev/null
+++ b/.github/workflows/sync-release.yml
@@ -0,0 +1,60 @@
+name: Sync Release with Main
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  update-release-branch:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Git
+        run: |
+          git config user.name "GitHub Action"
+          git config user.email "action@github.com"
+
+      - name: Fetch all branches
+        run: git fetch --all
+
+      - name: Check for differences between main and release
+        id: diff-check
+        run: |
+          git checkout release
+          git fetch origin main
+          if git diff --quiet origin/main; then
+            echo "No differences, safe to proceed."
+            echo "diff_found=false" >> $GITHUB_OUTPUT
+          else
+            echo "::error::Differences found between release and main!"
+            echo "diff_found=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Reset release branch to main
+        if: steps.diff-check.outputs.diff_found == 'false'
+        run: |
+          git reset --hard origin/main
+
+      - name: Force push release branch
+        if: steps.diff-check.outputs.diff_found == 'false'
+        run: git push origin release --force
+
+      - name: Notify via GitHub Issue if differences found
+        if: steps.diff-check.outputs.diff_found == 'true'
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: 'Sync Failure: Differences found between main and release',
+              body: 'There are differences between `main` and `release` branches that prevented synchronization. Please review the branches and resolve manually.'
+            });
diff --git a/package-lock.json b/package-lock.json
index e1e2a047..4468ea00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "uuid": "^10.0.0"
       },
       "devDependencies": {
-        "@playwright/test": "^1.46.1",
+        "@playwright/test": "^1.48.0",
         "@skeletonlabs/skeleton": "2.10.2",
         "@skeletonlabs/tw-plugin": "0.4.0",
         "@sveltejs/adapter-auto": "^3.2.4",
@@ -726,12 +726,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.46.1.tgz",
-      "integrity": "sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.0.tgz",
+      "integrity": "sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==",
       "dev": true,
       "dependencies": {
-        "playwright": "1.46.1"
+        "playwright": "1.48.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4136,12 +4136,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.46.1.tgz",
-      "integrity": "sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz",
+      "integrity": "sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==",
       "dev": true,
       "dependencies": {
-        "playwright-core": "1.46.1"
+        "playwright-core": "1.48.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -4154,9 +4154,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.46.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.46.1.tgz",
-      "integrity": "sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.0.tgz",
+      "integrity": "sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==",
       "dev": true,
       "bin": {
         "playwright-core": "cli.js"
diff --git a/package.json b/package.json
index e873e0ef..4b188f8d 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "playwright": "playwright test --ui"
   },
   "devDependencies": {
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.48.0",
     "@skeletonlabs/skeleton": "2.10.2",
     "@skeletonlabs/tw-plugin": "0.4.0",
     "@sveltejs/adapter-auto": "^3.2.4",

From bacad28af6d567a61b76a3988903f31f482ac166 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 08:25:29 -0400
Subject: [PATCH 08/14] [npm] Bump vitest from 1.5.0 to 2.1.2 (#260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest)
from 1.5.0 to 2.1.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vitest-dev/vitest/releases">vitest's
releases</a>.</em></p>
<blockquote>
<h2>v2.1.2</h2>
<h3>   🐞 Bug Fixes</h3>
<ul>
<li>Move <code>Vitest.setServer</code> to post
<code>configureServer</code> hook to enable import analysis for
workspace config loading  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6584">vitest-dev/vitest#6584</a>
<a href="https://github.com/vitest-dev/vitest/commit/e7f35214"><!-- raw
HTML omitted -->(e7f35)<!-- raw HTML omitted --></a></li>
<li><strong>benchmark</strong>:
<ul>
<li>Clear <code>BenchmarkResult.samples</code> array to reduce memory
usage  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> and <a
href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6541">vitest-dev/vitest#6541</a>
<a href="https://github.com/vitest-dev/vitest/commit/a6407afc"><!-- raw
HTML omitted -->(a6407)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>browser</strong>:
<ul>
<li>Fix dynamic import inside worker  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6569">vitest-dev/vitest#6569</a>
<a href="https://github.com/vitest-dev/vitest/commit/ea2d429b"><!-- raw
HTML omitted -->(ea2d4)<!-- raw HTML omitted --></a></li>
<li>Fix browser mock factory event race condition  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6530">vitest-dev/vitest#6530</a>
<a href="https://github.com/vitest-dev/vitest/commit/f131f93b"><!-- raw
HTML omitted -->(f131f)<!-- raw HTML omitted --></a></li>
<li>Serve ui assets as static  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6564">vitest-dev/vitest#6564</a>
<a href="https://github.com/vitest-dev/vitest/commit/adcdaee8"><!-- raw
HTML omitted -->(adcda)<!-- raw HTML omitted --></a></li>
<li>Update solidjs testing library lib  -  by <a
href="https://github.com/CamilleTeruel"><code>@​CamilleTeruel</code></a>
in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6548">vitest-dev/vitest#6548</a>
<a href="https://github.com/vitest-dev/vitest/commit/91442dfc"><!-- raw
HTML omitted -->(91442)<!-- raw HTML omitted --></a></li>
<li>Use <code>data:</code> protocol on preview provider file upload  - 
by <a href="https://github.com/userquin"><code>@​userquin</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6501">vitest-dev/vitest#6501</a>
<a href="https://github.com/vitest-dev/vitest/commit/e9821f70"><!-- raw
HTML omitted -->(e9821)<!-- raw HTML omitted --></a></li>
<li>Fix base for client script  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6510">vitest-dev/vitest#6510</a>
<a href="https://github.com/vitest-dev/vitest/commit/f952874e"><!-- raw
HTML omitted -->(f9528)<!-- raw HTML omitted --></a></li>
<li>Throw an error if &quot;<code>@​vitest/browser/</code>context&quot;
is imported outside of the browser mode  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6570">vitest-dev/vitest#6570</a>
<a href="https://github.com/vitest-dev/vitest/commit/383f1791"><!-- raw
HTML omitted -->(383f1)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>coverage</strong>:
<ul>
<li>Remove empty coverage folder on test failure too  -  by <a
href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6547">vitest-dev/vitest#6547</a>
<a href="https://github.com/vitest-dev/vitest/commit/1371ca6a"><!-- raw
HTML omitted -->(1371c)<!-- raw HTML omitted --></a></li>
<li>Include <code>*.astro</code> by default  -  by <a
href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6565">vitest-dev/vitest#6565</a>
<a href="https://github.com/vitest-dev/vitest/commit/f8ff76a9"><!-- raw
HTML omitted -->(f8ff7)<!-- raw HTML omitted --></a></li>
<li><code>cleanOnRerun: false</code> to invalidate previous results  - 
by <a href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a>
in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6592">vitest-dev/vitest#6592</a>
<a href="https://github.com/vitest-dev/vitest/commit/88bde99c"><!-- raw
HTML omitted -->(88bde)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>expect</strong>:
<ul>
<li>Fix <code>toBeDefined</code> with <code>expect.poll</code>  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6562">vitest-dev/vitest#6562</a>
<a href="https://github.com/vitest-dev/vitest/commit/f7da6199"><!-- raw
HTML omitted -->(f7da6)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>forks</strong>:
<ul>
<li>Fix <code>--cpu-prof</code> and <code>--heap-prof</code> not working
by default  -  by <a
href="https://github.com/AriPerkkio"><code>@​AriPerkkio</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/pull/6555">vitest-dev/vitest#6555</a>
<a href="https://github.com/vitest-dev/vitest/commit/2e4d894"><!-- raw
HTML omitted -->(2e4d894)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>runner</strong>:
<ul>
<li>Mark tests as skipped when <code>beforeAll</code> failed  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6524">vitest-dev/vitest#6524</a>
<a href="https://github.com/vitest-dev/vitest/commit/fb79792d"><!-- raw
HTML omitted -->(fb797)<!-- raw HTML omitted --></a></li>
<li>Support fixture parsing of lowered async syntax  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6531">vitest-dev/vitest#6531</a>
<a href="https://github.com/vitest-dev/vitest/commit/b553c7d6"><!-- raw
HTML omitted -->(b553c)<!-- raw HTML omitted --></a></li>
<li>Fix fixture parsing of lowered async syntax for non arrow functions
 -  by <a href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a>
in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6575">vitest-dev/vitest#6575</a>
<a href="https://github.com/vitest-dev/vitest/commit/3de00ab6"><!-- raw
HTML omitted -->(3de00)<!-- raw HTML omitted --></a></li>
<li>Guard test hook callback  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6604">vitest-dev/vitest#6604</a>
<a href="https://github.com/vitest-dev/vitest/commit/1497134e"><!-- raw
HTML omitted -->(14971)<!-- raw HTML omitted --></a></li>
<li>Run <code>onTestFinished</code> and <code>onTestFailed</code> during
<code>retry</code> and <code>repeats</code>  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6609">vitest-dev/vitest#6609</a>
<a href="https://github.com/vitest-dev/vitest/commit/c5e29098"><!-- raw
HTML omitted -->(c5e29)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>ui</strong>:
<ul>
<li>List tests on ui when <code>--standalone</code>  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6577">vitest-dev/vitest#6577</a>
<a href="https://github.com/vitest-dev/vitest/commit/d0bf89d3"><!-- raw
HTML omitted -->(d0bf8)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>vite-node</strong>:
<ul>
<li>Fix esm false-detection inside comment  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6506">vitest-dev/vitest#6506</a>
<a href="https://github.com/vitest-dev/vitest/commit/91f85997"><!-- raw
HTML omitted -->(91f85)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>vitest</strong>:
<ul>
<li>Install dependencies with the same version when prompted  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6611">vitest-dev/vitest#6611</a>
<a href="https://github.com/vitest-dev/vitest/commit/ed8b7c08"><!-- raw
HTML omitted -->(ed8b7)<!-- raw HTML omitted --></a></li>
<li>Make env.SSR consistent between different pools  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6616">vitest-dev/vitest#6616</a>
<a href="https://github.com/vitest-dev/vitest/commit/8a8d3f03"><!-- raw
HTML omitted -->(8a8d3)<!-- raw HTML omitted --></a></li>
<li>Don't start a websocket server if api is disabled  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6617">vitest-dev/vitest#6617</a>
<a href="https://github.com/vitest-dev/vitest/commit/821400b8"><!-- raw
HTML omitted -->(82140)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>workspace</strong>:
<ul>
<li>Fix glob pattern detection  -  by <a
href="https://github.com/hi-ogawa"><code>@​hi-ogawa</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6502">vitest-dev/vitest#6502</a>
<a href="https://github.com/vitest-dev/vitest/commit/7727ca87"><!-- raw
HTML omitted -->(7727c)<!-- raw HTML omitted --></a></li>
<li>Ignore DS_Store by default  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6571">vitest-dev/vitest#6571</a>
<a href="https://github.com/vitest-dev/vitest/commit/d2a86ff5"><!-- raw
HTML omitted -->(d2a86)<!-- raw HTML omitted --></a></li>
</ul>
</li>
</ul>
<h5>    <a
href="https://github.com/vitest-dev/vitest/compare/v2.1.1...v2.1.2">View
changes on GitHub</a></h5>
<h2>v2.1.1</h2>
<h3>   🐞 Bug Fixes</h3>
<ul>
<li><strong>browser</strong>:
<ul>
<li>Make example test callbacks async  -  by <a
href="https://github.com/aqandrew"><code>@​aqandrew</code></a> in <a
href="https://redirect.github.com/vitest-dev/vitest/issues/6484">vitest-dev/vitest#6484</a>
<a href="https://github.com/vitest-dev/vitest/commit/16aa76c2"><!-- raw
HTML omitted -->(16aa7)<!-- raw HTML omitted --></a></li>
<li>Optimize vitest-browser-vue correctly  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6490">vitest-dev/vitest#6490</a>
<a href="https://github.com/vitest-dev/vitest/commit/5cbb0bba"><!-- raw
HTML omitted -->(5cbb0)<!-- raw HTML omitted --></a></li>
</ul>
</li>
<li><strong>workspace</strong>:
<ul>
<li>Resolve glob pattern once to avoid name collision  -  by <a
href="https://github.com/sheremet-va"><code>@​sheremet-va</code></a> in
<a
href="https://redirect.github.com/vitest-dev/vitest/issues/6489">vitest-dev/vitest#6489</a>
<a href="https://github.com/vitest-dev/vitest/commit/36b5aceb"><!-- raw
HTML omitted -->(36b5a)<!-- raw HTML omitted --></a></li>
</ul>
</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vitest-dev/vitest/commit/0ce26a4c70093dd90ca6b5a592f1ea43bd0e4228"><code>0ce26a4</code></a>
chore: release v2.1.2</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/383f17916608768858beafcbfcce645190ca4ec8"><code>383f179</code></a>
fix(browser): throw an error if
&quot;<code>@​vitest/browser/</code>context&quot; is imported
outside...</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/821400b8c17f8cffff6f6521c8dfa4a66b1f8372"><code>821400b</code></a>
fix(vitest): don't start a websocket server if api is disabled (<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6617">#6617</a>)</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/8a8d3f0346c6faf5a400b8c5c15f0424f82b0982"><code>8a8d3f0</code></a>
fix(vitest): make env.SSR consistent between different pools (<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6616">#6616</a>)</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/ed8b7c087a99098888febfae91a3e7dddad205d2"><code>ed8b7c0</code></a>
fix(vitest): install dependencies with the same version when prompted
(<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6611">#6611</a>)</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/d2a86ff57a3a32efbd05f55286f7765c4ee91853"><code>d2a86ff</code></a>
fix(workspace): ignore DS_Store by default (<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6571">#6571</a>)</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/88bde99cda26ff833220293ad0d0b350d61b358a"><code>88bde99</code></a>
fix(coverage): <code>cleanOnRerun: false</code> to invalidate previous
results (<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6592">#6592</a>)</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/5f757900b5f55eced4517b26e90d02ae2e6ed2f7"><code>5f75790</code></a>
refactor: replace <code>strip-ansi</code> with
<code>stripVTControlCharacters</code> from `node:uti...</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/e7f35214c8fdcf218679b9ed2f6f68854c1b1e0b"><code>e7f3521</code></a>
fix: move <code>Vitest.setServer</code> to post
<code>configureServer</code> hook to enable import ...</li>
<li><a
href="https://github.com/vitest-dev/vitest/commit/891d6fe57c50a16900e7993461c64054a5431a50"><code>891d6fe</code></a>
docs: deprecate <code>benchmark.outputFile</code> option (<a
href="https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest/issues/6591">#6591</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vitest-dev/vitest/commits/v2.1.2/packages/vitest">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=vitest&package-manager=npm_and_yarn&previous-version=1.5.0&new-version=2.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: James <Jamestp19@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 596 +++++++++++++---------------------------------
 package.json      |   2 +-
 2 files changed, 164 insertions(+), 434 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4468ea00..0ca0c179 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "typescript": "^5.6.2",
         "vite": "^5.4.8",
         "vite-plugin-tailwind-purgecss": "0.3.0",
-        "vitest": "^1.5.0"
+        "vitest": "^2.1.2"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -625,18 +625,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
@@ -667,9 +655,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.20",
@@ -1107,12 +1095,6 @@
         "win32"
       ]
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
     "node_modules/@skeletonlabs/skeleton": {
       "version": "2.10.2",
       "resolved": "https://registry.npmjs.org/@skeletonlabs/skeleton/-/skeleton-2.10.2.tgz",
@@ -1533,96 +1515,107 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.0.tgz",
-      "integrity": "sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.2.tgz",
+      "integrity": "sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "1.5.0",
-        "@vitest/utils": "1.5.0",
-        "chai": "^4.3.10"
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
+        "chai": "^5.1.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.0.tgz",
-      "integrity": "sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==",
+    "node_modules/@vitest/mocker": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.2.tgz",
+      "integrity": "sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "1.5.0",
-        "p-limit": "^5.0.0",
-        "pathe": "^1.1.1"
+        "@vitest/spy": "^2.1.0-beta.1",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.11"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/spy": "2.1.2",
+        "msw": "^2.3.5",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@vitest/runner/node_modules/p-limit": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
-      "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.2.tgz",
+      "integrity": "sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==",
       "dev": true,
       "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+    "node_modules/@vitest/runner": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.2.tgz",
+      "integrity": "sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==",
       "dev": true,
-      "engines": {
-        "node": ">=12.20"
+      "dependencies": {
+        "@vitest/utils": "2.1.2",
+        "pathe": "^1.1.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.0.tgz",
-      "integrity": "sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.2.tgz",
+      "integrity": "sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==",
       "dev": true,
       "dependencies": {
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.7.0"
+        "@vitest/pretty-format": "2.1.2",
+        "magic-string": "^0.30.11",
+        "pathe": "^1.1.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.0.tgz",
-      "integrity": "sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.2.tgz",
+      "integrity": "sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==",
       "dev": true,
       "dependencies": {
-        "tinyspy": "^2.2.0"
+        "tinyspy": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.0.tgz",
-      "integrity": "sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.2.tgz",
+      "integrity": "sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==",
       "dev": true,
       "dependencies": {
-        "diff-sequences": "^29.6.3",
-        "estree-walker": "^3.0.3",
-        "loupe": "^2.3.7",
-        "pretty-format": "^29.7.0"
+        "@vitest/pretty-format": "2.1.2",
+        "loupe": "^3.1.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
@@ -1648,15 +1641,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -1751,12 +1735,12 @@
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
     "node_modules/asynckit": {
@@ -1999,21 +1983,19 @@
       ]
     },
     "node_modules/chai": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
-      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
       "dev": true,
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/chalk": {
@@ -2033,15 +2015,12 @@
       }
     },
     "node_modules/check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
       "engines": {
-        "node": "*"
+        "node": ">= 16"
       }
     },
     "node_modules/chokidar": {
@@ -2211,11 +2190,11 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2227,13 +2206,10 @@
       }
     },
     "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
       "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
       "engines": {
         "node": ">=6"
       }
@@ -2315,15 +2291,6 @@
       "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
       "dev": true
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -2739,29 +2706,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -2966,15 +2910,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/get-intrinsic": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
@@ -2993,18 +2928,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -3182,15 +3105,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=16.17.0"
-      }
-    },
     "node_modules/idtoken-verifier": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/idtoken-verifier/-/idtoken-verifier-2.2.4.tgz",
@@ -3369,18 +3283,6 @@
         "@types/estree": "*"
       }
     },
-    "node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -3419,12 +3321,6 @@
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
       "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ=="
     },
-    "node_modules/js-tokens": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
-      "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
-      "dev": true
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -3460,12 +3356,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
-    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -3518,22 +3408,6 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
-    "node_modules/local-pkg": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
-      "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
-      "dev": true,
-      "dependencies": {
-        "mlly": "^1.4.2",
-        "pkg-types": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/locate-character": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
@@ -3573,13 +3447,10 @@
       "dev": true
     },
     "node_modules/loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
-      "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.1"
-      }
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.2.tgz",
+      "integrity": "sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==",
+      "dev": true
     },
     "node_modules/lru-cache": {
       "version": "6.0.0",
@@ -3593,11 +3464,11 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.10",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
-      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/mdn-data": {
@@ -3605,12 +3476,6 @@
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
       "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA=="
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -3671,18 +3536,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -3742,18 +3595,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/mlly": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.10.0",
-        "pathe": "^1.1.1",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.0"
-      }
-    },
     "node_modules/mri": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -3773,9 +3614,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/mz": {
       "version": "2.7.0",
@@ -3836,33 +3677,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -3897,21 +3711,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
@@ -4064,18 +3863,18 @@
       }
     },
     "node_modules/pathe": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
-      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
       "dev": true
     },
     "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
       "engines": {
-        "node": "*"
+        "node": ">= 14.16"
       }
     },
     "node_modules/periscopic": {
@@ -4124,17 +3923,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "node_modules/playwright": {
       "version": "1.48.0",
       "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.0.tgz",
@@ -4390,32 +4178,6 @@
         "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
@@ -4539,12 +4301,6 @@
         }
       ]
     },
-    "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -4888,9 +4644,9 @@
       "dev": true
     },
     "node_modules/std-env": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.6.0.tgz",
-      "integrity": "sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+      "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
       "dev": true
     },
     "node_modules/string_decoder": {
@@ -4991,18 +4747,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/strip-indent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
@@ -5027,18 +4771,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strip-literal": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
-      "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^9.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/sucrase": {
       "version": "3.34.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz",
@@ -5413,24 +5145,39 @@
       }
     },
     "node_modules/tinybench": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.0.tgz",
+      "integrity": "sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==",
       "dev": true
     },
     "node_modules/tinypool": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz",
-      "integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.1.tgz",
+      "integrity": "sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==",
+      "dev": true,
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
-      "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
       "dev": true,
       "engines": {
         "node": ">=14.0.0"
@@ -5493,15 +5240,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -5527,12 +5265,6 @@
         "node": ">=14.17"
       }
     },
-    "node_modules/ufo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.2.tgz",
-      "integrity": "sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==",
-      "dev": true
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -5665,15 +5397,14 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.0.tgz",
-      "integrity": "sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.2.tgz",
+      "integrity": "sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
+        "debug": "^4.3.6",
+        "pathe": "^1.1.2",
         "vite": "^5.0.0"
       },
       "bin": {
@@ -5745,31 +5476,30 @@
       }
     },
     "node_modules/vitest": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.0.tgz",
-      "integrity": "sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==",
-      "dev": true,
-      "dependencies": {
-        "@vitest/expect": "1.5.0",
-        "@vitest/runner": "1.5.0",
-        "@vitest/snapshot": "1.5.0",
-        "@vitest/spy": "1.5.0",
-        "@vitest/utils": "1.5.0",
-        "acorn-walk": "^8.3.2",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
-        "execa": "^8.0.1",
-        "local-pkg": "^0.5.0",
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.5.0",
-        "strip-literal": "^2.0.0",
-        "tinybench": "^2.5.1",
-        "tinypool": "^0.8.3",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.2.tgz",
+      "integrity": "sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/expect": "2.1.2",
+        "@vitest/mocker": "2.1.2",
+        "@vitest/pretty-format": "^2.1.2",
+        "@vitest/runner": "2.1.2",
+        "@vitest/snapshot": "2.1.2",
+        "@vitest/spy": "2.1.2",
+        "@vitest/utils": "2.1.2",
+        "chai": "^5.1.1",
+        "debug": "^4.3.6",
+        "magic-string": "^0.30.11",
+        "pathe": "^1.1.2",
+        "std-env": "^3.7.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.0",
+        "tinypool": "^1.0.0",
+        "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "1.5.0",
-        "why-is-node-running": "^2.2.2"
+        "vite-node": "2.1.2",
+        "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
@@ -5783,8 +5513,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "1.5.0",
-        "@vitest/ui": "1.5.0",
+        "@vitest/browser": "2.1.2",
+        "@vitest/ui": "2.1.2",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -5825,9 +5555,9 @@
       }
     },
     "node_modules/why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
       "dependencies": {
         "siginfo": "^2.0.0",
diff --git a/package.json b/package.json
index 4b188f8d..e1ac61b2 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "typescript": "^5.6.2",
     "vite": "^5.4.8",
     "vite-plugin-tailwind-purgecss": "0.3.0",
-    "vitest": "^1.5.0"
+    "vitest": "^2.1.2"
   },
   "type": "module",
   "dependencies": {

From 07adea386101b5b86b7668c16a8a9aadfbc48bde Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Mon, 21 Oct 2024 12:31:09 -0400
Subject: [PATCH 09/14] Fix local docker arm64 issues

---
 supervisord-local.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/supervisord-local.conf b/supervisord-local.conf
index 5aa241e9..9e51613c 100644
--- a/supervisord-local.conf
+++ b/supervisord-local.conf
@@ -4,6 +4,10 @@ nodaemon=true
 [program:httpd]
 command=httpd-foreground
 
+[program:npm-install]
+command=npm install @rollup/rollup-linux-arm64-musl --save-optional
+directory=/app
+
 [program:npm]
 command=npm run dev
 directory=/app
\ No newline at end of file

From 276607427192d94f3cfcdcca2bab51f0fa4d9e6f Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Mon, 21 Oct 2024 16:24:27 -0400
Subject: [PATCH 10/14] [ALS-7658] Add json file for code blocks (#269)

---
 src/lib/assets/codeBlocks.json                | 10 ++++
 .../explorer/export/ExportStepper.svelte      | 48 ++-----------------
 .../(authorized)/analyze/+page.svelte         | 37 ++------------
 3 files changed, 17 insertions(+), 78 deletions(-)
 create mode 100644 src/lib/assets/codeBlocks.json

diff --git a/src/lib/assets/codeBlocks.json b/src/lib/assets/codeBlocks.json
new file mode 100644
index 00000000..5fcf1f99
--- /dev/null
+++ b/src/lib/assets/codeBlocks.json
@@ -0,0 +1,10 @@
+{
+  "bdcPythonExport": "# Requires python 3.7 or later\nimport sys\nimport pandas as pd\nimport matplotlib.pyplot as plt\n\n# BDC Powered by Terra users uncomment the following line to specify package install location\n# sys.path.insert(0, r\"/home/jupyter/.local/lib/python3.7/site-packages\")\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-client.git\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-adapter-hpds.git\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-biodatacatalyst-python-adapter-hpds.git\n\nimport PicSureClient\nimport PicSureBdcAdapter\n\ntoken_file = \"token.txt\"\nwith open(token_file, \"r\") as f:\n  my_token = f.read()\n\nbdc = PicSureBdcAdapter.Adapter(\"https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure\", my_token)\n\nresource = bdc.useResource('02e23f52-f354-4e8b-992c-d37c8b9ba140')\n\nqueryID = \"{{queryId}}\" \n\nresults = resource.retrieveQueryResults(queryID)\n\nfrom io import StringIO\ndf_UI = pd.read_csv(StringIO(results), low_memory=False)\ndf_UI.head() # View top 5 rows of dataframe",
+  "bdcRExport": "# Requires R 3.4 or later\n### Uncomment this code if you are not using the PIC-SURE environment in *BDC-Seven Bridges*, or if you do not have all the necessary dependencies installed.\n#install.packages(\"devtools\")\n\nSys.setenv(TAR = \"/bin/tar\")\noptions(unzip = \"internal\")\ndevtools::install_github(\"hms-dbmi/pic-sure-r-adapter-hpds\", ref=\"main\", force=T, quiet=FALSE)\nlibrary(dplyr)\n\ntoken_file <- \"token.txt\"\ntoken <- scan(token_file, what = \"character\")\n\nsession <- picsure::bdc.initializeSession(\"https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure\", token)\nsession <- picsure::bdc.setResource(session = session, resourceName = \"AUTH\")\n\nqueryID <- \"526c318d-4a0c-4937-9baa-e21042a0e444\"\nresults <- picsure::getResultByQueryUUID(session, queryID)\nhead(results) # View top 5 rows of dataframe",
+  "bdcPythonAPI": "# Requires python 3.6 or later\nimport sys\nimport pandas as pd\nimport matplotlib.pyplot as plt\n# BDC Powered by Terra users uncomment the following line to specify package install location\n# sys.path.insert(0, r\"/home/jupyter/.local/lib/python3.7/site-packages\")\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-client.git\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-adapter-hpds.git\n!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-biodatacatalyst-python-adapter-hpds.git\nimport PicSureClient\nimport PicSureBdcAdapter\n# Set up connection to PIC-SURE API\nPICSURE_network_URL = \"https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure\"\ntoken_file = \"token.txt\"\n\nwith open(token_file, \"r\") as f:\n    my_token = f.read()\n\nbdc = PicSureBdcAdapter.Adapter(PICSURE_network_URL, my_token)",
+  "bdcRAPI": "# Requires R 3.4 or later\n### Uncomment this code if you are not using the PIC-SURE environment in *BDC-Seven Bridges*, or if you do not have all the necessary dependencies installed.\n#install.packages(\"devtools\")\nSys.setenv(TAR = \"/bin/tar\")\noptions(unzip = \"internal\")\ndevtools::install_github(\"hms-dbmi/pic-sure-r-adapter-hpds\", ref=\"main\", force=T, quiet=FALSE)\nlibrary(dplyr)\nPICSURE_network_URL = \"https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure\"\ntoken_file <- \"token.txt\"\ntoken <- scan(token_file, what = \"character\")\nsession <- picsure::bdc.initializeSession(PICSURE_network_URL, token)\nsession <- picsure::bdc.setResource(session = session,  resourceName = \"AUTH\")",
+  "basePythonExport": "Code not set",
+  "baseRExport": "Code not set",
+  "basePythonAPI": "Code not set",
+  "baseRAPI": "Code not set"
+}
diff --git a/src/lib/components/explorer/export/ExportStepper.svelte b/src/lib/components/explorer/export/ExportStepper.svelte
index 5dfe93cb..b51f7bb8 100644
--- a/src/lib/components/explorer/export/ExportStepper.svelte
+++ b/src/lib/components/explorer/export/ExportStepper.svelte
@@ -20,6 +20,7 @@
   import { createDatasetName } from '$lib/services/datasets';
   import CardButton from '$lib/components/buttons/CardButton.svelte';
   import type { ExpectedResultType } from '$lib/models/query/Query.ts';
+  import codeBlocks from '$lib/assets/codeBlocks.json';
 
   export let query: QueryRequestInterface;
   export let showTreeStep = false;
@@ -321,55 +322,14 @@
                         language="python"
                         lineNumbers={true}
                         buttonCopied="Copied!"
-                        code={`# Requires python 3.7 or later
-import sys
-import pandas as pd
-import matplotlib.pyplot as plt
-# BDC Powered by Terra users uncomment the following line to specify package install location
-# sys.path.insert(0, r"/home/jupyter/.local/lib/python3.7/site-packages")
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-client.git
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-adapter-hpds.git
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-biodatacatalyst-python-adapter-hpds.git
-import PicSureHpdsLib
-import PicSureClient
-
-PICSURE_network_URL = "https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure"
-
-token_file = "token.txt"
-with open(token_file, "r") as f:
-    my_token = f.read()
-
-connection = PicSureClient.Client.connect(url = PICSURE_network_URL, token = my_token)
-
-queryID = "${datasetId}"
-
-results = resource.retrieveQueryResults(queryID)
-
-from io import StringIO
-df_UI = pd.read_csv(StringIO(results), low_memory=False)`}
+                        code={codeBlocks?.bdcPythonExport?.replace('{{queryId}}', datasetId) ||
+                          'Code not set'}
                       ></CodeBlock>
                     {:else if tabSet === 1}
                       <CodeBlock
                         language="r"
                         lineNumbers={true}
-                        code={`# Requires R 3.4 or later
-### Uncomment this code if you are not using the PIC-SURE environment in *BDC-Seven Bridges*, or if you do not have all the necessary dependencies installed.
-#install.packages("devtools")
-
-Sys.setenv(TAR = "/bin/tar")
-options(unzip = "internal")
-devtools::install_github("hms-dbmi/pic-sure-r-adapter-hpds", ref="main", force=T, quiet=FALSE)
-library(dplyr)
-
-PICSURE_network_URL = "https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure"
-token_file <- "token.txt"
-token <- scan(token_file, what = "character")
-session <- picsure::bdc.initializeSession(PICSURE_network_URL, token)
-session <- picsure::bdc.setResource(session = session)
-
-queryID <- "${datasetId}"
-
-results <- picsure::getResultByQueryUUID(session, queryID)`}
+                        code={codeBlocks?.bdcRExport || 'Code not set'}
                       ></CodeBlock>
                     {:else if tabSet === 2}
                       <div>
diff --git a/src/routes/(picsure)/(authorized)/analyze/+page.svelte b/src/routes/(picsure)/(authorized)/analyze/+page.svelte
index 648b21d5..4f27af6a 100644
--- a/src/routes/(picsure)/(authorized)/analyze/+page.svelte
+++ b/src/routes/(picsure)/(authorized)/analyze/+page.svelte
@@ -3,6 +3,7 @@
   import UserToken from '$lib/components/UserToken.svelte';
   import { branding } from '$lib/configuration';
   import { CodeBlock, Tab, TabGroup } from '@skeletonlabs/skeleton';
+  import codeBlocks from '$lib/assets/codeBlocks.json';
 
   let tabSet: number = 0;
 </script>
@@ -53,42 +54,10 @@
             language="python"
             lineNumbers={true}
             buttonCopied="Copied!"
-            code={`# Requires python 3.6 or later
-import sys
-import pandas as pd
-import matplotlib.pyplot as plt
-# BDC Powered by Terra users uncomment the following line to specify package install location
-# sys.path.insert(0, r"/home/jupyter/.local/lib/python3.7/site-packages")
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-client.git
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-python-adapter-hpds.git
-!{sys.executable} -m pip install --upgrade --force-reinstall git+https://github.com/hms-dbmi/pic-sure-biodatacatalyst-python-adapter-hpds.git
-import PicSureClient
-import PicSureBdcAdapter
-# Set up connection to PIC-SURE API
-PICSURE_network_URL = "https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure"
-token_file = "token.txt"
-
-with open(token_file, "r") as f:
-    my_token = f.read()
-
-bdc = PicSureBdcAdapter.Adapter(PICSURE_network_URL, my_token)`}
+            code={codeBlocks?.bdcPythonAPI || 'Code not set'}
           ></CodeBlock>
         {:else if tabSet === 1}
-          <CodeBlock
-            language="r"
-            lineNumbers={true}
-            code={`# Requires R 3.4 or later
-### Uncomment this code if you are not using the PIC-SURE environment in *BDC-Seven Bridges*, or if you do not have all the necessary dependencies installed.
-#install.packages("devtools")
-Sys.setenv(TAR = "/bin/tar")
-options(unzip = "internal")
-devtools::install_github("hms-dbmi/pic-sure-r-adapter-hpds", ref="main", force=T, quiet=FALSE)
-library(dplyr)
-PICSURE_network_URL = "https://picsure.biodatacatalyst.nhlbi.nih.gov/picsure"
-token_file <- "token.txt"
-token <- scan(token_file, what = "character")
-session <- picsure::bdc.initializeSession(PICSURE_network_URL, token)
-session <- picsure::bdc.setResource(session = session,  resourceName = "AUTH")`}
+          <CodeBlock language="r" lineNumbers={true} code={codeBlocks?.bdcRAPI || 'Code not set'}
           ></CodeBlock>
         {/if}
       </svelte:fragment>

From 10bc6182ce304cf3471369f0c9a770a5fb692caa Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Tue, 22 Oct 2024 10:42:00 -0400
Subject: [PATCH 11/14] Bump rollup, vite (#238)

---
 package-lock.json | 134 +++++++++++++++++++++++-----------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ca0c179..51aa9efc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -888,9 +888,9 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
-      "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -901,9 +901,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
-      "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -914,9 +914,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
-      "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -927,9 +927,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
-      "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -940,9 +940,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
-      "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -953,9 +953,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
-      "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -966,9 +966,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
-      "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -979,9 +979,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
-      "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -992,9 +992,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
-      "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -1005,9 +1005,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
-      "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -1018,9 +1018,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
-      "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -1031,9 +1031,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
-      "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -1044,9 +1044,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
-      "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -1057,9 +1057,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
-      "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -1070,9 +1070,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
-      "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -1083,9 +1083,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
-      "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -4387,9 +4387,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.22.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
-      "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.6"
@@ -4402,22 +4402,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.5",
-        "@rollup/rollup-android-arm64": "4.22.5",
-        "@rollup/rollup-darwin-arm64": "4.22.5",
-        "@rollup/rollup-darwin-x64": "4.22.5",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.5",
-        "@rollup/rollup-linux-arm64-musl": "4.22.5",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.5",
-        "@rollup/rollup-linux-x64-gnu": "4.22.5",
-        "@rollup/rollup-linux-x64-musl": "4.22.5",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.5",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.5",
-        "@rollup/rollup-win32-x64-msvc": "4.22.5",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },

From 92bbf94e5369a32d539124d128171bb954742b96 Mon Sep 17 00:00:00 2001
From: Gcolon021 <34667267+Gcolon021@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:39:35 -0400
Subject: [PATCH 12/14] Enhance GA tracking consent check (#229)

[ALS-6742] FIX: Google Consents
- The default consent is now set on every page appropriately.
- Removed `security_storage` and replaced it with `ad_user_data`.
> - Updated unit test to reflect this change.
- Moved all related code into a single `GoogleTracking.svelte` class.
This made it easier to ensure things are loaded in the expected order
and to maintain the code.
---
 .../tracking/GoogleAnalytics.svelte           |  53 -------
 .../components/tracking/GoogleConsents.svelte |  65 --------
 .../tracking/GoogleTagManger.svelte           |  24 ---
 .../components/tracking/GoogleTracking.svelte | 139 ++++++++++++++++++
 src/routes/+layout.svelte                     |  22 +--
 tests/routes/login/test.ts                    |   4 +-
 6 files changed, 152 insertions(+), 155 deletions(-)
 delete mode 100644 src/lib/components/tracking/GoogleAnalytics.svelte
 delete mode 100644 src/lib/components/tracking/GoogleConsents.svelte
 delete mode 100644 src/lib/components/tracking/GoogleTagManger.svelte
 create mode 100644 src/lib/components/tracking/GoogleTracking.svelte

diff --git a/src/lib/components/tracking/GoogleAnalytics.svelte b/src/lib/components/tracking/GoogleAnalytics.svelte
deleted file mode 100644
index 042fb690..00000000
--- a/src/lib/components/tracking/GoogleAnalytics.svelte
+++ /dev/null
@@ -1,53 +0,0 @@
-<script lang="ts">
-  import { page } from '$app/stores';
-  import { settings } from '$lib/configuration';
-  import { gtag } from 'gtagjs';
-  import { onMount } from 'svelte';
-  import { browser } from '$app/environment';
-  let googleAnalyticsID = settings.google.analytics;
-
-  $: {
-    if (
-      googleAnalyticsID &&
-      browser &&
-      typeof gtag === 'function' &&
-      localStorage.getItem('consentMode')?.includes('granted')
-    ) {
-      console.debug('Tracking page view with Google Analytics');
-      // Send page view to Google Analytics
-      gtag('config', googleAnalyticsID, {
-        page_title: document.title,
-        page_path: $page.url.pathname,
-      });
-    }
-  }
-
-  const setupGoogleAnalytics = () => {
-    gtag('js', new Date());
-    gtag('config', googleAnalyticsID);
-
-    let consentMode = localStorage.getItem('consentMode');
-    if (!consentMode) {
-      // Default to deny all
-      gtag('consent', 'default', {
-        ad_storage: 'denied',
-        analytics_storage: 'denied',
-        personalization_storage: 'denied',
-        security_storage: 'denied',
-        ad_personalization: 'denied',
-        ad_data: 'denied',
-      });
-    }
-  };
-
-  onMount(() => {
-    googleAnalyticsID && setupGoogleAnalytics();
-  });
-</script>
-
-<svelte:head>
-  {#if googleAnalyticsID}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={googleAnalyticsID}">
-    </script>
-  {/if}
-</svelte:head>
diff --git a/src/lib/components/tracking/GoogleConsents.svelte b/src/lib/components/tracking/GoogleConsents.svelte
deleted file mode 100644
index d026f803..00000000
--- a/src/lib/components/tracking/GoogleConsents.svelte
+++ /dev/null
@@ -1,65 +0,0 @@
-<script lang="ts">
-  import { onMount } from 'svelte';
-  import { gtag } from 'gtagjs';
-  import { branding, settings } from '$lib/configuration';
-  let googleTag = settings.google.tagManager;
-  $: googleConsentVisible = false;
-
-  function setUsersGoogleConsent(wasAccepted: boolean) {
-    let consent = {
-      ad_storage: 'denied',
-      analytics_storage: wasAccepted ? 'granted' : 'denied',
-      personalization_storage: wasAccepted ? 'granted' : 'denied',
-      security_storage: wasAccepted ? 'granted' : 'denied',
-      ad_personalization: 'denied',
-      ad_data: 'denied',
-    };
-
-    gtag('consent', 'default', consent);
-    localStorage.setItem('consentMode', JSON.stringify(consent));
-    googleConsentVisible = false;
-  }
-
-  onMount(() => {
-    console.debug('Google Consent Mode');
-    let consentMode = localStorage.getItem('consentMode');
-    if (!consentMode) {
-      googleConsentVisible = true;
-    }
-  });
-</script>
-
-{#if googleTag && googleConsentVisible && branding?.privacyPolicy?.url && branding?.privacyPolicy?.title}
-  <div
-    data-testid="consentModal"
-    class="fixed"
-    style="left: 5%; bottom: 60px; z-index: 1000; width: 90%"
-  >
-    <div class="bg-surface-50-900-token p-4 rounded-container-token shadow-2xl">
-      <div class="flex flex-row justify-between items-center">
-        <div class="flex items center">
-          <p>
-            We use cookies to provide you with the best possible experience and to help us make the
-            site more useful to visitors. To learn more, please visit our <a
-              href={branding?.privacyPolicy?.url}
-              target="_blank"
-              class="anchor">{branding?.privacyPolicy?.title}</a
-            >.
-          </p>
-        </div>
-        <div class="flex flex-col justify-center">
-          <button
-            data-testid="acceptGoogleConsent"
-            class="btn variant-filled-primary mt-1 mb-1"
-            on:click={() => setUsersGoogleConsent(true)}>Accept</button
-          >
-          <button
-            data-testid="rejectGoogleConsent"
-            class="btn variant-ghost-primary mt-1 mb-1 self-center"
-            on:click={() => setUsersGoogleConsent(false)}>Reject</button
-          >
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}
diff --git a/src/lib/components/tracking/GoogleTagManger.svelte b/src/lib/components/tracking/GoogleTagManger.svelte
deleted file mode 100644
index dfe8829f..00000000
--- a/src/lib/components/tracking/GoogleTagManger.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script lang="ts">
-  import { settings } from '$lib/configuration';
-  import { onMount } from 'svelte';
-  let googleTag = settings.google.tagManager;
-
-  function setupDataLayer() {
-    window.dataLayer = window.dataLayer || [];
-    window.dataLayer.push({ event: 'gtm.js', 'gtm.start': new Date().getTime() });
-  }
-
-  onMount(() => {
-    if (!googleTag) {
-      console.debug('Google Tag Manager ID is not set');
-      return;
-    }
-    console.debug('Google Tag Manager ID:', googleTag);
-    setupDataLayer();
-
-    let script = document.createElement('script');
-    script.src = `https://www.googletagmanager.com/gtm.js?id=${googleTag}&l=dataLayer`;
-    script.async = true;
-    document.head.appendChild(script);
-  });
-</script>
diff --git a/src/lib/components/tracking/GoogleTracking.svelte b/src/lib/components/tracking/GoogleTracking.svelte
new file mode 100644
index 00000000..cd6f8287
--- /dev/null
+++ b/src/lib/components/tracking/GoogleTracking.svelte
@@ -0,0 +1,139 @@
+<script lang="ts">
+  import { onMount } from 'svelte';
+  import { gtag } from 'gtagjs';
+  import { branding, settings } from '$lib/configuration';
+  import { browser } from '$app/environment';
+  import { page } from '$app/stores';
+
+  let googleTag = settings.google.tagManager;
+  let googleAnalyticsID = settings.google.analytics;
+  $: googleConsentVisible = false;
+
+  $: {
+    if (
+      googleAnalyticsID &&
+      browser &&
+      typeof gtag === 'function' &&
+      localStorage.getItem('consentMode')?.includes('granted')
+    ) {
+      // Send page view to Google Analytics
+      gtag('js', new Date());
+      gtag('config', googleAnalyticsID, {
+        page_title: document.title,
+        page_path: $page.url.pathname,
+      });
+    }
+  }
+
+  function setUsersGoogleConsent(wasAccepted: boolean) {
+    let consent = {
+      ad_storage: 'denied',
+      analytics_storage: wasAccepted ? 'granted' : 'denied',
+      personalization_storage: wasAccepted ? 'granted' : 'denied',
+      ad_personalization: 'denied',
+      ad_data: 'denied',
+      ad_user_data: 'denied',
+    };
+
+    gtag('consent', 'update', consent);
+    localStorage.setItem('consentMode', JSON.stringify(consent));
+    googleConsentVisible = false;
+  }
+
+  onMount(() => {
+    let consentMode = localStorage.getItem('consentMode');
+    if (!consentMode) {
+      googleConsentVisible = true;
+    }
+
+    if (consentMode?.includes('granted')) {
+      gtag('consent', 'update', JSON.parse(consentMode));
+    }
+  });
+</script>
+
+<svelte:head>
+  {#if googleAnalyticsID}
+    <script async src="https://www.googletagmanager.com/gtag/js?id={googleAnalyticsID}"></script>
+    <script data-analyticsID={googleAnalyticsID}>
+      let googleAnalyticsID = document.currentScript.getAttribute('data-analyticsID');
+      window.dataLayer = window.dataLayer || [];
+
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+
+      gtag('js', new Date());
+      gtag('config', googleAnalyticsID);
+
+      gtag('consent', 'default', {
+        ad_storage: 'denied',
+        analytics_storage: 'denied',
+        personalization_storage: 'denied',
+        ad_personalization: 'denied',
+        ad_data: 'denied',
+        ad_user_data: 'denied',
+      });
+
+      let consents = localStorage.getItem('consentMode');
+      if (consents) {
+        consents = JSON.parse(consents);
+        gtag('consent', 'update', consents);
+      }
+    </script>
+  {/if}
+  {#if googleTag}
+    <script data-googleTag={googleTag}>
+      let googleTag = document.currentScript.getAttribute('data-googleTag');
+
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({
+          'gtm.start': new Date().getTime(),
+          event: 'gtm.js',
+        });
+        var f = d.getElementsByTagName(s)[0],
+          j = d.createElement(s),
+          dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', googleTag);
+    </script>
+  {/if}
+</svelte:head>
+
+{#if googleTag && googleConsentVisible && branding?.privacyPolicy?.url && branding?.privacyPolicy?.title}
+  <div
+    data-testid="consentModal"
+    class="fixed"
+    style="left: 5%; bottom: 60px; z-index: 1000; width: 90%"
+  >
+    <div class="bg-surface-50-900-token p-4 rounded-container-token shadow-2xl">
+      <div class="flex flex-row justify-between items-center">
+        <div class="flex items center">
+          <p>
+            We use cookies to provide you with the best possible experience and to help us make the
+            site more useful to visitors. To learn more, please visit our <a
+              href={branding?.privacyPolicy?.url}
+              target="_blank"
+              class="anchor">{branding?.privacyPolicy?.title}</a
+            >.
+          </p>
+        </div>
+        <div class="flex flex-col justify-center">
+          <button
+            data-testid="acceptGoogleConsent"
+            class="btn variant-filled-primary mt-1 mb-1"
+            on:click={() => setUsersGoogleConsent(true)}>Accept</button
+          >
+          <button
+            data-testid="rejectGoogleConsent"
+            class="btn variant-ghost-primary mt-1 mb-1 self-center"
+            on:click={() => setUsersGoogleConsent(false)}>Reject</button
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+{/if}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7fb2eb6c..3235fcb9 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,30 +3,30 @@
   import '../app.postcss';
   import { initializeStores } from '@skeletonlabs/skeleton';
   import { initializeBranding } from '$lib/configuration';
+  import GoogleTracking from '$lib/components/tracking/GoogleTracking.svelte';
   import { settings } from '$lib/configuration';
-  import GoogleAnalytics from '$lib/components/tracking/GoogleAnalytics.svelte';
-  import GoogleConsents from '$lib/components/tracking/GoogleConsents.svelte';
-  import GoogleTagManger from '$lib/components/tracking/GoogleTagManger.svelte';
-  let googleTagManagerId = settings.google.tagManager;
+
+  let googleTag = settings.google.tagManager;
 
   initializeStores();
   initializeBranding();
 </script>
 
-<main class="w-full h-full">
-  <!-- Google Tag Manager (noscript) -->
+<!-- Google Tag Manager (noscript) -->
+{#if googleTag}
   <noscript>
     <iframe
-      title="googleTagManager"
-      src="https://www.googletagmanager.com/ns.html?id={googleTagManagerId}"
+      src="https://www.googletagmanager.com/ns.html?id={googleTag}"
+      title="googleTagManger"
       height="0"
       width="0"
       style="display:none;visibility:hidden"
     ></iframe>
   </noscript>
   <!-- End Google Tag Manager (noscript) -->
+{/if}
+
+<main class="w-full h-full">
   <slot />
-  <GoogleConsents />
+  <GoogleTracking />
 </main>
-<GoogleAnalytics />
-<GoogleTagManger />
diff --git a/tests/routes/login/test.ts b/tests/routes/login/test.ts
index f95ed9f1..71b3b160 100644
--- a/tests/routes/login/test.ts
+++ b/tests/routes/login/test.ts
@@ -156,7 +156,7 @@ unauthedTest.describe('Login page', () => {
         expect(parsedGoogleConsent).toHaveProperty('ad_storage', 'denied');
         expect(parsedGoogleConsent).toHaveProperty('analytics_storage', 'granted');
         expect(parsedGoogleConsent).toHaveProperty('personalization_storage', 'granted');
-        expect(parsedGoogleConsent).toHaveProperty('security_storage', 'granted');
+        expect(parsedGoogleConsent).toHaveProperty('ad_user_data', 'denied');
         expect(parsedGoogleConsent).toHaveProperty('ad_personalization', 'denied');
         expect(parsedGoogleConsent).toHaveProperty('ad_data', 'denied');
       }
@@ -179,7 +179,7 @@ unauthedTest.describe('Login page', () => {
       expect(parsedGoogleConsent).toHaveProperty('ad_storage', 'denied');
       expect(parsedGoogleConsent).toHaveProperty('analytics_storage', 'denied');
       expect(parsedGoogleConsent).toHaveProperty('personalization_storage', 'denied');
-      expect(parsedGoogleConsent).toHaveProperty('security_storage', 'denied');
+      expect(parsedGoogleConsent).toHaveProperty('ad_user_data', 'denied');
       expect(parsedGoogleConsent).toHaveProperty('ad_personalization', 'denied');
       expect(parsedGoogleConsent).toHaveProperty('ad_data', 'denied');
     }

From c8e4a25a67eafe83178c26ac859080ac200c6e56 Mon Sep 17 00:00:00 2001
From: James <Jamestp19@gmail.com>
Date: Tue, 22 Oct 2024 15:59:30 -0400
Subject: [PATCH 13/14] [ALS-7506][ALS-7646] Fix logout bug & add message when
 timed out (#263)

---
 src/lib/api.ts                                |  6 +++--
 src/lib/components/Navigation.svelte          |  2 +-
 src/lib/services/dictionary.ts                | 23 ++++++++-----------
 src/lib/stores/User.ts                        | 15 ++++++++----
 .../(authentication)/login/+layout.svelte     |  2 ++
 .../(authentication)/login/+page.svelte       | 19 ++++++++++++++-
 6 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/lib/api.ts b/src/lib/api.ts
index e1514df9..a6246ed6 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -75,8 +75,10 @@ async function handleResponse(res: Response) {
       return text; //TODO: Change this
     }
   } else if (res.status === 401) {
-    logout();
-    throw error(401, 'Unauthorized');
+    browser &&
+      sessionStorage.setItem('logout-reason', 'Your session has timed out. Please log in.');
+    logout(undefined, true);
+    return;
   }
 
   throw error(res.status as NumericRange<400, 599>, await res.text());
diff --git a/src/lib/components/Navigation.svelte b/src/lib/components/Navigation.svelte
index 44d93138..0fa382db 100644
--- a/src/lib/components/Navigation.svelte
+++ b/src/lib/components/Navigation.svelte
@@ -132,7 +132,7 @@
             id="user-logout-btn"
             class="btn variant-ringed-primary"
             title="Logout"
-            on:click={() => logout(providerInstance)}>Logout</button
+            on:click={() => logout(providerInstance, false)}>Logout</button
           >
         </div>
       {:else}
diff --git a/src/lib/services/dictionary.ts b/src/lib/services/dictionary.ts
index 3a64c91f..be5181a7 100644
--- a/src/lib/services/dictionary.ts
+++ b/src/lib/services/dictionary.ts
@@ -49,16 +49,6 @@ export function searchDictionary(
   );
 }
 
-export async function getAllFacets(): Promise<DictionaryFacetResult[]> {
-  let request: DictionarySearchRequest = { facets: [], search: '' };
-  if (!get(page).url.pathname.includes('/discover')) {
-    request = addConsents(request);
-  }
-  const response: DictionaryFacetResult[] = await api.post(`${dictionaryUrl}facets/`, request);
-  initializeHiddenFacets(response);
-  return response;
-}
-
 function initializeHiddenFacets(response: DictionaryFacetResult[]) {
   // facets that have a count of zero should never be shown in the UI
   // this happens because of consent filters
@@ -87,11 +77,16 @@ export async function updateFacetsFromSearch(
     request = addConsents(request);
   }
 
-  const response: DictionaryFacetResult[] = await api.post(`${dictionaryUrl}facets/`, request);
-  if (facets.length === 0 && search.length === 0) {
-    initializeHiddenFacets(response);
+  try {
+    const response: DictionaryFacetResult[] = await api.post(`${dictionaryUrl}facets/`, request);
+    if (facets.length === 0 && search.length === 0) {
+      initializeHiddenFacets(response);
+    }
+    return response;
+  } catch (error) {
+    console.error('Failed to update facets from search:', error);
+    throw error;
   }
-  return response;
 }
 
 export async function getConceptDetails(
diff --git a/src/lib/stores/User.ts b/src/lib/stores/User.ts
index 5489d994..6e7e0dcf 100644
--- a/src/lib/stores/User.ts
+++ b/src/lib/stores/User.ts
@@ -8,6 +8,7 @@ import { routes, features, resources } from '$lib/configuration';
 import { goto } from '$app/navigation';
 import type { QueryInterface } from '$lib/models/query/Query';
 import type AuthProvider from '$lib/models/AuthProvider.ts';
+import { page } from '$app/stores';
 
 export const user: Writable<User> = writable(restoreUser());
 
@@ -134,11 +135,15 @@ export async function login(token: string) {
   }
 }
 
-export async function logout(authProvider: AuthProvider | undefined) {
+export async function logout(authProvider?: AuthProvider, redirect = false) {
   if (browser) {
     const token = localStorage.getItem('token');
-    token && api.get('/psama/logout');
-    token && localStorage.removeItem('token');
+    if (token) {
+      api.get('/psama/logout').catch((error) => {
+        console.error('Error logging out: ' + error);
+      });
+      localStorage.removeItem('token');
+    }
   }
 
   // get the auth provider
@@ -161,7 +166,9 @@ export async function logout(authProvider: AuthProvider | undefined) {
       });
   } else {
     user.set({});
-    goto('/login');
+    redirect
+      ? goto(`/login?redirectTo=${encodeURIComponent(get(page).url.pathname)}`)
+      : goto('/login');
   }
 }
 
diff --git a/src/routes/(authentication)/login/+layout.svelte b/src/routes/(authentication)/login/+layout.svelte
index 8ef023d8..6b98ce61 100644
--- a/src/routes/(authentication)/login/+layout.svelte
+++ b/src/routes/(authentication)/login/+layout.svelte
@@ -4,6 +4,7 @@
   import { onMount } from 'svelte';
   import Footer from '$lib/components/Footer.svelte';
   import Dots from '$lib/components/Dots.svelte';
+  import { Toast } from '@skeletonlabs/skeleton';
 
   onMount(() => {
     if ($user && $user.token) {
@@ -12,6 +13,7 @@
   });
 </script>
 
+<Toast position="t" />
 <div class="w-full full-height">
   <Dots class="top-dots" />
   <slot />
diff --git a/src/routes/(authentication)/login/+page.svelte b/src/routes/(authentication)/login/+page.svelte
index ea479cdf..1e45f4c5 100644
--- a/src/routes/(authentication)/login/+page.svelte
+++ b/src/routes/(authentication)/login/+page.svelte
@@ -6,11 +6,28 @@
   import type { AuthData } from '$lib/models/AuthProvider';
   import { branding, features } from '$lib/configuration';
   import { fly } from 'svelte/transition';
-
+  import { browser } from '$app/environment';
+  import { getToastStore } from '@skeletonlabs/skeleton';
+  import { onMount } from 'svelte';
+  const toastStore = getToastStore();
   const redirectTo = $page.url.searchParams.get('redirectTo') || '/';
   const siteName = branding?.applicationName;
   const description = branding?.login.description;
   const openPicsureLinkText = branding?.login.openPicsureLinkText;
+  let logoutReason: string | null;
+
+  onMount(() => {
+    if (browser) {
+      logoutReason = sessionStorage.getItem('logout-reason');
+      if (logoutReason) {
+        toastStore.trigger({
+          message: logoutReason!,
+          background: 'variant-filled-error',
+        });
+        sessionStorage.removeItem('logout-reason');
+      }
+    }
+  });
 
   let selected: string;
 

From 464f0d6c2e52e4eb7fdf97472eb094fcef45702c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 16:00:39 -0400
Subject: [PATCH 14/14] [docker] Bump node from 22.9.0-alpine3.19 to
 23.0.0-alpine3.19 (#268)

Bumps node from 22.9.0-alpine3.19 to 23.0.0-alpine3.19.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=node&package-manager=docker&previous-version=22.9.0-alpine3.19&new-version=23.0.0-alpine3.19)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: James <Jamestp19@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Dockerfile      | 2 +-
 Dockerfile.bdc  | 2 +-
 Dockerfile.prod | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 66ab24ea..3b38fa8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .
diff --git a/Dockerfile.bdc b/Dockerfile.bdc
index 485677eb..9b7522e3 100644
--- a/Dockerfile.bdc
+++ b/Dockerfile.bdc
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .
diff --git a/Dockerfile.prod b/Dockerfile.prod
index 58322156..f470405e 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -1,5 +1,5 @@
 # Step 1: Build the app with node
-FROM node:22.9.0-alpine3.19 AS builder
+FROM node:23.0.0-alpine3.19 AS builder
 WORKDIR /app
 COPY package*.json .
 COPY .env .