Skip to content

Commit

Permalink
log
Browse files Browse the repository at this point in the history
  • Loading branch information
benmccann committed Nov 27, 2022
1 parent df1b4be commit 1ecf84e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
2 changes: 2 additions & 0 deletions packages/kit/src/runtime/client/client.js
Expand Up @@ -647,6 +647,7 @@ export function create_client({ target, base }) {
});

if (import.meta.env.DEV) {
console.warn('loading node');
try {
lock_fetch();
data = (await node.shared.load.call(null, load_input)) ?? null;
Expand Down Expand Up @@ -1521,6 +1522,7 @@ export function create_client({ target, base }) {
},

_hydrate: async ({ status, error, node_ids, params, route, data: server_data_nodes, form }) => {
console.warn(`hydrating`);
hydrated = true;

const url = new URL(location.href);
Expand Down
7 changes: 4 additions & 3 deletions packages/kit/src/runtime/client/fetcher.js
Expand Up @@ -11,7 +11,7 @@ export function lock_fetch() {
export function unlock_fetch() {
loading -= 1;
}

console.warn(`initializing fetcher ${import.meta.env.DEV}`);
if (import.meta.env.DEV) {
let can_inspect_stack_trace = false;

Expand All @@ -23,11 +23,12 @@ if (import.meta.env.DEV) {
check_stack_trace();

window.fetch = (input, init) => {
const url = input instanceof Request ? input.url : input.toString();
const stack = /** @type {string} */ (new Error().stack);

const heuristic = can_inspect_stack_trace ? stack.includes('load_node') : loading;
console.warn(`doing fetch. heuristic: ${!!heuristic}. can_inspect_stack_trace: ${!!can_inspect_stack_trace}. loading: ${loading}`);
console.warn(stack);
if (heuristic) {
const url = input instanceof Request ? input.url : input.toString();
console.warn(
`Loading ${url} using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests`
);
Expand Down
24 changes: 10 additions & 14 deletions packages/kit/test/apps/basics/test/client.test.js
Expand Up @@ -608,28 +608,24 @@ test.describe('Load', () => {

if (process.env.DEV) {
test('using window.fetch causes a warning', async ({ page, baseURL }) => {
await Promise.all([
page.goto('/load/window-fetch/incorrect'),
page.waitForEvent('console', {
predicate: (message) => {
return (
message.text() ===
`Loading ${baseURL}/load/window-fetch/data.json using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests`
);
},
timeout: 3_000
})
]);
expect(await page.textContent('h1')).toBe('42');

/** @type {string[]} */
const warnings = [];

page.on('console', (msg) => {
if (msg.type() === 'warning') {
warnings.push(msg.text());
}
});

await page.goto('/load/window-fetch/incorrect');
expect(await page.textContent('h1')).toBe('42');

expect(warnings).toContain(
`Loading ${baseURL}/load/window-fetch/data.json using \`window.fetch\`. For best results, use the \`fetch\` that is passed to your \`load\` function: https://kit.svelte.dev/docs/load#making-fetch-requests`
);

warnings.length = 0;

await page.goto('/load/window-fetch/correct');
expect(await page.textContent('h1')).toBe('42');

Expand Down

0 comments on commit 1ecf84e

Please sign in to comment.