Merge branch 'master' of github.com:zeit/next.js

rauchg · rauchg · commit 729088cbf7d1 · 2017-02-02T15:59:54.000-08:00
diff --git a/bin/next-start b/bin/next-start
@@ -42,8 +42,8 @@ const dir = resolve(argv._[0] || '.')
 
 const srv = new Server({ dir })
 
-if (!existsSync(resolve(dir, '.next'))) {
-  console.error(`> Could not find the '.next' directory! Try building your app with 'next build' before starting the server.`)
+if (!existsSync(resolve(dir, '.next', 'BUILD_ID'))) {
+  console.error(`> Could not find a valid build in the '.next' directory! Try building your app with 'next build' before starting the server.`)
   process.exit(1)
 }
 
diff --git a/examples/with-react-md/pages/index.js b/examples/with-react-md/pages/index.js
@@ -1,6 +1,8 @@
 import Head from 'next/head'
 import Link from 'next/link'
 
+import { PureComponent } from 'react'
+
 import Avatar from 'react-md/lib/Avatars'
 import Button from 'react-md/lib/Buttons/Button'
 import FontIcon from 'react-md/lib/FontIcons'
@@ -28,17 +30,23 @@ const drawerHeaderChildren = [
   />
 ]
 
-const NavigationLink = (props) => {
-  const { href, as, children, ..._props } = props
-  return (
-    <div {..._props}>
-      <Link href={href} as={as}>
-        <a className='md-list-tile' style={{padding: 0, overflow: 'hidden'}}>
-          {children}
-        </a>
-      </Link>
-    </div>
-  )
+class NavigationLink extends PureComponent {
+  // NOTE: Don't try using Stateless (function) component here. `ref` is
+  // required by React-MD/AccessibleFakeButton, but Stateless components
+  // don't have one by design:
+  // https://github.com/facebook/react/issues/4936
+  render () {
+    const { href, as, children, ..._props } = this.props
+    return (
+      <div {..._props} style={{padding: 0}}>
+        <Link href={href} as={as}>
+          <a className='md-list-tile md-list-tile--mini' style={{width: '100%', overflow: 'hidden'}}>
+            {children}
+          </a>
+        </Link>
+      </div>
+    )
+  }
 }
 
 export default () => {
diff --git a/server/build/webpack.js b/server/build/webpack.js
@@ -154,11 +154,12 @@ export default async function createCompiler (dir, { dev = false, quiet = false
         if (!(/\.js$/.test(interpolatedName))) {
           return { content, sourceMap }
         }
-
+        const babelRuntimePath = require.resolve('babel-runtime/package')
+          .replace(/[\\/]package\.json$/, '')
         const transpiled = babelCore.transform(content, {
           presets: [require.resolve('babel-preset-es2015')],
           sourceMaps: dev ? 'both' : false,
-          // Here we need to resolve styled-jsx/style to the absolute paths.
+          // Here we need to resolve all modules to the absolute paths.
           // Earlier we did it with the babel-preset.
           // But since we don't transpile ES2015 in the preset this is not resolving.
           // That's why we need to do it here.
@@ -168,7 +169,16 @@ export default async function createCompiler (dir, { dev = false, quiet = false
               require.resolve('babel-plugin-module-resolver'),
               {
                 alias: {
-                  'styled-jsx/style': require.resolve('styled-jsx/style')
+                  'babel-runtime': babelRuntimePath,
+                  react: require.resolve('react'),
+                  'react-dom': require.resolve('react-dom'),
+                  'react-dom/server': require.resolve('react-dom/server'),
+                  'next/link': require.resolve('../../lib/link'),
+                  'next/prefetch': require.resolve('../../lib/prefetch'),
+                  'next/css': require.resolve('../../lib/css'),
+                  'next/head': require.resolve('../../lib/head'),
+                  'next/document': require.resolve('../../server/document'),
+                  'next/router': require.resolve('../../lib/router')
                 }
               }
             ]

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ const dir = resolve(argv._[0] \|\| '.')`
`42`	`42`
`43`	`43`	`const srv = new Server({ dir })`
`44`	`44`
`45`		`-if (!existsSync(resolve(dir, '.next'))) {`
`46`		- console.error(`> Could not find the '.next' directory! Try building your app with 'next build' before starting the server.`)
	`45`	`+if (!existsSync(resolve(dir, '.next', 'BUILD_ID'))) {`
	`46`	+ console.error(`> Could not find a valid build in the '.next' directory! Try building your app with 'next build' before starting the server.`)
`47`	`47`	`process.exit(1)`
`48`	`48`	`}`
`49`	`49`