Skip to content

Commit 675a642

Browse files
committed
Merge branch 'master-upstream' into types/refactor_defineComponent
# Conflicts: # packages/runtime-core/src/componentOptions.ts # packages/runtime-core/src/componentPublicInstance.ts # packages/runtime-dom/src/directives/vModel.ts # packages/runtime-dom/src/directives/vOn.ts # packages/runtime-dom/src/index.ts
2 parents 99741b8 + 7ffa225 commit 675a642

File tree

347 files changed

+24626
-6970
lines changed

Some content is hidden

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

347 files changed

+24626
-6970
lines changed

.circleci/config.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.eslintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ module.exports = {
2020
'no-restricted-syntax': [
2121
'error',
2222
'ObjectExpression > SpreadElement',
23-
'ObjectPattern > RestElement'
23+
'ObjectPattern > RestElement',
24+
'AwaitExpression'
2425
]
2526
},
2627
overrides: [
@@ -41,7 +42,7 @@ module.exports = {
4142
},
4243
// Packages targeting DOM
4344
{
44-
files: ['packages/{vue,runtime-dom}/**'],
45+
files: ['packages/{vue,vue-compat,runtime-dom}/**'],
4546
rules: {
4647
'no-restricted-globals': ['error', ...NodeGlobals]
4748
}

.github/dependabot.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 10
8+
versioning-strategy: lockfile-only
9+
ignore:
10+
- dependency-name: "@types/node"
11+
versions:
12+
- 14.14.24
13+
- 14.14.37
14+
- dependency-name: "@babel/parser"
15+
versions:
16+
- 7.12.11
17+
- 7.12.13
18+
- 7.12.14
19+
- 7.12.15
20+
- 7.12.16
21+
- 7.12.17
22+
- 7.13.0
23+
- 7.13.10
24+
- 7.13.11
25+
- 7.13.13
26+
- 7.13.4
27+
- 7.13.9
28+
- dependency-name: eslint
29+
versions:
30+
- 7.23.0
31+
- dependency-name: postcss
32+
versions:
33+
- 8.2.4
34+
- 8.2.5
35+
- 8.2.7
36+
- 8.2.8
37+
- dependency-name: typescript
38+
versions:
39+
- 4.2.2
40+
- dependency-name: "@babel/types"
41+
versions:
42+
- 7.12.12
43+
- 7.12.13
44+
- 7.12.17
45+
- 7.13.0
46+
- dependency-name: pug-code-gen
47+
versions:
48+
- 2.0.3
49+
- dependency-name: estree-walker
50+
versions:
51+
- 2.0.2
52+
- dependency-name: "@typescript-eslint/parser"
53+
versions:
54+
- 4.14.2
55+
- 4.15.0
56+
- dependency-name: "@microsoft/api-extractor"
57+
versions:
58+
- 7.13.1
59+
- dependency-name: rollup
60+
versions:
61+
- 2.38.5
62+
- dependency-name: node-notifier
63+
versions:
64+
- 8.0.1

.github/workflows/ci.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: 'ci'
2+
on:
3+
push:
4+
branches:
5+
- '**'
6+
pull_request:
7+
branches:
8+
- master
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v1
14+
- name: Set node version to 16
15+
uses: actions/setup-node@v2
16+
with:
17+
node-version: 16
18+
- uses: bahmutov/npm-install@v1
19+
- name: Run unit tests
20+
run: yarn test --ci
21+
22+
test-dts:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v1
26+
- name: Set node version to 16
27+
uses: actions/setup-node@v2
28+
with:
29+
node-version: 16
30+
- uses: bahmutov/npm-install@v1
31+
- name: Run type declaration tests
32+
run: yarn test-dts
33+
34+
size:
35+
runs-on: ubuntu-latest
36+
env:
37+
CI_JOB_NUMBER: 1
38+
steps:
39+
- uses: actions/checkout@v1
40+
- name: Set node version to 16
41+
uses: actions/setup-node@v2
42+
with:
43+
node-version: 16
44+
- uses: bahmutov/npm-install@v1
45+
46+
- name: Check build size
47+
uses: posva/size-check-action@v1.1.2
48+
with:
49+
github_token: ${{ secrets.GITHUB_TOKEN }}
50+
build_script: size
51+
files: packages/vue/dist/vue.global.prod.js packages/runtime-dom/dist/runtime-dom.global.prod.js packages/size-check/dist/size-check.global.prod.js

.github/workflows/size-check.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.prettierrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
semi: false
22
singleQuote: true
33
printWidth: 80
4+
trailingComma: 'none'
5+
arrowParens: 'avoid'

0 commit comments

Comments
 (0)