Skip to content

Commit

Permalink
Merge commit 'bad3c326a3f8b8e0d3bcf07917dc0adf97c32351' into dev
Browse files Browse the repository at this point in the history
* commit 'bad3c326a3f8b8e0d3bcf07917dc0adf97c32351': (911 commits)
  chore: update sponsors [ci skip] (vuejs#10158)
  chore: fix sponsor url [ci skip]
  chore: update sponsors [ci skip] (vuejs#10136)
  chore: update sponsors [ci skip] (vuejs#10130)
  chore: update sponsors [ci skip] (vuejs#10113)
  chore(typo): fix comment typo (vuejs#10101)
  chore: update sponsors [ci skip] (vuejs#10064)
  Create FUNDING.yml
  chore: update sponsors [ci skip] (vuejs#10031)
  chore(typo): fix README tag mismatch (vuejs#9934)
  chore(typo): fix typo in comments (vuejs#9995)
  chore: update sponsors [ci skip] (vuejs#9970)
  chore: update sponsors [ci skip] (vuejs#9933)
  fix: fix function expression regex (vuejs#9922)
  fix(types): fix global namespace declaration for UMD bundle (vuejs#9912)
  fix(compiler): Remove the warning for valid v-slot value (vuejs#9917)
  polish: add warning when .native modifier is used on native HTML elements (vuejs#9884)
  test: fix running e2e test on windows (vuejs#9909)
  refactor: remove useless parameter to the function removeVnodes (vuejs#9914)
  test: separate failing test for TS 3.4
  ...

# Conflicts:
#	packages/weex-template-compiler/build.js
#	packages/weex-vue-framework/factory.js
#	packages/weex-vue-framework/index.js
  • Loading branch information
dukegod committed Jun 21, 2019
2 parents 3cac5c7 + bad3c32 commit bc08291
Show file tree
Hide file tree
Showing 429 changed files with 107,677 additions and 58,578 deletions.
8 changes: 0 additions & 8 deletions .babelrc

This file was deleted.

23 changes: 23 additions & 0 deletions .babelrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
const babelPresetFlowVue = {
plugins: [
require('@babel/plugin-proposal-class-properties'),
// require('@babel/plugin-syntax-flow'), // not needed, included in transform-flow-strip-types
require('@babel/plugin-transform-flow-strip-types')
]
}

module.exports = {
presets: [
require('@babel/preset-env'),
// require('babel-preset-flow-vue')
babelPresetFlowVue
],
plugins: [
require('babel-plugin-transform-vue-jsx'),
require('@babel/plugin-syntax-dynamic-import')
],
ignore: [
'dist/*.js',
'packages/**/*.js'
]
}
131 changes: 131 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
version: 2

defaults: &defaults
working_directory: ~/project/vue
docker:
- image: vuejs/ci

jobs:
install:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
- v1-vue-{{ .Branch }}-
- v1-vue-
- run: npm install
- save_cache:
key: v1-vue-{{ .Branch }}-{{ checksum "yarn.lock" }}
paths:
- node_modules/
- persist_to_workspace:
root: ~/project
paths:
- vue

lint-flow-types:
<<: *defaults
steps:
- attach_workspace:
at: ~/project
- run: npm run lint
- run: npm run flow
- run: npm run test:types

test-cover:
<<: *defaults
steps:
- attach_workspace:
at: ~/project
- run: npm run test:cover
- run:
name: report coverage stats for non-PRs
command: |
if [[ -z $CI_PULL_REQUEST ]]; then
./node_modules/.bin/codecov
fi
test-e2e:
<<: *defaults
steps:
- attach_workspace:
at: ~/project
- run: npm run test:e2e -- --env phantomjs

test-ssr-weex:
<<: *defaults
steps:
- attach_workspace:
at: ~/project
- run: npm run test:ssr
- run: npm run test:weex

trigger-regression-test:
<<: *defaults
steps:
- run:
command: |
curl --user ${CIRCLE_TOKEN}: \
--data build_parameters[CIRCLE_JOB]=update \
--data build_parameters[VUE_REVISION]=${CIRCLE_SHA1} \
https://circleci.com/api/v1.1/project/github/vuejs/regression-testing/tree/master
workflows:
version: 2
install-and-parallel-test:
jobs:
- install
- test-cover:
requires:
- install
- lint-flow-types:
requires:
- install
- test-e2e:
requires:
- install
- test-ssr-weex:
requires:
- install
- trigger-regression-test:
filters:
branches:
only:
- "2.6"
- regression-test
requires:
- test-cover
- lint-flow-types
- test-e2e
- test-ssr-weex
weekly_regression_test:
triggers:
- schedule:
# At 13:00 UTC (9:00 EDT) on every Monday
cron: "0 13 * * 1"
filters:
branches:
only:
dev
jobs:
- install
- test-cover:
requires:
- install
- lint-flow-types:
requires:
- install
- test-e2e:
requires:
- install
- test-ssr-weex:
requires:
- install
- trigger-regression-test:
requires:
- test-cover
- lint-flow-types
- test-e2e
- test-ssr-weex
13 changes: 0 additions & 13 deletions .eslintrc

This file was deleted.

29 changes: 29 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
module.exports = {
root: true,
parserOptions: {
parser: require.resolve('babel-eslint'),
ecmaVersion: 2018,
sourceType: 'module'
},
env: {
es6: true,
node: true,
browser: true
},
plugins: [
"flowtype"
],
extends: [
"eslint:recommended",
"plugin:flowtype/recommended"
],
globals: {
"__WEEX__": true,
"WXEnvironment": true
},
rules: {
'no-console': process.env.NODE_ENV !== 'production' ? 0 : 2,
'no-useless-escape': 0,
'no-empty': 0
}
}
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ignore]
.*/node_modules/.*
.*/test/.*
.*/build/.*
.*/scripts/.*
.*/examples/.*
.*/benchmarks/.*

Expand Down
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
We are committed to making participation in this project a harassment-free experience for everyone, regardless of the level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.

Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

Expand Down
20 changes: 14 additions & 6 deletions .github/COMMIT_CONVENTION.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
## Git Commit Message Convention

> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-angular/convention.md).
> This is adapted from [Angular's commit convention](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular).
#### TL;DR:

Messages must be matched by the following regex:

``` js
/^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types)(\(.+\))?: .{1,50}/
```

#### Examples

Expand Down Expand Up @@ -50,24 +58,24 @@ The **header** is mandatory and the **scope** of the header is optional.

### Revert

If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body, it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.

### Type

If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However if there is any [BREAKING CHANGE](#footer), the commit will always appear in the changelog.
If the prefix is `feat`, `fix` or `perf`, it will appear in the changelog. However, if there is any [BREAKING CHANGE](#footer), the commit will always appear in the changelog.

Other prefixes are up to your discretion. Suggested prefixes are `docs`, `chore`, `style`, `refactor`, and `test` for non-changelog related tasks.

### Scope

The scope could be anything specifying place of the commit change. For example `core`, `compiler`, `ssr`, `v-model`, `transition` etc...
The scope could be anything specifying the place of the commit change. For example `core`, `compiler`, `ssr`, `v-model`, `transition` etc...

### Subject

The subject contains succinct description of the change:
The subject contains a succinct description of the change:

* use the imperative, present tense: "change" not "changed" nor "changes"
* don't capitalize first letter
* don't capitalize the first letter
* no dot (.) at the end

### Body
Expand Down
Loading

0 comments on commit bc08291

Please sign in to comment.