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
f342624f
Commit
f342624f
authored
Jun 05, 2017
by
Arunoda Susiripala
Browse files
Options
Browse Files
Download
Plain Diff
Merge master with v3-beta
parents
e74fb785
443abba9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
34 deletions
+49
-34
hot-reloader.js
server/hot-reloader.js
+2
-1
yarn.lock
yarn.lock
+47
-33
No files found.
server/hot-reloader.js
View file @
f342624f
...
@@ -156,7 +156,8 @@ export default class HotReloader {
...
@@ -156,7 +156,8 @@ export default class HotReloader {
this
.
webpackHotMiddleware
=
webpackHotMiddleware
(
compiler
,
{
this
.
webpackHotMiddleware
=
webpackHotMiddleware
(
compiler
,
{
path
:
'/_next/webpack-hmr'
,
path
:
'/_next/webpack-hmr'
,
log
:
false
log
:
false
,
heartbeat
:
2500
})
})
this
.
onDemandEntries
=
onDemandEntryHandler
(
this
.
webpackDevMiddleware
,
compiler
,
{
this
.
onDemandEntries
=
onDemandEntryHandler
(
this
.
webpackDevMiddleware
,
compiler
,
{
dir
:
this
.
dir
,
dir
:
this
.
dir
,
...
...
yarn.lock
View file @
f342624f
...
@@ -118,8 +118,8 @@ append-transform@^0.4.0:
...
@@ -118,8 +118,8 @@ append-transform@^0.4.0:
default-require-extensions "^1.0.0"
default-require-extensions "^1.0.0"
aproba@^1.0.3:
aproba@^1.0.3:
version "1.1.
1
"
version "1.1.
2
"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.
1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab
"
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.
2.tgz#45c6629094de4e96f693ef7eab74ae079c240fc1
"
archiver-utils@^1.3.0:
archiver-utils@^1.3.0:
version "1.3.0"
version "1.3.0"
...
@@ -959,6 +959,15 @@ babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
...
@@ -959,6 +959,15 @@ babel-traverse@^6.18.0, babel-traverse@^6.23.1, babel-traverse@^6.24.1:
invariant "^2.2.0"
invariant "^2.2.0"
lodash "^4.2.0"
lodash "^4.2.0"
babel-types@6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
dependencies:
babel-runtime "^6.22.0"
esutils "^2.0.2"
lodash "^4.2.0"
to-fast-properties "^1.0.1"
babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.21.0, babel-types@^6.23.0, babel-types@^6.24.1:
babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.21.0, babel-types@^6.23.0, babel-types@^6.24.1:
version "6.24.1"
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975"
...
@@ -1134,10 +1143,6 @@ buffer-crc32@^0.2.1:
...
@@ -1134,10 +1143,6 @@ buffer-crc32@^0.2.1:
version "0.2.13"
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
buffer-shims@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
buffer-xor@^1.0.2:
buffer-xor@^1.0.2:
version "1.0.3"
version "1.0.3"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
...
@@ -1193,8 +1198,8 @@ camelcase@^4.1.0:
...
@@ -1193,8 +1198,8 @@ camelcase@^4.1.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
caniuse-lite@^1.0.30000670:
caniuse-lite@^1.0.30000670:
version "1.0.3000067
6
"
version "1.0.3000067
7
"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.3000067
6.tgz#1e962123f48073f0c51c4ea0651dd64d25786498
"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.3000067
7.tgz#43090233d4b2c7190657f95455983d94d264baaa
"
case-sensitive-paths-webpack-plugin@2.0.0:
case-sensitive-paths-webpack-plugin@2.0.0:
version "2.0.0"
version "2.0.0"
...
@@ -1547,6 +1552,12 @@ css-select@~1.2.0:
...
@@ -1547,6 +1552,12 @@ css-select@~1.2.0:
domutils "1.5.1"
domutils "1.5.1"
nth-check "~1.0.1"
nth-check "~1.0.1"
css-tree@1.0.0-alpha17:
version "1.0.0-alpha17"
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha17.tgz#7ab95ab72c533917af8be54313fec81841c5223a"
dependencies:
source-map "^0.5.3"
css-what@2.1:
css-what@2.1:
version "2.1.0"
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
...
@@ -1742,6 +1753,10 @@ domutils@1.5.1, domutils@^1.5.1:
...
@@ -1742,6 +1753,10 @@ domutils@1.5.1, domutils@^1.5.1:
dom-serializer "0"
dom-serializer "0"
domelementtype "1"
domelementtype "1"
double-ended-queue@^2.1.0-0:
version "2.1.0-0"
resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
ecc-jsbn@~0.1.1:
ecc-jsbn@~0.1.1:
version "0.1.1"
version "0.1.1"
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
...
@@ -1833,7 +1848,7 @@ error-stack-parser@^2.0.0:
...
@@ -1833,7 +1848,7 @@ error-stack-parser@^2.0.0:
dependencies:
dependencies:
stackframe "^1.0.3"
stackframe "^1.0.3"
es-abstract@^1.
6.1, es-abstract@^1.
7.0:
es-abstract@^1.7.0:
version "1.7.0"
version "1.7.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
dependencies:
dependencies:
...
@@ -3958,15 +3973,6 @@ object-keys@^1.0.8:
...
@@ -3958,15 +3973,6 @@ object-keys@^1.0.8:
version "1.0.11"
version "1.0.11"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
object.entries@1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
dependencies:
define-properties "^1.1.2"
es-abstract "^1.6.1"
function-bind "^1.1.0"
has "^1.0.1"
object.omit@^2.0.0:
object.omit@^2.0.0:
version "2.0.1"
version "2.0.1"
resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
...
@@ -4426,14 +4432,14 @@ read-pkg@^2.0.0:
...
@@ -4426,14 +4432,14 @@ read-pkg@^2.0.0:
path-type "^2.0.0"
path-type "^2.0.0"
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6:
version "2.2.
9
"
version "2.2.
10
"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.
9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8
"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.
10.tgz#effe72bb7c884c0dd335e2379d526196d9d011ee
"
dependencies:
dependencies:
buffer-shims "~1.0.0"
core-util-is "~1.0.0"
core-util-is "~1.0.0"
inherits "~2.0.1"
inherits "~2.0.1"
isarray "~1.0.0"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
process-nextick-args "~1.0.6"
safe-buffer "^5.0.1"
string_decoder "~1.0.0"
string_decoder "~1.0.0"
util-deprecate "~1.0.1"
util-deprecate "~1.0.1"
...
@@ -4476,8 +4482,8 @@ recursive-copy@^2.0.6:
...
@@ -4476,8 +4482,8 @@ recursive-copy@^2.0.6:
slash "^1.0.0"
slash "^1.0.0"
redbox-react@^1.3.6:
redbox-react@^1.3.6:
version "1.
3.7
"
version "1.
4.0
"
resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.
3.7.tgz#bb3a1a73c07ebe1d67b55860908ee2bc35386968
"
resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.
4.0.tgz#0b571dab6a7acbf3da0e0034825c44b5bd8dba34
"
dependencies:
dependencies:
error-stack-parser "^1.3.6"
error-stack-parser "^1.3.6"
object-assign "^4.0.1"
object-assign "^4.0.1"
...
@@ -4689,8 +4695,8 @@ rxjs@^5.0.0-beta.11:
...
@@ -4689,8 +4695,8 @@ rxjs@^5.0.0-beta.11:
symbol-observable "^1.0.1"
symbol-observable "^1.0.1"
safe-buffer@^5.0.1:
safe-buffer@^5.0.1:
version "5.
0.1
"
version "5.
1.0
"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.
0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7
"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.
1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223
"
sane@~1.6.0:
sane@~1.6.0:
version "1.6.0"
version "1.6.0"
...
@@ -5029,18 +5035,24 @@ strip-json-comments@~2.0.1:
...
@@ -5029,18 +5035,24 @@ strip-json-comments@~2.0.1:
version "2.0.1"
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
styled-jsx@
0.5.7
:
styled-jsx@
1.0.4
:
version "
0.5.7
"
version "
1.0.4
"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-
0.5.7.tgz#2cb02263ffa719b1435a864fdd6c62802ae86669
"
resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-
1.0.4.tgz#13bddf5c9ca7c15fa4c347e178d9d3bdefaaa25d
"
dependencies:
dependencies:
babel-plugin-syntax-jsx "6.18.0"
babel-plugin-syntax-jsx "6.18.0"
babel-traverse "6.21.0"
babel-traverse "6.21.0"
babel-types "6.23.0"
babylon "6.14.1"
babylon "6.14.1"
convert-source-map "1.3.0"
convert-source-map "1.3.0"
css-tree "1.0.0-alpha17"
escape-string-regexp "1.0.5"
escape-string-regexp "1.0.5"
object.entries "1.0.4"
source-map "0.5.6"
source-map "0.5.6"
string-hash "1.1.1"
string-hash "1.1.1"
stylis "3.0.15"
stylis@3.0.15:
version "3.0.15"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.0.15.tgz#e0f9bf403048511043b479d39422c835141e0fbb"
supports-color@^2.0.0:
supports-color@^2.0.0:
version "2.0.0"
version "2.0.0"
...
@@ -5132,8 +5144,10 @@ thenify-all@^1.0.0:
...
@@ -5132,8 +5144,10 @@ thenify-all@^1.0.0:
any-promise "^1.0.0"
any-promise "^1.0.0"
throat@^3.0.0:
throat@^3.0.0:
version "3.0.0"
version "3.1.0"
resolved "https://registry.yarnpkg.com/throat/-/throat-3.0.0.tgz#e7c64c867cbb3845f10877642f7b60055b8ec0d6"
resolved "https://registry.yarnpkg.com/throat/-/throat-3.1.0.tgz#ef22d8855963b3fdc626d043508f24c4cdf7d3c3"
dependencies:
double-ended-queue "^2.1.0-0"
through@^2.3.6:
through@^2.3.6:
version "2.3.8"
version "2.3.8"
...
@@ -5221,8 +5235,8 @@ ua-parser-js@^0.7.9:
...
@@ -5221,8 +5235,8 @@ ua-parser-js@^0.7.9:
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
uglify-js@^2.6, uglify-js@^2.8.27:
uglify-js@^2.6, uglify-js@^2.8.27:
version "2.8.2
7
"
version "2.8.2
8
"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.2
7.tgz#47787f912b0f242e5b984343be8e35e95f694c9c
"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.2
8.tgz#e335032df9bb20dcb918f164589d5af47f38834a
"
dependencies:
dependencies:
source-map "~0.5.1"
source-map "~0.5.1"
yargs "~3.10.0"
yargs "~3.10.0"
...
...
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