Skip to content

Commit 656fdb5

Browse files
committed
Merge branch 'master' into add-rule/valid-slot-scope
# Conflicts: # README.md # package.json
2 parents 609ad90 + 9fdf8e0 commit 656fdb5

File tree

159 files changed

+4229
-2433
lines changed

Some content is hidden

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

159 files changed

+4229
-2433
lines changed

Diff for: .circleci/config.yml

+40-14
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,28 @@ workflows:
22
version: 2
33
node-multi-build:
44
jobs:
5-
- node-v6
6-
- node-v8
7-
- node-v10
8-
- node-v10-minimal
5+
- node-v6:
6+
filters:
7+
branches:
8+
ignore: gh-pages
9+
- node-v8:
10+
filters:
11+
branches:
12+
ignore: gh-pages
13+
- node-v10:
14+
filters:
15+
branches:
16+
ignore: gh-pages
17+
- node-v10-minimal:
18+
filters:
19+
branches:
20+
ignore: gh-pages
21+
- deploy_docs:
22+
requires:
23+
- node-v10
24+
filters:
25+
branches:
26+
only: master
927

1028
version: 2
1129
jobs:
@@ -20,19 +38,16 @@ jobs:
2038
- restore_cache:
2139
keys:
2240
- v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
23-
- v2-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
24-
- v2-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
25-
- v2-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
2641
- run:
2742
name: Install dependencies
2843
command: npm install
29-
- run:
30-
name: Test
31-
command: npm test
3244
- save_cache:
3345
key: v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
3446
paths:
3547
- node_modules
48+
- run:
49+
name: Test
50+
command: npm test
3651

3752
node-v6:
3853
<<: *node-base
@@ -55,9 +70,6 @@ jobs:
5570
- restore_cache:
5671
keys:
5772
- v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
58-
- v2-npm-lock-master-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
59-
- v2-npm-cache-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
60-
- v2-npm-cache-master-{{ .Environment.CIRCLE_JOB }}
6173
- run:
6274
name: Install dependencies
6375
command: npm install
@@ -73,4 +85,18 @@ jobs:
7385
- node_modules
7486
docker:
7587
- image: node:10
76-
88+
89+
deploy_docs:
90+
docker:
91+
- image: node:10
92+
steps:
93+
- checkout
94+
- restore_cache:
95+
keys:
96+
- v2-npm-lock-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package.json" }}
97+
- run:
98+
name: Install dependencies
99+
command: npm install
100+
- run:
101+
name: Deploy to Github Pages
102+
command: npm run docs:deploy

Diff for: .eslintignore

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/node_modules
44
/tests/fixtures
55
/tests/integrations/*/node_modules
6+
7+
!.vuepress
8+
/docs/.vuepress/dist

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
/test.*
88
yarn.lock
99
yarn-error.log
10+
docs/.vuepress/dist

Diff for: .vscode/settings.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
"editor.tabSize": 2,
33
"eslint.options": {
44
"rulePaths": ["eslint-internal-rules"]
5-
}
5+
},
6+
"eslint.validate": [
7+
"javascript",
8+
"javascriptreact",
9+
{ "language": "vue", "autoFix": true }
10+
]
611
}

0 commit comments

Comments
 (0)