You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 9db278b
Browse filesBrowse the repository at this point in the historyBrowse files
Jacek
committed
Merge remote-tracking branch 'origin/main' into feat/nextjs-cache-components-support
@@ -109,10 +115,16 @@ test.describe('next start - invalid middleware at root on src/ @quickstart', ()
109
115
constu=createTestUtils({ app, page, context });
110
116
awaitu.page.goToAppHome();
111
117
112
-
expect(app.serveOutput).not.toContain('Your Middleware exists at ./src/middleware.(ts|js)');
113
-
expect(app.serveOutput).toContain(
114
-
'Clerk: clerkMiddleware() was not run, your middleware file might be misplaced. Move your middleware file to ./src/middleware.ts. Currently located at ./middleware.ts',
115
-
);
118
+
constexpectedMessage=
119
+
major>=16
120
+
? 'Your middleware or proxy file exists at ./src/middleware.(ts|js) or proxy.(ts|js)'
121
+
: 'Your middleware file exists at ./src/middleware.(ts|js)';
? 'Clerk: clerkMiddleware() was not run, your middleware or proxy file might be misplaced. Move your middleware or proxy file to ./src/middleware.ts. Currently located at ./middleware.ts'
126
+
: 'Clerk: clerkMiddleware() was not run, your middleware file might be misplaced. Move your middleware file to ./src/middleware.ts. Currently located at ./middleware.ts';
127
+
expect(app.serveOutput).toContain(expectedError);
116
128
});
117
129
118
130
test('Does not display misplaced middleware error on Next 16+',async({ page, context })=>{
test.skip(major>=16&&isCanary,'Middleware detection is smarter in Next 16 canary.');
154
166
constu=createTestUtils({ app, page, context });
155
167
awaitu.page.goToAppHome();
156
-
expect(app.serveOutput).not.toContain('Your Middleware exists at ./src/middleware.(ts|js)');
157
-
expect(app.serveOutput).toContain(
158
-
'Clerk: clerkMiddleware() was not run, your middleware file might be misplaced. Move your middleware file to ./src/middleware.ts. Currently located at ./src/app/middleware.ts',
159
-
);
168
+
constexpectedMessage=
169
+
major>=16
170
+
? 'Your middleware or proxy file exists at ./src/middleware.(ts|js) or proxy.(ts|js)'
171
+
: 'Your middleware file exists at ./src/middleware.(ts|js)';
? 'Clerk: clerkMiddleware() was not run, your middleware or proxy file might be misplaced. Move your middleware or proxy file to ./src/middleware.ts. Currently located at ./src/app/middleware.ts'
176
+
: 'Clerk: clerkMiddleware() was not run, your middleware file might be misplaced. Move your middleware file to ./src/middleware.ts. Currently located at ./src/app/middleware.ts';
177
+
expect(app.serveOutput).toContain(expectedError);
160
178
});
161
179
162
180
test('Does not display misplaced middleware error on Next 16 canary',async({ page, context })=>{
0 commit comments