Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to NextJS 15 #1214

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Upgrade to NextJS 15 #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a62e326
Upgrade to NextJS 15
NSeydoux Dec 19, 2024
d919d73
Lint
NSeydoux Dec 19, 2024
0b3c18e
Fix order of expectations
NSeydoux Jan 6, 2025
8ca7c21
Remove unnecessary expect
NSeydoux Jan 6, 2025
9f144e8
Ignore test app optional dependencies
NSeydoux Jan 7, 2025
997ea20
Document dependency exclusion
NSeydoux Jan 7, 2025
21c6dff
Lint
NSeydoux Jan 7, 2025
3e9616e
Add snyk exception
NSeydoux Jan 7, 2025
9df7540
Move snyk file in test app
NSeydoux Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions e2e/browser/test-app/.snyk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
version: v1.25.0
ignore:
'@img/sharp-libvips-linux-arm':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linux-arm>@img/sharp-libvips-linux-arm']
'@img/sharp-libvips-linux-x64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linux-x64>@img/sharp-libvips-linux-x64']
'@img/sharp-libvips-darwin-x64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-darwin-x64>@img/sharp-libvips-darwin-x64']
'@img/sharp-libvips-linux-arm64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linux-arm64>@img/sharp-libvips-linux-arm64']
'@img/sharp-libvips-linux-s390x':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linux-s390x>@img/sharp-libvips-linux-s390x']
'@img/sharp-libvips-darwin-arm64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-darwin-arm64>@img/sharp-libvips-darwin-arm64']
'@img/sharp-libvips-linuxmusl-x64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linuxmusl-x64>@img/sharp-libvips-linuxmusl-x64']
'@img/sharp-libvips-linuxmusl-arm64':
- expires: 2026-01-07
path: ['next>sharp>@img/sharp-linuxmusl-arm64>@img/sharp-libvips-linuxmusl-arm64']
13 changes: 13 additions & 0 deletions e2e/browser/test-app/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export default function TestAppLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<html lang="en">
<body>
<main>{children}</main>
</body>
</html>
);
}
7 changes: 4 additions & 3 deletions .../test-app/components/appContent/index.tsx → e2e/browser/test-app/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//

"use client";

import {
login,
logout,
Expand All @@ -33,11 +35,10 @@ import {
TESTID_SESSION_STATUS,
} from "@inrupt/internal-playwright-testids";
import { useState, useEffect } from "react";
import VerifiableCredential from "../verifiableCredentials";
import VerifiableCredential from "../components/verifiableCredentials";

// This is the content of the file uploaded manually at SHARED_FILE_IRI.
const DEFAULT_ISSUER = "https://login.inrupt.com/";
const REDIRECT_URL = window.location.href;
const APP_NAME = "Verifiable Credentials browser-based tests app";
const VerifiableCredentialContainer = ({
sessionInfo,
Expand Down Expand Up @@ -70,7 +71,7 @@ export default function Home() {
// 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,
});
Expand Down
6 changes: 6 additions & 0 deletions e2e/browser/test-app/dependency-exclusion.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
NextJS 15 brings in `sharp` as an optional dependency, which causes a concern because
it is licensed under LGPL 3.0, which is incompatible with our policy. NextJS is
therefore installed without optional dependencies using the `--omit=optional` flag.
See the `test:e2e:browser:build` script in the pain `package.json`.

For reference, this issue was [reported to NextJS](https://github.com/vercel/next.js/issues/72406).
Loading
Loading