Merge branch 'canary' into feature/typescript-cache

examples/custom-server-express/README.md

@@ -1,10 +1,8 @@
 # Custom Express Server example
 
-Most of the time the default Next.js server will be enough but there are times you'll want to run your own server to customize routes or other kinds of app behavior. Next.js provides [Custom server and routing](https://github.com/vercel/next.js#custom-server-and-routing) options, so you can customize as much as you want.
+Most of the time the default Next.js server will be enough but there are times you'll want to run your own server to integrate into an existing application. Next.js provides [a custom server api](https://nextjs.org/docs/advanced-features/custom-server).
 
-Because the Next.js server is just a node.js module you can combine it with any other part of the node.js ecosystem. In this case we are using express to build a custom router on top of Next.
-
-This example demonstrates a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
+Because the Next.js server is a Node.js module you can combine it with any other part of the Node.js ecosystem. In this case we are using express.
 
 ## How to use
 
@@ -15,15 +13,3 @@ npx create-next-app --example custom-server-express custom-server-express-app
 # or
 yarn create next-app --example custom-server-express custom-server-express-app
 ```
-
-### Populate body property
-
-Without the use of body parsing middleware `req.body` will return undefined. To get express to populate `req.body` you need to use middleware within server.js:
-
-```js
-app.prepare().then(() => {
-  const server = express()
-  server.use(express.urlencoded({ extended: true }))
-  server.use(express.json())
-})
-```

examples/custom-server-express/server.js

@@ -9,14 +9,6 @@ const handle = app.getRequestHandler()
 app.prepare().then(() => {
   const server = express()
 
-  server.get('/a', (req, res) => {
-    return app.render(req, res, '/a', req.query)
-  })
-
-  server.get('/b', (req, res) => {
-    return app.render(req, res, '/b', req.query)
-  })
-
   server.all('*', (req, res) => {
     return handle(req, res)
   })

examples/custom-server-hapi/README.md

@@ -1,10 +1,8 @@
 # Custom server using Hapi example
 
-Most of the times the default Next server will be enough but sometimes you want to run your own server to customize routes or other kind of the app behavior. Next provides a [Custom server and routing](https://github.com/vercel/next.js#custom-server-and-routing) so you can customize as much as you want.
+Most of the time the default Next.js server will be enough but there are times you'll want to run your own server to integrate into an existing application. Next.js provides [a custom server api](https://nextjs.org/docs/advanced-features/custom-server).
 
-Because the Next.js server is just a node.js module you can combine it with any other part of the node.js ecosystem. in this case we are using [Hapi](https://hapijs.com) to build a custom router on top of Next.
-
-The example shows a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
+Because the Next.js server is a Node.js module you can combine it with any other part of the node.js ecosystem. In this case we are using [Hapi](https://hapijs.com).
 
 ## How to use
 

examples/custom-server-hapi/server.js

@@ -1,6 +1,6 @@
 const next = require('next')
 const Hapi = require('@hapi/hapi')
-const { pathWrapper, nextHandlerWrapper } = require('./next-wrapper')
+const { /* pathWrapper, */ nextHandlerWrapper } = require('./next-wrapper')
 
 const port = parseInt(process.env.PORT, 10) || 3000
 const dev = process.env.NODE_ENV !== 'production'
@@ -10,18 +10,6 @@ const server = new Hapi.Server({
 })
 
 app.prepare().then(async () => {
-  server.route({
-    method: 'GET',
-    path: '/a',
-    handler: pathWrapper(app, '/a'),
-  })
-
-  server.route({
-    method: 'GET',
-    path: '/b',
-    handler: pathWrapper(app, '/b'),
-  })
-
   server.route({
     method: 'GET',
     path: '/_next/{p*}' /* next specific routes */,

examples/custom-server-koa/README.md

@@ -1,10 +1,8 @@
 # Custom Koa Server example
 
-Most of the times the default Next server will be enough but sometimes you want to run your own server to customize routes or other kind of the app behavior. Next provides a [Custom server and routing](https://nextjs.org/docs/advanced-features/custom-server) so you can customize as much as you want.
+Most of the time the default Next.js server will be enough but there are times you'll want to run your own server to integrate into an existing application. Next.js provides [a custom server api](https://nextjs.org/docs/advanced-features/custom-server).
 
-Because the Next.js server is just a node.js module you can combine it with any other part of the node.js ecosystem. in this case we are using [Koa](https://koajs.com/) to build a custom router on top of Next.
-
-The example shows a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
+Because the Next.js server is a Node.js module you can combine it with any other part of the Node.js ecosystem. In this case we are using [Koa](https://koajs.com/).
 
 ## How to use
 

examples/custom-server-koa/server.js

@@ -11,16 +11,6 @@ app.prepare().then(() => {
   const server = new Koa()
   const router = new Router()
 
-  router.get('/a', async (ctx) => {
-    await app.render(ctx.req, ctx.res, '/a', ctx.query)
-    ctx.respond = false
-  })
-
-  router.get('/b', async (ctx) => {
-    await app.render(ctx.req, ctx.res, '/b', ctx.query)
-    ctx.respond = false
-  })
-
   router.all('(.*)', async (ctx) => {
     await handle(ctx.req, ctx.res)
     ctx.respond = false

examples/custom-server-polka/README.md

@@ -1,10 +1,8 @@
 # Custom [Polka](https://github.com/lukeed/polka) Server example
 
-Most of the times the default Next server will be enough but sometimes you want to run your own server to customize routes or other kind of the app behavior. Next provides a [Custom server and routing](https://github.com/vercel/next.js#custom-server-and-routing) so you can customize as much as you want.
+Most of the time the default Next.js server will be enough but there are times you'll want to run your own server to integrate into an existing application. Next.js provides [a custom server api](https://nextjs.org/docs/advanced-features/custom-server).
 
-Because the Next.js server is just a node.js module you can combine it with any other part of the node.js ecosystem. in this case we are using express to build a custom router on top of Next.
-
-The example shows a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
+Because the Next.js server is a Node.js module you can combine it with any other part of the Node.js ecosystem. In this case we are using Polka.
 
 ## How to use
 

examples/custom-server-polka/server.js

@@ -9,10 +9,6 @@ const handle = app.getRequestHandler()
 app.prepare().then(() => {
   const server = polka()
 
-  server.get('/a', (req, res) => app.render(req, res, '/a', req.query))
-
-  server.get('/b', (req, res) => app.render(req, res, '/b', req.query))
-
   server.all('*', (req, res) => handle(req, res))
 
   server.listen(port, (err) => {

examples/custom-server-typescript/.babelrc

@@ -1,13 +1,3 @@
 {
-  "env": {
-    "development": {
-      "presets": ["next/babel"]
-    },
-    "production": {
-      "presets": ["next/babel"]
-    },
-    "test": {
-      "presets": [["next/babel", { "preset-env": { "modules": "commonjs" } }]]
-    }
-  }
+  "presets": ["next/babel"]
 }

examples/custom-server-typescript/server/index.ts

@@ -10,15 +10,7 @@ const handle = app.getRequestHandler()
 app.prepare().then(() => {
   createServer((req, res) => {
     const parsedUrl = parse(req.url!, true)
-    const { pathname, query } = parsedUrl
-
-    if (pathname === '/a') {
-      app.render(req, res, '/a', query)
-    } else if (pathname === '/b') {
-      app.render(req, res, '/b', query)
-    } else {
-      handle(req, res, parsedUrl)
-    }
+    handle(req, res, parsedUrl)
   }).listen(port)
 
   // tslint:disable-next-line:no-console

examples/custom-server/README.md

@@ -1,15 +1 @@
-# Custom server example
-
-Most of the times the default Next server will be enough but sometimes you want to run your own server to customize routes or other kind of the app behavior. Next provides a [Custom server and routing](https://github.com/vercel/next.js#custom-server-and-routing) so you can customize as much as you want.
-
-The example shows a server that serves the component living in `pages/a.js` when the route `/b` is requested and `pages/b.js` when the route `/a` is accessed. This is obviously a non-standard routing strategy. You can see how this custom routing is being made inside `server.js`.
-
-## How to use
-
-Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init) or [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/) to bootstrap the example:
-
-```bash
-npx create-next-app --example custom-server custom-server-app
-# or
-yarn create next-app --example custom-server custom-server-app
-```
+This example has been moved to the documentation: [https://nextjs.org/docs/advanced-features/custom-server](https://nextjs.org/docs/advanced-features/custom-server)