Commit Graph

214 Commits

Author SHA1 Message Date
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
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