Merge pull request #18 from jasonwaters/nexxt

XDex · web-flow · commit 5eef043433c5 · 2021-02-26T18:25:47.000+02:00
fix next-server-side-rendering-demo
diff --git a/advanced-atjs-integration-serverstate/package.json b/advanced-atjs-integration-serverstate/package.json
@@ -26,7 +26,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/ecid-analytics-atjs-integration/package.json b/ecid-analytics-atjs-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/ecid-analytics-integration/package.json b/ecid-analytics-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/ecid-customer-ids-integration/package.json b/ecid-customer-ids-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/ecid-integration/package.json b/ecid-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/feature-flag/package.json b/feature-flag/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "alpha",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.5",
     "express": "^4.17.1",
     "handlebars": "^4.7.4",
diff --git a/multiple-mbox-ecid-analytics-atjs-integration/package.json b/multiple-mbox-ecid-analytics-atjs-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }
diff --git a/next-server-side-rendering-demo/helpers/target-server-side.js b/next-server-side-rendering-demo/helpers/target-server-side.js
@@ -26,14 +26,21 @@ function getTargetOptions(ctx) {
   };
 }
 
-function setTraceToken(trace = {}, ctx) {
+function setTraceToken(request = {}, ctx) {
+  const { trace={} } = request;
   const { authorizationToken = ctx.query.authorization } = trace;
 
   if (!authorizationToken || typeof authorizationToken !== "string") {
-    return trace;
+    return request;
   }
 
-  return Object.assign({}, trace, { authorizationToken });
+  return {
+    ...request,
+    trace: {
+      ...trace,
+      authorizationToken
+    }
+  }
 }
 
 function setResponseCookies(ctx, response) {
@@ -47,12 +54,13 @@ async function prefetchOffers(ctx) {
     return {};
   }
   const requestURL = ctx.req.headers.host + ctx.asPath;
-  const prefetchViewsRequest = {
+  let prefetchViewsRequest = {
     prefetch: {
       views: [{ address: { url: requestURL } }]
     }
   };
-  prefetchViewsRequest.trace = setTraceToken(prefetchViewsRequest.trace, ctx);
+
+  prefetchViewsRequest = setTraceToken(prefetchViewsRequest, ctx);
 
   const options = Object.assign(
     { request: prefetchViewsRequest },
diff --git a/next-server-side-rendering-demo/package.json b/next-server-side-rendering-demo/package.json
@@ -20,7 +20,7 @@
     "@adobe/target-nodejs-sdk": false
   },
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "isomorphic-unfetch": "^3.0.0",
     "next": "^9.0.0",
     "nookies": "^2.0.8",
diff --git a/on-device-decisioning/package.json b/on-device-decisioning/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "alpha",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.5",
     "express": "^4.17.1",
     "handlebars": "^4.7.4",
diff --git a/react-shopping-cart-demo/package.json b/react-shopping-cart-demo/package.json
@@ -15,7 +15,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "axios": "^0.19.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.16.4",
diff --git a/shared-ecid-analytics-integration/package.json b/shared-ecid-analytics-integration/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1",
     "uuid": "^3.3.3"
diff --git a/target-only/package.json b/target-only/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   },
diff --git a/target-traces/package.json b/target-traces/package.json
@@ -25,7 +25,7 @@
   "author": "Adobe Systems Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@adobe/target-nodejs-sdk": "^1.0.3",
+    "@adobe/target-nodejs-sdk": "^2.1.0",
     "cookie-parser": "^1.4.4",
     "express": "^4.17.1"
   }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"author": "Adobe Systems Inc.",`
`27`	`27`	`"license": "Apache-2.0",`
`28`	`28`	`"dependencies": {`
`29`		`- "@adobe/target-nodejs-sdk": "^1.0.3",`
	`29`	`+ "@adobe/target-nodejs-sdk": "^2.1.0",`
`30`	`30`	`"cookie-parser": "^1.4.4",`
`31`	`31`	`"express": "^4.17.1"`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"author": "Adobe Systems Inc.",`
`26`	`26`	`"license": "Apache-2.0",`
`27`	`27`	`"dependencies": {`
`28`		`- "@adobe/target-nodejs-sdk": "^1.0.3",`
	`28`	`+ "@adobe/target-nodejs-sdk": "^2.1.0",`
`29`	`29`	`"cookie-parser": "^1.4.4",`
`30`	`30`	`"express": "^4.17.1"`
`31`	`31`	`}`