Merge branch 'master' into fix/meta

nkzawa · nkzawa · commit c698b32ac8fb · 2016-10-25T23:59:13.000+09:00
diff --git a/Readme.md b/Readme.md
@@ -1,4 +1,4 @@
-# next.js
+<img width="112" alt="screen shot 2016-10-25 at 2 37 27 pm" src="https://cloud.githubusercontent.com/assets/13041/19686250/971bf7f8-9ac0-11e6-975c-188defd82df1.png">
 
 Next.js is a minimalistic framework for server-rendered React applications.
 
@@ -50,23 +50,21 @@ We use [glamor](https://github.com/threepointone/glamor) to provide a great buil
 
 ```jsx
 import React from 'react'
-import style from 'next/css'
+import css from 'next/css'
 
 export default () => (
   <div className={style}>
     Hello world
   </div>
 )
 
-const style = style({
-  main: {
-    background: 'red',
-    ':hover': {
-      background: 'gray'
-    }
-    '@media (max-width: 600px)': {
-      background: 'blue'
-    }
+const style = css({
+  background: 'red',
+  ':hover': {
+    background: 'gray'
+  },
+  '@media (max-width: 600px)': {
+    background: 'blue'
   }
 })
 ```
diff --git a/bin/next-dev b/bin/next-dev
@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-import { exec } from 'child_process'
 import { resolve, join } from 'path'
 import parseArgs from 'minimist'
 import { exists } from 'mz/fs'
@@ -17,12 +16,6 @@ const argv = parseArgs(process.argv.slice(2), {
   }
 })
 
-const open = url => {
-  const openers = { darwin: 'open', win32: 'start' }
-  const cmdName = openers[process.platform] || 'xdg-open'
-  exec(`${cmdName} ${url}`)
-}
-
 const dir = resolve(argv._[0] || '.')
 
 clean(dir)
@@ -39,10 +32,6 @@ clean(dir)
       console.warn('> Couldn\'t find a `pages` directory. Please create one under the project root')
     }
   }
-
-  if (!/^(false|0)$/i.test(process.env.NEXT_OPEN_BROWSER)) {
-    open(`http://localhost:${argv.port}`)
-  }
 })
 .catch((err) => {
   console.error(err)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "0.9.9",
+  "version": "0.9.11",
   "description": "Next.js is a minimalistic framework for server-rendered React applications",
   "main": "./dist/lib/index.js",
   "homepage": "https://github.com/zeit/next.js",
diff --git a/server/build/plugins/watch-pages-plugin.js b/server/build/plugins/watch-pages-plugin.js
@@ -26,7 +26,7 @@ export default class WatchPagesPlugin {
         const name = getEntryName(f)
         if (compiler.hasEntry(name)) return
 
-        const entries = ['webpack/hot/only-dev-server', f]
+        const entries = ['webpack/hot/dev-server', f]
         compiler.addEntry(entries, name)
       })
 
diff --git a/server/build/webpack.js b/server/build/webpack.js
@@ -13,7 +13,7 @@ export default async function createCompiler (dir, { hotReload = false } = {}) {
   const pages = await glob('pages/**/*.js', { cwd: dir })
 
   const entry = {}
-  const defaultEntries = hotReload ? ['webpack/hot/only-dev-server'] : []
+  const defaultEntries = hotReload ? ['webpack/hot/dev-server'] : []
   for (const p of pages) {
     entry[join('bundles', p)] = defaultEntries.concat(['./' + p])
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "next",`
`3`		`- "version": "0.9.9",`
	`3`	`+ "version": "0.9.11",`
`4`	`4`	`"description": "Next.js is a minimalistic framework for server-rendered React applications",`
`5`	`5`	`"main": "./dist/lib/index.js",`
`6`	`6`	`"homepage": "https://github.com/zeit/next.js",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export default async function createCompiler (dir, { hotReload = false } = {}) {`
`13`	`13`	`const pages = await glob('pages/*/.js', { cwd: dir })`
`14`	`14`
`15`	`15`	`const entry = {}`
`16`		`- const defaultEntries = hotReload ? ['webpack/hot/only-dev-server'] : []`
	`16`	`+ const defaultEntries = hotReload ? ['webpack/hot/dev-server'] : []`
`17`	`17`	`for (const p of pages) {`
`18`	`18`	`entry[join('bundles', p)] = defaultEntries.concat(['./' + p])`
`19`	`19`	`}`