Repository: incubator-weex Updated Branches: refs/heads/0.12-dev 35a3f8c21 -> 5b1126a56
Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8d2411e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8d2411e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8d2411e4 Branch: refs/heads/0.12-dev Commit: 8d2411e42fbe85047c05053fd515e184fce538d0 Parents: 20f0dc1 e1be952 Author: éé£ <cxf...@apache.org> Authored: Mon Mar 27 15:36:15 2017 +0800 Committer: éé£ <cxf...@apache.org> Committed: Mon Mar 27 15:36:15 2017 +0800 ---------------------------------------------------------------------- CHANGELOG.md | 7 + .../java/com/taobao/weex/WXSDKInstance.java | 6 +- .../main/java/com/taobao/weex/WXSDKManager.java | 10 + .../taobao/weex/adapter/DefaultUriAdapter.java | 8 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 3 +- .../com/taobao/weex/dom/ApplyStyleConsumer.java | 245 ++++ .../java/com/taobao/weex/dom/DOMAction.java | 216 +++ .../com/taobao/weex/dom/DOMActionContext.java | 255 ++++ .../taobao/weex/dom/DOMActionContextImpl.java | 620 +++++++++ .../java/com/taobao/weex/dom/RenderAction.java | 215 +++ .../taobao/weex/dom/RenderActionContext.java | 218 +++ .../com/taobao/weex/dom/RenderActionTask.java | 227 ++++ .../java/com/taobao/weex/dom/WXDomHandler.java | 82 +- .../java/com/taobao/weex/dom/WXDomManager.java | 300 +---- .../java/com/taobao/weex/dom/WXDomModule.java | 439 +----- .../java/com/taobao/weex/dom/WXDomObject.java | 4 +- .../com/taobao/weex/dom/WXDomStatement.java | 1272 ------------------ .../dom/action/AbstractAddElementAction.java | 313 +++++ .../dom/action/AbstractLayoutFinishAction.java | 240 ++++ .../java/com/taobao/weex/dom/action/Action.java | 212 +++ .../com/taobao/weex/dom/action/Actions.java | 350 +++++ .../weex/dom/action/AddElementAction.java | 295 ++++ .../taobao/weex/dom/action/AddEventAction.java | 262 ++++ .../taobao/weex/dom/action/AddRuleAction.java | 254 ++++ .../taobao/weex/dom/action/AnimationAction.java | 463 +++++++ .../weex/dom/action/CreateBodyAction.java | 302 +++++ .../weex/dom/action/CreateFinishAction.java | 224 +++ .../weex/dom/action/GetComponentRectAction.java | 299 ++++ .../weex/dom/action/InvokeMethodAction.java | 236 ++++ .../weex/dom/action/MoveElementAction.java | 281 ++++ .../weex/dom/action/RefreshFinishAction.java | 221 +++ .../weex/dom/action/RemoveElementAction.java | 286 ++++ .../weex/dom/action/RemoveEventAction.java | 264 ++++ .../weex/dom/action/ScrollToElementAction.java | 257 ++++ .../weex/dom/action/UpdateAttributeAction.java | 263 ++++ .../weex/dom/action/UpdateFinishAction.java | 237 ++++ .../weex/dom/action/UpdateStyleAction.java | 298 ++++ .../taobao/weex/ui/RenderActionContextImpl.java | 299 ++++ .../com/taobao/weex/ui/WXRenderManager.java | 191 +-- .../com/taobao/weex/ui/WXRenderStatement.java | 556 -------- .../ui/animation/DimensionUpdateListener.java | 6 +- .../weex/ui/animation/WXAnimationBean.java | 5 +- .../weex/ui/animation/WXAnimationModule.java | 199 +-- .../weex/ui/component/NestedContainer.java | 2 + .../taobao/weex/ui/component/WXComponent.java | 12 +- .../com/taobao/weex/ui/component/WXEmbed.java | 6 + .../java/com/taobao/weex/WXSDKManagerTest.java | 2 +- .../com/taobao/weex/dom/WXDomStatementTest.java | 119 +- .../com/taobao/weex/dom/action/TestActions.java | 59 + .../taobao/weex/ui/WXRenderStatementTest.java | 4 +- .../ui/animation/WXAnimationModuleTest.java | 18 +- build/webpack.ci.config.js | 53 + build/webpack.ci.web.config.js | 68 + build/webpack.deprecatedmacacatest.config.js | 53 + build/webpack.macacatest.config.js | 53 - circle.yml | 37 - .../WeexSDK/Sources/Component/WXEditComponent.m | 30 +- package.json | 10 +- test/.gitignore | 2 + test/pages/components/scroller-fixed.vue | 64 + test/pages/components/scroller-fixed.we | 62 - test/pages/components/textarea-maxlength.vue | 50 + test/pages/dom-operation.vue | 37 + test/pages/dom-operation.we | 32 - test/pages/image-onload.vue | 21 + test/pages/image-onload.we | 19 - test/pages/index.vue | 30 + test/pages/index.we | 27 - test/pages/list-scroll.vue | 34 + test/pages/list-scroll.we | 31 - test/pages/scroller-scroll.vue | 33 + test/pages/scroller-scroll.we | 31 - test/run.sh | 10 +- test/scripts/components/image-onload.test.js | 2 +- test/scripts/components/scroll-event.test.js | 4 +- test/scripts/components/scroller-fixed.test.js | 2 +- .../components/textarea-maxlength.test.js | 36 + test/scripts/dom.test.js | 11 +- test/scripts/index.test.js | 2 +- test/scripts/util.js | 24 + test/serve.sh | 6 +- 81 files changed, 8742 insertions(+), 3294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8d2411e4/build/webpack.deprecatedmacacatest.config.js ---------------------------------------------------------------------- diff --cc build/webpack.deprecatedmacacatest.config.js index 0000000,ba154a8..30d5359 mode 000000,100644..100644 --- a/build/webpack.deprecatedmacacatest.config.js +++ b/build/webpack.deprecatedmacacatest.config.js @@@ -1,0 -1,57 +1,53 @@@ + var path = require('path'); + var fs = require('fs'); + var webpack = require('webpack'); + + var entry = {}; + var bannerExcludeFiles = []; + + function walk(dir) { + dir = dir || '.' + var directory = path.join(__dirname, '../test/pages', dir); + fs.readdirSync(directory) + .forEach(function(file) { + var fullpath = path.join(directory, file); + var stat = fs.statSync(fullpath); + var extname = path.extname(fullpath); + if (stat.isFile() && (extname === '.we' || extname === '.vue')) { + var name = path.join('test', 'build', dir, path.basename(file, extname)); + entry[name] = fullpath + '?entry=true'; + if (extname === '.we') { + bannerExcludeFiles.push(name + '.js') + } + } else if (stat.isDirectory() && file !== 'build' && file !== 'include') { + var subdir = path.join(dir, file); + walk(subdir); + } + }); + } + + walk(); + + var banner = '// { "framework": "Vue" }\n' + + var bannerPlugin = new webpack.BannerPlugin(banner, { + raw: true, + exclude: bannerExcludeFiles + }) + + module.exports = { + entry: entry, + output : { + path: '.', + filename: '[name].js' + }, + module: { + loaders: [ + { - test: /\.we(\?[^?]+)?$/, ++ test: /\.(we|vue)(\?[^?]+)?$/, + loader: 'weex' - }, - { - test: /\.vue(\?[^?]+)?$/, - loader: 'weex-vue-loader' + } + ] + }, + plugins: [bannerPlugin] + }
