From 34d9baba871db1b54a52c721dd000883e63e1b45 Mon Sep 17 00:00:00 2001 From: David Roizenman Date: Thu, 1 Sep 2022 17:14:36 -0700 Subject: [PATCH] feat: use config.kit.paths.base for static assets fixes #4442, fixes #2843 - add manifest.appPath and builder.getAppPath() - adapter-cloudflare*: use manifest.appPath 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 | 5 +++-- packages/adapter-cloudflare/index.js | 5 +++-- packages/adapter-cloudflare/src/worker.js | 2 +- packages/adapter-netlify/index.js | 7 ++++--- packages/adapter-vercel/index.js | 2 +- packages/kit/src/core/adapt/builder.js | 4 ++++ packages/kit/src/core/generate_manifest/index.js | 1 + packages/kit/src/exports/vite/dev/index.js | 1 + packages/kit/src/exports/vite/index.js | 4 ++++ packages/kit/types/index.d.ts | 3 +++ packages/kit/types/internal.d.ts | 1 + 13 files changed, 36 insertions(+), 10 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 0000000000000..131bdef686942 --- /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 \ No newline at end of file diff --git a/packages/adapter-cloudflare-workers/files/entry.js b/packages/adapter-cloudflare-workers/files/entry.js index fe1c45a246eaf..9dd72c21f85ab 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 { app_path } = manifest; export default { /** diff --git a/packages/adapter-cloudflare-workers/index.js b/packages/adapter-cloudflare-workers/index.js index c8830c12bfa71..5c345661bdf23 100644 --- a/packages/adapter-cloudflare-workers/index.js +++ b/packages/adapter-cloudflare-workers/index.js @@ -73,8 +73,9 @@ export default function () { }); builder.log.minor('Copying assets...'); - builder.writeClient(site.bucket); - builder.writePrerendered(site.bucket); + const prefixedBucket = `${site.bucket}${builder.config.kit.paths.base}`; + builder.writeClient(prefixedBucket); + builder.writePrerendered(prefixedBucket); } }; } diff --git a/packages/adapter-cloudflare/index.js b/packages/adapter-cloudflare/index.js index 0b6eb5c41f980..a8504e8201aa0 100644 --- a/packages/adapter-cloudflare/index.js +++ b/packages/adapter-cloudflare/index.js @@ -23,8 +23,9 @@ export default function () { builder.rimraf(tmp); builder.mkdirp(tmp); - const written_files = builder.writeClient(dest); - builder.writePrerendered(dest); + const prefixedDest = `${dest}${builder.config.kit.paths.base}`; + const written_files = 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 d3223615f2a09..a861e07719b55 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 { app_path } = 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 6d77b17a7cccc..8bffa028fd20d 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -54,15 +54,16 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) { builder.log.minor(`Publishing to "${publish}"`); builder.log.minor('Copying assets...'); - builder.writeClient(publish); - builder.writePrerendered(publish); + const prefixedPublish = `${publish}${builder.config.kit.paths.base}`; + 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}/immutable/*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` + `\n\n/${builder.getAppPath()}/immutable/*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` ); if (edge) { diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js index 071d025e760ed..297df6dd6af2d 100644 --- a/packages/adapter-vercel/index.js +++ b/packages/adapter-vercel/index.js @@ -118,7 +118,7 @@ export default function ({ external = [], edge, split } = {}) { ...redirects[builder.config.kit.trailingSlash], ...prerendered_redirects, { - src: `/${builder.config.kit.appDir}/.+`, + src: `/${builder.getAppPath()}/.+`, 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 f8dcc36d1c61e..93998ec7e2e13 100644 --- a/packages/kit/src/core/adapt/builder.js +++ b/packages/kit/src/core/adapt/builder.js @@ -128,6 +128,10 @@ export function create_builder({ config, build_data, routes, prerendered, log }) return config.kit.files.assets; }, + getAppPath() { + return build_data.app_path; + }, + writeClient(dest) { return [...copy(`${config.kit.outDir}/output/client`, dest)]; }, diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js index 91ec769976363..46d56d340f032 100644 --- a/packages/kit/src/core/generate_manifest/index.js +++ b/packages/kit/src/core/generate_manifest/index.js @@ -45,6 +45,7 @@ export function generate_manifest({ build_data, relative_path, routes, format = /** @type {import('types').SSRManifest} */ return `{ appDir: ${s(build_data.app_dir)}, + appPath: ${s(build_data.app_path)}, assets: new Set(${s(assets)}), mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))}, _: { diff --git a/packages/kit/src/exports/vite/dev/index.js b/packages/kit/src/exports/vite/dev/index.js index cbab3e1a57796..489d78c9e4a6f 100644 --- a/packages/kit/src/exports/vite/dev/index.js +++ b/packages/kit/src/exports/vite/dev/index.js @@ -59,6 +59,7 @@ export async function dev(vite, vite_config, svelte_config) { manifest = { appDir: svelte_config.kit.appDir, + appPath: svelte_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/exports/vite/index.js b/packages/kit/src/exports/vite/index.js index c6b99a81527d5..d7781b0b28237 100644 --- a/packages/kit/src/exports/vite/index.js +++ b/packages/kit/src/exports/vite/index.js @@ -379,6 +379,7 @@ function kit() { ); log.info('Building server'); + const options = { cwd, config: svelte_config, @@ -395,6 +396,9 @@ function kit() { /** @type {import('types').BuildData} */ build_data = { app_dir: svelte_config.kit.appDir, + app_path: `${svelte_config.kit.paths.base}${ + !svelte_config.kit.paths.base.endsWith('/') ? '/' : '' + }${svelte_config.kit.appDir}`, manifest_data, service_worker: options.service_worker_entry_file ? 'service-worker.js' : null, // TODO make file configurable? client, diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index c346f5bc53d8b..9468fce84785a 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -85,6 +85,8 @@ export interface Builder { getClientDirectory(): string; getServerDirectory(): string; getStaticDirectory(): string; + /** The application path including any configured base path */ + getAppPath(): string; /** * @param dest the destination folder to which files should be copied @@ -379,6 +381,7 @@ export interface ServerInitOptions { export interface SSRManifest { appDir: string; + appPath: string; assets: Set; mimeTypes: Record; diff --git a/packages/kit/types/internal.d.ts b/packages/kit/types/internal.d.ts index 3f7ff7d760163..c2d27ee6fec94 100644 --- a/packages/kit/types/internal.d.ts +++ b/packages/kit/types/internal.d.ts @@ -47,6 +47,7 @@ export interface Asset { export interface BuildData { app_dir: string; + app_path: string; manifest_data: ManifestData; service_worker: string | null; client: {