From 77961d892eb91740315123dfc2a654015406f3d0 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 9 Apr 2019 17:34:34 +0800
Subject: [PATCH] fix(runtime): mp globalData

---
 packages/uni-app-plus/dist/index.js    | 6 +++++-
 packages/uni-app-plus/package.json     | 2 +-
 packages/uni-mp-weixin/dist/index.js   | 6 +++++-
 packages/uni-mp-weixin/package.json    | 2 +-
 src/core/runtime/wrapper/create-app.js | 4 ++++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js
index a2f56391..4e65b027 100644
--- a/packages/uni-app-plus/dist/index.js
+++ b/packages/uni-app-plus/dist/index.js
@@ -663,7 +663,11 @@ function createApp (vm) {
 
       this.$vm.__call_hook('onLaunch', args);
     }
-  };
+  };
+
+  if (vm.$options.globalData) { // 兼容旧版本 globalData
+    appOptions.globalData = vm.$options.globalData;
+  }
 
   initHooks(appOptions, hooks); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json
index 1578bc8c..e064bca8 100644
--- a/packages/uni-app-plus/package.json
+++ b/packages/uni-app-plus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-app-plus",
-	"version": "0.0.212",
+	"version": "0.0.213",
 	"description": "uni-app app-plus",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js
index a1404212..12ea83ed 100644
--- a/packages/uni-mp-weixin/dist/index.js
+++ b/packages/uni-mp-weixin/dist/index.js
@@ -695,7 +695,11 @@ function createApp (vm) {
 
       this.$vm.__call_hook('onLaunch', args);
     }
-  };
+  };
+
+  if (vm.$options.globalData) { // 兼容旧版本 globalData
+    appOptions.globalData = vm.$options.globalData;
+  }
 
   initHooks(appOptions, hooks); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json
index bb95b15d..597d21e9 100644
--- a/packages/uni-mp-weixin/package.json
+++ b/packages/uni-mp-weixin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.931",
+	"version": "0.0.932",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/src/core/runtime/wrapper/create-app.js b/src/core/runtime/wrapper/create-app.js
index d3a8a21c..1a8eb856 100644
--- a/src/core/runtime/wrapper/create-app.js
+++ b/src/core/runtime/wrapper/create-app.js
@@ -57,6 +57,10 @@ export function createApp (vm) {
 
       this.$vm.__call_hook('onLaunch', args)
     }
+  }
+
+  if (vm.$options.globalData) { // 兼容旧版本 globalData
+    appOptions.globalData = vm.$options.globalData
   }
 
   initHooks(appOptions, hooks) // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
-- 
GitLab