From 160f8c6f55194c96ed733b10e312854efc2e92ee Mon Sep 17 00:00:00 2001 From: baseballyama Date: Sat, 5 Mar 2022 22:18:01 +0900 Subject: [PATCH 1/4] consider `paths.assets` for `version.json` --- packages/kit/src/core/build/build_client.js | 2 +- packages/kit/src/runtime/client/utils.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/kit/src/core/build/build_client.js b/packages/kit/src/core/build/build_client.js index 3f0cfaf60c3d..1dee1a8c9b19 100644 --- a/packages/kit/src/core/build/build_client.js +++ b/packages/kit/src/core/build/build_client.js @@ -28,7 +28,7 @@ export async function build_client({ client_entry_file }) { process.env.VITE_SVELTEKIT_APP_VERSION = config.kit.version.name; - process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${config.kit.appDir}/version.json`; + process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${assets_base}version.json`; process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = `${config.kit.version.pollInterval}`; process.env.VITE_SVELTEKIT_AMP = config.kit.amp ? 'true' : ''; diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js index adad18224e69..c40d339f8528 100644 --- a/packages/kit/src/runtime/client/utils.js +++ b/packages/kit/src/runtime/client/utils.js @@ -1,6 +1,5 @@ import { writable } from 'svelte/store'; import { hash } from '../hash.js'; -import { base } from '../paths.js'; /** @param {HTMLDocument} doc */ export function get_base_uri(doc) { @@ -86,7 +85,7 @@ export function create_updated_store() { const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE; - const res = await fetch(`${base}/${file}`, { + const res = await fetch('' + file, { headers: { pragma: 'no-cache', 'cache-control': 'no-cache' From fe606badeb36bf74d9784a6feb5441f357e76dd3 Mon Sep 17 00:00:00 2001 From: baseballyama Date: Sat, 5 Mar 2022 22:18:44 +0900 Subject: [PATCH 2/4] add changeset --- .changeset/silent-crews-change.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/silent-crews-change.md diff --git a/.changeset/silent-crews-change.md b/.changeset/silent-crews-change.md new file mode 100644 index 000000000000..45d15c2bc32d --- /dev/null +++ b/.changeset/silent-crews-change.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +consider `paths.assets` for `version.json` From 5cb887020877461b6302f8b6a083e9b5422ef27e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 5 Mar 2022 13:04:00 -0500 Subject: [PATCH 3/4] construct path at runtime --- packages/kit/src/core/build/build_client.js | 2 +- packages/kit/src/runtime/client/utils.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/kit/src/core/build/build_client.js b/packages/kit/src/core/build/build_client.js index 1dee1a8c9b19..3f0cfaf60c3d 100644 --- a/packages/kit/src/core/build/build_client.js +++ b/packages/kit/src/core/build/build_client.js @@ -28,7 +28,7 @@ export async function build_client({ client_entry_file }) { process.env.VITE_SVELTEKIT_APP_VERSION = config.kit.version.name; - process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${assets_base}version.json`; + process.env.VITE_SVELTEKIT_APP_VERSION_FILE = `${config.kit.appDir}/version.json`; process.env.VITE_SVELTEKIT_APP_VERSION_POLL_INTERVAL = `${config.kit.version.pollInterval}`; process.env.VITE_SVELTEKIT_AMP = config.kit.amp ? 'true' : ''; diff --git a/packages/kit/src/runtime/client/utils.js b/packages/kit/src/runtime/client/utils.js index c40d339f8528..6c860120d444 100644 --- a/packages/kit/src/runtime/client/utils.js +++ b/packages/kit/src/runtime/client/utils.js @@ -1,5 +1,6 @@ import { writable } from 'svelte/store'; import { hash } from '../hash.js'; +import { assets } from '../paths.js'; /** @param {HTMLDocument} doc */ export function get_base_uri(doc) { @@ -85,7 +86,7 @@ export function create_updated_store() { const file = import.meta.env.VITE_SVELTEKIT_APP_VERSION_FILE; - const res = await fetch('' + file, { + const res = await fetch(`${assets}/${file}`, { headers: { pragma: 'no-cache', 'cache-control': 'no-cache' From a5b8ee09a876dd0b5741248b856d9f072a717e78 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 5 Mar 2022 14:01:09 -0500 Subject: [PATCH 4/4] Update .changeset/silent-crews-change.md --- .changeset/silent-crews-change.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/silent-crews-change.md b/.changeset/silent-crews-change.md index 45d15c2bc32d..fef985c42dd8 100644 --- a/.changeset/silent-crews-change.md +++ b/.changeset/silent-crews-change.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -consider `paths.assets` for `version.json` +fetch `version.json` relative to `paths.assets`, if set