Merge branch 'master' into fix/meta

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,7 +50,7 @@ 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}>
@@ -58,15 +58,13 @@ export default () => (
   </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'
   }
 })
 ```

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)

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",

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)
       })
 

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])
   }