Commit Graph

593 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
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
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
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
Sebastien Chopin
a4c4b88de4 Use boolean for ssr option 2017-07-07 15:41:25 +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
Pooya Parsa
498c6be7a5 feat(generator): refactor generate into functions 2017-07-05 02:56:01 +04:30
Pooya Parsa
9475e1c431 feat: top level ssr option 2017-07-05 02:20:43 +04:30
Sebastien Chopin
0831f9c5bc Use es6-promise instead 2017-07-04 18:38:09 +02:00
Sebastien Chopin
a7793bb3de Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-07-04 18:30:13 +02:00
Sebastien Chopin
70a75f4e42 Compatible with IE9+ 2017-07-04 18:30:01 +02:00
Pooya Parsa
ea1b5ae10f feat: better aliases 2017-07-04 18:52:13 +04:30
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
Pooya Parsa
bf1065f438 more webpack friendly tappable hooks 2017-07-03 15:58:10 +04:30
Pooya Parsa
b209c80d2b feat: add tappable hooks 2017-07-03 15:41:40 +04:30
Pooya Parsa
c348d83120 feat: basic support for ssr:false 2017-07-03 04:23:19 +04:30
Sébastien Chopin
e4e9149b54 feat: Add dynamic component injection + example 2017-07-02 20:47:01 +02:00
Pooya Parsa
b41fb5e88c update @ deprecated warning 2017-07-02 02:35:07 +04:30
Pooya Parsa
57e75c58d2 fix(resolvePath): using require.resolve first to support scopped module 2017-06-30 15:49:22 +04:30
Pooya Parsa
447e85af14 depricated ~ in flavour of @ for aliases 2017-06-29 21:06:22 +04:30
Alexandre Chopin
f488eda003 add static 404.html 2017-06-29 13:34:59 +02:00
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
Sébastien Chopin
e1be5944cd Fix typo 2017-06-20 20:19:31 +02:00
Sebastien Chopin
e1126d799c Use relative path 2017-06-20 19:12:06 +02:00
Sebastien Chopin
365d51c0b7 Simplify publicPath and add test for protected resources 2017-06-20 16:12:55 +02:00
Sebastien Chopin
2d34d81d9c Merge branch 'tapable' of github.com:nuxt/nuxt.js into tapable 2017-06-20 15:32:05 +02:00
Sebastien Chopin
fb2eddb78b Add applyPlugins for setupMiddleware 2017-06-20 15:32:02 +02:00
Pooya Parsa
2c12b37bf6 coverage 2017-06-20 17:43:29 +04:30
Sebastien Chopin
8aaadfae79 Merge branch 'tapable' of github.com:nuxt/nuxt.js into tapable 2017-06-20 15:08:26 +02:00
Sebastien Chopin
ebc6da4c08 Add server-destroy 2017-06-20 15:07:38 +02:00
Pooya Parsa
0f85308191 add render.resourceHints option
#899
2017-06-20 17:18:25 +04:30
Pooya Parsa
5ad640b294 use nuxt.js build target 2017-06-20 16:42:21 +04:30