From 6aea7c55a37d8ff7e4c0d7737b0e748e9ce28e5e Mon Sep 17 00:00:00 2001 From: David Roizenman Date: Thu, 24 Mar 2022 15:37:36 -0700 Subject: [PATCH] feat: use config.kit.paths.base for static assets fixes #4442, fixes #2843 - add manifest.prefix and builder.getAppPrefixDirectory() - adapter-cloudflare*: use manifest.prefix instead of manifest.appDir - adapter-netlify: use prefixed appDir for cache headers - adapter-vercel: use prefixed appDir for routes.json - adapter-cloudflare, adapter-cloudflare-workers, adapter-netlify: write static assets to "$dest/$base" --- .changeset/smooth-waves-accept.md | 9 +++++++++ packages/adapter-cloudflare-workers/files/entry.js | 2 +- packages/adapter-cloudflare-workers/index.js | 8 +++++--- packages/adapter-cloudflare/index.js | 7 ++++--- packages/adapter-cloudflare/src/worker.js | 2 +- packages/adapter-netlify/index.js | 10 ++++++---- packages/adapter-vercel/index.js | 4 ++-- packages/kit/src/core/adapt/builder.js | 4 ++++ packages/kit/src/core/build/index.js | 4 +++- packages/kit/src/core/dev/plugin.js | 1 + packages/kit/src/core/generate_manifest/index.js | 1 + packages/kit/types/index.d.ts | 2 ++ packages/kit/types/internal.d.ts | 1 + 13 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 .changeset/smooth-waves-accept.md diff --git a/.changeset/smooth-waves-accept.md b/.changeset/smooth-waves-accept.md new file mode 100644 index 000000000000..56076284d9a8 --- /dev/null +++ b/.changeset/smooth-waves-accept.md @@ -0,0 +1,9 @@ +--- +'@sveltejs/adapter-cloudflare': patch +'@sveltejs/adapter-cloudflare-workers': patch +'@sveltejs/adapter-netlify': patch +'@sveltejs/adapter-vercel': patch +'@sveltejs/kit': patch +--- + +Use config.kit.paths.base prefix for static assets diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js index 96af27c22634..ede56b49d06a 100644 --- a/packages/adapter-cloudflare-workers/files/entry.js +++ b/packages/adapter-cloudflare-workers/files/entry.js @@ -6,7 +6,7 @@ const static_asset_manifest = JSON.parse(static_asset_manifest_json); const server = new Server(manifest); -const prefix = `/${manifest.appDir}/`; +const { prefix } = manifest; export default { /** diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index f5b537a8b7e0..0bdae4d0d9b2 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -71,9 +71,11 @@ export default function (options = {}) { ); builder.log.minor('Copying assets...'); - builder.writeClient(bucket); - builder.writeStatic(bucket); - builder.writePrerendered(bucket); + + const prefixedBucket = `${bucket}${builder.config.kit.paths.base}`; + builder.writeClient(prefixedBucket); + builder.writeStatic(prefixedBucket); + builder.writePrerendered(prefixedBucket); } }; } diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index d79e65807257..f163229551b9 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -16,9 +16,10 @@ export default function (options = {}) { builder.rimraf(tmp); builder.mkdirp(tmp); - builder.writeStatic(dest); - builder.writeClient(dest); - builder.writePrerendered(dest); + const prefixedDest = `${dest}${builder.config.kit.paths.base}`; + builder.writeStatic(prefixedDest); + builder.writeClient(prefixedDest); + builder.writePrerendered(prefixedDest); const relativePath = posix.relative(tmp, builder.getServerDirectory()); diff --git a/packages/adapter-cloudflare/src/worker.js b/packages/adapter-cloudflare/src/worker.js index af770b93222d..3c93f6f697f3 100644 --- a/packages/adapter-cloudflare/src/worker.js +++ b/packages/adapter-cloudflare/src/worker.js @@ -4,7 +4,7 @@ import * as Cache from 'worktop/cfw.cache'; const server = new Server(manifest); -const prefix = `/${manifest.appDir}/`; +const { prefix } = manifest; /** @type {import('worktop/cfw').Module.Worker<{ ASSETS: import('worktop/cfw.durable').Durable.Object }>} */ const worker = { diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js index 917dabe00e65..7ed5e14562dc 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -69,16 +69,18 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) { } builder.log.minor('Copying assets...'); - builder.writeStatic(publish); - builder.writeClient(publish); - builder.writePrerendered(publish); + + const prefixedPublish = `${publish}${builder.config.kit.paths.base}`; + builder.writeStatic(prefixedPublish); + builder.writeClient(prefixedPublish); + builder.writePrerendered(prefixedPublish); builder.log.minor('Writing custom headers...'); const headers_file = join(publish, '_headers'); builder.copy('_headers', headers_file); appendFileSync( headers_file, - `\n\n/${builder.config.kit.appDir}/*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` + `\n\n${builder.getPrefixedAppDirectory()}*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` ); } }; diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js index f98c2c4b5137..31f86e608400 100644 --- a/packages/adapter-vercel/index.js +++ b/packages/adapter-vercel/index.js @@ -177,7 +177,7 @@ async function v1(builder, external) { ...prerendered_pages, ...prerendered_redirects, { - src: `/${builder.config.kit.appDir}/.+`, + src: `/${builder.getPrefixedAppDirectory()}/.+`, headers: { 'cache-control': 'public, immutable, max-age=31536000' } @@ -227,7 +227,7 @@ async function v3(builder, external, edge, split) { ...redirects[builder.config.kit.trailingSlash], ...prerendered_redirects, { - src: `/${builder.config.kit.appDir}/.+`, + src: `/${builder.getPrefixedAppDirectory()}/.+`, headers: { 'cache-control': 'public, immutable, max-age=31536000' } diff --git a/packages/kit/src/core/adapt/builder.js b/packages/kit/src/core/adapt/builder.js index a06e88e99eca..7128432767a5 100644 --- a/packages/kit/src/core/adapt/builder.js +++ b/packages/kit/src/core/adapt/builder.js @@ -120,6 +120,10 @@ export function create_builder({ config, build_data, prerendered, log }) { return config.kit.files.assets; }, + getPrefixedAppDirectory() { + return build_data.prefix; + }, + writeClient(dest) { return copy(`${config.kit.outDir}/output/client`, dest); }, diff --git a/packages/kit/src/core/build/index.js b/packages/kit/src/core/build/index.js index 61def523cc7f..a7308ec85d6e 100644 --- a/packages/kit/src/core/build/index.js +++ b/packages/kit/src/core/build/index.js @@ -26,6 +26,7 @@ export async function build(config, { log }) { const { manifest_data } = sync.all(config); + const assets_prefix = `${config.kit.paths.assets || config.kit.paths.base}/${config.kit.appDir}/`; const options = { cwd, config, @@ -34,7 +35,7 @@ export async function build(config, { log }) { // during `svelte-kit preview`, because we use a local asset path. If Vite // used relative paths, I _think_ this could get fixed. Issue here: // https://github.com/vitejs/vite/issues/2009 - assets_base: `${config.kit.paths.assets || config.kit.paths.base}/${config.kit.appDir}/`, + assets_base: assets_prefix, manifest_data, output_dir, client_entry_file: path.relative(cwd, `${get_runtime_path(config)}/client/start.js`), @@ -48,6 +49,7 @@ export async function build(config, { log }) { /** @type {import('types').BuildData} */ const build_data = { app_dir: config.kit.appDir, + prefix: assets_prefix, manifest_data: options.manifest_data, service_worker: options.service_worker_entry_file ? 'service-worker.js' : null, // TODO make file configurable? client, diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js index d778fd28cf87..8bb05911d22d 100644 --- a/packages/kit/src/core/dev/plugin.js +++ b/packages/kit/src/core/dev/plugin.js @@ -50,6 +50,7 @@ export async function create_plugin(config, cwd) { manifest = { appDir: config.kit.appDir, + prefix: config.kit.appDir, assets: new Set(manifest_data.assets.map((asset) => asset.file)), mimeTypes: get_mime_lookup(manifest_data), _: { diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js index 4d9b326bc1ea..e512a7cce80d 100644 --- a/packages/kit/src/core/generate_manifest/index.js +++ b/packages/kit/src/core/generate_manifest/index.js @@ -63,6 +63,7 @@ export function generate_manifest({ build_data, relative_path, routes, format = // prettier-ignore return `{ appDir: ${s(build_data.app_dir)}, + prefix: ${s(build_data.prefix)}, assets: new Set(${s(assets)}), mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))}, _: { diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index 3629cf0c66d2..9736bc3ee8d4 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -46,6 +46,7 @@ export interface Builder { getClientDirectory(): string; getServerDirectory(): string; getStaticDirectory(): string; + getPrefixedAppDirectory(): string; /** * @param dest the destination folder to which files should be copied @@ -261,6 +262,7 @@ export class Server { export interface SSRManifest { appDir: string; + prefix: string; assets: Set; mimeTypes: Record; diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts index 7c8ab989c63d..ee05ee6d2446 100644 --- a/packages/kit/types/internal.d.ts +++ b/packages/kit/types/internal.d.ts @@ -43,6 +43,7 @@ export interface Asset { export interface BuildData { app_dir: string; + prefix: string; manifest_data: ManifestData; service_worker: string | null; client: {