Commit Graph

3425 Commits

Author SHA1 Message Date
Sébastien Chopin
fdc84d2a4a Merge branch 'dev' of github.com:Atinux/nuxt.js into dev 2017-07-12 08:41:47 +02:00
Sebastien Chopin
eedd1137b6 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-07-11 12:45:01 +02:00
Sebastien Chopin
f4d61a07b1 Remove unused option build.loaders 2017-07-11 12:44:58 +02:00
Pooya Parsa
75d933aac6 tests: update with-config
Two index files are generated now so increase assets.length by 1
2017-07-11 13:40:46 +04:30
Pooya Parsa
107d36c851 tests: update module fixture 2017-07-11 13:33:29 +04:30
Pooya Parsa
a3be3cfe1b feat: mode option 2017-07-11 04:54:39 +04:30
Pooya Parsa
3ef0d15f6b perf: use es6 import for plugins 2017-07-11 03:23:06 +04:30
Sebastien Chopin
8ac2f3e6b0 Point to example 2017-07-10 13:52:58 +02:00
Sebastien Chopin
74870baa3e Example ready with Vue 2.4 2017-07-10 13:52:10 +02:00
Sébastien Chopin
896f80d59f Start refactoring sockets example 2017-07-10 09:03:18 +02:00
Sébastien Chopin
a870896c67 Merge branch 'dev' of github.com:Atinux/nuxt.js into dev
Conflicts:
	lib/app/client.js
	lib/app/server.js
2017-07-10 09:02:35 +02:00
Sébastien Chopin
3e36219a43 Update component injection example 2017-07-10 08:56:02 +02:00
Pooya Parsa
518692b2f4 chore: minor fixes 2017-07-10 04:27:50 +04:30
Pooya Parsa
a9f2f299a3 chore: minor olishes 2017-07-10 03:10:09 +04:30
Pooya Parsa
5da4e49d56 chore: polish app/index.js 2017-07-10 02:59:27 +04:30
Pooya Parsa
f635b73a0b chore: minor improvements for server.js 2017-07-10 02:11:44 +04:30
Pooya Parsa
ddc6369e05 chore: polish client.js 2017-07-10 02:11:04 +04:30
Sébastien Chopin
2cc78c0446 Remove dynamic components 2017-07-09 23:06:17 +02:00
Sébastien Chopin
f07d9855b6 Polish app/server.js 2017-07-09 16:50:55 +02:00
Sébastien Chopin
78400042ef Merge branch 'dev' of github.com:Atinux/nuxt.js into dev 2017-07-09 16:31:25 +02:00
Sébastien Chopin
ad85582f5c Rename routerViewKey to nuxtChildKey 2017-07-09 16:29:14 +02:00
Pooya Parsa
db2a5ef75a update server.js 2017-07-09 17:07:54 +04:30
Pooya Parsa
85825d190c fix: gracefully handle unhandled promises
This prevents nuxt process exiting in dev mode on unhandled promises
2017-07-09 17:07:54 +04:30
Pooya Parsa
4bf0a46cb0 chore: polish app/server.js 2017-07-09 17:07:54 +04:30
Sébastien Chopin
fc2c780dd0 Merge branch 'dev' of github.com:Atinux/nuxt.js into dev 2017-07-09 12:27:08 +02:00
Sébastien Chopin
a963b566c1 Use nuxtChildKey as computed by default 2017-07-09 12:23:56 +02:00
Sébastien Chopin
a869637615 Fix example for v1 2017-07-09 12:23:03 +02:00
Sébastien Chopin
b921191f91 Fix typo 2017-07-09 12:15:28 +02:00
Sébastien Chopin
f083990dbd Update dependencies 2017-07-09 12:15:12 +02:00
Sébastien Chopin
270c490a9d Add generate.concurrency option 2017-07-09 12:00:08 +02:00
Pooya Parsa
2a76ff4d27 feat: build.devMiddleware and build.hotMiddleware options
Closes #1025
2017-07-09 14:10:37 +04:30
Sébastien Chopin
9e2c4b9761 Merge branch 'dev' of github.com:Atinux/nuxt.js into dev 2017-07-09 02:35:40 +02:00
Sébastien Chopin
505aed4575 Use transitions for 🙀 2017-07-09 02:35:07 +02:00
Sébastien Chopin
dca165828a Update README.md 2017-07-09 02:09:03 +02:00
Sébastien Chopin
272ae52c73 Remove first timeout 2017-07-09 01:50:26 +02:00
Sébastien Chopin
2dafa52bc4 Update README 2017-07-09 01:47:13 +02:00
Sébastien Chopin
c7ce0802c9 Updates dynamic examples 2017-07-09 01:44:59 +02:00
Sébastien Chopin
51694783b9 Fix paths & typo 2017-07-08 20:31:41 +02:00
Sébastien Chopin
ebb67243c8 Fix path and add random image 2017-07-08 20:26:11 +02:00
Sébastien Chopin
592f8cc733 Remove offline example 2017-07-08 20:16:01 +02:00
Sébastien Chopin
56272eb5fd Remove generate routes 2017-07-08 20:05:28 +02:00
Sébastien Chopin
5e93befc44 Fix paths 2017-07-08 20:01:57 +02:00
Sébastien Chopin
1d0493c0c1 Fix paths 2017-07-08 19:58:07 +02:00
Sébastien Chopin
6f84f69b7a Fix paths & typo 2017-07-08 19:55:39 +02:00
Sébastien Chopin
763ca011e9 Update scripts 2017-07-08 19:47:23 +02:00
Sébastien Chopin
1e064ac180 Fix path 2017-07-08 19:44:05 +02:00
Sébastien Chopin
6164c12524 Update example 2017-07-08 19:40:41 +02:00
Sébastien Chopin
eaf362910f Use async/await 2017-07-08 18:52:29 +02:00
Sébastien Chopin
a39b9fe13b Fix typo 2017-07-08 18:49:37 +02:00
Sébastien Chopin
4098e68983 Use render.bundleRenderer 2017-07-08 18:41:10 +02:00