[next] Update app test fixture (#8584)

### Related Issues Updates our test fixture for related changes in latest canary of Next.js. Fixes: https://vercel.slack.com/archives/CGU8HUTUH/p1663607276817069 ### 📋 Checklist  #### Tests - [ ] The code changed/added as part of this PR has been covered with tests - [ ] All tests pass locally with `yarn test-unit` #### Code Review - [ ] This PR has a concise title and thorough description useful to a reviewer - [ ] Issue from task tracker has a link to this PR
vercel · Sep 19, 2022 · 1f30e3a · 1f30e3a
1 parent 20e8fdd
commit 1f30e3a
Show file tree

Hide file tree

Showing 41 changed files with 114 additions and 168 deletions.
diff --git a/...newroot)/dashboard/another/page.server.js → ...r/app/(newroot)/dashboard/another/page.js b/...newroot)/dashboard/another/page.server.js → ...r/app/(newroot)/dashboard/another/page.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.js b/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.js
@@ -0,0 +1,10 @@
+export default function Root({ children }) {
+  return (
+    <html className="this-is-another-document-html">
+      <head>
+        <title>{`hello world`}</title>
+      </head>
+      <body className="this-is-another-document-body">{children}</body>
+    </html>
+  );
+}
diff --git a/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.server.js b/packages/next/test/fixtures/00-app-dir/app/(newroot)/layout.server.js
diff --git a/...tonly)/dashboard/changelog/page.server.js → ...pp/(rootonly)/dashboard/changelog/page.js b/...tonly)/dashboard/changelog/page.server.js → ...pp/(rootonly)/dashboard/changelog/page.js
diff --git a/...(rootonly)/dashboard/hello/page.server.js → ...ir/app/(rootonly)/dashboard/hello/page.js b/...(rootonly)/dashboard/hello/page.server.js → ...ir/app/(rootonly)/dashboard/hello/page.js
diff --git a/...app/client-component-route/page.client.js → ...pp-dir/app/client-component-route/page.js b/...app/client-component-route/page.client.js → ...pp-dir/app/client-component-route/page.js
@@ -1,3 +1,5 @@
+'client';
+
 import { useState, useEffect } from 'react';
 
 import style from './style.module.css';

diff --git a/...pp-dir/app/client-nested/layout.client.js → ...es/00-app-dir/app/client-nested/layout.js b/...pp-dir/app/client-nested/layout.client.js → ...es/00-app-dir/app/client-nested/layout.js
@@ -1,3 +1,5 @@
+'client';
+
 import { useState, useEffect } from 'react';
 
 import styles from './style.module.css';

diff --git a/...-app-dir/app/client-nested/page.server.js → ...ures/00-app-dir/app/client-nested/page.js b/...-app-dir/app/client-nested/page.server.js → ...ures/00-app-dir/app/client-nested/page.js
diff --git a/...tom)/deployments/breakdown/page.server.js → ...rd/(custom)/deployments/breakdown/page.js b/...tom)/deployments/breakdown/page.server.js → ...rd/(custom)/deployments/breakdown/page.js
diff --git a/...r/app/dashboard/(custom)/layout.server.js → ...-app-dir/app/dashboard/(custom)/layout.js b/...r/app/dashboard/(custom)/layout.server.js → ...-app-dir/app/dashboard/(custom)/layout.js
diff --git a/...dashboard/deployments/[id]/page.server.js → ...ir/app/dashboard/deployments/[id]/page.js b/...dashboard/deployments/[id]/page.server.js → ...ir/app/dashboard/deployments/[id]/page.js
@@ -1,15 +1,7 @@
-export async function getServerSideProps({ params }) {
-  return {
-    props: {
-      id: params.id,
-    },
-  };
-}
-
 export default function DeploymentsPage(props) {
   return (
     <>
-      <p>hello from app/dashboard/deployments/[id]. ID is: {props.id}</p>
+      <p>hello from app/dashboard/deployments/[id]. ID is: {props.params.id}</p>
     </>
   );
 }
diff --git a/...dashboard/deployments/info/page.server.js → ...ir/app/dashboard/deployments/info/page.js b/...dashboard/deployments/info/page.server.js → ...ir/app/dashboard/deployments/info/page.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.js b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.js
@@ -0,0 +1,8 @@
+export default function DeploymentsLayout({ message, children }) {
+  return (
+    <>
+      <h2>Deployments hello</h2>
+      {children}
+    </>
+  );
+}
diff --git a/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.server.js b/packages/next/test/fixtures/00-app-dir/app/dashboard/deployments/layout.server.js
diff --git a/...pp-dir/app/dashboard/index/lazy.client.js → ...es/00-app-dir/app/dashboard/index/lazy.js b/...pp-dir/app/dashboard/index/lazy.client.js → ...es/00-app-dir/app/dashboard/index/lazy.js
@@ -1,3 +1,5 @@
+'client';
+
 export default function LazyComponent() {
   return (
     <>

diff --git a/...pp-dir/app/dashboard/index/page.server.js → ...es/00-app-dir/app/dashboard/index/page.js b/...pp-dir/app/dashboard/index/page.server.js → ...es/00-app-dir/app/dashboard/index/page.js
@@ -1,4 +1,4 @@
-import { ClientComponent } from './test.client.js';
+import { ClientComponent } from './test.js';
 
 export default function DashboardIndexPage() {
   return (

diff --git a/...pp-dir/app/dashboard/index/test.client.js → ...es/00-app-dir/app/dashboard/index/test.js b/...pp-dir/app/dashboard/index/test.client.js → ...es/00-app-dir/app/dashboard/index/test.js
@@ -1,6 +1,8 @@
+'client';
+
 import { useState, lazy } from 'react';
 
-const Lazy = lazy(() => import('./lazy.client.js'));
+const Lazy = lazy(() => import('./lazy.js'));
 
 export function ClientComponent() {
   let [state] = useState('client');

diff --git a/...app/dashboard/integrations/page.server.js → ...pp-dir/app/dashboard/integrations/page.js b/...app/dashboard/integrations/page.server.js → ...pp-dir/app/dashboard/integrations/page.js
diff --git a/...00-app-dir/app/dashboard/layout.server.js → ...xtures/00-app-dir/app/dashboard/layout.js b/...00-app-dir/app/dashboard/layout.server.js → ...xtures/00-app-dir/app/dashboard/layout.js
diff --git a/...s/00-app-dir/app/dashboard/page.server.js → ...fixtures/00-app-dir/app/dashboard/page.js b/...s/00-app-dir/app/dashboard/page.server.js → ...fixtures/00-app-dir/app/dashboard/page.js
diff --git a/.../dynamic/[category]/[id]/layout.server.js → ...dir/app/dynamic/[category]/[id]/layout.js b/.../dynamic/[category]/[id]/layout.server.js → ...dir/app/dynamic/[category]/[id]/layout.js
@@ -1,11 +1,3 @@
-export async function getServerSideProps({ params }) {
-  return {
-    props: {
-      params,
-    },
-  };
-}
-
 export default function IdLayout({ children, params }) {
   return (
     <>

diff --git a/...pp/dynamic/[category]/[id]/page.server.js → ...p-dir/app/dynamic/[category]/[id]/page.js b/...pp/dynamic/[category]/[id]/page.server.js → ...p-dir/app/dynamic/[category]/[id]/page.js
@@ -1,11 +1,3 @@
-export async function getServerSideProps({ params }) {
-  return {
-    props: {
-      params,
-    },
-  };
-}
-
 export default function IdPage({ children, params }) {
   return (
     <>

diff --git a/...r/app/dynamic/[category]/layout.server.js → ...-app-dir/app/dynamic/[category]/layout.js b/...r/app/dynamic/[category]/layout.server.js → ...-app-dir/app/dynamic/[category]/layout.js
@@ -1,11 +1,3 @@
-export async function getServerSideProps({ params }) {
-  return {
-    props: {
-      params,
-    },
-  };
-}
-
 export default function CategoryLayout({ children, params }) {
   return (
     <>

diff --git a/...s/00-app-dir/app/dynamic/layout.server.js → ...fixtures/00-app-dir/app/dynamic/layout.js b/...s/00-app-dir/app/dynamic/layout.server.js → ...fixtures/00-app-dir/app/dynamic/layout.js
@@ -1,11 +1,3 @@
-export async function getServerSideProps({ params }) {
-  return {
-    props: {
-      params,
-    },
-  };
-}
-
 export default function DynamicLayout({ children, params }) {
   return (
     <>

diff --git a/packages/next/test/fixtures/00-app-dir/app/layout.js b/packages/next/test/fixtures/00-app-dir/app/layout.js
@@ -0,0 +1,14 @@
+export default function Root({ children }) {
+  return (
+    <html className="this-is-the-document-html">
+      <head>
+        <title>{`hello world`}</title>
+      </head>
+      <body className="this-is-the-document-body">{children}</body>
+    </html>
+  );
+}
+
+export const config = {
+  revalidate: 0,
+};
diff --git a/packages/next/test/fixtures/00-app-dir/app/layout.server.js b/packages/next/test/fixtures/00-app-dir/app/layout.server.js
diff --git a/...st/fixtures/00-app-dir/app/page.server.js → ...next/test/fixtures/00-app-dir/app/page.js b/...st/fixtures/00-app-dir/app/page.server.js → ...next/test/fixtures/00-app-dir/app/page.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.js b/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.js
@@ -0,0 +1,7 @@
+export default function DeploymentsPage(props) {
+  return (
+    <>
+      <p>hello from app/partial-match-[id]. ID is: {props.params.id}</p>
+    </>
+  );
+}
diff --git a/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.server.js b/packages/next/test/fixtures/00-app-dir/app/partial-match-[id]/page.server.js
diff --git a/...pp/should-not-serve-client/page.client.js → ...p-dir/app/should-not-serve-client/page.js b/...pp/should-not-serve-client/page.client.js → ...p-dir/app/should-not-serve-client/page.js
@@ -1,3 +1,5 @@
+'client';
+
 export default function ShouldNotServeClientDotJs(props) {
   return (
     <>

diff --git a/...pp/should-not-serve-server/page.server.js → ...p-dir/app/should-not-serve-server/page.js b/...pp/should-not-serve-server/page.server.js → ...p-dir/app/should-not-serve-server/page.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.js b/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.js
@@ -0,0 +1,18 @@
+import { experimental_use as use } from 'react';
+
+async function getData() {
+  await new Promise(resolve => setTimeout(resolve, 1000));
+  return {
+    message: 'hello from slow layout',
+  };
+}
+
+export default function SlowLayout(props) {
+  const data = use(getData());
+  return (
+    <>
+      <p id="slow-layout-message">{data.message}</p>
+      {props.children}
+    </>
+  );
+}
diff --git a/...next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.server.js b/...next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/layout.server.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/page.js b/packages/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/page.js
@@ -0,0 +1,13 @@
+import { experimental_use as use } from 'react';
+
+async function getData() {
+  await new Promise(resolve => setTimeout(resolve, 5000));
+  return {
+    message: 'hello from slow page',
+  };
+}
+
+export default function SlowPage(props) {
+  const data = use(getData());
+  return <h1 id="slow-page-message">{data.message}</h1>;
+}
diff --git a/...s/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/page.server.js b/...s/next/test/fixtures/00-app-dir/app/slow-layout-and-page-with-loading/slow/page.server.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-layout-with-loading/slow/layout.js b/packages/next/test/fixtures/00-app-dir/app/slow-layout-with-loading/slow/layout.js
@@ -0,0 +1,18 @@
+import { experimental_use as use } from 'react';
+
+async function getData() {
+  await new Promise(resolve => setTimeout(resolve, 5000));
+  return {
+    message: 'hello from slow layout',
+  };
+}
+
+export default function SlowLayout(props) {
+  const data = use(getData());
+  return (
+    <>
+      <p id="slow-layout-message">{data.message}</p>
+      {props.children}
+    </>
+  );
+}
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-layout-with-loading/slow/layout.server.js b/packages/next/test/fixtures/00-app-dir/app/slow-layout-with-loading/slow/layout.server.js
diff --git a/...w-layout-with-loading/slow/page.server.js → ...app/slow-layout-with-loading/slow/page.js b/...w-layout-with-loading/slow/page.server.js → ...app/slow-layout-with-loading/slow/page.js
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-page-with-loading/page.js b/packages/next/test/fixtures/00-app-dir/app/slow-page-with-loading/page.js
@@ -0,0 +1,13 @@
+import { experimental_use as use } from 'react';
+
+async function getData() {
+  await new Promise(resolve => setTimeout(resolve, 5000));
+  return {
+    message: 'hello from slow page',
+  };
+}
+
+export default function SlowPage(props) {
+  const data = use(getData());
+  return <h1 id="slow-page-message">{data.message}</h1>;
+}
diff --git a/packages/next/test/fixtures/00-app-dir/app/slow-page-with-loading/page.server.js b/packages/next/test/fixtures/00-app-dir/app/slow-page-with-loading/page.server.js
diff --git a/...s/00-app-dir/app/test-page/page.server.js → ...fixtures/00-app-dir/app/test-page/page.js b/...s/00-app-dir/app/test-page/page.server.js → ...fixtures/00-app-dir/app/test-page/page.js