Migrate test app to app/ directory (#1154)

inrupt · Dec 19, 2024 · f1583b5 · f1583b5
1 parent de2483a
commit f1583b5
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 120 deletions.
diff --git a/e2e/browser/test-app/app/layout.tsx b/e2e/browser/test-app/app/layout.tsx
@@ -0,0 +1,13 @@
+export default function TestAppLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>
+        <main>{children}</main>
+      </body>
+    </html>
+  );
+}
diff --git a/...est-app/components/appContainer/index.tsx → e2e/browser/test-app/app/page.tsx b/...est-app/components/appContainer/index.tsx → e2e/browser/test-app/app/page.tsx
@@ -1,13 +1,14 @@
+"use client";
+
 import React, { useState, useEffect } from "react";
 import {
   login,
   logout,
   handleIncomingRedirect,
   ISessionInfo,
 } from "@inrupt/solid-client-authn-browser";
-import Notifications from "../notifications";
+import Notifications from "../components/notifications";
 
-const REDIRECT_URL = window.location.href;
 const APP_NAME = "Notifications browser-based tests app";
 const DEFAULT_ISSUER = "https://login.inrupt.com/";
 
@@ -36,7 +37,7 @@ export default function AppContainer() {
       // Login will redirect the user away so that they can log in the OIDC issuer,
       // and back to the provided redirect URL (which should be controlled by your app).
       await login({
-        redirectUrl: REDIRECT_URL,
+        redirectUrl: "http://localhost:3000",
         oidcIssuer: issuer,
         clientName: APP_NAME,
       });

diff --git a/e2e/browser/test-app/next-env.d.ts b/e2e/browser/test-app/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/e2e/browser/test-app/package-lock.json b/e2e/browser/test-app/package-lock.json
diff --git a/e2e/browser/test-app/package.json b/e2e/browser/test-app/package.json
@@ -12,7 +12,7 @@
     "@inrupt/solid-client": "^2.0.0",
     "@inrupt/solid-client-authn-browser": "^2.3.0",
     "@inrupt/solid-client-notifications": "file:../../../",
-    "next": "^15.0.4",
+    "next": "^15.1.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },

diff --git a/e2e/browser/test-app/pages/_app.tsx b/e2e/browser/test-app/pages/_app.tsx
diff --git a/e2e/browser/test-app/pages/index.tsx b/e2e/browser/test-app/pages/index.tsx
diff --git a/e2e/browser/test-app/tsconfig.json b/e2e/browser/test-app/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "es2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -13,8 +17,20 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ]
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "next-env.d.ts",
+    ".next/types/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }