Commit Graph

693 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
Pooya Parsa
b6544637e0 renderer: errorMiddleware
Catch all middleware errors
2017-06-20 16:34:20 +04:30
Pooya Parsa
daa50e4efb refactor server into nuxt 2017-06-20 16:14:47 +04:30
Sébastien Chopin
bf379fc0fd fix: dont serve index.html when url is / and remove publicPath in production 2017-06-20 09:13:24 +02:00
Pooya Parsa
0b4b46c91e add missing default fs for loadResources 2017-06-20 04:00:27 +04:30
Pooya Parsa
0ee670c665 eslint 2017-06-20 03:53:57 +04:30
Pooya Parsa
185dfc1ecf move serverMiddleware to renderer 2017-06-20 03:46:29 +04:30
Sébastien Chopin
0dabc38785 Merge branch 'tapable' of github.com:Atinux/nuxt.js into tapable 2017-06-20 01:04:40 +02:00
Sébastien Chopin
0c68b67dcd Update maxEntrypointSize 2017-06-20 01:04:01 +02:00
Sébastien Chopin
041d5c37a0 Fix path undefined when refreshing files 2017-06-20 00:34:50 +02:00
Pooya Parsa
be8191de60 protect serving SSR assets in production 2017-06-20 02:40:54 +04:30
Sébastien Chopin
664ce12662 Fix: transition property beeing a function 2017-06-19 23:30:05 +02:00
Pooya Parsa
d9a01c25f1 deprecated options.build.ssr 2017-06-20 01:33:55 +04:30
Pooya Parsa
9fe3f0d334 webpack3: temporary disable scope hoisting
Currently it makes trouble with context.require
2017-06-20 01:15:48 +04:30
Pooya Parsa
adb43fbc10 better production source maps 2017-06-20 00:44:13 +04:30
Pooya Parsa
8378a772e5 webpack3: Scope Hoisting 2017-06-19 23:45:59 +04:30
Sébastien Chopin
4f9684e117 Remove ~store & ~router 2017-06-19 20:20:51 +02:00
Pooya Parsa
4880bc85ad lint 2017-06-19 20:39:01 +04:30
Pooya Parsa
a594606f85 coverage 2017-06-19 20:17:31 +04:30
Sébastien Chopin
c8c2084bba Fix lint 2017-06-18 20:27:24 +02:00
Pooya Parsa
289c6f2214 chalk OPEN color 2017-06-18 22:23:01 +04:30
Sébastien Chopin
840a6cfe00 Fix small typos 2017-06-18 19:32:59 +02:00
Pooya Parsa
59d7e786aa Fully decouple builder
runBuild flag removed
2017-06-18 20:17:21 +04:30
Sébastien Chopin
5521925668 Handle error 2017-06-18 17:41:49 +02:00
Sébastien Chopin
79a09aa4fa Merge branch 'tapable' of github.com:Atinux/nuxt.js into tapable 2017-06-18 15:54:58 +02:00
Sébastien Chopin
69e6450377 Fix issue #908 and #916 2017-06-18 15:49:04 +02:00
Sébastien Chopin
582e8179f4 remove NUXT_APP_DIR env 2017-06-18 15:48:25 +02:00
Pooya Parsa
1ff37506a7 simplify webpackBuild() 2017-06-18 16:20:43 +04:30
Pooya Parsa
20f93b8b54 migrate require to ES6 imports 2017-06-18 14:05:00 +04:30
Pooya Parsa
fa9bc9445b forbid access to server-bundle.json in production (#916) 2017-06-18 12:48:45 +04:30
Pooya Parsa
d593d11720 common index.js 2017-06-18 12:15:13 +04:30
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
0895b333ec fix devMiddleware with baseUrl 2017-06-16 03:30:53 +04:30
Pooya Parsa
42b603304d fix tests 2017-06-16 03:08:43 +04:30
Pooya Parsa
644d19f7ec eslint 2017-06-16 02:58:08 +04:30
Pooya Parsa
5722a92c4c many improvements 2017-06-16 02:49:53 +04:30
Pooya Parsa
d68b4f0c00 webpack3 2017-06-15 20:56:13 +04:30
Pooya Parsa
ce959878e7 eslint 2017-06-15 19:30:23 +04:30
Pooya Parsa
2576e8795e init() ~> ready() 2017-06-15 19:29:26 +04:30
Pooya Parsa
d882b1ac77 improvements 2017-06-15 19:23:00 +04:30
Pooya Parsa
25d106e2ab runBuild option 2017-06-14 23:21:14 +04:30
Pooya Parsa
3df51f7f45 remove debug 2017-06-14 22:20:58 +04:30
Pooya Parsa
e2ee016a22 simpler bundleRenderer check 2017-06-14 22:12:20 +04:30
Pooya Parsa
59f8e48549 builder no longer needs init 2017-06-14 22:09:32 +04:30
Pooya Parsa
7343af0d5f typo 2017-06-14 22:08:07 +04:30
Pooya Parsa
3747e3cc36 refactor more into defaults 2017-06-14 22:02:25 +04:30
Pooya Parsa
8691e21efb remove unnecessary initialized 2017-06-14 21:58:20 +04:30
Pooya Parsa
de51b8a6da set this.resources in constructor
Prevent error when access methods earlier than init is called
2017-06-14 21:41:38 +04:30
Pooya Parsa
4569b3a46f remove ssr === false condition 2017-06-14 21:28:14 +04:30
Pooya Parsa
a00378102b move bundleRenderer to renderRoute with proper timeout 2017-06-14 21:22:23 +04:30
Pooya Parsa
17d0082861 prevent calling init multi times 2017-06-14 21:03:04 +04:30
Pooya Parsa
42bf9bb41d decouple builder from renderer + improvements 2017-06-14 20:43:43 +04:30
Pooya Parsa
b61694ca21 clone options to prevent unwanted side-effects
fixes with-config test that runs nuxt twice with same nuxt.config.js file
2017-06-14 03:22:30 +04:30
Pooya Parsa
76c3b358cc better No build files found error 2017-06-14 03:17:22 +04:30
Pooya Parsa
c519c3edff fixes + improvements 2017-06-14 02:39:03 +04:30
Pooya Parsa
37c92e7398 better build chain 2017-06-14 01:13:00 +04:30
Pooya Parsa
fa97b2af67 typo 2017-06-14 01:07:28 +04:30
Pooya Parsa
4c07a397e2 builder: decouple build from production logic 2017-06-14 01:04:28 +04:30
Pooya Parsa
5768ef5092 update render references 2017-06-14 00:53:02 +04:30
Pooya Parsa
f3ecfb6a92 better exit message 2017-06-14 00:44:51 +04:30
Pooya Parsa
5ba7d593aa fix constructor order logic 2017-06-14 00:29:26 +04:30
Pooya Parsa
277aa7e6fa refactor renderer init into it's component 2017-06-14 00:24:23 +04:30
Pooya Parsa
030273db49 improve build lifecycle 2017-06-14 00:01:30 +04:30
Pooya Parsa
dfa1d915d6 working version! 2017-06-13 22:28:04 +04:30
Pooya Parsa
c347a1bf48 generator: send back duration & errors
Manual merge 7760e9a49b
2017-06-13 01:10:44 +04:30
Pooya Parsa
a318144b9a reorder imports 2017-06-13 01:02:34 +04:30
Pooya Parsa
344e4a159e Update generator 2017-06-13 00:46:42 +04:30
Pooya Parsa
a14819ca88 Nuxt.* Components 2017-06-13 00:46:27 +04:30
Pooya Parsa
e753f93f97 better mapTransitions
prevents some unhandled cases
2017-06-13 00:06:05 +04:30
Pooya Parsa
61534431a9 eslint 2017-06-12 21:34:45 +04:30
Pooya Parsa
13a4e71a83 refactor into components 2017-06-12 21:34:45 +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
Sébastien Chopin
8853b7af04 Remove build.loaders option 2017-06-12 21:34:45 +04:30
Sébastien Chopin
4623170c99 Display localhost instead of 0.0.0.0 2017-06-12 21:34:13 +04:30
Pooya Parsa
8fe9380df9 refactor into components 2017-06-11 18:47:36 +04:30
Pooya Parsa
c08801cf53 eslint 2017-06-10 23:12:13 +04:30
Pooya Parsa
affcb9d58e fix: show localhost instead of 0.0.0.0 in Open URL
fixes potential problems after merging #865
2017-06-10 23:10:14 +04:30
Sébastien Chopin
e2dac5f3aa Merge pull request #853 from 0pt1m1z3r/server-build-extend
Fix server build.extend context
2017-06-10 12:19:25 +02:00
Sebastien Chopin
92951853fc Add error in plugins context 2017-06-09 13:44:07 +02:00
Dmitri Efimenko
092d9cd0ab Fix server build.extend context 2017-06-07 19:05:02 +03:00
Sebastien Chopin
5e5b58c461 Add redirect in plugins context 2017-06-06 14:51:49 +02:00
Sebastien Chopin
c25aa4bc45 Modules: unshit plugins to be executed first 2017-06-06 14:51:30 +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
Pooya Parsa
b37c7cbd8d chore: eslint 2017-06-05 13:27:41 +04:30
Pooya Parsa
bd54ddd2a7 feat(http2): push assets with single link header
less payload!

https://blog.cloudflare.com/http-2-server-push-with-multiple-assets-per-link-header
2017-06-05 13:26:07 +04:30
Pooya Parsa
0468c7997e feat(module): improve require 2017-06-05 13:22:02 +04:30
Pooya Parsa
349f6e6219 feat(http2): add render.http2.push option
This option disables http2 push headers by default as is currently inconsistent with different browser and webservers
2017-06-05 13:19:27 +04:30
Sébastien Chopin
ce69c3be0f Fix: error on template for layout when redirected 2017-06-04 19:59:36 +02:00
Sébastien Chopin
f958801fff fix: modules called before renderer in production 2017-06-04 14:08:36 +02:00
Sebastien Chopin
5682eef2a5 Update coverage 2017-06-02 18:09:20 +02:00
Sebastien Chopin
1ae3062283 Add nuxt.ready(), dev depends on process.env.NODE_ENV, server waits for modules to be ready and build() is called on development by default 2017-06-02 17:58:53 +02:00
Sebastien Chopin
b4b740f2a0 Merge branch 'dev' of github.com:nuxt/nuxt.js into dev 2017-06-02 12:15:41 +02:00
Sebastien Chopin
ea03d76e85 Fix issue #829 with onNuxtReady undefined 2017-06-02 12:15:38 +02:00
Pooya Parsa
30b5387f95 test(module): code coverage 2017-05-31 19:28:36 +04:30
Pooya Parsa
44c6a25247 feat(module): easier options
Allow using babel style array and flatten options
2017-05-31 19:24:53 +04:30
Pooya Parsa
79b97093d0 ESLint 2017-05-31 18:56:49 +04:30
Pooya Parsa
c5ca8c64f1 refactor: nuxt constructor no longer returns a promise
by not returning a promise we can expose .render method
also the old way of using nuxt won't change by 1.x release
2017-05-31 18:51:16 +04:30