From c5e7c808b2328f8dcbad017e1541a5ce217a6ff2 Mon Sep 17 00:00:00 2001
From: jill64 <intents.turrets0h@icloud.com>
Date: Mon, 11 Sep 2023 08:00:46 +0900
Subject: [PATCH] migration toucan v2 -> v3

---
 package.json                          |  2 +-
 packages/lib/src/server/initSentry.ts | 30 +++++++++++++--------------
 pnpm-lock.yaml                        | 18 ++++++++--------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index c7872ec..f57773d 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,6 @@
     "@sentry/utils": "^7.68.0",
     "@sveltejs/kit": "^1.24.1",
     "esm-env": "^1.0.0",
-    "toucan-js": "^3.0.0"
+    "toucan-js": "^3.2.3"
   }
 }
diff --git a/packages/lib/src/server/initSentry.ts b/packages/lib/src/server/initSentry.ts
index c23ffde..ddb879c 100644
--- a/packages/lib/src/server/initSentry.ts
+++ b/packages/lib/src/server/initSentry.ts
@@ -1,6 +1,6 @@
 import { isPrimitive } from '@sentry/utils'
 import type { Options } from 'toucan-js'
-import Toucan from 'toucan-js'
+import { Toucan, RewriteFrames } from 'toucan-js'
 
 export const initSentry = (
   request: Request,
@@ -8,21 +8,21 @@ export const initSentry = (
 ) => {
   const sentry = new Toucan({
     request,
-    allowedHeaders: [
-      'user-agent',
-      'cf-challenge',
-      'accept-encoding',
-      'accept-language',
-      'cf-ray',
-      'content-length',
-      'content-type',
-      'x-real-ip',
-      'host'
-    ],
-    allowedSearchParams: /(.*)/,
-    rewriteFrames: {
-      root: '/'
+    requestDataOptions: {
+      allowedHeaders: [
+        'user-agent',
+        'cf-challenge',
+        'accept-encoding',
+        'accept-language',
+        'cf-ray',
+        'content-length',
+        'content-type',
+        'x-real-ip',
+        'host'
+      ],
+      allowedSearchParams: /(.*)/
     },
+    integrations: [new RewriteFrames({ root: '/' })],
     ...additionalOptions
   })
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26f1025..36d8500 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,22 +9,22 @@ importers:
   .:
     dependencies:
       '@sentry/core':
-        specifier: ^7.68.0
+        specifier: 7.68.0
         version: 7.68.0
       '@sentry/svelte':
-        specifier: ^7.68.0
+        specifier: 7.68.0
         version: 7.68.0(svelte@4.2.0)
       '@sentry/utils':
-        specifier: ^7.68.0
+        specifier: 7.68.0
         version: 7.68.0
       '@sveltejs/kit':
-        specifier: ^1.24.1
+        specifier: 1.24.1
         version: 1.24.1(svelte@4.2.0)(vite@4.4.9)
       esm-env:
         specifier: ^1.0.0
         version: 1.0.0
       toucan-js:
-        specifier: ^3.0.0
+        specifier: ^3.2.3
         version: 3.2.3
     devDependencies:
       '@playwright/test':
@@ -46,8 +46,8 @@ importers:
         specifier: ^9.0.0
         version: 9.0.0(eslint@8.49.0)
       eslint-plugin-svelte:
-        specifier: ^2.33.0
-        version: 2.33.0(eslint@8.49.0)(svelte@4.2.0)
+        specifier: ^2.33.1
+        version: 2.33.1(eslint@8.49.0)(svelte@4.2.0)
       prettier:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1385,8 +1385,8 @@ packages:
       eslint: 8.49.0
     dev: true
 
-  /eslint-plugin-svelte@2.33.0(eslint@8.49.0)(svelte@4.2.0):
-    resolution: {integrity: sha512-kk7Z4BfxVjFYJseFcOpS8kiKNio7KnAnhFagmM89h1wNSKlM7tIn+uguNQppKM9leYW+S+Us0Rjg2Qg3zsEcvg==}
+  /eslint-plugin-svelte@2.33.1(eslint@8.49.0)(svelte@4.2.0):
+    resolution: {integrity: sha512-veYmyjsbt8ikXdaa6pLsgytdlzJpZZKw9vRaQlRBNKaLNmrbsdJulwiWfcDZ7tYJdaVpRB4iDFn/fuPeebxUVg==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0-0