Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-12-12 15:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,598 Commits 60 Branches 268 Tags 229 MiB
c659f9bce4
Commit Graph

317 Commits

Author SHA1 Message Date
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
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
4bf0a46cb0 chore: polish app/server.js 2017-07-09 17:07:54 +04:30
Sébastien Chopin
a963b566c1 Use nuxtChildKey as computed by default 2017-07-09 12:23:56 +02:00
Sébastien Chopin
f490652d18 Merge pull request #1022 from silverbackdan/silverbackdan-vue-router-key 
Configurable 'key' attribute/property for transitions
 2017-07-08 12:57:52 +02:00
Sebastien Chopin
e5906e5ac4 Avoid loop redirect on server-side 2017-07-07 15:44:04 +02:00
Pooya Parsa
9226f606b5 fix(dynamic components): temporary fix for vue-loader 13.0.0 2017-07-07 02:43:35 +04:30
Pooya Parsa
aaf924f49d fix(asyncData): keep results in ssrContext 2017-07-07 02:03:11 +04:30
Pooya Parsa
a2f62b3bbd fix: support for vue-loader 13.0.0 
https://github.com/vuejs/vue-loader/releases/tag/v13.0.0
 2017-07-05 02:56:42 +04:30
Sebastien Chopin
0831f9c5bc Use es6-promise instead 2017-07-04 18:38:09 +02:00
Sebastien Chopin
70a75f4e42 Compatible with IE9+ 2017-07-04 18:30:01 +02:00
Sebastien Chopin
71faf7cae3 IE9: fix issue with Array.find and String.includes 2017-07-04 15:41:43 +02:00
Daniel West
825d0e4c82 Configurable key property for transitions 
The vue-router component can have a 'key' property which means it's easier to configure transitions between routes with slugs.

With this change in a layout template you can use
```html
<nuxt :routerViewKey="routerViewKey" />
```
And the following for example
```js
    computed: {
      routerViewKey () {
        if (this.$route.name === 'service') {
          return this.$route.name
        } else {
          return this.$route.fullPath
        }
      }
    }
```
This would implement the functionality that @myst729 mentioned here https://github.com/vuejs/vue-router/issues/474 for vue-router - some routes can just switch, but some you may want to transition as though it's a complete new page to an end-user

This is a possible resolution to issue raised here https://github.com/nuxt/nuxt.js/issues/1021
 2017-07-03 18:19:29 +01:00
Sébastien Chopin
e4e9149b54 feat: Add dynamic component injection + example 2017-07-02 20:47:01 +02:00
Pooya Parsa
447e85af14 depricated ~ in flavour of @ for aliases 2017-06-29 21:06:22 +04:30
Pooya Parsa
6a562e1fe7 fix minor problems with relative 2017-06-21 01:53:53 +04:30
Sébastien Chopin
4cfe700846 Use relative path for plugins paths 2017-06-20 20:31:03 +02:00
Sebastien Chopin
e1126d799c Use relative path 2017-06-20 19:12:06 +02:00
Sébastien Chopin
664ce12662 Fix: transition property beeing a function 2017-06-19 23:30:05 +02:00
Pooya Parsa
766009dbba Cleaner structure 2017-06-18 12:06:00 +04:30
Pooya Parsa
829ffa634b refactor structure 2017-06-16 17:12:45 +04:30
Pooya Parsa
e753f93f97 better mapTransitions 
prevents some unhandled cases
 2017-06-13 00:06:05 +04:30
Pooya Parsa
d3f66e132e chore(client): simplify resolveTransitions() 
#566
 2017-06-12 21:34:45 +04:30
Pooya Parsa
5c36ed7b73 fix(client): combine & prefer leave* transitions of from route 
#566
 2017-06-12 21:34:45 +04:30
Pooya Parsa
6ca11461ce feat(nuxt-child): bind transition calls to parent 
WIP for #566
 2017-06-12 21:34:45 +04:30
Sebastien Chopin
92951853fc Add error in plugins context 2017-06-09 13:44:07 +02:00
Sebastien Chopin
5e5b58c461 Add redirect in plugins context 2017-06-06 14:51:49 +02:00
Sebastien Chopin
3a2b732965 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-06-05 11:24:09 +02:00
Sebastien Chopin
703b5071d6 fix: redirect works with full path 2017-06-05 11:24:06 +02:00
Sébastien Chopin
ce69c3be0f Fix: error on template for layout when redirected 2017-06-04 19:59:36 +02:00
Sebastien Chopin
ea03d76e85 Fix issue #829 with onNuxtReady undefined 2017-06-02 12:15:38 +02:00
Sebastien Chopin
f089bcfff6 Add hotReload in context 2017-05-31 13:21:24 +02:00
Sebastien Chopin
488010bf78 Upgrade dependencies and JSDOM API 2017-05-30 16:08:51 +02:00
Sebastien Chopin
4f1e82e959 fix: payload is not fully working on nuxt generate 2017-05-30 12:00:31 +02:00
Sébastien Chopin
c2592a2663 Merge pull request #768 from jroxendal/feature-routepayload 
[Feature: generate] optimize rendering step in generate
 2017-05-28 12:44:05 +02:00
Pooya Parsa
a58b85a238 refactor client.js createApp using async/await 2017-05-26 16:11:18 +04:30
Pooya Parsa
a1d78988c0 fix: call to wp instead of r for css 
The intention of using r was to fix problems with windows paths, but calling r will try to resolve path as well. This was breaking original webpack resolve mechanism from node_modules
 2017-05-26 13:34:11 +04:30
Johan Roxendal
7cfa548ddf renamed generatePayload -> payload 2017-05-24 12:46:22 +02:00
Johan Roxendal
b2d5186e39 renamed routePayload to payload and generatePayload in the context object. added backwards compatability with string-only routes. 2017-05-24 11:32:17 +02:00
Johan Roxendal
64e7cab8fa [Feature: generate] Added support for rendering dynamic routes using data cached by generate.routes in the config file. 2017-05-23 12:20:26 +02:00
Clark Du
e4e0711de2 Fix class component typeerror when using nuxt1.0.0-alpha 2017-05-23 17:04:44 +08:00
Sebastien Chopin
b2ef8c320f No need a name for exported method 2017-05-22 14:26:24 +02:00
Sebastien Chopin
9098854a30 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-05-22 14:05:26 +02:00
Sebastien Chopin
29d2751940 Update warning for Vuex store (classic mode) 2017-05-22 14:05:23 +02:00
Pooya Parsa
bbd2eddb40 import SSR plugins 
This supports proper functionality of plugins registering Vue Components.
Also we await for each plugin to make sure that they are initialized before createApp
 2017-05-22 15:30:20 +04:30
Pooya Parsa
1f6c3a9a7b [fix] resolve css imports 
This resolves problems with windows paths
 2017-05-22 02:19:51 +04:30
Sébastien Chopin
78cd3bae86 Remove injectAs property, now you only have to export a method which receives the context 2017-05-21 21:00:41 +02:00
Sébastien Chopin
1f317a188b Should work with route not code-splitted 2017-05-21 19:16:36 +02:00
Sébastien Chopin
c3355e1467 Store state should always be a method now 2017-05-21 15:45:21 +02:00
Sébastien Chopin
01de17b827 Fix store module vs store 2017-05-21 02:03:32 +02:00
Sébastien Chopin
4cd48f3927 Support ts 2017-05-20 11:36:35 +02:00
Pooya Parsa
32ac90482e Merge remote-tracking branch 'remotes/origin/fix-middleware' into dev 
# Conflicts:
#	lib/app/server.js
#	lib/app/utils.js
#	lib/generate.js
#	yarn.lock
 2017-05-15 15:33:52 +04:30
Pooya Parsa
59ece4978e fix plugins injectAs 2017-05-15 02:26:00 +04:30
Pooya Parsa
0220be4466 [store] fix condition where root store is not exporting state 2017-05-13 23:22:37 +04:30
Pooya Parsa
437586d92b [store] check if storeData.state is function for workaround 2017-05-13 22:22:04 +04:30
Pooya Parsa
05725d70e7 [store] fix 2017-05-13 22:15:42 +04:30
Pooya Parsa
2cdeab5661 [Store] Fix createStore bug 2017-05-13 22:02:11 +04:30
Andrii Korzh
4beaecdc5c add linkExactActiveClass 
Pass linkExactActiveClass to router options
 2017-05-09 21:46:11 +03:00
Sebastien Chopin
64abcc04a8 Fix middleware on client-side 2017-05-09 14:43:47 +02:00
Sébastien Chopin
888811f5f4 Fix middleware on server-side 2017-05-08 19:30:57 +02:00
Pooya Parsa
e2e849fbd2 [vue-style-loader] Inline global css on SSR 
Currently with `<style src>` approach global styles are injected on
runtime only and this may affect page render performance.
 2017-05-05 18:40:12 +04:30
Sebastien Chopin
01b02a9010 Add typescript compatibility 2017-05-05 14:07:54 +02:00
Sebastien Chopin
fd833216df Format code 2017-05-05 12:11:32 +02:00
Pooya Parsa
a04a563f8d create store only when available 2017-05-02 15:36:22 +04:30
Evan You
74652e3974 make use of runInNewContext: false 2017-05-02 13:33:09 +04:30
Sébastien Chopin
2eecb8c0de Add webpackChunkName 2017-04-17 18:15:37 +02:00
Sebastien Chopin
e2ad6517e2 Give this to data() 2017-04-14 16:31:14 +02:00
Sebastien Chopin
55db6e336f Add injectAs feature 2017-04-14 11:57:08 +02:00
Sebastien Chopin
25066545bb Merge branch 'master' of github.com:nuxt/nuxt.js 2017-04-10 18:45:01 +02:00
Sebastien Chopin
b11a4d761b Add injectAs to work with external plugins 2017-04-10 18:44:08 +02:00
Sébastien Chopin
5412ddc8d1 Merge pull request #456 from taldy/nuxtserverinit-promises-improvement 
Support other implementations of Promises inside nuxtServerInit (currently only HTML5 Promises works correctly)
 2017-04-06 12:33:29 +02:00
taldy
1ba4adca70 Fix codestyle 2017-04-06 12:18:27 +03:00
taldy
c22b0b790b Simplify fix and cover other Promise checks 2017-04-06 12:09:56 +03:00
Ilya
6c0f138b7d fix server validate 2017-04-05 22:33:11 +03:00
Sébastien Chopin
3e7d0a19ed Update client.js 2017-04-05 21:25:44 +02:00
Ilya
17db23f45f fix in client : validate method 2017-04-05 21:40:46 +03:00
Sébastien Chopin
4c012e93af Update server.js 2017-04-05 18:25:35 +02:00
Sébastien Chopin
99a03812a4 Update client.js 2017-04-05 18:25:12 +02:00
Sébastien Chopin
9c4244635c Update server.js 2017-04-05 18:24:48 +02:00
Sébastien Chopin
7ef6411269 Update client.js 2017-04-05 18:24:15 +02:00
Ilya
99400bb12d server proposal for validation 2017-04-05 19:14:45 +03:00
Ilya
42e16a650b proposal for validation pages 2017-04-04 14:25:48 +03:00
Sébastien Chopin
d576dad069 Fix eslint + istanbul 2017-03-28 16:28:24 +02:00
Sébastien Chopin
2f2eaac299 Add debug for redirect on ssr 2017-03-26 23:38:51 +02:00
taldy
93c4be2d28 Support other types of Promises returned by nuxtServerInit() 2017-03-26 17:54:27 +03:00
Ralph Huwiler
78ea2591c2 Create nested modules for each folder in ./store 2017-03-25 21:21:11 +01:00
Sébastien Chopin
3b635323a4 Add layout in __NUXT__ 2017-03-25 18:59:58 +01:00
evseevnn
435337529a fix - store no available to context on client side 2017-03-25 12:30:23 +07:00
evseevnn
8ec4eb908f fix - store no available to context on client side 2017-03-25 12:23:42 +07:00
Sébastien Chopin
8831331e3d Fix hot reloading 2017-03-24 16:52:18 +01:00
Sébastien Chopin
52d1df7a24 Fix updated route in context + error handling 2017-03-24 15:49:24 +01:00
Sébastien Chopin
26083a9de0 Avoid using req.url 2017-03-24 13:52:15 +01:00
Sébastien Chopin
4ba3982307 Add duration property in transition 2017-03-24 03:00:35 +01:00
Sébastien Chopin
4034801fc9 Replace store state the soonest possible 2017-03-24 01:35:57 +01:00
Sébastien Chopin
474f68e46e Call store.replaceState on start 2017-03-24 01:28:38 +01:00
Sébastien Chopin
cfd6b197c4 Improve error handling on SSR 2017-03-24 01:28:19 +01:00
Sébastien Chopin
5102e819fe Use data-* for vue-meta (valid markup) 
- data-*
- remove defer for __NUXT__ script
 2017-03-24 01:24:50 +01:00
Sébastien Chopin
64f83b71c3 Vue 2.2 and styles included 2017-03-22 15:47:34 +01:00
Sébastien Chopin
b6856928db Dynamic layout feature 2017-03-17 18:02:58 +01:00
Sébastien Chopin
fb7b856343 force calling middleware from error page 2017-03-16 21:00:22 +01:00
Sébastien Chopin
65eeff332e Fix hotReloading for children 2017-03-16 18:52:06 +01:00
Sébastien Chopin
b8727b8d51 Fix asyncData on hot reloading 2017-03-02 17:31:37 +01:00
Sébastien Chopin
8253f5e75b Add plugin ssr option & rename process.browser 2017-03-01 17:54:44 +01:00
Sébastien Chopin
40d52645e8 asyncData 2017-02-28 13:11:29 +01:00
Sébastien Chopin
66c5aad09d Fix redirected 2017-02-22 18:19:17 +00:00
Sébastien Chopin
9a2767ac90 Layout on afterEach 2017-02-20 22:11:34 +00:00
cj
c40259877b allow router mode to be set in config 2017-02-17 02:43:48 -06:00
Sébastien Chopin
b4f9504942 Update order 2017-02-10 00:47:35 +01:00
Matthew Pietz
f1386c3a5e Remove extraneous div 
Vue 2.x allows multiple root elements when only one would be rendered. Using `v-if` with `v-else` ensures that only one component will get rendered.
 2017-02-09 00:25:04 -08:00
Sébastien Chopin
ae8700f117 Add comment 2017-02-07 10:46:05 +01:00
Sébastien Chopin
61ac979cba Fix regression on query changes 2017-02-06 13:24:59 +01:00
Sébastien Chopin
17650c25e0 Middleware feature 🔥 2017-02-03 15:09:38 +01:00
Sébastien Chopin
f33afa521f Fix progress bar on different layouts (#113) 2017-01-30 11:20:20 +01:00
Sébastien Chopin
55003631fc Fix calling data on hash changes 2017-01-29 07:54:25 +01:00
Sébastien Chopin
423f52f35d Fix error component on dynamic route. 2017-01-27 23:10:02 +01:00
Sébastien Chopin
a99161f685 Use ES6 syntax for hooks in transition key 2017-01-26 16:01:22 +01:00
Sébastien Chopin
d9fe4b9612 Add scrollBehavior option 2017-01-26 15:56:47 +01:00
Sébastien Chopin
615bcae90c Improve error handling when string 2017-01-26 15:21:39 +01:00
Sébastien Chopin
4cbd6d6a28 Improve comments 2017-01-26 15:21:21 +01:00
Sébastien Chopin
55f907877e Normalize components 2017-01-20 18:32:43 +01:00
Sébastien Chopin
224a18dea8 Improve error handling in page components 2017-01-20 18:11:30 +01:00
Sébastien Chopin
75a81430a4 Remove fix for vue-router 2017-01-20 12:42:15 +01:00
Sébastien Chopin
0d7e0ca8a8 Improve error page when throwing exception 2017-01-19 16:39:36 +01:00
Sébastien Chopin
be6562f244 Add _name in router template 2017-01-19 16:25:55 +01:00
Sébastien Chopin
2d85b53266 Add transition hooks in nuxt.config.js 2017-01-13 21:30:31 +01:00
Sébastien Chopin
ac9412b908 Don't use polyfill anymore 2017-01-11 22:18:47 +01:00
Sébastien Chopin
d7de8bf458 Merge pull request #92 from Granipouss/master 
Store generation
 2017-01-02 18:41:39 +01:00
Sébastien Chopin
3b553ce16a Add enterToClass and leaveToClass 2017-01-02 18:05:53 +01:00
Brendan
13aff87b9b no more includes 2017-01-02 10:50:18 +01:00
Brendan
9fd04a6ec8 safer store with try catch 2017-01-02 10:13:53 +01:00
Sébastien Chopin
0b58637a09 Add polyfill in client & index 2016-12-31 12:33:51 +01:00
Sébastien Chopin
99bfac25aa Move polyfill to root 2016-12-31 12:11:37 +01:00
Brendan
f0fba0b0c5 Merged branch master into master 2016-12-30 14:28:21 +01:00
Sébastien Chopin
0e1f0af3b9 Fix hot-reload on data 2016-12-27 17:02:03 +01:00
Sébastien Chopin
f82bde9d1c Add scrollToTop option 2016-12-27 14:53:14 +01:00
Brendan
e2d5d2fa61 Accept both ways of creating the store 2016-12-26 17:19:10 +01:00
Brendan
d7c5babf1f better vuex store 2016-12-25 21:16:30 +01:00
pi0
5e6703484f handle dash in layout filenames. Fixes #78 2016-12-25 23:20:55 +03:30
Sébastien Chopin
fcae73a79b Remove nuxt-container 2016-12-24 17:58:52 +01:00
Sébastien Chopin
3f220625b9 Fix hot reloading for layout 2016-12-24 14:15:00 +01:00
Sébastien Chopin
3a0fcdee73 Layout with code-splitting! 2016-12-24 12:34:41 +01:00