Skip to content

Commit 2b3e26f

Browse files
authored
ref(solidstart): Simplify middleware structure without subexport (#13494)
⚠️ This is a breaking change ⚠️ Simplifies the package by getting rid of the `@sentry/solidstart/middleware` subexport in favor of a regular export. The middleware now needs to be imported like this: ```js import { sentryBeforeResponseMiddleware } from '@sentry/solidstart'; ```
1 parent 3964548 commit 2b3e26f

File tree

8 files changed

+6
-19
lines changed

8 files changed

+6
-19
lines changed

packages/solidstart/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ Sentry.init({
7373

7474
### 4. Server instrumentation
7575

76-
Complete the setup by adding the Sentry middlware to your `src/middleware.ts` file:
76+
Complete the setup by adding the Sentry middleware to your `src/middleware.ts` file:
7777

7878
```typescript
79-
import { sentryBeforeResponseMiddleware } from '@sentry/solidstart/middleware';
79+
import { sentryBeforeResponseMiddleware } from '@sentry/solidstart';
8080
import { createMiddleware } from '@solidjs/start/middleware';
8181

8282
export default createMiddleware({

packages/solidstart/package.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@
3939
"require": "./build/cjs/index.server.js"
4040
}
4141
},
42-
"./middleware": {
43-
"types": "./middleware.d.ts",
44-
"import": {
45-
"types": "./middleware.d.ts",
46-
"default": "./build/esm/middleware.js"
47-
},
48-
"require": {
49-
"types": "./middleware.d.ts",
50-
"default": "./build/cjs/middleware.js"
51-
}
52-
},
5342
"./solidrouter": {
5443
"types": "./solidrouter.d.ts",
5544
"browser": {
@@ -106,7 +95,7 @@
10695
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
10796
"build:types:watch": "tsc -p tsconfig.types.json --watch",
10897
"build:tarball": "npm pack",
109-
"circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts && madge --circular src/solidrouter.client.ts && madge --circular src/solidrouter.server.ts && madge --circular src/solidrouter.ts && madge --circular src/middleware.ts",
98+
"circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts && madge --circular src/solidrouter.client.ts && madge --circular src/solidrouter.server.ts && madge --circular src/solidrouter.ts",
11099
"clean": "rimraf build coverage sentry-solidstart-*.tgz ./*.d.ts ./*.d.ts.map ./client ./server",
111100
"fix": "eslint . --format stylish --fix",
112101
"lint": "eslint . --format stylish",

packages/solidstart/rollup.npm.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export default makeNPMConfigVariants(
1212
'src/solidrouter.server.ts',
1313
'src/client/solidrouter.ts',
1414
'src/server/solidrouter.ts',
15-
'src/middleware.ts',
1615
],
1716
// prevent this internal code from ending up in our built package (this doesn't happen automatially because
1817
// the name doesn't match an SDK dependency)

packages/solidstart/src/server/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,3 +128,4 @@ export { withSentryErrorBoundary } from '@sentry/solid';
128128
export { init } from './sdk';
129129

130130
export * from './withServerActionInstrumentation';
131+
export * from './middleware';

packages/solidstart/test/middleware.test.ts renamed to packages/solidstart/test/server/middleware.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as SentryCore from '@sentry/core';
22
import { beforeEach, describe, it, vi } from 'vitest';
3-
import { sentryBeforeResponseMiddleware } from '../src/middleware';
4-
import type { ResponseMiddlewareResponse } from '../src/middleware';
3+
import { sentryBeforeResponseMiddleware } from '../../src/server';
4+
import type { ResponseMiddlewareResponse } from '../../src/server';
55

66
describe('middleware', () => {
77
describe('sentryBeforeResponseMiddleware', () => {

packages/solidstart/tsconfig.subexports-types.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"src/solidrouter.server.ts",
1616
"src/server/solidrouter.ts",
1717
"src/solidrouter.ts",
18-
"src/middleware.ts",
1918
],
2019
// Without this, we cannot output into the root dir
2120
"exclude": []

packages/solidstart/tsconfig.types.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
"src/solidrouter.server.ts",
1616
"src/server/solidrouter.ts",
1717
"src/solidrouter.ts",
18-
"src/middleware.ts",
1918
]
2019
}

0 commit comments

Comments
 (0)