From 03c43aa8effdc4f75db0c52641472f5a4cbdfcc0 Mon Sep 17 00:00:00 2001 From: Daniel Woelfel Date: Fri, 12 Aug 2022 11:42:04 -0700 Subject: [PATCH 1/5] feat(graph): populate graph token in odb --- packages/runtime/src/templates/getHandler.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/packages/runtime/src/templates/getHandler.ts b/packages/runtime/src/templates/getHandler.ts index cac6bc159b..fc150831e7 100644 --- a/packages/runtime/src/templates/getHandler.ts +++ b/packages/runtime/src/templates/getHandler.ts @@ -130,6 +130,19 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str console.log( `[${event.httpMethod}] ${event.path} (${requestMode?.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`, ) + + const graphToken = event.netlifyGraphToken + if (graphToken) { + if (requestMode === 'ssr') { + multiValueHeaders['X-Netlify-Graph-Token'] = [graphToken] + } else { + // Prefix with underscore to help us determine the origin of the token + // allows us to write better error messages + // eslint-disable-next-line no-underscore-dangle + process.env._NETLIFY_GRAPH_TOKEN = graphToken + } + } + return { ...result, multiValueHeaders, From daa0d3cf83955cc7f5dc5e094fd1f9d5a399c0e8 Mon Sep 17 00:00:00 2001 From: Daniel Woelfel Date: Fri, 12 Aug 2022 13:27:52 -0700 Subject: [PATCH 2/5] feat(graph): simplify --- packages/runtime/src/templates/getHandler.ts | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/runtime/src/templates/getHandler.ts b/packages/runtime/src/templates/getHandler.ts index fc150831e7..3c0c145183 100644 --- a/packages/runtime/src/templates/getHandler.ts +++ b/packages/runtime/src/templates/getHandler.ts @@ -132,15 +132,11 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str ) const graphToken = event.netlifyGraphToken - if (graphToken) { - if (requestMode === 'ssr') { - multiValueHeaders['X-Netlify-Graph-Token'] = [graphToken] - } else { - // Prefix with underscore to help us determine the origin of the token - // allows us to write better error messages - // eslint-disable-next-line no-underscore-dangle - process.env._NETLIFY_GRAPH_TOKEN = graphToken - } + if (graphToken && requestMode !== 'ssr') { + // Prefix with underscore to help us determine the origin of the token + // allows us to write better error messages + // eslint-disable-next-line no-underscore-dangle + process.env._NETLIFY_GRAPH_TOKEN = graphToken } return { From ba65a56d33dd13927f6370ad5eded007efff42ee Mon Sep 17 00:00:00 2001 From: Daniel Woelfel Date: Fri, 12 Aug 2022 15:07:50 -0700 Subject: [PATCH 3/5] chore(graph): set env var before the launcher --- packages/runtime/src/templates/getHandler.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/runtime/src/templates/getHandler.ts b/packages/runtime/src/templates/getHandler.ts index 3c0c145183..dc8ef125b2 100644 --- a/packages/runtime/src/templates/getHandler.ts +++ b/packages/runtime/src/templates/getHandler.ts @@ -101,6 +101,14 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str const query = new URLSearchParams(event.queryStringParameters).toString() event.path = query ? `${event.path}?${query}` : event.path + const graphToken = event.netlifyGraphToken + if (graphToken && requestMode !== 'ssr') { + // Prefix with underscore to help us determine the origin of the token + // allows us to write better error messages + // eslint-disable-next-line no-underscore-dangle + process.env._NETLIFY_GRAPH_TOKEN = graphToken + } + const { headers, ...result } = await getBridge(event).launcher(event, context) // Convert all headers to multiValueHeaders @@ -131,14 +139,6 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str `[${event.httpMethod}] ${event.path} (${requestMode?.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`, ) - const graphToken = event.netlifyGraphToken - if (graphToken && requestMode !== 'ssr') { - // Prefix with underscore to help us determine the origin of the token - // allows us to write better error messages - // eslint-disable-next-line no-underscore-dangle - process.env._NETLIFY_GRAPH_TOKEN = graphToken - } - return { ...result, multiValueHeaders, From f555f468606257b86f224208e490b970b34d06da Mon Sep 17 00:00:00 2001 From: Daniel Woelfel Date: Fri, 12 Aug 2022 16:06:32 -0700 Subject: [PATCH 4/5] chore(graph): update functions dep --- package-lock.json | 18 +++++++++--------- packages/runtime/package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e53fd7736e..80701f16f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4130,9 +4130,9 @@ } }, "node_modules/@netlify/functions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.0.0.tgz", - "integrity": "sha512-7fnJv3vr8uyyyOYPChwoec6MjzsCw1CoRUO2DhQ1BD6bOyJRlD4DUaOOGlMILB2LCT8P24p5LexEGx8AJb7xdA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz", + "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==", "dependencies": { "is-promise": "^4.0.0" }, @@ -22768,10 +22768,10 @@ }, "packages/runtime": { "name": "@netlify/plugin-nextjs", - "version": "4.14.2", + "version": "4.15.0", "license": "MIT", "dependencies": { - "@netlify/functions": "^1.0.0", + "@netlify/functions": "^1.1.0", "@netlify/ipx": "^1.2.0", "@vercel/node-bridge": "^2.1.0", "chalk": "^4.1.2", @@ -25595,9 +25595,9 @@ } }, "@netlify/functions": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.0.0.tgz", - "integrity": "sha512-7fnJv3vr8uyyyOYPChwoec6MjzsCw1CoRUO2DhQ1BD6bOyJRlD4DUaOOGlMILB2LCT8P24p5LexEGx8AJb7xdA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-1.1.0.tgz", + "integrity": "sha512-XUFC5nt4iLMrDK+6WjYrDOW9h6XGIQlEk3o++xglFbDKc6dsP+k6rjfz3vl0w8S9Oiosxj3uLaPW18szJc1UgA==", "requires": { "is-promise": "^4.0.0" } @@ -25670,7 +25670,7 @@ "requires": { "@delucis/if-env": "^1.1.2", "@netlify/build": "^27.11.4", - "@netlify/functions": "^1.0.0", + "@netlify/functions": "^1.1.0", "@netlify/ipx": "^1.2.0", "@types/fs-extra": "^9.0.13", "@types/jest": "^27.4.1", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 6daeb7edee..2b80b60235 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -9,7 +9,7 @@ "manifest.yml" ], "dependencies": { - "@netlify/functions": "^1.0.0", + "@netlify/functions": "^1.1.0", "@netlify/ipx": "^1.2.0", "@vercel/node-bridge": "^2.1.0", "chalk": "^4.1.2", From 271eaffe67dad9a0edf6fccafcad025167c96e02 Mon Sep 17 00:00:00 2001 From: Daniel Woelfel Date: Fri, 12 Aug 2022 16:08:35 -0700 Subject: [PATCH 5/5] undo whitespace change --- packages/runtime/src/templates/getHandler.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/runtime/src/templates/getHandler.ts b/packages/runtime/src/templates/getHandler.ts index dc8ef125b2..c135dc2c0b 100644 --- a/packages/runtime/src/templates/getHandler.ts +++ b/packages/runtime/src/templates/getHandler.ts @@ -138,7 +138,6 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str console.log( `[${event.httpMethod}] ${event.path} (${requestMode?.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`, ) - return { ...result, multiValueHeaders,