move "integration-test" into "integration-test/nextjs"

apollographql · Feb 19, 2024 · e6316e8 · e6316e8
1 parent 1d254e7
commit e6316e8
Show file tree

Hide file tree

Showing 34 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -63,9 +63,9 @@ jobs:
         if: steps.playwright-cache.outputs.cache-hit == 'true'
 
       - run: yarn workspaces foreach --all --include "@apollo/*" add -D -P @apollo/client@${{ matrix.version }}
-      - run: yarn workspace integration-test add @apollo/client@${{ matrix.version }}
+      - run: yarn workspace @integration-test/nextjs add @apollo/client@${{ matrix.version }}
 
       - name: Build
-        run: yarn workspaces foreach --all -t --include "@apollo/*" --include integration-test run build
+        run: yarn workspaces foreach --all -t --include "@apollo/*" --include @integration-test/nextjs run build
       - name: Run tests
-        run: yarn workspace integration-test run test | tee $GITHUB_STEP_SUMMARY
+        run: yarn workspace @integration-test/nextjs run test | tee $GITHUB_STEP_SUMMARY
diff --git a/integration-test/.env.local → integration-test/nextjs/.env.local b/integration-test/.env.local → integration-test/nextjs/.env.local
diff --git a/integration-test/empty.har → integration-test/nextjs/empty.har b/integration-test/empty.har → integration-test/nextjs/empty.har
diff --git a/integration-test/fixture.ts → integration-test/nextjs/fixture.ts b/integration-test/fixture.ts → integration-test/nextjs/fixture.ts
diff --git a/integration-test/next-env.d.ts → integration-test/nextjs/next-env.d.ts b/integration-test/next-env.d.ts → integration-test/nextjs/next-env.d.ts
diff --git a/integration-test/next.config.js → integration-test/nextjs/next.config.js b/integration-test/next.config.js → integration-test/nextjs/next.config.js
diff --git a/integration-test/package.json → integration-test/nextjs/package.json b/integration-test/package.json → integration-test/nextjs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "integration-test",
+  "name": "@integration-test/nextjs",
   "version": "0.1.0",
   "private": true,
   "scripts": {

diff --git a/integration-test/playwright.config.ts → integration-test/nextjs/playwright.config.ts b/integration-test/playwright.config.ts → integration-test/nextjs/playwright.config.ts
diff --git a/...gration-test/src/app/cc/ApolloWrapper.tsx → ...-test/nextjs/src/app/cc/ApolloWrapper.tsx b/...gration-test/src/app/cc/ApolloWrapper.tsx → ...-test/nextjs/src/app/cc/ApolloWrapper.tsx
diff --git a/...n-test/src/app/cc/dynamic/dynamic.test.ts → ...nextjs/src/app/cc/dynamic/dynamic.test.ts b/...n-test/src/app/cc/dynamic/dynamic.test.ts → ...nextjs/src/app/cc/dynamic/dynamic.test.ts
diff --git a/...ration-test/src/app/cc/dynamic/layout.tsx → ...test/nextjs/src/app/cc/dynamic/layout.tsx b/...ration-test/src/app/cc/dynamic/layout.tsx → ...test/nextjs/src/app/cc/dynamic/layout.tsx
diff --git a/...pp/cc/dynamic/useBackgroundQuery/page.tsx → ...pp/cc/dynamic/useBackgroundQuery/page.tsx b/...pp/cc/dynamic/useBackgroundQuery/page.tsx → ...pp/cc/dynamic/useBackgroundQuery/page.tsx
diff --git a/...ckgroundQueryWithoutSsrReadQuery/page.tsx → ...ckgroundQueryWithoutSsrReadQuery/page.tsx b/...ckgroundQueryWithoutSsrReadQuery/page.tsx → ...ckgroundQueryWithoutSsrReadQuery/page.tsx
diff --git a/...test/src/app/cc/dynamic/useQuery/page.tsx → ...xtjs/src/app/cc/dynamic/useQuery/page.tsx b/...test/src/app/cc/dynamic/useQuery/page.tsx → ...xtjs/src/app/cc/dynamic/useQuery/page.tsx
diff --git a/...app/cc/dynamic/useQueryWithCache/page.tsx → ...app/cc/dynamic/useQueryWithCache/page.tsx b/...app/cc/dynamic/useQueryWithCache/page.tsx → ...app/cc/dynamic/useQueryWithCache/page.tsx
diff --git a/.../app/cc/dynamic/useSuspenseQuery/page.tsx → .../app/cc/dynamic/useSuspenseQuery/page.tsx b/.../app/cc/dynamic/useSuspenseQuery/page.tsx → .../app/cc/dynamic/useSuspenseQuery/page.tsx
diff --git a/...gration-test/src/app/cc/static/layout.tsx → ...-test/nextjs/src/app/cc/static/layout.tsx b/...gration-test/src/app/cc/static/layout.tsx → ...-test/nextjs/src/app/cc/static/layout.tsx
diff --git a/...ion-test/src/app/cc/static/static.test.ts → ...t/nextjs/src/app/cc/static/static.test.ts b/...ion-test/src/app/cc/static/static.test.ts → ...t/nextjs/src/app/cc/static/static.test.ts
diff --git a/...ckgroundQueryWithoutSsrReadQuery/page.tsx → ...ckgroundQueryWithoutSsrReadQuery/page.tsx b/...ckgroundQueryWithoutSsrReadQuery/page.tsx → ...ckgroundQueryWithoutSsrReadQuery/page.tsx
diff --git a/...c/app/cc/static/useSuspenseQuery/page.tsx → ...c/app/cc/static/useSuspenseQuery/page.tsx b/...c/app/cc/static/useSuspenseQuery/page.tsx → ...c/app/cc/static/useSuspenseQuery/page.tsx
diff --git a/integration-test/src/app/graphql/route.ts → ...tion-test/nextjs/src/app/graphql/route.ts b/integration-test/src/app/graphql/route.ts → ...tion-test/nextjs/src/app/graphql/route.ts
diff --git a/integration-test/src/app/graphql/schema.ts → ...ion-test/nextjs/src/app/graphql/schema.ts b/integration-test/src/app/graphql/schema.ts → ...ion-test/nextjs/src/app/graphql/schema.ts
diff --git a/integration-test/src/app/layout.tsx → integration-test/nextjs/src/app/layout.tsx b/integration-test/src/app/layout.tsx → integration-test/nextjs/src/app/layout.tsx
diff --git a/integration-test/src/app/rsc/client.ts → ...gration-test/nextjs/src/app/rsc/client.ts b/integration-test/src/app/rsc/client.ts → ...gration-test/nextjs/src/app/rsc/client.ts
diff --git a/...src/app/rsc/dynamic/apollo-client.test.ts → ...src/app/rsc/dynamic/apollo-client.test.ts b/...src/app/rsc/dynamic/apollo-client.test.ts → ...src/app/rsc/dynamic/apollo-client.test.ts
diff --git a/...n-test/src/app/rsc/dynamic/query/page.tsx → ...nextjs/src/app/rsc/dynamic/query/page.tsx b/...n-test/src/app/rsc/dynamic/query/page.tsx → ...nextjs/src/app/rsc/dynamic/query/page.tsx
diff --git a/.../src/app/rsc/static/apollo-client.test.ts → .../src/app/rsc/static/apollo-client.test.ts b/.../src/app/rsc/static/apollo-client.test.ts → .../src/app/rsc/static/apollo-client.test.ts
diff --git a/...on-test/src/app/rsc/static/query/page.tsx → .../nextjs/src/app/rsc/static/query/page.tsx b/...on-test/src/app/rsc/static/query/page.tsx → .../nextjs/src/app/rsc/static/query/page.tsx
diff --git a/integration-test/src/global.d.ts → integration-test/nextjs/src/global.d.ts b/integration-test/src/global.d.ts → integration-test/nextjs/src/global.d.ts
diff --git a/integration-test/src/middleware.ts → integration-test/nextjs/src/middleware.ts b/integration-test/src/middleware.ts → integration-test/nextjs/src/middleware.ts
diff --git a/integration-test/src/shared/delayLink.ts → ...ation-test/nextjs/src/shared/delayLink.ts b/integration-test/src/shared/delayLink.ts → ...ation-test/nextjs/src/shared/delayLink.ts
diff --git a/integration-test/tsconfig.json → integration-test/nextjs/tsconfig.json b/integration-test/tsconfig.json → integration-test/nextjs/tsconfig.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "packageManager": "yarn@4.1.0",
   "workspaces": [
     "packages/*",
-    "integration-test",
+    "integration-test/*",
     "examples/*"
   ],
   "dependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -3810,6 +3810,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@integration-test/nextjs@workspace:integration-test/nextjs":
+  version: 0.0.0-use.local
+  resolution: "@integration-test/nextjs@workspace:integration-test/nextjs"
+  dependencies:
+    "@apollo/client": "npm:^3.9.1"
+    "@apollo/experimental-nextjs-app-support": "workspace:*"
+    "@apollo/server": "npm:^4.9.5"
+    "@as-integrations/next": "npm:^3.0.0"
+    "@graphql-tools/schema": "npm:^10.0.0"
+    "@playwright/test": "npm:^1.39.0"
+    "@types/node": "npm:20.3.1"
+    "@types/react": "npm:^18.2.55"
+    "@types/react-dom": "npm:18.2.6"
+    graphql: "npm:^16.7.1"
+    graphql-tag: "npm:^2.12.6"
+    next: "npm:^14.1.0"
+    react: "npm:18.2.0"
+    react-dom: "npm:18.2.0"
+    ssr-only-secrets: "npm:^0.0.5"
+    typescript: "npm:5.1.3"
+  languageName: unknown
+  linkType: soft
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -9473,29 +9496,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"integration-test@workspace:integration-test":
-  version: 0.0.0-use.local
-  resolution: "integration-test@workspace:integration-test"
-  dependencies:
-    "@apollo/client": "npm:^3.9.1"
-    "@apollo/experimental-nextjs-app-support": "workspace:*"
-    "@apollo/server": "npm:^4.9.5"
-    "@as-integrations/next": "npm:^3.0.0"
-    "@graphql-tools/schema": "npm:^10.0.0"
-    "@playwright/test": "npm:^1.39.0"
-    "@types/node": "npm:20.3.1"
-    "@types/react": "npm:^18.2.55"
-    "@types/react-dom": "npm:18.2.6"
-    graphql: "npm:^16.7.1"
-    graphql-tag: "npm:^2.12.6"
-    next: "npm:^14.1.0"
-    react: "npm:18.2.0"
-    react-dom: "npm:18.2.0"
-    ssr-only-secrets: "npm:^0.0.5"
-    typescript: "npm:5.1.3"
-  languageName: unknown
-  linkType: soft
-
 "internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"