Merged in feature/turbopack (pull request #3117)

Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood

packages/trpc/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql

@@ -1,102 +0,0 @@
-#import "../../Fragments/System.graphql"
-
-#import "../../Fragments/Blocks/CardsGrid.graphql"
-#import "../../Fragments/Blocks/Content.graphql"
-#import "../../Fragments/Blocks/DynamicContent.graphql"
-#import "../../Fragments/Blocks/Shortcuts.graphql"
-
-#import "../../Fragments/Sidebar/Content.graphql"
-#import "../../Fragments/Sidebar/DynamicContent.graphql"
-#import "../../Fragments/Sidebar/JoinLoyaltyContact.graphql"
-
-query GetLoyaltyPage($locale: String!, $uid: String!) {
-  loyalty_page(uid: $uid, locale: $locale) {
-    heading
-    hero_image
-    preamble
-    title
-    blocks {
-      __typename
-      ...CardsGrid_LoyaltyPage
-      ...Content_LoyaltyPage
-      ...DynamicContent_LoyaltyPage
-      ...Shortcuts_LoyaltyPage
-    }
-    sidebar {
-      __typename
-      ...ContentSidebar_LoyaltyPage
-      ...DynamicContentSidebar_LoyaltyPage
-      ...JoinLoyaltyContactSidebar_LoyaltyPage
-    }
-    system {
-      ...System
-      created_at
-      updated_at
-    }
-  }
-  trackingProps: loyalty_page(locale: "en", uid: $uid) {
-    url
-  }
-}
-
-query GetLoyaltyPageRefs($locale: String!, $uid: String!) {
-  loyalty_page(locale: $locale, uid: $uid) {
-    blocks {
-      __typename
-      ...CardsGrid_LoyaltyPageRefs
-      ...Content_LoyaltyPageRefs
-      ...DynamicContent_LoyaltyPageRefs
-      ...Shortcuts_LoyaltyPageRefs
-    }
-    sidebar {
-      __typename
-      ...ContentSidebar_LoyaltyPageRefs
-      ...JoinLoyaltyContactSidebar_LoyaltyPageRefs
-    }
-    system {
-      ...System
-    }
-  }
-}
-
-query GetDaDeEnUrlsLoyaltyPage($uid: String!) {
-  de: loyalty_page(locale: "de", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-  en: loyalty_page(locale: "en", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-  da: loyalty_page(locale: "da", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-}
-
-query GetFiNoSvUrlsLoyaltyPage($uid: String!) {
-  sv: loyalty_page(locale: "sv", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-  no: loyalty_page(locale: "no", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-  fi: loyalty_page(locale: "fi", uid: $uid) {
-    web {
-      original_url
-    }
-    url
-  }
-}

packages/trpc/lib/graphql/Query/LoyaltyPage/LoyaltyPage.graphql.ts

@@ -0,0 +1,143 @@
+import { gql } from "graphql-tag"
+
+import {
+  CardsGrid_LoyaltyPage,
+  CardsGrid_LoyaltyPageRefs,
+} from "../../Fragments/Blocks/CardsGrid.graphql"
+import {
+  Content_LoyaltyPage,
+  Content_LoyaltyPageRefs,
+} from "../../Fragments/Blocks/Content.graphql"
+import {
+  DynamicContent_LoyaltyPage,
+  DynamicContent_LoyaltyPageRefs,
+} from "../../Fragments/Blocks/DynamicContent.graphql"
+import {
+  Shortcuts_LoyaltyPage,
+  Shortcuts_LoyaltyPageRefs,
+} from "../../Fragments/Blocks/Shortcuts.graphql"
+import {
+  ContentSidebar_LoyaltyPage,
+  ContentSidebar_LoyaltyPageRefs,
+} from "../../Fragments/Sidebar/Content.graphql"
+import { DynamicContentSidebar_LoyaltyPage } from "../../Fragments/Sidebar/DynamicContent.graphql"
+import {
+  JoinLoyaltyContactSidebar_LoyaltyPage,
+  JoinLoyaltyContactSidebar_LoyaltyPageRefs,
+} from "../../Fragments/Sidebar/JoinLoyaltyContact.graphql"
+import { System } from "../../Fragments/System.graphql"
+
+export const GetLoyaltyPage = gql`
+  query GetLoyaltyPage($locale: String!, $uid: String!) {
+    loyalty_page(uid: $uid, locale: $locale) {
+      heading
+      hero_image
+      preamble
+      title
+      blocks {
+        __typename
+        ...CardsGrid_LoyaltyPage
+        ...Content_LoyaltyPage
+        ...DynamicContent_LoyaltyPage
+        ...Shortcuts_LoyaltyPage
+      }
+      sidebar {
+        __typename
+        ...ContentSidebar_LoyaltyPage
+        ...DynamicContentSidebar_LoyaltyPage
+        ...JoinLoyaltyContactSidebar_LoyaltyPage
+      }
+      system {
+        ...System
+        created_at
+        updated_at
+      }
+    }
+    trackingProps: loyalty_page(locale: "en", uid: $uid) {
+      url
+    }
+  }
+  ${System}
+  ${CardsGrid_LoyaltyPage}
+  ${Content_LoyaltyPage}
+  ${DynamicContent_LoyaltyPage}
+  ${Shortcuts_LoyaltyPage}
+  ${ContentSidebar_LoyaltyPage}
+  ${DynamicContentSidebar_LoyaltyPage}
+  ${JoinLoyaltyContactSidebar_LoyaltyPage}
+`
+
+export const GetLoyaltyPageRefs = gql`
+  query GetLoyaltyPageRefs($locale: String!, $uid: String!) {
+    loyalty_page(locale: $locale, uid: $uid) {
+      blocks {
+        __typename
+        ...CardsGrid_LoyaltyPageRefs
+        ...Content_LoyaltyPageRefs
+        ...DynamicContent_LoyaltyPageRefs
+        ...Shortcuts_LoyaltyPageRefs
+      }
+      sidebar {
+        __typename
+        ...ContentSidebar_LoyaltyPageRefs
+        ...JoinLoyaltyContactSidebar_LoyaltyPageRefs
+      }
+      system {
+        ...System
+      }
+    }
+  }
+  ${System}
+  ${CardsGrid_LoyaltyPageRefs}
+  ${Content_LoyaltyPageRefs}
+  ${DynamicContent_LoyaltyPageRefs}
+  ${Shortcuts_LoyaltyPageRefs}
+  ${ContentSidebar_LoyaltyPageRefs}
+  ${JoinLoyaltyContactSidebar_LoyaltyPageRefs}
+`
+
+export const GetDaDeEnUrlsLoyaltyPage = gql`
+  query GetDaDeEnUrlsLoyaltyPage($uid: String!) {
+    de: loyalty_page(locale: "de", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+    en: loyalty_page(locale: "en", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+    da: loyalty_page(locale: "da", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+  }
+`
+
+export const GetFiNoSvUrlsLoyaltyPage = gql`
+  query GetFiNoSvUrlsLoyaltyPage($uid: String!) {
+    sv: loyalty_page(locale: "sv", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+    no: loyalty_page(locale: "no", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+    fi: loyalty_page(locale: "fi", uid: $uid) {
+      web {
+        original_url
+      }
+      url
+    }
+  }
+`

packages/trpc/lib/graphql/Query/LoyaltyPage/Metadata.graphql

@@ -1,31 +0,0 @@
-#import "../../Fragments/Metadata.graphql"
-#import "../../Fragments/System.graphql"
-
-query GetLoyaltyPageMetadata($locale: String!, $uid: String!) {
-  loyalty_page(locale: $locale, uid: $uid) {
-    web {
-      breadcrumbs {
-        title
-      }
-      seo_metadata {
-        ...Metadata
-      }
-    }
-    heading
-    preamble
-    hero_image
-    blocks {
-      ... on LoyaltyPageBlocksContent {
-        __typename
-        content {
-          content {
-            json
-          }
-        }
-      }
-    }
-    system {
-      ...System
-    }
-  }
-}

packages/trpc/lib/graphql/Query/LoyaltyPage/Metadata.graphql.ts

@@ -0,0 +1,37 @@
+import { gql } from "graphql-tag"
+
+import { Metadata } from "../../Fragments/Metadata.graphql"
+import { System } from "../../Fragments/System.graphql"
+
+export const GetLoyaltyPageMetadata = gql`
+  query GetLoyaltyPageMetadata($locale: String!, $uid: String!) {
+    loyalty_page(locale: $locale, uid: $uid) {
+      web {
+        breadcrumbs {
+          title
+        }
+        seo_metadata {
+          ...Metadata
+        }
+      }
+      heading
+      preamble
+      hero_image
+      blocks {
+        ... on LoyaltyPageBlocksContent {
+          __typename
+          content {
+            content {
+              json
+            }
+          }
+        }
+      }
+      system {
+        ...System
+      }
+    }
+  }
+  ${Metadata}
+  ${System}
+`