Merge branch 'dev' into 4.0

# Conflicts: # CHANGELOG.md # dist/logger.js # dist/vuex.common.js # dist/vuex.esm.browser.js # dist/vuex.esm.browser.min.js # dist/vuex.esm.js # dist/vuex.js # dist/vuex.min.js # package.json # yarn.lock
vuejs · Aug 4, 2020 · 2351c22 · 2351c22
2 parents 83bc26f + 4b038d7
commit 2351c22
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/docs/guide/modules.md b/docs/guide/modules.md
@@ -151,6 +151,7 @@ modules: {
       someGetter (state, getters, rootState, rootGetters) {
         getters.someOtherGetter // -> 'foo/someOtherGetter'
         rootGetters.someOtherGetter // -> 'someOtherGetter'
+        rootGetters['bar/someOtherGetter'] // -> 'bar/someOtherGetter'
       },
       someOtherGetter: state => { ... }
     },
@@ -161,6 +162,7 @@ modules: {
       someAction ({ dispatch, commit, getters, rootGetters }) {
         getters.someGetter // -> 'foo/someGetter'
         rootGetters.someGetter // -> 'someGetter'
+        rootGetters['bar/someGetter'] // -> 'bar/someGetter'
 
         dispatch('someOtherAction') // -> 'foo/someOtherAction'
         dispatch('someOtherAction', null, { root: true }) // -> 'someOtherAction'

diff --git a/docs/kr/README.md b/docs/kr/README.md
@@ -52,7 +52,7 @@ new Vue({
 
 이는 [Flux](https://facebook.github.io/flux/docs/overview), [Redux](http://redux.js.org/), [The Elm Architecture](https://guide.elm-lang.org/architecture/)에서 영감을 받은 Vuex의 기본 아이디어 입니다. 다른 패턴과 달리 Vuex는 Vue.js가 효율적인 업데이트를 위해 세분화된 반응 시스템을 활용하도록 특별히 고안된 라이브러리입니다.
 
-대화식으로 Vuex를 배우고 싶다면 [Scrimba]((https://scrimba.com/g/gvuex))의 Vuex 과정에 등록하십시오.
+대화식으로 Vuex를 배우고 싶다면 [Scrimba](https://scrimba.com/g/gvuex)의 Vuex 과정에 등록하십시오.
 
 ![vuex](/vuex.png)
 

diff --git a/docs/zh/guide/README.md b/docs/zh/guide/README.md
@@ -20,7 +20,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 
-Vue.use(Vuex);
+Vue.use(Vuex)
 
 const store = new Vuex.Store({
   state: {

diff --git a/examples/classic/counter-hot/store/getters.js b/examples/classic/counter-hot/store/getters.js
@@ -1,11 +1,7 @@
 export const count = state => state.count
 
-const limit = 5
-
 export const recentHistory = state => {
-  const end = state.history.length
-  const begin = end - limit < 0 ? 0 : end - limit
   return state.history
-    .slice(begin, end)
+    .slice(-5)
     .join(', ')
 }
diff --git a/package.json b/package.json
@@ -77,8 +77,8 @@
     "vue": "^3.0.0-beta.10",
     "vue-loader": "^16.0.0-beta.1",
     "vue-template-compiler": "^2.5.22",
-    "vuepress": "^0.14.1",
-    "vuepress-theme-vue": "^1.1.0",
+    "vuepress": "^0.14.11",
+    "vuepress-theme-vue": "^1.1.1",
     "webpack": "^4.43.0",
     "webpack-dev-middleware": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0"