You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:56 UTC
[45/50] [abbrv] incubator-weex git commit: Merge branch
'jsfm-feature-0.19' into dev-release095
Merge branch 'jsfm-feature-0.19' into dev-release095
# Conflicts:
# circle.yml
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9e54e4d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9e54e4d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9e54e4d8
Branch: refs/heads/master
Commit: 9e54e4d81a074d7c2eb144f201723301919bcc08
Parents: 1e837f3 d88375a
Author: sospartan <so...@gmail.com>
Authored: Wed Jan 11 17:06:43 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Wed Jan 11 17:06:43 2017 +0800
----------------------------------------------------------------------
.eslintrc | 1 +
build/build.js | 225 +++----
build/config.js | 121 ++++
build/rollup.browser.config.js | 38 --
build/rollup.config.js | 34 --
build/webpack.examples.config.js | 6 +-
circle.yml | 3 +-
dist/weex-html5/LICENSE | 201 -------
dist/weex-html5/NOTICE | 7 -
dist/weex-html5/README.md | 158 -----
dist/weex-html5/demo/build/index.js | 111 ----
dist/weex-html5/demo/index.we | 29 -
dist/weex-html5/index.html | 57 --
dist/weex-html5/package.json | 23 -
dist/weex-js-framework/LICENSE | 202 -------
dist/weex-js-framework/NOTICE | 7 -
dist/weex-js-framework/README.md | 8 -
dist/weex-js-framework/index.js | 1 -
dist/weex-js-framework/package.json | 39 --
examples/vue/animation.vue | 24 +-
examples/vue/components/a.vue | 12 +-
examples/vue/components/countdown.vue | 36 +-
examples/vue/components/image.vue | 10 +-
examples/vue/components/input.vue | 21 +-
examples/vue/components/list.vue | 73 +--
examples/vue/components/marquee.vue | 32 +-
examples/vue/components/navigator.vue | 20 +-
examples/vue/components/scroller.vue | 118 ++--
examples/vue/components/slider.vue | 160 ++---
examples/vue/components/tabbar.vue | 72 +--
examples/vue/components/text.vue | 2 +-
examples/vue/components/video.vue | 14 +-
examples/vue/components/web.vue | 4 +-
examples/vue/include/button.vue | 162 +++++
examples/vue/include/countdown.vue | 93 +++
examples/vue/include/example-list-item.vue | 2 +-
examples/vue/include/hn.vue | 47 ++
examples/vue/include/list-item.vue | 46 ++
examples/vue/include/marquee.vue | 78 +++
examples/vue/include/navbar.vue | 121 ++++
examples/vue/include/navpage.vue | 62 ++
examples/vue/include/panel.vue | 141 +++++
examples/vue/include/tabbar.vue | 92 +++
examples/vue/include/tabitem.vue | 63 ++
examples/vue/include/tip.vue | 65 ++
examples/vue/index.vue | 70 +--
examples/vue/modules/clipboard.vue | 29 +-
examples/vue/modules/instance-api.vue | 8 +-
examples/vue/modules/modal.vue | 12 +-
examples/vue/modules/storage.vue | 16 +-
examples/vue/modules/stream.vue | 24 +-
examples/vue/showcase/calculator.vue | 10 +-
examples/vue/showcase/itemlist.vue | 588 ++++++++++---------
examples/vue/showcase/progress.vue | 10 +-
examples/vue/style/index.vue | 2 +-
examples/vue/style/style-box.vue | 4 +-
examples/vue/style/style-flex.vue | 2 +-
examples/vue/syntax/hello-world.vue | 1 +
examples/vue/syntax/script-component.vue | 14 +-
examples/vue/syntax/script-data.vue | 11 +-
examples/vue/syntax/script-events.vue | 7 +-
examples/vue/syntax/script-instance.vue | 8 +-
examples/vue/syntax/script-lifecycle.vue | 9 +-
examples/vue/syntax/template-class.vue | 1 +
examples/vue/syntax/template-event.vue | 10 +-
examples/vue/syntax/template-if.vue | 1 +
examples/vue/syntax/template-repeat-update.vue | 24 +-
examples/vue/syntax/template-repeat.vue | 36 +-
examples/vue/syntax/template-style.vue | 9 +-
examples/vue/template.vue | 20 +-
examples/vue/test.vue | 16 -
examples/vue/test2.vue | 6 -
html5/frameworks/index.js | 2 +
html5/frameworks/legacy/api/methods.js | 30 +-
html5/frameworks/legacy/app/bundle/bootstrap.js | 6 +
html5/frameworks/legacy/app/ctrl/init.js | 118 ++--
html5/frameworks/legacy/app/ctrl/misc.js | 40 +-
html5/frameworks/legacy/app/index.js | 4 +-
html5/frameworks/legacy/app/instance.js | 18 +-
html5/frameworks/legacy/app/register.js | 25 +-
html5/frameworks/legacy/app/viewport.js | 38 ++
html5/frameworks/legacy/static/create.js | 13 +-
html5/frameworks/vanilla/index.js | 43 +-
html5/render/native/index.js | 6 +-
html5/runtime/callback-manager.js | 37 ++
html5/runtime/config.js | 17 +
html5/runtime/handler.js | 2 +-
html5/runtime/index.js | 32 +-
html5/runtime/init.js | 87 ++-
html5/runtime/service.js | 58 ++
html5/runtime/task-center.js | 72 +++
html5/runtime/vdom/document.js | 4 +-
html5/runtime/vdom/element-types.js | 65 ++
html5/runtime/vdom/element.js | 149 +++--
html5/runtime/vdom/index.js | 8 +-
html5/runtime/vdom/operation.js | 29 +-
html5/services/amd/index.js | 70 +++
html5/services/broadcast-channel/index.js | 106 ++++
.../services/broadcast-channel/message-event.js | 21 +
html5/services/index.js | 5 +
html5/shared/setTimeout.js | 2 +
.../case/basic/global-weex-object.output.js | 6 +
.../case/basic/global-weex-object.source.js | 19 +
html5/test/case/prepare.js | 10 +-
html5/test/case/tester.js | 50 +-
html5/test/unit/default/api/methods.js | 6 +-
html5/test/unit/default/app/bundle.js | 30 +-
html5/test/unit/default/app/ctrl.js | 31 +-
html5/test/unit/default/app/index.js | 54 +-
html5/test/unit/default/app/viewport.js | 61 ++
html5/test/unit/default/runtime.js | 40 +-
html5/test/unit/default/vm/dom-helper.js | 9 +-
html5/test/unit/default/vm/events.js | 14 +-
html5/test/unit/default/vm/vm.js | 16 +-
html5/test/unit/shared/BroadcastChannel.js | 220 +++++++
html5/test/unit/vanilla/index.js | 3 -
html5/test/unit/vdom/index.js | 76 ++-
html5/test/unit/vdom/listener.js | 34 +-
package.json | 31 +-
119 files changed, 3370 insertions(+), 2236 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9e54e4d8/circle.yml
----------------------------------------------------------------------
diff --cc circle.yml
index ee399e2,6ccabd5..37fd785
--- a/circle.yml
+++ b/circle.yml
@@@ -1,21 -1,12 +1,22 @@@
machine:
+ pre:
+ - sudo service mongodb stop
+ - sudo service mysql stop
+ - sudo service postgresql stop
+ - sudo service rabbitmq-server stop
+ - sudo service couchdb stop
node:
- version: 7
+ version: 7
+ java:
+ version: 'oraclejdk8'
test:
override:
- # - npm run test
+ - npm run build
+ - npm run test
- - npm run test:cover
+ - cd android/playground && ./gradlew assembleDebug :weex_sdk:testDebugUnitTest -PdisableCov=true -PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true -Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" -Dfile.encoding=UTF-8
post:
+ - cp -r android/playground/app/build/outputs $CIRCLE_ARTIFACTS/playground # playground artifacts
+ - cp -r android/sdk/build/reports $CIRCLE_ARTIFACTS/sdk_reports
dependencies:
cache_directories:
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9e54e4d8/package.json
----------------------------------------------------------------------
diff --cc package.json
index 21649af,bf85b7f..d4331be
--- a/package.json
+++ b/package.json
@@@ -76,14 -76,11 +78,15 @@@
"modals": "^0.1.6",
"scroll-to": "0.0.2",
"semver": "^5.1.0",
- "weex-vue-framework": "2.0.5-weex.1",
- "weex-components": "^0.2.0"
+ "weex-components": "^0.2.0",
+ "weex-rax-framework": "0.1.0",
+ "weex-vue-framework": "2.1.8-weex.1"
},
"devDependencies": {
+ "xml2map": "^1.0.2",
+ "macaca-cli": "^1.1.0",
+ "webdriver-client": "~1.0.0",
+ "macaca-utils": "^0.1.9",
"babel-core": "^6.17.0",
"babel-istanbul": "^0.11.0",
"babel-loader": "^6.2.5",