Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
729088cb
Commit
729088cb
authored
Feb 02, 2017
by
Guillermo Rauch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:zeit/next.js
parents
adf38f3b
ec83670c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
16 deletions
+34
-16
next-start
bin/next-start
+2
-2
index.js
examples/with-react-md/pages/index.js
+19
-11
webpack.js
server/build/webpack.js
+13
-3
No files found.
bin/next-start
View file @
729088cb
...
...
@@ -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
)
}
...
...
examples/with-react-md/pages/index.js
View file @
729088cb
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
()
=>
{
...
...
server/build/webpack.js
View file @
729088cb
...
...
@@ -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'
)
}
}
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment