-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'bad3c326a3f8b8e0d3bcf07917dc0adf97c32351' into dev
* 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
Showing
429 changed files
with
107,677 additions
and
58,578 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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' | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
[ignore] | ||
.*/node_modules/.* | ||
.*/test/.* | ||
.*/build/.* | ||
.*/scripts/.* | ||
.*/examples/.* | ||
.*/benchmarks/.* | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.