totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-20 14:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

expose host in preload and page store

Browse Source
This commit is contained in:
Conduitry
2019-06-11 11:13:44 -04:00
parent e2f13aad7a
commit 57b11b4b67
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/app/app.ts
View File

@@ -121,7 +121,7 @@ export function select_target(url: URL): Target {
const part = route.parts[route.parts.length - 1]; const part = route.parts[route.parts.length - 1];
const params = part.params ? part.params(match) : {}; const params = part.params ? part.params(match) : {};
const page = { path, query, params }; const page = { host: location.host, path, query, params };
return { href: url.href, route, match, page }; return { href: url.href, route, match, page };
} }
@@ -129,7 +129,7 @@ export function select_target(url: URL): Target {
} }
export function handle_error(url: URL) { export function handle_error(url: URL) {
const { pathname, search } = location; const { host, pathname, search } = location;
const { session, preloaded, status, error } = initial_data; const { session, preloaded, status, error } = initial_data;
if (!root_preloaded) { if (!root_preloaded) {
@@ -154,7 +154,7 @@ export function handle_error(url: URL) {
} }
const query = extract_query(search); const query = extract_query(search);
render(null, [], props, { path: pathname, query, params: {} }); render(null, [], props, { host, path: pathname, query, params: {} });
} }
export function scroll_state() { export function scroll_state() {
@@ -301,6 +301,7 @@ export async function hydrate_target(target: Target): Promise<{
if (!root_preloaded) { if (!root_preloaded) {
root_preloaded = initial_data.preloaded[0] || root_preload.call(preload_context, { root_preloaded = initial_data.preloaded[0] || root_preload.call(preload_context, {
host: page.host,
path: page.path, path: page.path,
query: page.query, query: page.query,
params: {} params: {}
@@ -338,6 +339,7 @@ export async function hydrate_target(target: Target): Promise<{
if (ready || !initial_data.preloaded[i + 1]) { if (ready || !initial_data.preloaded[i + 1]) {
preloaded = preload preloaded = preload
? await preload.call(preload_context, { ? await preload.call(preload_context, {
host: page.host,
path: page.path, path: page.path,
query: page.query, query: page.query,
params: part.params ? part.params(target.match) : {} params: part.params ? part.params(target.match) : {}

1
runtime/src/app/types.ts
View File

@@ -56,6 +56,7 @@ export type Redirect = {
}; };
export type Page = { export type Page = {
host: string;
path: string; path: string;
params: Record<string, string>; params: Record<string, string>;
query: Record<string, string | string[]>; query: Record<string, string | string[]>;

3
runtime/src/server/middleware/get_page_handler.ts
View File

@@ -149,6 +149,7 @@ export function get_page_handler(
try { try {
const root_preloaded = manifest.root_preload const root_preloaded = manifest.root_preload
? manifest.root_preload.call(preload_context, { ? manifest.root_preload.call(preload_context, {
host: req.headers.host,
path: req.path, path: req.path,
query: req.query, query: req.query,
params: {} params: {}
@@ -168,6 +169,7 @@ export function get_page_handler(
return part.preload return part.preload
? part.preload.call(preload_context, { ? part.preload.call(preload_context, {
host: req.headers.host,
path: req.path, path: req.path,
query: req.query, query: req.query,
params params
@@ -218,6 +220,7 @@ export function get_page_handler(
stores: { stores: {
page: { page: {
subscribe: writable({ subscribe: writable({
host: req.headers.host,
path: req.path, path: req.path,
query: req.query, query: req.query,
params params