Merge remote-tracking branch 'apache/master' into merge_all_code

* apache/master: [jsfm] upgrade js framework to v0.27.6 | remove Object.create(null) (apache#1449)
Darin726 · Aug 23, 2018 · 1c6907a · 1c6907a
2 parents e0520f3 + fe689f1
commit 1c6907a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/android/sdk/assets/weex-main-jsfm.js b/android/sdk/assets/weex-main-jsfm.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "weex",
   "version": "0.12.2",
   "subversion": {
-    "framework": "0.27.5",
+    "framework": "0.27.6",
     "transformer": ">=0.1.5 <0.5"
   },
   "description": "A framework for building Mobile cross-platform UI",

diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
diff --git a/runtime/api/WeexInstance.js b/runtime/api/WeexInstance.js
@@ -78,7 +78,7 @@ export default class WeexInstance {
     }
 
     // create registered module apis
-    const moduleProxy = Object.create(null)
+    const moduleProxy = {}
     const moduleDefine = getModuleDescription(moduleName)
     for (const methodName in moduleDefine) {
       Object.defineProperty(moduleProxy, methodName, {