Skip to content

fix: avoid suppressing errors when loading pages for ssr fails #8813

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
merged 6 commits into from
Feb 1, 2023
Merged

fix: avoid suppressing errors when loading pages for ssr fails #8813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecc6f1c
fix: output errors if pages fail to compile
gtm-nayan Jan 31, 2023
90d6a43
stupid javascript try catch syntax
gtm-nayan Jan 31, 2023
bff1899
changeset
gtm-nayan Jan 31, 2023
d60552e
less blatant copy paste, more code reuse
gtm-nayan Jan 31, 2023
60ffe18
use superior casing and wrap a few more places
gtm-nayan Feb 1, 2023
4889c81
why did I change this
gtm-nayan Feb 1, 2023
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: 5 additions & 0 deletions .changeset/curly-jobs-switch.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: output errors properly if pages fail to compile
22 changes: 18 additions & 4 deletions packages/kit/src/exports/vite/dev/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path from 'node:path';
import { URL } from 'node:url';
import colors from 'kleur';
import sirv from 'sirv';
import { isCSSRequest, loadEnv } from 'vite';
import { isCSSRequest, loadEnv, buildErrorMessage } from 'vite';
import { getRequest, setResponse } from '../../../exports/node/index.js';
import { installPolyfills } from '../../../exports/node/polyfills.js';
import { coalesce_to_error } from '../../../utils/error.js';
Expand Down Expand Up @@ -50,11 +50,25 @@ export async function dev(vite, vite_config, svelte_config) {
/** @type {Error | null} */
let manifest_error = null;

/** @param {string} url */
async function loud_ssr_load_module(url) {
Copy link
Member

@benmccann benmccann Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loud. Lol

Copy link
Member

@benmccann benmccann Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I thought it was a typo for load, but then I just noticed load is in the name later on, so maybe it's not a typo 🤣

try {
return await vite.ssrLoadModule(url);
} catch (/** @type {any} */ err) {
const msg = buildErrorMessage(err, [colors.red(`Internal server error: ${err.message}`)]);

vite.config.logger.error(msg, { error: err });
vite.ws.send({ type: 'error', err: err });

throw err;
}
}

/** @param {string} id */
async function resolve(id) {
const url = id.startsWith('..') ? `/@fs${path.posix.resolve(id)}` : `/${id}`;

const module = await vite.ssrLoadModule(url);
const module = await loud_ssr_load_module(url);

const module_node = await vite.moduleGraph.getModuleByUrl(url);
if (!module_node) throw new Error(`Could not find node for ${url}`);
Expand Down Expand Up @@ -161,7 +175,7 @@ export async function dev(vite, vite_config, svelte_config) {
(query.has('svelte') && query.get('type') === 'style')
) {
try {
const mod = await vite.ssrLoadModule(dep.url);
const mod = await loud_ssr_load_module(dep.url);
styles[dep.url] = mod.default;
} catch {
// this can happen with dynamically imported modules, I think
Expand Down Expand Up @@ -191,7 +205,7 @@ export async function dev(vite, vite_config, svelte_config) {
endpoint: endpoint
? async () => {
const url = path.resolve(cwd, endpoint.file);
return await vite.ssrLoadModule(url);
return await loud_ssr_load_module(url);
}
: null,
endpoint_id: endpoint?.file
Expand Down