Skip to content

Fix dev overlay #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nksaraf merged 1 commit into from
Jan 8, 2024
Merged

Fix dev overlay #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 33 additions & 3 deletions packages/start/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,17 @@ export function defineConfig(baseConfig = {}) {
extensions,
target: "server",
plugins: async () => [
config("user", userConfig),
config("user", {
...userConfig,
optimizeDeps: {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),

serverTransform({
Expand Down Expand Up @@ -121,7 +131,17 @@ export function defineConfig(baseConfig = {}) {
extensions,
target: "browser",
plugins: async () => [
config("user", userConfig),
config("user", {
...userConfig,
optimizeDeps: {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),
serverFunctions.client({
runtime: normalize(fileURLToPath(new URL("./server-runtime.jsx", import.meta.url)))
Expand Down Expand Up @@ -161,7 +181,17 @@ export function defineConfig(baseConfig = {}) {
runtime: normalize(fileURLToPath(new URL("./server-fns-runtime.jsx", import.meta.url))),
// routes: solidStartServerFsRouter({ dir: `${start.appRoot}/routes`, extensions }),
plugins: async () => [
config("user", userConfig),
config("user", {
...userConfig,
optimizeDeps: {
...(userConfig.optimizeDeps || {}),
include: [
...(userConfig.optimizeDeps?.include || []),
'@solidjs/start > source-map-js',
'@solidjs/start > error-stack-parser',
],
},
}),
...(typeof plugins === "function" ? [...(await plugins())] : plugins),

solid({ ...start.solid, ssr: true, extensions: extensions.map(ext => `.${ext}`) }),
Expand Down
7 changes: 2 additions & 5 deletions packages/start/shared/dev-overlay/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
margin-bottom: 2rem;
z-index: 10;
gap: 0.5rem;
color: rgb(17 24 39);
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}

.dev-overlay-navbar {
Expand Down Expand Up @@ -87,7 +89,6 @@
}

.dev-overlay-page-counter {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 0.875rem;
line-height: 1.25rem;
font-weight: 600;
Expand Down Expand Up @@ -120,7 +121,6 @@
border-radius: 9999px;
background-color: rgb(249 250 251);
padding: 0.25rem 0.5rem;
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 0.875rem;
line-height: 1.25rem;
font-weight: 600;
Expand All @@ -146,7 +146,6 @@
}

.dev-overlay-error-info {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
display: flex;
flex-direction: column;
gap: 0.25rem;
Expand Down Expand Up @@ -208,7 +207,6 @@
}

.dev-overlay-stack-frame-function {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-weight: 700;
}

Expand Down Expand Up @@ -245,7 +243,6 @@
.dev-overlay-stack-frames-code-source {
font-size: 0.875rem;
line-height: 1.25rem;
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
color: rgb(249 250 251);
}

Expand Down