Merge branch 'main' into mk/package-json-tidying

Author: kodiakhq[bot]

demos/canary/package-lock.json

@@ -14,6 +14,6 @@
     "react-dom": "18.1.0"
   },
   "devDependencies": {
-    "eslint": "8.16.0"
+    "eslint": "8.22.0"
   }
 }

demos/canary/package.json

@@ -15,7 +15,7 @@
     "react-dom": "18.1.0"
   },
   "devDependencies": {
-    "eslint": "8.14.0",
+    "eslint": "8.22.0",
     "eslint-config-next": "12.2.4"
   }
 }

demos/next-auth/package-lock.json

@@ -38,9 +38,9 @@
     "@typescript-eslint/parser": "~5.10.0",
     "babel-jest": "27.4.6",
     "cypress": "^8.3.0",
-    "eslint": "8.7.0",
+    "eslint": "8.22.0",
     "eslint-config-next": "12.2.4",
-    "eslint-config-prettier": "8.3.0",
+    "eslint-config-prettier": "8.5.0",
     "eslint-plugin-cypress": "^2.10.3",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsx-a11y": "6.5.1",

demos/next-i18next/package-lock.json

@@ -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