Merge branch 'main' into mk/cleanup-edge

Author: ascorbic

.prettierignore

@@ -22,7 +22,6 @@ lib
 tsconfig.json
 demos/nx-next-monorepo-demo
 
-packages/next/CHANGELOG.md
-packages/runtime/CHANGELOG.md
+**/CHANGELOG.md
 packages/runtime/lib
 packages/runtime/dist-types

package-lock.json

@@ -11,12 +11,13 @@
   "dependencies": {
     "@netlify/esbuild": "0.14.25",
     "@netlify/functions": "^1.2.0",
-    "@netlify/ipx": "^1.2.3",
+    "@netlify/ipx": "^1.2.4",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "execa": "^5.1.1",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
+    "merge-stream": "^2.0.0",
     "moize": "^6.1.0",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
@@ -33,6 +34,7 @@
     "@netlify/build": "^27.16.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
+    "@types/merge-stream": "^1.1.2",
     "@types/node": "^17.0.25",
     "next": "^12.2.0",
     "npm-run-all": "^4.1.5",