Upgrade test app to NextJS 15 (#3819)

* Upgrade test app to NextJS 15 * Add missing directive * Remove legacy pages/ directory * Fix esbuild test --------- Co-authored-by: Joseph Gosselin <[email protected]>
inrupt · Jan 7, 2025 · 85ddf27 · 85ddf27
1 parent 43fa909
commit 85ddf27
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 46 deletions.
diff --git a/...ent-authn-browser/test-app/pages/_app.tsx → ...ent-authn-browser/test-app/app/layout.tsx b/...ent-authn-browser/test-app/pages/_app.tsx → ...ent-authn-browser/test-app/app/layout.tsx
@@ -18,10 +18,16 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-import type { AppProps } from "next/app";
-
-function MyApp({ Component, pageProps }: AppProps) {
-  return <Component {...pageProps} />;
+export default function TestAppLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>
+        <main>{children}</main>
+      </body>
+    </html>
+  );
 }
-
-export default MyApp;
diff --git a/...est-app/components/appContainer/index.tsx → ...lient-authn-browser/test-app/app/page.tsx b/...est-app/components/appContainer/index.tsx → ...lient-authn-browser/test-app/app/page.tsx
@@ -19,6 +19,8 @@
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+"use client";
+
 import React, { useState, useEffect } from "react";
 import {
   TESTID_OPENID_PROVIDER_INPUT,
@@ -34,10 +36,10 @@ import {
   events,
   EVENTS,
 } from "@inrupt/solid-client-authn-browser";
-import AuthenticatedFetch from "../authenticatedFetch";
+import AuthenticatedFetch from "../components/authenticatedFetch";
 // The extension is required for JSON imports.
 // eslint-disable-next-line import/extensions, import/no-relative-packages
-import CONSTANTS from "../../../../../../playwright.client-authn.constants.json";
+import CONSTANTS from "../../../../../playwright.client-authn.constants.json";
 
 // Importing the playwright config file crashes the Next Web server.
 const REDIRECT_URL = new URL(

diff --git a/e2e/browser/solid-client-authn-browser/test-app/package.json b/e2e/browser/solid-client-authn-browser/test-app/package.json
@@ -7,7 +7,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "test:esbuild": "esbuild components/appContainer/index.tsx --bundle"
+    "test:esbuild": "esbuild app/page.tsx --bundle"
   },
   "dependencies": {
     "@inrupt/internal-playwright-testids": "^3.0.2",

diff --git a/e2e/browser/solid-client-authn-browser/test-app/pages/index.tsx b/e2e/browser/solid-client-authn-browser/test-app/pages/index.tsx
diff --git a/e2e/browser/solid-ui-react/test-app/next-env.d.ts b/e2e/browser/solid-ui-react/test-app/next-env.d.ts