From af6548eabc87ec921426d72807f1ed048885f47e Mon Sep 17 00:00:00 2001 From: Felix Haus Date: Fri, 1 Apr 2022 18:45:56 +0200 Subject: [PATCH 1/3] Fix tests --- .../test/integration/legacy-custom-dependency/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/runtime/test/integration/legacy-custom-dependency/package.json b/packages/runtime/test/integration/legacy-custom-dependency/package.json index 3136cbfd..f8a96f0b 100644 --- a/packages/runtime/test/integration/legacy-custom-dependency/package.json +++ b/packages/runtime/test/integration/legacy-custom-dependency/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "encoding": "latest", "isomorphic-unfetch": "latest", "next": "7.0.0" } From 5e8879567446bee76ac2ff185a4c8780e51f7780 Mon Sep 17 00:00:00 2001 From: Felix Haus Date: Fri, 1 Apr 2022 19:13:13 +0200 Subject: [PATCH 2/3] Add support for route manifest version 4 --- packages/runtime/src/index.ts | 3 ++- packages/runtime/src/utils.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts index 9053dfdb..fa307cbe 100644 --- a/packages/runtime/src/index.ts +++ b/packages/runtime/src/index.ts @@ -509,7 +509,8 @@ export async function build({ switch (routesManifest.version) { case 1: case 2: - case 3: { + case 3: + case 4: { redirects.push(...convertRedirects(routesManifest.redirects)); rewrites.push(...convertRewrites(routesManifest.rewrites)); diff --git a/packages/runtime/src/utils.ts b/packages/runtime/src/utils.ts index a3b0b062..75fbdf71 100644 --- a/packages/runtime/src/utils.ts +++ b/packages/runtime/src/utils.ts @@ -420,7 +420,8 @@ export async function getDynamicRoutes( }; }); } - case 3: { + case 3: + case 4: { return routesManifest.dynamicRoutes .filter(({ page }) => omittedRoutes ? !omittedRoutes.has(page) : true From c1f1991c6f797e053ee0a6b9b7130a520bb9adb7 Mon Sep 17 00:00:00 2001 From: Felix Haus Date: Fri, 1 Apr 2022 19:36:20 +0200 Subject: [PATCH 3/3] Async next config is now supported --- packages/runtime/test/integration/index.test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/runtime/test/integration/index.test.js b/packages/runtime/test/integration/index.test.js index a2a25856..a203e06c 100644 --- a/packages/runtime/test/integration/index.test.js +++ b/packages/runtime/test/integration/index.test.js @@ -320,7 +320,7 @@ it( ); it( - 'Should not build the serverless-config-async example', + 'Should build the serverless-config-async example', async () => { let error = null; @@ -330,13 +330,13 @@ it( error = err; } - expect(error).not.toBe(null); + expect(error).toBe(null); }, FOUR_MINUTES ); it( - 'Should not build the serverless-config-promise example', + 'Should build the serverless-config-promise example', async () => { let error = null; @@ -346,7 +346,7 @@ it( error = err; } - expect(error).not.toBe(null); + expect(error).toBe(null); }, FOUR_MINUTES );