Skip to content

Commit 0dd718f

Browse files
fix all the various examples eslint warnings (#544)
* fix all the various eslint warnings present in the examples directory * include example directory
1 parent 6359c50 commit 0dd718f

File tree

3 files changed

+61
-53
lines changed

3 files changed

+61
-53
lines changed

.eslintrc.cjs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ module.exports = {
3232

3333
"@typescript-eslint/no-non-null-assertion": "warn",
3434
},
35+
overrides: [
36+
{
37+
files: ["example/**/*", "examples/**/*"],
38+
rules: {
39+
"unused-imports/no-unused-vars": "off",
40+
},
41+
},
42+
],
3543
parserOptions: {
3644
project: ["./tsconfig.eslint.json", "./**/tsconfig.json"],
3745
},

examples/app-pages-router/middleware.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ export function middleware(request: NextRequest) {
2121
"content-type": "application/json",
2222
},
2323
});
24+
} else {
25+
const rHeaders = new Headers(request.headers);
26+
const r = NextResponse.next({
27+
request: {
28+
headers: rHeaders,
29+
},
30+
});
31+
return r;
2432
}
25-
26-
const rHeaders = new Headers(request.headers);
27-
const r = NextResponse.next({
28-
request: {
29-
headers: rHeaders,
30-
},
31-
});
32-
return r;
3333
}
3434

3535
export const config = {

examples/app-router/middleware.ts

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,56 +20,56 @@ export function middleware(request: NextRequest) {
2020
"content-type": "application/json",
2121
},
2222
});
23-
}
24-
25-
const requestHeaders = new Headers();
26-
// Setting the Request Headers, this should be available in RSC
27-
requestHeaders.set("request-header", "request-header");
28-
requestHeaders.set(
29-
"search-params",
30-
`mw/${request.nextUrl.searchParams.get("searchParams") || ""}`,
31-
);
32-
const responseHeaders = new Headers();
33-
// Response headers should show up in the client's response headers
34-
responseHeaders.set("response-header", "response-header");
35-
36-
// Set the cache control header with custom swr
37-
// For: isr.test.ts
38-
if (path === "/isr" && !request.headers.get("x-prerender-revalidate")) {
39-
responseHeaders.set(
40-
"cache-control",
41-
"max-age=10, stale-while-revalidate=999",
23+
} else {
24+
const requestHeaders = new Headers();
25+
// Setting the Request Headers, this should be available in RSC
26+
requestHeaders.set("request-header", "request-header");
27+
requestHeaders.set(
28+
"search-params",
29+
`mw/${request.nextUrl.searchParams.get("searchParams") || ""}`,
4230
);
43-
}
31+
const responseHeaders = new Headers();
32+
// Response headers should show up in the client's response headers
33+
responseHeaders.set("response-header", "response-header");
4434

45-
// It is so that cloudfront doesn't cache the response
46-
if (
47-
path.startsWith("/revalidate-tag") ||
48-
path.startsWith("/revalidate-path")
49-
) {
50-
responseHeaders.set(
51-
"cache-control",
52-
"private, no-cache, no-store, max-age=0, must-revalidate",
53-
);
54-
}
35+
// Set the cache control header with custom swr
36+
// For: isr.test.ts
37+
if (path === "/isr" && !request.headers.get("x-prerender-revalidate")) {
38+
responseHeaders.set(
39+
"cache-control",
40+
"max-age=10, stale-while-revalidate=999",
41+
);
42+
}
5543

56-
const r = NextResponse.next({
57-
headers: responseHeaders,
58-
request: {
59-
headers: requestHeaders,
60-
},
61-
});
44+
// It is so that cloudfront doesn't cache the response
45+
if (
46+
path.startsWith("/revalidate-tag") ||
47+
path.startsWith("/revalidate-path")
48+
) {
49+
responseHeaders.set(
50+
"cache-control",
51+
"private, no-cache, no-store, max-age=0, must-revalidate",
52+
);
53+
}
6254

63-
// Set cookies in middleware
64-
// For: middleware.cookies.test.ts
65-
r.cookies.set("from", "middleware", {
66-
expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
67-
});
68-
r.cookies.set("with", "love", {
69-
expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
70-
});
55+
const r = NextResponse.next({
56+
headers: responseHeaders,
57+
request: {
58+
headers: requestHeaders,
59+
},
60+
});
61+
62+
// Set cookies in middleware
63+
// For: middleware.cookies.test.ts
64+
r.cookies.set("from", "middleware", {
65+
expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
66+
});
67+
r.cookies.set("with", "love", {
68+
expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365),
69+
});
7170

72-
return r;
71+
return r;
72+
}
7373
}
7474

7575
export const config = {

0 commit comments

Comments
 (0)