Skip to content

Commit 501e442

Browse files
authored
deps(solidstart): Add explicit peer deps as devDependencies (#16860)
This adds explicit peer dependecies in the solidstart package. Those are dev dependencies only. Importantly, that seems to bump some things that result in slightly different types we need to adjust to. Extracted out of #16751
1 parent 68eef54 commit 501e442

File tree

4 files changed

+2032
-801
lines changed

4 files changed

+2032
-801
lines changed

packages/solidstart/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@
7777
"@solidjs/testing-library": "0.8.5",
7878
"@testing-library/jest-dom": "^6.4.5",
7979
"@testing-library/user-event": "^14.5.2",
80-
"vite-plugin-solid": "^2.11.6"
80+
"solid-js": "^1.8.4",
81+
"vite-plugin-solid": "^2.11.6",
82+
"vite": "^5.4.11",
83+
"vinxi": "^0.3.12"
8184
},
8285
"scripts": {
8386
"build": "run-p build:transpile build:types",

packages/solidstart/src/config/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export type RollupConfig = {
66
plugins: unknown[];
77
};
88

9-
export type SolidStartInlineConfig = Parameters<typeof defineConfig>[0];
9+
export type SolidStartInlineConfig = NonNullable<Parameters<typeof defineConfig>[0]>;
1010

1111
export type SolidStartInlineServerConfig = {
1212
hooks?: {

packages/solidstart/src/config/withSentry.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ export function withSentry(
3737

3838
const server = (solidStartConfig.server || {}) as SolidStartInlineServerConfig;
3939
const hooks = server.hooks || {};
40+
const viteConfig = solidStartConfig.vite;
4041
const vite =
41-
typeof solidStartConfig.vite === 'function'
42-
? (...args: unknown[]) => addSentryPluginToVite(solidStartConfig.vite(...args), sentryPluginOptions)
43-
: addSentryPluginToVite(solidStartConfig.vite, sentryPluginOptions);
42+
typeof viteConfig === 'function'
43+
? (...args: Parameters<typeof viteConfig>) => addSentryPluginToVite(viteConfig(...args), sentryPluginOptions)
44+
: addSentryPluginToVite(viteConfig, sentryPluginOptions);
4445

4546
return {
4647
...solidStartConfig,

0 commit comments

Comments
 (0)