Merge branch 'canary' into fix/optional-value-normalizing

Author: ijjk

docs/middleware.md

@@ -76,6 +76,18 @@ Middleware runs directly after `redirects` and `headers`, before the first files
 
 Middleware uses a [strict runtime](/docs/api-reference/edge-runtime.md) that supports standard Web APIs like `fetch`. This works out of the box using `next start`, as well as on Edge platforms like Vercel, which use [Edge Functions](http://www.vercel.com/edge).
 
+## Custom Server
+
+When using a custom server with middleware, you must specify the hostname and port when instantiating your `NextApp`.
+
+```ts
+import next from 'next'
+// ...
+const port = process.env.PORT ? +process.env.PORT : 3000
+const dev = process.env.NODE_ENV !== 'production'
+const app = next({ dev, customServer: true, hostname: 'localhost', port })
+```
+
 ## Related
 
 <div class="card">

packages/next/package.json

@@ -74,7 +74,7 @@
     "@next/env": "12.0.9-canary.5",
     "caniuse-lite": "^1.0.30001283",
     "postcss": "8.4.5",
-    "styled-jsx": "5.0.0-beta.7",
+    "styled-jsx": "5.0.0",
     "use-subscription": "1.5.1"
   },
   "peerDependencies": {

yarn.lock

@@ -18906,10 +18906,10 @@ styled-jsx-plugin-postcss@3.0.2:
     postcss "^7.0.2"
     postcss-load-plugins "^2.3.0"
 
-styled-jsx@5.0.0-beta.7:
-  version "5.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0-beta.7.tgz#d952f888576b1390897b2b2a026eb43eeef7ee85"
-  integrity sha512-fCrifrkBKt+SM6aNDNnRWiV0YP7JJ6HRLCofyfbseo0RFhbxD2pka5zG5yH5Ym8KOChUrEFbibkjWeSB7n6IwQ==
+styled-jsx@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-5.0.0.tgz#816b4b92e07b1786c6b7111821750e0ba4d26e77"
+  integrity sha512-qUqsWoBquEdERe10EW8vLp3jT25s/ssG1/qX5gZ4wu15OZpmSMFI2v+fWlRhLfykA5rFtlJ1ME8A8pm/peV4WA==
 
 stylehacks@^4.0.0:
   version "4.0.3"