Skip to content

Commit 4e7d34c

Browse files
committed
Run pnpm format
1 parent 202a615 commit 4e7d34c

File tree

6 files changed

+43
-38
lines changed

6 files changed

+43
-38
lines changed

packages/kit/src/runtime/server/index.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { set_private_env, set_public_env, set_safe_public_env } from '../shared-
33
import { options, get_hooks } from '__SERVER__/internal.js';
44
import { DEV } from 'esm-env';
55
import { filter_private_env, filter_public_env } from '../../utils/env.js';
6-
import { format_server_error } from './utils.js'
6+
import { format_server_error } from './utils.js';
77
import { prerendering } from '__sveltekit/environment';
88
import { set_read_implementation, set_manifest } from '__sveltekit/server';
99
import { set_app } from './app.js';
@@ -77,10 +77,15 @@ export class Server {
7777
this.#options.hooks = {
7878
handle: module.handle || (({ event, resolve }) => resolve(event)),
7979
handleError:
80-
module.handleError || (({ status, error, event }) => {
81-
const error_message = format_server_error(status, /** @type {Error} */ (error), event)
82-
console.error(error_message)
83-
}),
80+
module.handleError ||
81+
(({ status, error, event }) => {
82+
const error_message = format_server_error(
83+
status,
84+
/** @type {Error} */ (error),
85+
event
86+
);
87+
console.error(error_message);
88+
}),
8489
handleFetch: module.handleFetch || (({ request, fetch }) => fetch(request)),
8590
reroute: module.reroute || (() => {}),
8691
transport: module.transport || {}

packages/kit/src/runtime/server/utils.js

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -188,42 +188,44 @@ export function has_prerendered_path(manifest, pathname) {
188188
* @param {import('@sveltejs/kit').RequestEvent} event
189189
*/
190190
export function format_server_error(status, error, event) {
191-
let formatted_text = `\x1b[1;31m[${status}] ${event.request.method} ${event.url.pathname}\x1b[0m\n`
191+
const formatted_text = `\x1b[1;31m[${status}] ${event.request.method} ${event.url.pathname}\x1b[0m\n`;
192192

193-
if (status === 404) {
194-
return formatted_text + error.message
195-
}
193+
if (status === 404) {
194+
return formatted_text + error.message;
195+
}
196196

197-
return formatted_text + clean_up_stack_trace(error)
197+
return formatted_text + clean_up_stack_trace(error);
198198
}
199199

200200
/**
201201
* Provides a refined stack trace by excluding lines following the last occurrence of a line containing +page. +layout. or +server.
202202
* @param {Error} error
203203
*/
204204
export function clean_up_stack_trace(error) {
205-
const stack_trace = error.stack?.split('\n') ?? []
206-
const last_line_from_src_code = find_last_index(
207-
stack_trace, line => ['+page.', '+layout.', '+server.'].find(snippet => line.includes(snippet)) !== undefined
208-
)
205+
const stack_trace = error.stack?.split('\n') ?? [];
206+
const last_line_from_src_code = find_last_index(
207+
stack_trace,
208+
(line) =>
209+
['+page.', '+layout.', '+server.'].find((snippet) => line.includes(snippet)) !== undefined
210+
);
209211

210-
if (last_line_from_src_code === -1) {
211-
// default to the whole stack trace
212-
return error.stack
213-
}
212+
if (last_line_from_src_code === -1) {
213+
// default to the whole stack trace
214+
return error.stack;
215+
}
214216

215-
return stack_trace.slice(0, last_line_from_src_code + 1).join('\n')
217+
return stack_trace.slice(0, last_line_from_src_code + 1).join('\n');
216218
}
217219

218220
/**
219221
* @param {any[]} array
220222
* @param {(item: any, index: number, array: any[]) => boolean} predicate
221223
*/
222224
export function find_last_index(array, predicate) {
223-
for (let i = array.length - 1; i >= 0; i--) {
224-
if (predicate(array[i], i, array)) {
225-
return i;
226-
}
227-
}
228-
return -1;
229-
}
225+
for (let i = array.length - 1; i >= 0; i--) {
226+
if (predicate(array[i], i, array)) {
227+
return i;
228+
}
229+
}
230+
return -1;
231+
}

packages/kit/src/utils/filesystem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export function walk(cwd, dirs = false) {
105105
}
106106
}
107107

108-
return (walk_dir(''), all_files);
108+
return walk_dir(''), all_files;
109109
}
110110

111111
/** @param {string} str */

packages/kit/test/apps/basics/src/routes/css/dynamic/+page.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
let Dynamic;
33
</script>
44

5-
<button on:click={async () => {
5+
<button
6+
on:click={async () => {
67
Dynamic = (await import('./Dynamic.svelte')).default;
7-
}}
8-
>load component</button
8+
}}>load component</button
99
>
1010

1111
<svelte:component this={Dynamic}></svelte:component>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export const actions = {
2-
default: async () => {
3-
throw new Error('test')
4-
}
5-
}
2+
default: async () => {
3+
throw new Error('test');
4+
}
5+
};
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<br>
1+
<br />
22
<form method="post">
3-
<button type="submit">
4-
Trigger server error
5-
</button>
3+
<button type="submit"> Trigger server error </button>
64
</form>

0 commit comments

Comments
 (0)