Merge branch 'dev' of github.com:dcloudio/uni-app into dev

package.json

@@ -5,13 +5,14 @@
         "lint": "eslint --fix --config package.json --ext .js --ext .vue --ignore-path .eslintignore build src",
         "dev:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js",
         "build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js",
-        "build:app-plus": "npm run lint && cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js",
+        "build:app-plus": "cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js",
         "build:service:legacy": "npm run lint && rollup -c build/rollup.config.service.js",
-        "build:mp-qq": "npm run lint && cross-env UNI_PLATFORM=mp-qq rollup -c build/rollup.config.js",
-        "build:mp-weixin": "npm run lint && cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js",
-        "build:mp-baidu": "npm run lint && cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js",
-        "build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js",
-        "build:mp-toutiao": "npm run lint && cross-env UNI_PLATFORM=mp-toutiao rollup -c build/rollup.config.js",
+        "build:mp-qq": "cross-env UNI_PLATFORM=mp-qq rollup -c build/rollup.config.js",
+        "build:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js",
+        "build:mp-baidu": "cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js",
+        "build:mp-alipay": "cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js",
+        "build:mp-toutiao": "cross-env UNI_PLATFORM=mp-toutiao rollup -c build/rollup.config.js",
+        "build:runtime": "npm run lint && npm run build:mp-weixin && npm run build:mp-qq && npm run build:mp-alipay && npm run build:mp-baidu && npm run build:mp-toutiao && npm run build:app-plus",
         "test:unit": "cross-env NODE_ENV=test UNI_PLATFORM=h5 mocha-webpack --require tests/unit/setup.js --webpack-config build/webpack.config.test.js tests/unit/**/*.spec.js"
     },
     "dependencies": {},

packages/uni-app-plus/dist/index.js

@@ -438,6 +438,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-app-plus/package.json

 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.244",
+	"version": "0.0.245",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-alipay/dist/index.js

@@ -813,6 +813,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-mp-alipay/package.json

 {
 	"name": "@dcloudio/uni-mp-alipay",
-	"version": "0.0.818",
+	"version": "0.0.819",
 	"description": "uni-app mp-alipay",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-baidu/dist/index.js

@@ -538,6 +538,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-mp-baidu/package.json

 {
 	"name": "@dcloudio/uni-mp-baidu",
-	"version": "0.0.846",
+	"version": "0.0.847",
 	"description": "uni-app mp-baidu",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-qq/dist/index.js

@@ -502,6 +502,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-mp-qq/package.json

 {
 	"name": "@dcloudio/uni-mp-qq",
-	"version": "0.0.102",
+	"version": "0.0.103",
 	"description": "uni-app mp-qq",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-toutiao/dist/index.js

@@ -583,6 +583,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-mp-toutiao/package.json

 {
 	"name": "@dcloudio/uni-mp-toutiao",
-	"version": "0.0.342",
+	"version": "0.0.343",
 	"description": "uni-app mp-toutiao",
 	"main": "dist/index.js",
 	"scripts": {

packages/uni-mp-weixin/dist/index.js

@@ -440,6 +440,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions;
 
   if (isFn(vueOptions)) {

packages/uni-mp-weixin/package.json

 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.963",
+	"version": "0.0.964",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

src/core/runtime/wrapper/util.js

+import Vue from 'vue'
+
 import {
   isFn,
   noop,
@@ -28,6 +30,10 @@ function hasHook (hook, vueOptions) {
     return true
   }
 
+  if (Vue.options && Array.isArray(Vue.options[hook])) {
+    return true
+  }
+
   vueOptions = vueOptions.default || vueOptions
 
   if (isFn(vueOptions)) {