From c6720d799236d256d055bfbcda33b3d0716726fb Mon Sep 17 00:00:00 2001
From: Coby Sher <63015754+CobyPear@users.noreply.github.com>
Date: Tue, 17 Aug 2021 16:07:02 -0500
Subject: [PATCH] Update RAV configs to include layoutServiceConfiguration
 (#785)

---
 samples/angular/sitecore/config/JssAngularWeb.config | 6 ++++++
 samples/react/sitecore/config/JssReactWeb.config     | 6 ++++++
 samples/vue/sitecore/config/JssVueWeb.config         | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/samples/angular/sitecore/config/JssAngularWeb.config b/samples/angular/sitecore/config/JssAngularWeb.config
index 95ad3a95cb..d43e54f6f7 100644
--- a/samples/angular/sitecore/config/JssAngularWeb.config
+++ b/samples/angular/sitecore/config/JssAngularWeb.config
@@ -49,8 +49,14 @@
           Defaults are defined in `/App_Config/Sitecore/JavaScriptServices/Sitecore.JavaScriptServices.Apps.config`
 
           NOTE: graphQLEndpoint enables _Integrated GraphQL_. If not using integrated GraphQL, it can be removed.
+
+          NOTE: layoutServiceConfiguration should be set to "default" when using GraphQL Edge schema.
+          When using integrated GraphQL with Edge schema, a $language value is injected
+          since language is required in all Edge queries. "jss" configuration does not do this (which is backwards
+          compatible with JSS versions < 18.0.0).
         -->
         <app name="JssAngularWeb"
+             layoutServiceConfiguration="default"
              sitecorePath="/sitecore/content/JssAngularWeb"
              inherits="defaults"
              useLanguageSpecificLayout="true"
diff --git a/samples/react/sitecore/config/JssReactWeb.config b/samples/react/sitecore/config/JssReactWeb.config
index 9660673e69..f09a277fed 100644
--- a/samples/react/sitecore/config/JssReactWeb.config
+++ b/samples/react/sitecore/config/JssReactWeb.config
@@ -49,8 +49,14 @@
           Defaults are defined in `/App_Config/Sitecore/JavaScriptServices/Sitecore.JavaScriptServices.Apps.config`
 
           NOTE: graphQLEndpoint enables _Integrated GraphQL_. If not using integrated GraphQL, it can be removed.
+          
+          NOTE: layoutServiceConfiguration should be set to "default" when using GraphQL Edge schema.
+          When using integrated GraphQL with Edge schema, a $language value is injected
+          since language is required in all Edge queries. "jss" configuration does not do this (which is backwards
+          compatible with JSS versions < 18.0.0).
         -->
         <app name="JssReactWeb"
+             layoutServiceConfiguration="default"
              sitecorePath="/sitecore/content/JssReactWeb"
              useLanguageSpecificLayout="true"
              graphQLEndpoint="/sitecore/api/graph/edge"
diff --git a/samples/vue/sitecore/config/JssVueWeb.config b/samples/vue/sitecore/config/JssVueWeb.config
index 9dc9dd6bfd..0f3e15d72f 100644
--- a/samples/vue/sitecore/config/JssVueWeb.config
+++ b/samples/vue/sitecore/config/JssVueWeb.config
@@ -49,8 +49,14 @@
           Defaults are defined in `/App_Config/Sitecore/JavaScriptServices/Sitecore.JavaScriptServices.Apps.config`
 
           NOTE: graphQLEndpoint enables _Integrated GraphQL_. If not using integrated GraphQL, it can be removed.
+
+          NOTE: layoutServiceConfiguration should be set to "default" when using GraphQL Edge schema.
+          When using integrated GraphQL with Edge schema, a $language value is injected
+          since language is required in all Edge queries. "jss" configuration does not do this (which is backwards
+          compatible with JSS versions < 18.0.0).
         -->
         <app name="JssVueWeb"
+             layoutServiceConfiguration="default"
              sitecorePath="/sitecore/content/JssVueWeb"
              useLanguageSpecificLayout="true"
              graphQLEndpoint="/sitecore/api/graph/edge"