Commit Graph

2272 Commits

Author SHA1 Message Date
Clark Du
7103b34ec8 test: add start timeout warning in cli.test 2018-03-09 10:09:57 +08:00
Clark Du
0aff524d3b test: adjust starting timeout to 20s 2018-03-09 10:09:57 +08:00
Sébastien Chopin
b2d285cd81
Merge pull request #2971 from oXg3n/fix-html5-script-tag
Fix HTML script tag in core/renderer to pass W3C validation
2018-03-08 16:23:42 +01:00
oXg3n
b554a524a8 Fix HTML script tag in core/renderer to pass W3C validation (The type attribute is unnecessary for Javascript resources) 2018-03-08 15:38:29 +01:00
Sébastien Chopin
bb5a604c1b
Merge pull request #2950 from clarkdo/jsdomError
fix: throw jsdomError to avoid renderAndGetWindow hanging
2018-03-06 10:17:07 +01:00
Clark Du
0783be2790
refator: remove jsdomError listener before returning window 2018-03-06 16:29:21 +08:00
Clark Du
d9d747c9a8
refator: only throw jsdomerror in window initialization 2018-03-06 16:14:34 +08:00
Clark Du
d6f22c904d
fix: throw jsdomError to avoid renderAndGetWindow hanging 2018-03-06 14:03:09 +08:00
Clark Du
a6b8fe565a
Merge pull request #2945 from dojineko/hotfix-csp
Fix unnecessary shallow-copy
2018-03-05 10:11:25 +08:00
dojineko
dd9dfc6d55 to be simple 2018-03-05 09:58:10 +09:00
Andrew Shield
662b780266 chore: remove reference to npm scripts as they no longer exist (#2937) 2018-03-03 09:28:59 +03:30
Clark Du
b45f273b83
Merge pull request #2938 from Coalpha/patch-1
Fixed grammar
2018-03-03 10:50:47 +08:00
Cole Gannon
7f6ed29d3c
Fixed grammar
Changed "you" to "your"
2018-03-02 15:35:07 -08:00
Sébastien Chopin
85b584693c version: Bump to nuxt 1.4.0 2018-03-01 17:44:58 +01:00
Sébastien Chopin
83c1e085a5
Merge pull request #2831 from jasonc08/dev
inject ssrContext into createRouter and createStore
2018-03-01 17:42:10 +01:00
Sébastien Chopin
344fba8f32
Update AppVeyor badge 2018-03-01 16:49:16 +01:00
Sébastien Chopin
a89a0f7ca9 Update router.js 2018-03-01 18:31:19 +03:30
devneko
5f55bf76bd fix DOMException when using an url-hash that is not valid as css selector 2018-03-01 18:31:19 +03:30
Clark Du
03f89421c2
fix: i18n lint issue 2018-03-01 21:03:36 +08:00
Clark Du
6494873f70
Merge pull request #2920 from phivk/patch-1
fetch default locale from i18n.fallbackLocale in i18n example
2018-03-01 20:59:18 +08:00
Clark Du
f412827570
Merge pull request #2909 from liborvanek/dev
Include Vuex only when store is not empty
2018-03-01 20:57:28 +08:00
Pooya Parsa
e0cc9a1cc6 fix: ignore test files inside middleware and store (#2905) 2018-03-01 09:38:42 +03:30
Pooya Parsa
c79a861809 tests: add failing test for ignores (#2905) 2018-03-01 09:37:19 +03:30
Philo van Kemenade
a694f31117
fetch default locale from i18n.fallbackLocale
Not all projects have 'en' as their default locale. It would be nicer to fetch a default locale from the `fallbackLocale` set on the i18n plugin, rather than hard coding it in middleware.
2018-02-28 22:51:58 +00:00
Sébastien Chopin
ca13b6bfbb fix: Comment line since we use _dataRefresh 2018-02-28 16:46:48 +01:00
Sébastien Chopin
8903db1c27 fix: Fix watchQuery on reused page component 2018-02-28 16:40:59 +01:00
Clark Du
f55c648fed
Merge pull request #2915 from QingWei-Li/patch-1
example: upgrade element-ui
2018-02-28 15:39:32 +08:00
cinwell.li
6c8fcbdbd7
example: upgrade element-ui 2018-02-28 11:15:13 +08:00
cinwell.li
257f9bb62c
example: upgarde element-ui 2018-02-28 11:12:31 +08:00
cinwell.li
757080e87d
example: upgrade element-ui 2018-02-28 11:11:15 +08:00
Libor Vaněk
d7b1dd53ac
Include Vuex only when store is not empty 2018-02-27 23:08:19 +02:00
Sébastien Chopin
9b846acd17
Merge pull request #2783 from qm3ster/refactor/cli
refactor(cli)
2018-02-27 15:35:09 +01:00
Hana Shiro
0a823252ae fix file permission in lib and test (#2883) 2018-02-27 00:18:36 +03:30
Clark Du
9ab4ebde78 Revert "refactor: styleResources watch patterns"
This reverts commit a764fb691d.
2018-02-26 21:30:15 +08:00
Clark Du
a764fb691d refactor: styleResources watch patterns 2018-02-26 13:35:36 +08:00
Clark Du
f45a114021
Merge pull request #2884 from shirohana/feature/watch-style-resources
Feature: watch `options.build.styleResources` as default in dev mode
2018-02-26 13:34:46 +08:00
Clark Du
3c274e19a5
Merge pull request #2898 from clarkdo/ssr.syntax.error
fix: SyntaxError in ssr.test
2018-02-26 13:21:24 +08:00
Clark Du
fd0e7100ec fix: SyntaxError in ssr.test 2018-02-26 11:30:51 +08:00
Hana Shiro
ce6f8b9e8a Add watch options.build.styleResources as default in dev mode 2018-02-23 05:20:07 +08:00
Sébastien Chopin
20d16e8425
Merge pull request #2790 from ricardogobbosouza/module-register-layout
feat: add layout on module
2018-02-20 17:20:07 +01:00
Sébastien Chopin
ac1bc81d4a
Merge pull request #2861 from ConsoleTVs/patch-2
Update nuxt.config.js
2018-02-20 13:26:02 +01:00
Sébastien Chopin
d2f14e3e9c
Update nuxt.config.js 2018-02-20 12:56:39 +01:00
Erik Campobadal
fc94bce2a6
Update nuxt.config.js 2018-02-19 19:36:45 +01:00
Ricardo Gobbo de Souza
f7928d0413 perf: if need parse path 2018-02-14 17:32:41 -02:00
Ricardo Gobbo de Souza
764fe7b8f1 fix: typo 2018-02-14 17:31:11 -02:00
Ricardo Gobbo de Souza
744b45f1ee Trigger 2018-02-14 15:11:36 -02:00
Ricardo Gobbo de Souza
76f85ca990 Merge remote-tracking branch 'upstream/dev' into module-register-layout 2018-02-14 10:11:28 -02:00
Ricardo Gobbo de Souza
9687857fdc Trigger 2018-02-14 09:30:19 -02:00
jason
65b8148a3d inject ssrContext into createRouter and createStore 2018-02-14 01:45:37 +08:00
Clark Du
4a5aa48b44
test: remove extra log 2018-02-13 16:03:03 +08:00