From 9afc10e6d64e3608e0193ee4b5db48252c8ad0bd Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 11 Mar 2022 17:48:47 -0500 Subject: [PATCH 1/3] make manifest.mime part of the public API --- .changeset/early-pants-unite.md | 5 +++++ packages/kit/src/core/dev/plugin.js | 2 +- packages/kit/src/core/generate_manifest/index.js | 2 +- packages/kit/src/runtime/server/page/load_node.js | 2 +- packages/kit/types/index.d.ts | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 .changeset/early-pants-unite.md diff --git a/.changeset/early-pants-unite.md b/.changeset/early-pants-unite.md new file mode 100644 index 000000000000..296b59371420 --- /dev/null +++ b/.changeset/early-pants-unite.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +Make manifest.mime part of the public API diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js index 1045292bc3d3..d551f568e3cd 100644 --- a/packages/kit/src/core/dev/plugin.js +++ b/packages/kit/src/core/dev/plugin.js @@ -49,8 +49,8 @@ export async function create_plugin(config, cwd) { manifest = { appDir: config.kit.appDir, assets: new Set(manifest_data.assets.map((asset) => asset.file)), + mime: get_mime_lookup(manifest_data), _: { - mime: get_mime_lookup(manifest_data), entry: { file: `/@fs${runtime}/client/start.js`, css: [], diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js index 09f284a31a50..ce14c3142dc3 100644 --- a/packages/kit/src/core/generate_manifest/index.js +++ b/packages/kit/src/core/generate_manifest/index.js @@ -58,8 +58,8 @@ export function generate_manifest({ build_data, relative_path, routes, format = return `{ appDir: ${s(build_data.app_dir)}, assets: new Set(${s(assets)}), + mime: ${s(get_mime_lookup(build_data.manifest_data))}, _: { - mime: ${s(get_mime_lookup(build_data.manifest_data))}, entry: ${s(build_data.client.entry)}, nodes: [ ${Array.from(bundled_nodes.values()).map(node => importer(node.path)).join(',\n\t\t\t\t')} diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js index f2d29b3b97ad..bb931ad24c3f 100644 --- a/packages/kit/src/runtime/server/page/load_node.js +++ b/packages/kit/src/runtime/server/page/load_node.js @@ -155,7 +155,7 @@ export async function load_node({ if (options.read) { const type = is_asset - ? options.manifest._.mime[filename.slice(filename.lastIndexOf('.'))] + ? options.manifest.mime[filename.slice(filename.lastIndexOf('.'))] : 'text/html'; response = new Response(options.read(file), { diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index 9e695aecb138..418cb9e4b664 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -241,9 +241,10 @@ export class Server { export interface SSRManifest { appDir: string; assets: Set; + mime: Record; + /** private fields */ _: { - mime: Record; entry: { file: string; js: string[]; From 361fd6c960760ac2c0c9fb015e7a012876a96fbb Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 14 Mar 2022 08:58:31 -0400 Subject: [PATCH 2/3] change mime to mimeTypes --- packages/kit/src/core/dev/plugin.js | 2 +- packages/kit/src/core/generate_manifest/index.js | 2 +- packages/kit/src/runtime/server/page/load_node.js | 2 +- packages/kit/types/index.d.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kit/src/core/dev/plugin.js b/packages/kit/src/core/dev/plugin.js index d551f568e3cd..aee0b340c97a 100644 --- a/packages/kit/src/core/dev/plugin.js +++ b/packages/kit/src/core/dev/plugin.js @@ -49,7 +49,7 @@ export async function create_plugin(config, cwd) { manifest = { appDir: config.kit.appDir, assets: new Set(manifest_data.assets.map((asset) => asset.file)), - mime: get_mime_lookup(manifest_data), + mimeTypes: get_mime_lookup(manifest_data), _: { entry: { file: `/@fs${runtime}/client/start.js`, diff --git a/packages/kit/src/core/generate_manifest/index.js b/packages/kit/src/core/generate_manifest/index.js index ce14c3142dc3..2a79ccb5a29e 100644 --- a/packages/kit/src/core/generate_manifest/index.js +++ b/packages/kit/src/core/generate_manifest/index.js @@ -58,7 +58,7 @@ export function generate_manifest({ build_data, relative_path, routes, format = return `{ appDir: ${s(build_data.app_dir)}, assets: new Set(${s(assets)}), - mime: ${s(get_mime_lookup(build_data.manifest_data))}, + mimeTypes: ${s(get_mime_lookup(build_data.manifest_data))}, _: { entry: ${s(build_data.client.entry)}, nodes: [ diff --git a/packages/kit/src/runtime/server/page/load_node.js b/packages/kit/src/runtime/server/page/load_node.js index bb931ad24c3f..1aca3f4eb4da 100644 --- a/packages/kit/src/runtime/server/page/load_node.js +++ b/packages/kit/src/runtime/server/page/load_node.js @@ -155,7 +155,7 @@ export async function load_node({ if (options.read) { const type = is_asset - ? options.manifest.mime[filename.slice(filename.lastIndexOf('.'))] + ? options.manifest.mimeTypes[filename.slice(filename.lastIndexOf('.'))] : 'text/html'; response = new Response(options.read(file), { diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index 418cb9e4b664..fbae9a124e83 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -241,7 +241,7 @@ export class Server { export interface SSRManifest { appDir: string; assets: Set; - mime: Record; + mimeTypes: Record; /** private fields */ _: { From 9eab40794953b0a97cf7d44ffb5089ba9433638c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 14 Mar 2022 08:58:54 -0400 Subject: [PATCH 3/3] update changeset --- .changeset/early-pants-unite.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/early-pants-unite.md b/.changeset/early-pants-unite.md index 296b59371420..bec507a4d306 100644 --- a/.changeset/early-pants-unite.md +++ b/.changeset/early-pants-unite.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -Make manifest.mime part of the public API +Make `manifest.mimeTypes` part of the public API