feat(solidjs): Drop solid router dep and vendor in types instead

Author: andreiborza

packages/solidjs/package.json

@@ -48,16 +48,13 @@
     "@sentry/utils": "8.5.0"
   },
   "peerDependencies": {
-    "solid-js": "1.8.x"
+    "solid-js": "^1.8.4"
   },
   "devDependencies": {
     "@solidjs/testing-library": "0.8.5",
-    "solid-js": "1.8.11",
+    "solid-js": "^1.8.11",
     "vite-plugin-solid": "^2.8.2"
   },
-  "optionalDependencies": {
-    "@solidjs/router": "0.13.3"
-  },
   "scripts": {
     "build": "run-p build:transpile build:types",
     "build:dev": "yarn build",

packages/solidjs/src/solidrouter.ts

@@ -15,25 +15,54 @@ import {
 } from '@sentry/core';
 import type { Client, Integration, Span } from '@sentry/types';
 import { logger } from '@sentry/utils';
-import type { BeforeLeaveEventArgs, Location, RouteSectionProps, RouterProps } from '@solidjs/router';
 import { createEffect, mergeProps, splitProps } from 'solid-js';
 import type { Component, JSX, ParentProps } from 'solid-js';
 import { createComponent } from 'solid-js/web';
 import { DEBUG_BUILD } from './debug-build';
 
-const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet<Client>();
+// Vendored solid router types so that we don't need to depend on solid router.
+// These are not exhaustive and loose on purpose.
+interface Location {
+  pathname: string;
+}
 
-type UserBeforeLeave = (listener: (e: BeforeLeaveEventArgs) => void) => void;
-type UseLocation = () => Location;
+interface BeforeLeaveEventArgs {
+  from: Location;
+  to: string | number;
+}
 
-let _useBeforeLeave: UserBeforeLeave;
-let _useLocation: UseLocation;
+interface RouteSectionProps<T = unknown> {
+  location: Location;
+  data?: T;
+  children?: JSX.Element;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type RouteDefinition<S extends string | string[] = any, T = unknown> = {
+  path?: S;
+  children?: RouteDefinition | RouteDefinition[];
+  component?: Component<RouteSectionProps<T>>;
+};
+
+interface RouterProps {
+  base?: string;
+  root?: Component<RouteSectionProps>;
+  children?: JSX.Element | RouteDefinition | RouteDefinition[];
+}
 
 interface SolidRouterOptions {
   useBeforeLeave: UserBeforeLeave;
   useLocation: UseLocation;
 }
 
+type UserBeforeLeave = (listener: (e: BeforeLeaveEventArgs) => void) => void;
+type UseLocation = () => Location;
+
+const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet<Client>();
+
+let _useBeforeLeave: UserBeforeLeave;
+let _useLocation: UseLocation;
+
 function handleNavigation(location: string): void {
   const client = getClient();
   if (!client || !CLIENTS_WITH_INSTRUMENT_NAVIGATION.has(client)) {

yarn.lock

@@ -7768,11 +7768,6 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
-"@solidjs/[email protected]":
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.13.3.tgz#f520362d716a58c0416a33372ae9e5ed1a26be9a"
-  integrity sha512-p8zznlvnN3KySMXqT8irhubgDNTETNa/guaGHU/cZl7kuiPO3PmkWNYfoNCygtEpoxLmLpf62/ZKeyhFdZexsw==
-
 "@solidjs/[email protected]":
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/@solidjs/testing-library/-/testing-library-0.8.5.tgz#97061b2286d8641bd43bf474e624c3bb47e486a6"
@@ -26123,6 +26118,7 @@ react-is@^18.0.0:
     "@remix-run/router" "1.0.2"
 
 "react-router-6@npm:[email protected]", [email protected]:
+  name react-router-6
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
   integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
@@ -27506,7 +27502,7 @@ seroval-plugins@^1.0.3:
   resolved "https://registry.yarnpkg.com/seroval-plugins/-/seroval-plugins-1.0.7.tgz#c02511a1807e9bc8f68a91fbec13474fa9cea670"
   integrity sha512-GO7TkWvodGp6buMEX9p7tNyIkbwlyuAWbI6G9Ec5bhcm7mQdu3JOK1IXbEUwb3FVzSc363GraG/wLW23NSavIw==
 
-seroval@^1.0.3:
+seroval@^1.0.4:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/seroval/-/seroval-1.0.7.tgz#ee48ad8ba69f1595bdd5c55d1a0d1da29dee7455"
   integrity sha512-n6ZMQX5q0Vn19Zq7CIKNIo7E75gPkGCFUEqDpa8jgwpYr/vScjqnQ6H09t1uIiZ0ZSK0ypEGvrYK2bhBGWsGdw==
@@ -27948,13 +27944,13 @@ socks@^2.6.2:
     ip "^2.0.0"
     smart-buffer "^4.2.0"
 
-[email protected]:
-  version "1.8.11"
-  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.11.tgz#0e7496a9834720b10fe739eaac250221d3f72cd5"
-  integrity sha512-WdwmER+TwBJiN4rVQTVBxocg+9pKlOs41KzPYntrC86xO5sek8TzBYozPEZPL1IRWDouf2lMrvSbIs3CanlPvQ==
+solid-js@^1.8.11:
+  version "1.8.17"
+  resolved "https://registry.yarnpkg.com/solid-js/-/solid-js-1.8.17.tgz#780ed6f0fd8633009d1b3c29d56bf6b6bb33bd50"
+  integrity sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==
   dependencies:
     csstype "^3.1.0"
-    seroval "^1.0.3"
+    seroval "^1.0.4"
     seroval-plugins "^1.0.3"
 
 solid-refresh@^0.6.3:
@@ -28456,6 +28452,7 @@ string-template@~0.2.1:
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -31204,6 +31201,7 @@ workerpool@^6.4.0:
   integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==