From 9600881ae3db2f8c16c2234235c0ae3671aa4ffa Mon Sep 17 00:00:00 2001 From: chientrm Date: Mon, 19 Sep 2022 05:09:52 +0000 Subject: [PATCH 1/4] fix: #6458 --- packages/kit/src/runtime/client/client.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index 106b0c918f0c..75adfeceebaf 100644 --- a/packages/kit/src/runtime/client/client.js +++ b/packages/kit/src/runtime/client/client.js @@ -179,8 +179,8 @@ export function create_client({ target, base, trailing_slash }) { state, replaceState }, - accepted: () => {}, - blocked: () => {}, + accepted: () => { }, + blocked: () => { }, type: 'goto' }); } @@ -574,7 +574,7 @@ export function create_client({ target, base, trailing_slash }) { ? subsequent_fetch(resolved, init) : initial_fetch(requested, resolved, init); }, - setHeaders: () => {}, // noop + setHeaders: () => { }, // noop depends, parent() { uses.parent = true; @@ -699,8 +699,8 @@ export function create_client({ target, base, trailing_slash }) { // preload modules to avoid waterfall, but handle rejections // so they don't get reported to Sentry et al (we don't need // to act on the failures at this point) - errors.forEach((loader) => loader?.().catch(() => {})); - loaders.forEach((loader) => loader?.[1]().catch(() => {})); + errors.forEach((loader) => loader?.().catch(() => { })); + loaders.forEach((loader) => loader?.[1]().catch(() => { })); /** @type {import('types').ServerData | null} */ let server_data = null; @@ -714,7 +714,7 @@ export function create_client({ target, base, trailing_slash }) { acc.push(invalid); return acc; - }, /** @type {boolean[]} */ ([])); + }, /** @type {boolean[]} */([])); if (invalid_server_nodes.some(Boolean)) { try { @@ -781,7 +781,7 @@ export function create_client({ target, base, trailing_slash }) { }); // if we don't do this, rejections will be unhandled - for (const p of branch_promises) p.catch(() => {}); + for (const p of branch_promises) p.catch(() => { }); /** @type {Array} */ const branch = []; @@ -802,7 +802,7 @@ export function create_client({ target, base, trailing_slash }) { /** @type {App.PageError} */ let error; - if (server_data_nodes?.includes(/** @type {import('types').ServerErrorNode} */ (err))) { + if (server_data_nodes?.includes(/** @type {import('types').ServerErrorNode} */(err))) { // this is the server error rethrown above, reconstruct but don't invoke // the client error handler; it should've already been handled on the server status = /** @type {import('types').ServerErrorNode} */ (err).status ?? status; @@ -1065,7 +1065,7 @@ export function create_client({ target, base, trailing_slash }) { */ function native_navigation(url) { location.href = url.href; - return new Promise(() => {}); + return new Promise(() => { }); } if (import.meta.hot) { @@ -1459,7 +1459,7 @@ export function create_client({ target, base, trailing_slash }) { if (error instanceof Redirect) { // this is a real edge case — `load` would need to return // a redirect but only in the browser - await native_navigation(new URL(/** @type {Redirect} */ (e).location, location.href)); + await native_navigation(new URL(/** @type {Redirect} */(e).location, location.href)); return; } @@ -1486,6 +1486,7 @@ let data_id = 1; async function load_data(url, invalid) { const data_url = new URL(url); data_url.pathname = url.pathname.replace(/\/$/, '') + DATA_SUFFIX; + data_url.searchParams.set('__a', new Date().getTime().toString()); data_url.searchParams.set('__invalid', invalid.map((x) => (x ? 'y' : 'n')).join('')); data_url.searchParams.set('__id', String(data_id++)); @@ -1557,7 +1558,7 @@ function pre_update() { }; } - return () => {}; + return () => { }; } if (__SVELTEKIT_DEV__) { From 5bbb3597ce68cf4d22d9d669dd8478cda0d22027 Mon Sep 17 00:00:00 2001 From: chientrm Date: Mon, 19 Sep 2022 05:13:03 +0000 Subject: [PATCH 2/4] fix --- .changeset/moody-seahorses-attack.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/moody-seahorses-attack.md diff --git a/.changeset/moody-seahorses-attack.md b/.changeset/moody-seahorses-attack.md new file mode 100644 index 000000000000..4e5d938fa31f --- /dev/null +++ b/.changeset/moody-seahorses-attack.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +add timestamp to force revalidating data From dc5d670baa5f2f677eb8b40cd06c59a9c7066fb8 Mon Sep 17 00:00:00 2001 From: chientrm Date: Mon, 19 Sep 2022 05:16:52 +0000 Subject: [PATCH 3/4] fix --- packages/kit/src/runtime/client/client.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index 75adfeceebaf..12bcc4168847 100644 --- a/packages/kit/src/runtime/client/client.js +++ b/packages/kit/src/runtime/client/client.js @@ -179,8 +179,8 @@ export function create_client({ target, base, trailing_slash }) { state, replaceState }, - accepted: () => { }, - blocked: () => { }, + accepted: () => {}, + blocked: () => {}, type: 'goto' }); } @@ -574,7 +574,7 @@ export function create_client({ target, base, trailing_slash }) { ? subsequent_fetch(resolved, init) : initial_fetch(requested, resolved, init); }, - setHeaders: () => { }, // noop + setHeaders: () => {}, // noop depends, parent() { uses.parent = true; @@ -699,8 +699,8 @@ export function create_client({ target, base, trailing_slash }) { // preload modules to avoid waterfall, but handle rejections // so they don't get reported to Sentry et al (we don't need // to act on the failures at this point) - errors.forEach((loader) => loader?.().catch(() => { })); - loaders.forEach((loader) => loader?.[1]().catch(() => { })); + errors.forEach((loader) => loader?.().catch(() => {})); + loaders.forEach((loader) => loader?.[1]().catch(() => {})); /** @type {import('types').ServerData | null} */ let server_data = null; @@ -714,7 +714,7 @@ export function create_client({ target, base, trailing_slash }) { acc.push(invalid); return acc; - }, /** @type {boolean[]} */([])); + }, /** @type {boolean[]} */ ([])); if (invalid_server_nodes.some(Boolean)) { try { @@ -802,7 +802,7 @@ export function create_client({ target, base, trailing_slash }) { /** @type {App.PageError} */ let error; - if (server_data_nodes?.includes(/** @type {import('types').ServerErrorNode} */(err))) { + if (server_data_nodes?.includes(/** @type {import('types').ServerErrorNode} */ (err))) { // this is the server error rethrown above, reconstruct but don't invoke // the client error handler; it should've already been handled on the server status = /** @type {import('types').ServerErrorNode} */ (err).status ?? status; @@ -1065,7 +1065,7 @@ export function create_client({ target, base, trailing_slash }) { */ function native_navigation(url) { location.href = url.href; - return new Promise(() => { }); + return new Promise(() => {}); } if (import.meta.hot) { @@ -1459,7 +1459,7 @@ export function create_client({ target, base, trailing_slash }) { if (error instanceof Redirect) { // this is a real edge case — `load` would need to return // a redirect but only in the browser - await native_navigation(new URL(/** @type {Redirect} */(e).location, location.href)); + await native_navigation(new URL(/** @type {Redirect} */ (e).location, location.href)); return; } @@ -1558,7 +1558,7 @@ function pre_update() { }; } - return () => { }; + return () => {}; } if (__SVELTEKIT_DEV__) { From f6bde980cdab443e5e185ecf0aedfa900a52243d Mon Sep 17 00:00:00 2001 From: chientrm Date: Mon, 19 Sep 2022 05:17:19 +0000 Subject: [PATCH 4/4] fix --- packages/kit/src/runtime/client/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/src/runtime/client/client.js b/packages/kit/src/runtime/client/client.js index 12bcc4168847..8a94b8c18d2c 100644 --- a/packages/kit/src/runtime/client/client.js +++ b/packages/kit/src/runtime/client/client.js @@ -781,7 +781,7 @@ export function create_client({ target, base, trailing_slash }) { }); // if we don't do this, rejections will be unhandled - for (const p of branch_promises) p.catch(() => { }); + for (const p of branch_promises) p.catch(() => {}); /** @type {Array} */ const branch = [];