Merge branch 'main' into main

PravinPK · Jan 17, 2024 · 8912d28 · 8912d28
2 parents b65f9d4 + ce5dfa5
commit 8912d28
Show file tree

Hide file tree

Showing 51 changed files with 2,020 additions and 557 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,10 +7,12 @@ updates:
     # Check the npm registry for updates every day (weekdays)
     schedule:
       interval: "daily"
+    allow:
+      - dependency-name: "@adobe/gatsby-theme-aio"
     versioning-strategy: increase
     open-pull-requests-limit: 25
     labels:
       - "dependencies"
     ignore:
       # Ignore updates to package
-      - dependency-name: "gatsby"
+      - dependency-name: "gatsby"
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -11,17 +11,21 @@
  */
 module.exports = {
     siteMetadata: {
-        versions: [{
-                title: 'Latest version',
-                path: '/client-sdks/',
-                selected: true
-            },
-            {
-                title: 'Previous versions',
-                path: '/client-sdks/previous-versions/'
-            }
-        ],
         pages: [
+            {
+                title: "Versions",
+                menu: [
+                    {
+                        title: "Latest version",
+                        path: "/home",
+                        selected: true
+                    },
+                    {
+                        title: "Previous versions",
+                        path: '/previous-versions/'
+                    }
+                ]
+            },
             {
                 title: "Home",
                 path: "/home"
@@ -125,6 +129,16 @@ module.exports = {
                                 title: "Validation",
                                 path: "/edge/edge-network/validation"
                             },
+                            {
+                                title: "Tutorials",
+                                path: "/edge/edge-network/tutorials",
+                                pages: [
+                                    {
+                                        title: "Datastream config overrides using rules",
+                                        path: "/edge/edge-network/tutorials/datastream-config-override-rules"
+                                    }
+                                ]
+                            },
                             {
                                 title: "Release notes",
                                 path: "/edge/edge-network/release-notes"
@@ -717,8 +731,8 @@ module.exports = {
                         path: "/resources/faq"
                     },
                     {
-                        title: "ACP SDKs end-of-support",
-                        path: "/resources/acp-end-of-support"
+                        title: "SDKs end-of-support announcements",
+                        path: "/resources/sdks-end-of-support"
                     },
                     {
                         title: "Adobe Mobile Library (v4) end-of-support",
@@ -755,6 +769,32 @@ module.exports = {
                     }
 
                 ]
+            },{
+                title: "Migration",
+                path: "/resources/migration",
+                pages: [{
+                        title: "Android",
+                        path: "/resources/migration/android",
+                        pages: [{
+                                title: "Migrate to 2.x SDKs",
+                                path: "/resources/migration/android/migrate-to-2x"
+                            }
+                        ]
+                    },
+                    {
+                        title: "iOS",
+                        path: "/resources/migration/ios",
+                        pages: [{
+                                title: "Migrate to 4.x SDKs",
+                                path: "/resources/migration/ios/migrate-to-4x"
+                            },
+                            {
+                                title: "Migrate to 3.x SDKs",
+                                path: "/resources/migration/ios/migrate-to-3x"
+                            },                            
+                        ]
+                    }
+                ]
             },
             {
                 title: "User guides",
@@ -806,4 +846,4 @@ module.exports = {
     },
     plugins: [`@adobe/gatsby-theme-aio`],
     pathPrefix: process.env.PATH_PREFIX || '/client-sdks/'
-};
+};
diff --git a/package.json b/package.json
@@ -12,11 +12,15 @@
     "url": "https://github.com/icaraps"
   },
   "dependencies": {
-    "@adobe/gatsby-theme-aio": "^4.10.5",
+    "@adobe/gatsby-theme-aio": "^4.10.7",
     "gatsby": "4.22.0",
     "react": "^18.2.0",
     "react-dom": "^17.0.2"
   },
+  "resolutions": {
+    "sharp": "0.33.0",
+    "gatsby-sharp": "1.12.0"
+  },
   "scripts": {
     "start": "gatsby build && gatsby serve",
     "start:prefix": "gatsby build --prefix-paths && gatsby serve --prefix-paths",

diff --git a/src/pages/edge/adobe-journey-optimizer-decisioning/release-notes.md b/src/pages/edge/adobe-journey-optimizer-decisioning/release-notes.md
@@ -6,7 +6,7 @@ keywords:
 - Release notes
 ---
 
-# Release Notes
+# Release notes
 
 ## October 5, 2023
 

diff --git a/src/pages/edge/adobe-journey-optimizer/release-notes.md b/src/pages/edge/adobe-journey-optimizer/release-notes.md
@@ -7,7 +7,7 @@ keywords:
 - Release notes
 ---
 
-# Release Notes
+# Release notes
 
 ## September 28, 2023
 

diff --git a/src/pages/edge/consent-for-edge-network/release-notes.md b/src/pages/edge/consent-for-edge-network/release-notes.md
@@ -7,7 +7,7 @@ keywords:
 - Release notes
 ---
 
-# Release Notes
+# Release notes
 
 ## June 1, 2023
 

diff --git a/src/pages/edge/edge-network/api-reference.md b/src/pages/edge/edge-network/api-reference.md
@@ -60,6 +60,15 @@ See [MobileCore.resetIdentities](../../home/base/mobile-core/api-reference.md#re
 
 Sends an Experience event to Adobe Experience Platform Edge Network.
 
+<InlineAlert variant="info" slots="text"/>
+
+Starting with `Edge` extension version **2.4.0** (Android) and **4.3.0** (iOS), the `sendEvent` API supports optional datastream overrides. This allows you to adjust your datastreams without the need for new ones or modifications to existing settings.
+
+The process involves two steps:
+
+1. Define your Datastream configuration overrides on the [datastream configuration page](https://experienceleague.adobe.com/docs/experience-platform/datastreams/configure.html).
+2. Send these overrides to the Edge Network using the `sendEvent` API.
+
 <TabsBlock orientation="horizontal" slots="heading, content" repeat="2"/>
 
 Android

diff --git a/...-network/assets/tutorial/configOverrides/datastream-config-override-payload.png b/...-network/assets/tutorial/configOverrides/datastream-config-override-payload.png
diff --git a/...edge-network/assets/tutorial/configOverrides/datastream-id-override-payload.png b/...edge-network/assets/tutorial/configOverrides/datastream-id-override-payload.png
diff --git a/...dge/edge-network/assets/tutorial/configOverrides/final-rule-configoverrides.png b/...dge/edge-network/assets/tutorial/configOverrides/final-rule-configoverrides.png
diff --git a/...dge/edge-network/assets/tutorial/configOverrides/if-event-application-close.png b/...dge/edge-network/assets/tutorial/configOverrides/if-event-application-close.png
diff --git a/...ge/edge-network/assets/tutorial/configOverrides/if-event-application-launch.png b/...ge/edge-network/assets/tutorial/configOverrides/if-event-application-launch.png
diff --git a/src/pages/edge/edge-network/release-notes.md b/src/pages/edge/edge-network/release-notes.md
@@ -6,7 +6,19 @@ keywords:
 - Release notes
 ---
 
-# Release Notes
+# Release notes
+
+## October 27, 2023
+
+### iOS Edge 4.3.0
+
+* Added support to customize datastream configurations on a per-event basis using the sendEvent API.
+* Improved logging on connection failure.
+
+### Android Edge 2.4.0
+
+* Added support to customize datastream configurations on a per-event basis using the sendEvent API.
+* Improved logging on connection failure.
 
 ## September 1, 2023