Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/solidstart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@
"@solidjs/testing-library": "0.8.5",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/user-event": "^14.5.2",
"vite-plugin-solid": "^2.11.6"
"solid-js": "^1.8.4",
"vite-plugin-solid": "^2.11.6",
"vite": "^5.4.11",
"vinxi": "^0.3.12"
},
"scripts": {
"build": "run-p build:transpile build:types",
Expand Down
2 changes: 1 addition & 1 deletion packages/solidstart/src/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export type RollupConfig = {
plugins: unknown[];
};

export type SolidStartInlineConfig = Parameters<typeof defineConfig>[0];
export type SolidStartInlineConfig = NonNullable<Parameters<typeof defineConfig>[0]>;

export type SolidStartInlineServerConfig = {
hooks?: {
Expand Down
7 changes: 4 additions & 3 deletions packages/solidstart/src/config/withSentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ export function withSentry(

const server = (solidStartConfig.server || {}) as SolidStartInlineServerConfig;
const hooks = server.hooks || {};
const viteConfig = solidStartConfig.vite;
const vite =
typeof solidStartConfig.vite === 'function'
? (...args: unknown[]) => addSentryPluginToVite(solidStartConfig.vite(...args), sentryPluginOptions)
: addSentryPluginToVite(solidStartConfig.vite, sentryPluginOptions);
typeof viteConfig === 'function'
? (...args: Parameters<typeof viteConfig>) => addSentryPluginToVite(viteConfig(...args), sentryPluginOptions)
: addSentryPluginToVite(viteConfig, sentryPluginOptions);

return {
...solidStartConfig,
Expand Down
Loading
Loading