server: render .json urls

nkzawa · nkzawa · commit 66b224ad26cf · 2016-10-06T16:06:55.000+09:00
diff --git a/server/build.js b/server/build.js
@@ -13,7 +13,7 @@ import moduleAlias from 'babel-plugin-module-alias'
 const babelRuntimePath = require.resolve('babel-runtime/package')
 .replace(/[\\\/]package\.json$/, '');
 
-export function transpile (path, { root = process.cwd() } = {}) {
+export function transpile (path) {
   return new Promise((resolve, reject) => {
     transformFile(path, {
       presets: [preset2015, presetReact],
@@ -38,7 +38,7 @@ export function transpile (path, { root = process.cwd() } = {}) {
   })
 }
 
-export function bundle (path, { root = process.cwd() } = {}) {
+export function bundle (path) {
   const fs = new MemoryFS()
 
   const compiler = webpack({
diff --git a/server/index.js b/server/index.js
@@ -66,6 +66,7 @@ export default class Server {
   }
 
   async renderJSON (req, res, path) {
+    const { root } = this
     let json
     try {
       json = await renderJSON(path, { root })
@@ -75,9 +76,11 @@ export default class Server {
       }
       throw err
     }
+
+    const data = JSON.stringify(json)
     res.setHeader('Content-Type', 'application/json')
-    res.setHeader('Content-Length', Buffer.byteLength(json))
-    res.end(json)
+    res.setHeader('Content-Length', Buffer.byteLength(data))
+    res.end(data)
   }
 
   async render404 (req, res) {
diff --git a/server/render.js b/server/render.js
@@ -39,5 +39,8 @@ export async function render (path, req, res, { root = process.cwd() } = {}) {
   return '<!DOCTYPE html>' + renderToStaticMarkup(doc)
 }
 
-export async function renderJSON (path) {
+export async function renderJSON (path, { root = process.cwd() }) {
+  const bundlePath = resolve(root, '.next', '.next', 'pages', (path || 'index') + '.js')
+  const component = await fs.readFile(bundlePath, 'utf8')
+  return { component }
 }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ export default class Server {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`async renderJSON (req, res, path) {`
	`69`	`+ const { root } = this`
`69`	`70`	`let json`
`70`	`71`	`try {`
`71`	`72`	`json = await renderJSON(path, { root })`
`@@ -75,9 +76,11 @@ export default class Server {`
`75`	`76`	`}`
`76`	`77`	`throw err`
`77`	`78`	`}`
	`79`	`+`
	`80`	`+ const data = JSON.stringify(json)`
`78`	`81`	`res.setHeader('Content-Type', 'application/json')`
`79`		`- res.setHeader('Content-Length', Buffer.byteLength(json))`
`80`		`- res.end(json)`
	`82`	`+ res.setHeader('Content-Length', Buffer.byteLength(data))`
	`83`	`+ res.end(data)`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`async render404 (req, res) {`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,8 @@ export async function render (path, req, res, { root = process.cwd() } = {}) {`
`39`	`39`	`return '<!DOCTYPE html>' + renderToStaticMarkup(doc)`
`40`	`40`	`}`
`41`	`41`
`42`		`-export async function renderJSON (path) {`
	`42`	`+export async function renderJSON (path, { root = process.cwd() }) {`
	`43`	`+ const bundlePath = resolve(root, '.next', '.next', 'pages', (path \|\| 'index') + '.js')`
	`44`	`+ const component = await fs.readFile(bundlePath, 'utf8')`
	`45`	`+ return { component }`
`43`	`46`	`}`