Skip to content

Commit 567d6f9

Browse files
committed
fix: wrapper tests
1 parent 6e8807d commit 567d6f9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

packages/nextjs/test/config/wrappingLoader.test.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ describe('wrappingLoader', () => {
100100

101101
await loaderPromise;
102102

103-
expect(callback).toHaveBeenCalledWith(null, expect.stringContaining("'/my/route'"), expect.anything());
103+
// Rolldown uses double quotes, old Rollup used single quotes
104+
expect(callback).toHaveBeenCalledWith(null, expect.stringMatching(/["']\/my\/route['"]/), expect.anything());
104105
});
105106

106107
describe('middleware wrapping', () => {
@@ -148,8 +149,8 @@ describe('wrappingLoader', () => {
148149
expect(wrappedCode).toContain('userProvidedProxy = true');
149150

150151
// Proxy should be wrapped, middleware should be undefined
151-
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
152-
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
152+
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : (?:undefined|void 0)/);
153+
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : (?:undefined|void 0)/);
153154
});
154155

155156
it('should export middleware when user exports named "middleware" export', async () => {
@@ -196,8 +197,8 @@ describe('wrappingLoader', () => {
196197
expect(wrappedCode).toContain('userProvidedProxy = false');
197198

198199
// Middleware should be wrapped, proxy should be undefined
199-
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
200-
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
200+
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : (?:undefined|void 0)/);
201+
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : (?:undefined|void 0)/);
201202
});
202203

203204
it('should export undefined middleware/proxy when user only exports default', async () => {
@@ -245,8 +246,8 @@ describe('wrappingLoader', () => {
245246
expect(wrappedCode).toContain('userProvidedProxy = false');
246247

247248
// Both middleware and proxy should be undefined (conditionals evaluate to false)
248-
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
249-
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
249+
expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : (?:undefined|void 0)/);
250+
expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : (?:undefined|void 0)/);
250251
});
251252
});
252253
});

0 commit comments

Comments
 (0)