Skip to content
This repository was archived by the owner on Jan 28, 2025. It is now read-only.

fix(core): fix renderPageToHtml for work for all next.js versions #1611

Merged
merged 9 commits into from
Aug 31, 2021
Merged

fix(core): fix renderPageToHtml for work for all next.js versions #1611

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
975057c
fix(core): call resultToChunks() in renderPageToHtml only when htmlRe…
dphang Aug 31, 2021
1e21cf7
fixes
dphang Aug 31, 2021
d21f665
sync next.js versions
dphang Aug 31, 2021
8f722c8
fixes
dphang Aug 31, 2021
3828ea2
fixes
dphang Aug 31, 2021
708ee9e
fixes
dphang Aug 31, 2021
9a4f1e6
add resolutions
dphang Aug 31, 2021
4dd26da
fixes
dphang Aug 31, 2021
27ffbdc
update react types
dphang Aug 31, 2021
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
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@
"@types/lodash": "^4.14.172",
"@types/node": "^16.7.2",
"@types/node-fetch": "^2.5.10",
"@types/react": "^17.0.19",
"@types/react-dom": "^17.0.6",
"@types/webpack": "^5.28.0",
"@typescript-eslint/eslint-plugin": "^4.29.3",
"@typescript-eslint/parser": "^4.29.3",
Expand All @@ -65,7 +63,7 @@
"jest": "^27.0.4",
"lerna": "^4.0.0",
"lint-staged": "^11.1.2",
"next": "^11.1.0",
"next": "^11.1.2",
"prettier": "^2.0.5",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
5 changes: 4 additions & 1 deletion packages/libs/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@
"@hapi/accept": "^5.0.1",
"cookie": "^0.4.1",
"jsonwebtoken": "^8.5.1",
"next": "^11.1.0",
"next": "^11.1.2",
"path-to-regexp": "^6.1.0",
"regex-parser": "^2.2.10"
},
"devDependencies": {
"@types/cookie": "^0.4.0",
"@types/jsonwebtoken": "^8.5.5",
"@types/react": "^17.0.19",
"@types/react-dom": "^17.0.9",
"@types/zen-observable": "^0.8.3",
"rimraf": "^3.0.2",
"typescript": "^4.3.4"
}
Expand Down
23 changes: 15 additions & 8 deletions packages/libs/core/src/utils/renderUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { resultToChunks } from "next/dist/server/utils";
import { resultsToString } from "next/dist/server/utils";
import { IncomingMessage, ServerResponse } from "http";

/**
Expand All @@ -15,14 +15,14 @@ export const renderPageToHtml = async (
renderReqToHTML: (
req: IncomingMessage,
res: ServerResponse,
renderMode: string | boolean
renderMode?: "export" | "passthrough" | true
) =>
| PromiseLike<{ renderOpts: Record<string, any>; html: string }>
| { renderOpts: Record<string, any>; html: string };
},
req: IncomingMessage,
res: ServerResponse,
renderMode: "export" | "passthrough" | true
renderMode?: "export" | "passthrough" | true
): Promise<{ html: string; renderOpts: Record<string, any> }> => {
const { renderOpts, html: htmlResult } = await page.renderReqToHTML(
req,
Expand All @@ -31,11 +31,18 @@ export const renderPageToHtml = async (
);

let html;
if (typeof htmlResult === "string") {
html = htmlResult;
} else {
const htmlChunks = htmlResult ? await resultToChunks(htmlResult) : [];
html = htmlChunks.join("");
try {
if (typeof htmlResult === "string") {
html = htmlResult; // Next.js < 11.1
} else {
html = htmlResult ? await resultsToString([htmlResult]) : ""; // Next >= 11.1.1
}
} catch (e) {
// Fallback to using renderReqToHtml without renderMode specified,
// which will render html based on the page's renderReqToHtml,
// which should always work (but adds another *warm* render cost)
console.log("Falling back to using page's rendering function for html");
html = (await page.renderReqToHTML(req, res)) as unknown as string;
}

return { html, renderOpts };
Expand Down
3 changes: 2 additions & 1 deletion packages/libs/core/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"outDir": "dist",
"sourceMap": true,
"strict": true,
"allowJs": true
"allowJs": true,
"skipLibCheck": true
},
"exclude": ["node_modules"],
"include": ["**/*.ts"]
Expand Down
151 changes: 100 additions & 51 deletions packages/libs/core/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"

"@babel/runtime@7.12.5":
version "7.12.5"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
"@babel/runtime@7.15.3":
version "7.15.3"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b"
integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==
dependencies:
regenerator-runtime "^0.13.4"

Expand Down Expand Up @@ -75,20 +75,20 @@
resolved "https://registry.npmjs.org/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.npmjs.org/@next/env/-/env-11.1.0.tgz#cae83d8e0a65aa9f2af3368f8269ffd9d911746a"
integrity sha512-zPJkMFRenSf7BLlVee8987G0qQXAhxy7k+Lb/5hLAGkPVHAHm+oFFeL+2ipbI2KTEFlazdmGY0M+AlLQn7pWaw==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/env/-/env-11.1.2.tgz#27996efbbc54c5f949f5e8c0a156e3aa48369b99"
integrity sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.1.0.tgz#ee6b9117a1f9bb137479dfa51d5a9e38e066a62f"
integrity sha512-64EgW8SzJRQls2yJ5DkuljRxgE24o2kYtX/ghTkPUJYsfidHMWzQGwg26IgRbb/uHqTd1G0W5UkKag+Nt8TWaQ==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/polyfill-module/-/polyfill-module-11.1.2.tgz#1fe92c364fdc81add775a16c678f5057c6aace98"
integrity sha512-xZmixqADM3xxtqBV0TpAwSFzWJP0MOQzRfzItHXf1LdQHWb0yofHHC+7eOrPFic8+ZGz5y7BdPkkgR1S25OymA==

"@next/[email protected].0":
version "11.1.0"
resolved "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.1.0.tgz#8d4e8020a4cbdacbca431a0bf40c4d28187083af"
integrity sha512-h+ry0sTk1W3mJw+TwEf91aqLbBJ5oqAsxfx+QryqEItNtfW6zLSSjxkyTYTqX8DkgSssQQutQfATkzBVgOR+qQ==
"@next/[email protected].2":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/react-dev-overlay/-/react-dev-overlay-11.1.2.tgz#73795dc5454b7af168bac93df7099965ebb603be"
integrity sha512-rDF/mGY2NC69mMg2vDqzVpCOlWqnwPUXB2zkARhvknUHyS6QJphPYv9ozoPJuoT/QBs49JJd9KWaAzVBvq920A==
dependencies:
"@babel/code-frame" "7.12.11"
anser "1.4.9"
Expand All @@ -102,10 +102,30 @@
stacktrace-parser "0.1.10"
strip-ansi "6.0.0"

"@next/[email protected]":
version "11.1.0"
resolved "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.1.0.tgz#60c3c7b127a5dab8b0a2889a7dcf8a90d2c4e592"
integrity sha512-g5DtFTpLTGa36iy9DuZawtJeitI11gysFGKPQQqy+mNbSFazguArcJ10gAYFlbqpIi4boUamWNI5mAoSPx3kog==
"@next/[email protected]":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/react-refresh-utils/-/react-refresh-utils-11.1.2.tgz#44ea40d8e773e4b77bad85e24f6ac041d5e4b4a5"
integrity sha512-hsoJmPfhVqjZ8w4IFzoo8SyECVnN+8WMnImTbTKrRUHOVJcYMmKLL7xf7T0ft00tWwAl/3f3Q3poWIN2Ueql/Q==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-11.1.2.tgz#93226c38db488c4b62b30a53b530e87c969b8251"
integrity sha512-hZuwOlGOwBZADA8EyDYyjx3+4JGIGjSHDHWrmpI7g5rFmQNltjlbaefAbiU5Kk7j3BUSDwt30quJRFv3nyJQ0w==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-11.1.2.tgz#792003989f560c00677b5daeff360b35b510db83"
integrity sha512-PGOp0E1GisU+EJJlsmJVGE+aPYD0Uh7zqgsrpD3F/Y3766Ptfbe1lEPPWnRDl+OzSSrSrX1lkyM/Jlmh5OwNvA==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-11.1.2.tgz#8216b2ae1f21f0112958735c39dd861088108f37"
integrity sha512-YcDHTJjn/8RqvyJVB6pvEKXihDcdrOwga3GfMv/QtVeLphTouY4BIcEUfrG5+26Nf37MP1ywN3RRl1TxpurAsQ==

"@next/[email protected]":
version "11.1.2"
resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-11.1.2.tgz#e15824405df137129918205e43cb5e9339589745"
integrity sha512-e/pIKVdB+tGQYa1cW3sAeHm8gzEri/HYLZHT4WZojrUxgWXqx8pk7S7Xs47uBcFTqBDRvK3EcQpPLf3XdVsDdg==

"@node-rs/[email protected]":
version "1.2.1"
Expand All @@ -131,6 +151,37 @@
resolved "https://registry.npmjs.org/@types/node/-/node-16.7.2.tgz#0465a39b5456b61a04d98bd5545f8b34be340cb7"
integrity sha512-TbG4TOx9hng8FKxaVrCisdaxKxqEwJ3zwHoCWXZ0Jw6mnvTInpaB99/2Cy4+XxpXtjNv9/TgfGSvZFyfV/t8Fw==

"@types/prop-types@*":
version "15.7.4"
resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==

"@types/react-dom@^17.0.9":
version "17.0.9"
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
dependencies:
"@types/react" "*"

"@types/react@*", "@types/react@^17.0.19":
version "17.0.19"
resolved "https://registry.npmjs.org/@types/react/-/react-17.0.19.tgz#8f2a85e8180a43b57966b237d26a29481dacc991"
integrity sha512-sX1HisdB1/ZESixMTGnMxH9TDe8Sk709734fEQZzCV/4lSu9kJCPbo2PbTRoZM+53Pp0P10hYVyReUueGwUi4A==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"

"@types/scheduler@*":
version "0.16.2"
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==

"@types/zen-observable@^0.8.3":
version "0.8.3"
resolved "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3"
integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==

[email protected]:
version "1.4.9"
resolved "https://registry.npmjs.org/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
Expand Down Expand Up @@ -551,6 +602,11 @@ [email protected]:
dependencies:
cssnano-preset-simple "^3.0.0"

csstype@^3.0.2:
version "3.0.8"
resolved "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==

[email protected]:
version "3.0.1"
resolved "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
Expand Down Expand Up @@ -1239,17 +1295,17 @@ [email protected]:
dependencies:
querystring "^0.2.0"

next@^11.1.0:
version "11.1.0"
resolved "https://registry.npmjs.org/next/-/next-11.1.0.tgz#767d4c4fa0b9b0c768cdbd6c9f03dd86b5d701c0"
integrity sha512-GHBk/c7Wyr6YbFRFZF37I0X7HKzkHHI8pur/loyXo5AIE8wdkbGPGO0ds3vNAO6f8AxZAKGCRYtAzoGlVLoifA==
next@^11.1.2:
version "11.1.2"
resolved "https://registry.npmjs.org/next/-/next-11.1.2.tgz#527475787a9a362f1bc916962b0c0655cc05bc91"
integrity sha512-azEYL0L+wFjv8lstLru3bgvrzPvK0P7/bz6B/4EJ9sYkXeW8r5Bjh78D/Ol7VOg0EIPz0CXoe72hzAlSAXo9hw==
dependencies:
"@babel/runtime" "7.12.5"
"@babel/runtime" "7.15.3"
"@hapi/accept" "5.0.2"
"@next/env" "11.1.0"
"@next/polyfill-module" "11.1.0"
"@next/react-dev-overlay" "11.1.0"
"@next/react-refresh-utils" "11.1.0"
"@next/env" "11.1.2"
"@next/polyfill-module" "11.1.2"
"@next/react-dev-overlay" "11.1.2"
"@next/react-refresh-utils" "11.1.2"
"@node-rs/helper" "1.2.1"
assert "2.0.0"
ast-types "0.13.2"
Expand Down Expand Up @@ -1287,13 +1343,18 @@ next@^11.1.0:
stream-browserify "3.0.0"
stream-http "3.1.1"
string_decoder "1.3.0"
styled-jsx "4.0.0"
styled-jsx "4.0.1"
timers-browserify "2.0.12"
tty-browserify "0.0.1"
use-subscription "1.5.1"
util "0.12.3"
util "0.12.4"
vm-browserify "1.1.2"
watchpack "2.1.1"
optionalDependencies:
"@next/swc-darwin-arm64" "11.1.2"
"@next/swc-darwin-x64" "11.1.2"
"@next/swc-linux-x64-gnu" "11.1.2"
"@next/swc-win32-x64-msvc" "11.1.2"

[email protected]:
version "2.6.1"
Expand Down Expand Up @@ -1822,10 +1883,10 @@ [email protected]:
dependencies:
ansi-regex "^5.0.0"

[email protected].0:
version "4.0.0"
resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-4.0.0.tgz#f7b90e7889d0a4f4635f8d1ae9ac32f3acaedc57"
integrity sha512-2USeoWMoJ/Lx5s2y1PxuvLy/cz2Yrr8cTySV3ILHU1Vmaw1bnV7suKdblLPjnyhMD+qzN7B1SWyh4UZTARn/WA==
[email protected].1:
version "4.0.1"
resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-4.0.1.tgz#ae3f716eacc0792f7050389de88add6d5245b9e9"
integrity sha512-Gcb49/dRB1k8B4hdK8vhW27Rlb2zujCk1fISrizCcToIs+55B4vmUM0N9Gi4nnVfFZWe55jRdWpAqH1ldAKWvQ==
dependencies:
"@babel/plugin-syntax-jsx" "7.14.5"
"@babel/types" "7.15.0"
Expand Down Expand Up @@ -1970,10 +2031,10 @@ [email protected]:
dependencies:
inherits "2.0.1"

[email protected].3:
version "0.12.3"
resolved "https://registry.npmjs.org/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
[email protected].4, util@^0.12.0:
version "0.12.4"
resolved "https://registry.npmjs.org/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
dependencies:
inherits "^2.0.3"
is-arguments "^1.0.4"
Expand All @@ -1989,18 +2050,6 @@ util@^0.11.0:
dependencies:
inherits "2.0.3"

util@^0.12.0:
version "0.12.4"
resolved "https://registry.npmjs.org/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
dependencies:
inherits "^2.0.3"
is-arguments "^1.0.4"
is-generator-function "^1.0.7"
is-typed-array "^1.1.3"
safe-buffer "^5.1.2"
which-typed-array "^1.1.2"

[email protected], vm-browserify@^1.0.1:
version "1.1.2"
resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
Expand Down
2 changes: 2 additions & 0 deletions packages/libs/lambda-at-edge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
"@types/node": "^16.7.2",
"@types/node-fetch": "^2.5.7",
"@types/normalize-path": "^3.0.0",
"@types/react": "17.0.19",
"@types/react-dom": "^17.0.9",
"@types/send": "^0.17.0",
"@types/sharp": "^0.28.1",
"fetch-mock-jest": "^1.5.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/libs/lambda-at-edge/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"outDir": "dist",
"sourceMap": true,
"strict": true,
"allowJs": true
"allowJs": true,
"skipLibCheck": true
},
"exclude": ["node_modules"],
"include": ["**/*.ts"]
Expand Down
Loading