Skip to content

Commit 6d82dc1

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into working
# Conflicts resolved: # README.md # docs/README.md # docs/en/SUMMARY.md # docs/en/api.md # docs/en/core-concepts.md # docs/en/images/flow.png # docs/en/images/vuex.png # docs/guide/README.md # docs/guide/getters.md # docs/guide/modules.md # docs/guide/plugins.md # docs/guide/state.md # docs/guide/testing.md # docs/installation.md Signed-off-by: MachinisteWeb <[email protected]>
2 parents 99a6fcb + f22d472 commit 6d82dc1

File tree

270 files changed

+29487
-8994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

270 files changed

+29487
-8994
lines changed

.circleci/config.yml

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
version: 2
2+
3+
defaults: &defaults
4+
working_directory: ~/vuex
5+
docker:
6+
- image: circleci/node:8-browsers
7+
8+
jobs:
9+
install:
10+
<<: *defaults
11+
steps:
12+
- checkout
13+
- restore_cache:
14+
keys:
15+
- v1-vuex-{{ .Branch }}-{{ checksum "yarn.lock" }}
16+
- v1-vuex-{{ .Branch }}
17+
- v1-vuex
18+
- run:
19+
name: Installing Dependencies
20+
command: yarn
21+
- save_cache:
22+
paths:
23+
- ./node_modules
24+
key: v1-vuex-{{ .Branch }}-{{ checksum "yarn.lock" }}
25+
- persist_to_workspace:
26+
root: ~/
27+
paths:
28+
- vuex
29+
30+
lint-types:
31+
<<: *defaults
32+
steps:
33+
- attach_workspace:
34+
at: ~/
35+
- run:
36+
name: Linting
37+
command: |
38+
yarn lint --format junit --output-file test-results/eslint/results.xml
39+
- run:
40+
name: Testing Types
41+
command: |
42+
yarn test:types
43+
- store_test_results:
44+
path: test-results
45+
- store_artifacts:
46+
path: test-results
47+
48+
test-unit:
49+
<<: *defaults
50+
steps:
51+
- attach_workspace:
52+
at: ~/
53+
- run:
54+
name: Running Unit Tests
55+
command: |
56+
yarn test:unit
57+
58+
test-e2e:
59+
<<: *defaults
60+
steps:
61+
- attach_workspace:
62+
at: ~/
63+
- run:
64+
name: Running End-to-end Tests
65+
command: |
66+
yarn test:e2e
67+
68+
test-ssr:
69+
<<: *defaults
70+
steps:
71+
- attach_workspace:
72+
at: ~/
73+
- run:
74+
name: Running Server-side Rendering Tests
75+
command: |
76+
yarn test:ssr
77+
78+
workflows:
79+
version: 2
80+
install-and-parallel-test:
81+
jobs:
82+
- install
83+
- lint-types:
84+
requires:
85+
- install
86+
- test-unit:
87+
requires:
88+
- install
89+
- test-e2e:
90+
requires:
91+
- install
92+
- test-ssr:
93+
requires:
94+
- install

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
node_modules
33
TODO.md
44
lib
5-
docs/_book
5+
docs/.vuepress/dist
66
examples/**/build.js
77
types/typings
88
types/test/*.js

bower.json

-18
This file was deleted.

circle.yml

-5
This file was deleted.

dist/logger.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ export interface LoggerOption<S> {
1212
mutationTransformer?: <P extends Payload>(mutation: P) => any;
1313
}
1414

15-
export default function createLogger<S>(option: LoggerOption<S>): Plugin<S>;
15+
export default function createLogger<S>(option?: LoggerOption<S>): Plugin<S>;

docs/LANGS.md renamed to docs-gitbook/LANGS.md

+1
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/fr/api.md renamed to docs-gitbook/fr/api.md

+4-2
File renamed without changes.

docs-gitbook/fr/images/flow.png

9.54 KB
File renamed without changes.

docs/fr/intro.md renamed to docs-gitbook/fr/intro.md

+1-1

docs/en/testing.md renamed to docs-gitbook/fr/testing.md

+2-2

docs/ja/api.md renamed to docs-gitbook/ja/api.md

+6-2
File renamed without changes.

docs/ja/getters.md renamed to docs-gitbook/ja/getters.md

+8-1

docs-gitbook/ja/images/flow.png

24.5 KB

docs-gitbook/ja/images/vuex.png

7.92 KB

docs-gitbook/ja/installation.md

+50

docs/ja/mutations.md renamed to docs-gitbook/ja/mutations.md

-17

docs/ja/state.md renamed to docs-gitbook/ja/state.md

+1-1

docs/ja/testing.md renamed to docs-gitbook/ja/testing.md

+2-2

docs-gitbook/kr/README.md

+1

docs/kr/actions.md renamed to docs-gitbook/kr/actions.md

+1-1

docs/kr/api.md renamed to docs-gitbook/kr/api.md

+19-5
File renamed without changes.

docs/kr/getters.md renamed to docs-gitbook/kr/getters.md

+1-1

docs-gitbook/kr/images/flow.png

24.5 KB

docs-gitbook/kr/images/vuex.png

7.92 KB

0 commit comments

Comments
 (0)