From 00d0e3f5d32b25ac52618c7422160e07b7cf4551 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Thu, 15 Sep 2022 10:21:35 -0700 Subject: [PATCH 1/2] pass all of server.js data from root layout --- src/vite/transforms/kit/load.test.ts | 4 ++-- src/vite/transforms/kit/session.test.ts | 2 +- src/vite/transforms/kit/session.ts | 8 +------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/vite/transforms/kit/load.test.ts b/src/vite/transforms/kit/load.test.ts index 9a6067bbbe..fbd5b5e130 100644 --- a/src/vite/transforms/kit/load.test.ts +++ b/src/vite/transforms/kit/load.test.ts @@ -1010,7 +1010,7 @@ test('layout loads', async function () { }; return { - __houdini__session__: context.data?.__houdini__session__, + ...context.data, ...__houdini__vite__plugin__return__value__ }; } @@ -1095,7 +1095,7 @@ test('layout inline query', async function () { }; return { - __houdini__session__: context.data?.__houdini__session__, + ...context.data, ...__houdini__vite__plugin__return__value__ }; } diff --git a/src/vite/transforms/kit/session.test.ts b/src/vite/transforms/kit/session.test.ts index ac41dd3236..750ca38a09 100644 --- a/src/vite/transforms/kit/session.test.ts +++ b/src/vite/transforms/kit/session.test.ts @@ -260,7 +260,7 @@ test('passes session from root client-side layout', async function () { const __houdini__vite__plugin__return__value__ = {}; return { - __houdini__session__: event.data?.__houdini__session__, + ...event.data, ...__houdini__vite__plugin__return__value__ }; } diff --git a/src/vite/transforms/kit/session.ts b/src/vite/transforms/kit/session.ts index 1e899d1f2f..c5b037ac69 100644 --- a/src/vite/transforms/kit/session.ts +++ b/src/vite/transforms/kit/session.ts @@ -44,13 +44,7 @@ function process_root_layout_server(page: TransformPage) { // threading the value through the return function process_root_layout_script(page: TransformPage) { add_load_return(page, (event_id) => [ - AST.objectProperty( - AST.identifier('__houdini__session__'), - AST.optionalMemberExpression( - AST.memberExpression(event_id, AST.identifier('data')), - AST.identifier('__houdini__session__') - ) - ), + AST.spreadElement(AST.memberExpression(event_id, AST.identifier('data'))), ]) } From 335aaf2aa8248028034019159501e1d96dc394c4 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Thu, 15 Sep 2022 10:24:05 -0700 Subject: [PATCH 2/2] changeset --- .changeset/neat-jokes-lick.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/neat-jokes-lick.md diff --git a/.changeset/neat-jokes-lick.md b/.changeset/neat-jokes-lick.md new file mode 100644 index 0000000000..5ace5379b5 --- /dev/null +++ b/.changeset/neat-jokes-lick.md @@ -0,0 +1,5 @@ +--- +'houdini': patch +--- + +fix a bug hiding +layout.server data from client