Few more fixes for Relay Support in Rust Compiler PR (vercel#33795)

* revert changes in build_test_deploy * correct relay config * typoscript * Restructure Relay multi-project example
alunyov · Jan 31, 2022 · 288208f · 288208f
1 parent d90f9d4
commit 288208f
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 24 deletions.
diff --git a/...oject/__generated__/pagesQuery.graphql.ts → ...ct-a/__generated__/pagesAQuery.graphql.ts b/...oject/__generated__/pagesQuery.graphql.ts → ...ct-a/__generated__/pagesAQuery.graphql.ts
diff --git a/test/integration/relay-graphql-swc-multi-project/project-a/next.config.js b/test/integration/relay-graphql-swc-multi-project/project-a/next.config.js
@@ -4,7 +4,7 @@ module.exports = {
   experimental: {
     relay: {
       src: './pages',
-      artifactDirectory: '../__generated__',
+      artifactDirectory: './__generated__',
       language: relay.projects['project-b'].language,
     },
     externalDir: true,

diff --git a/test/integration/relay-graphql-swc-multi-project/project-a/pages/index.tsx b/test/integration/relay-graphql-swc-multi-project/project-a/pages/index.tsx
@@ -8,7 +8,7 @@ import {
   Store,
 } from 'relay-runtime'
 import { GetServerSideProps } from 'next'
-import { pagesQuery } from '../../__generated__/pagesQuery.graphql'
+import { pagesAQuery } from '../__generated__/pagesAQuery.graphql'
 
 type Props = { greeting: string }
 
@@ -41,10 +41,10 @@ export const getServerSideProps: GetServerSideProps = async ({ req }) => {
     network: Network.create(createGraphQLFetcher(req.headers.host)),
   })
 
-  const result = await fetchQuery<pagesQuery>(
+  const result = await fetchQuery<pagesAQuery>(
     environment,
     graphql`
-      query pagesQuery {
+      query pagesAQuery {
         greeting
       }
     `,

diff --git a/...ntegration/relay-graphql-swc-multi-project/project-b/__generated__/pagesBQuery.graphql.ts b/...ntegration/relay-graphql-swc-multi-project/project-b/__generated__/pagesBQuery.graphql.ts
diff --git a/test/integration/relay-graphql-swc-multi-project/project-b/next.config.js b/test/integration/relay-graphql-swc-multi-project/project-b/next.config.js
@@ -4,7 +4,7 @@ module.exports = {
   experimental: {
     relay: {
       src: './pages',
-      artifactDirectory: '../__generated__',
+      artifactDirectory: './__generated__',
       language: relay.projects['project-b'].language,
     },
     externalDir: true,

diff --git a/test/integration/relay-graphql-swc-multi-project/project-b/pages/index.tsx b/test/integration/relay-graphql-swc-multi-project/project-b/pages/index.tsx
@@ -8,7 +8,7 @@ import {
   Store,
 } from 'relay-runtime'
 import { GetServerSideProps } from 'next'
-import { pagesQuery } from '../../__generated__/pagesQuery.graphql'
+import { pagesBQuery } from '../__generated__/pagesBQuery.graphql'
 
 type Props = { greeting: string }
 
@@ -41,10 +41,10 @@ export const getServerSideProps: GetServerSideProps = async ({ req }) => {
     network: Network.create(createGraphQLFetcher(req.headers.host)),
   })
 
-  const result = await fetchQuery<pagesQuery>(
+  const result = await fetchQuery<pagesBQuery>(
     environment,
     graphql`
-      query pagesQuery {
+      query pagesBQuery {
         greeting
       }
     `,

diff --git a/test/integration/relay-graphql-swc-multi-project/relay.config.js b/test/integration/relay-graphql-swc-multi-project/relay.config.js
@@ -8,12 +8,12 @@ module.exports = {
     'project-a': {
       schema: 'schema.graphql',
       language: 'typescript',
-      output: '__generated__',
+      output: 'project-a/__generated__',
     },
     'project-b': {
       schema: 'schema.graphql',
       language: 'typescript',
-      output: '__generated__',
+      output: 'project-b/__generated__',
     },
   },
 }