From 8a342225e89aa77d5b53ad9971eb07686ffdc13a Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 31 Jul 2019 11:55:16 +0800
Subject: [PATCH] add uni-invoke-api

---
 build/webpack.config.js                     |  1 +
 build/webpack.config.test.js                | 17 +++++++++--------
 src/core/service/platform.js                |  2 +-
 src/platforms/app-plus/service/api.js       |  5 +++++
 src/platforms/app-plus/service/api/index.js |  1 -
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/build/webpack.config.js b/build/webpack.config.js
index bb52b22b4..8f1ebb79e 100644
--- a/build/webpack.config.js
+++ b/build/webpack.config.js
@@ -31,6 +31,7 @@ module.exports = {
       'uni-platform': resolve('src/platforms/' + process.env.UNI_PLATFORM),
       // tree shaking
       'uni-components': resolve('src/core/view/components'),
+      'uni-invoke-api': resolve('src/platforms/' + process.env.UNI_PLATFORM + '/service/api'),
       'uni-service-api': resolve('src/core/service/platform-api'),
       'uni-api-protocol': resolve('src/core/helpers/protocol'),
       'uni-api-subscribe': resolve('src/core/view/bridge/subscribe/api/index'),
diff --git a/build/webpack.config.test.js b/build/webpack.config.test.js
index f55d92de8..63059ddff 100644
--- a/build/webpack.config.test.js
+++ b/build/webpack.config.test.js
@@ -23,14 +23,15 @@ config.resolve.alias = {
   'uni-mixins': resolve('src/core/view/mixins'),
   'uni-helpers': resolve('src/core/helpers'),
   'uni-platform': resolve('src/platforms/' + process.env.UNI_PLATFORM),
-  // tree shaking
-  'uni-components': resolve('src/core/view/components'),
-  'uni-service-api': resolve('src/core/service/platform-api'),
-  'uni-api-protocol': resolve('src/core/helpers/protocol'),
-  'uni-api-subscribe': resolve('src/core/view/bridge/subscribe/api/index'),
-  // h5 components
-  'uni-h5-app-components': resolve('src/platforms/h5/components/app/popup/index'),
-  'uni-h5-app-mixins': resolve('src/platforms/h5/components/app/popup/mixins/index'),
+  // tree shaking
+  'uni-components': resolve('src/core/view/components'),
+  'uni-invoke-api': resolve('src/platforms/' + process.env.UNI_PLATFORM + '/service/api'),
+  'uni-service-api': resolve('src/core/service/platform-api'),
+  'uni-api-protocol': resolve('src/core/helpers/protocol'),
+  'uni-api-subscribe': resolve('src/core/view/bridge/subscribe/api/index'),
+  // h5 components
+  'uni-h5-app-components': resolve('src/platforms/h5/components/app/popup/index'),
+  'uni-h5-app-mixins': resolve('src/platforms/h5/components/app/popup/mixins/index'),
   'uni-h5-system-routes': resolve('src/platforms/h5/components/system-routes/index')
 }
 
diff --git a/src/core/service/platform.js b/src/core/service/platform.js
index e1f05ff18..d5b2d2e55 100644
--- a/src/core/service/platform.js
+++ b/src/core/service/platform.js
@@ -1,4 +1,4 @@
-import api from 'uni-platform/service/api'
+import api from 'uni-invoke-api'
 
 /**
  * 执行内部平台方法
diff --git a/src/platforms/app-plus/service/api.js b/src/platforms/app-plus/service/api.js
index 3fc12d3dc..e4e365de5 100644
--- a/src/platforms/app-plus/service/api.js
+++ b/src/platforms/app-plus/service/api.js
@@ -1,3 +1,8 @@
 import * as api from './api/index'
+import * as eventApis from './api/base/event-bus'
+
+Object.keys(eventApis).forEach(name => {
+  api[name] = eventApis
+})
 
 export default api
diff --git a/src/platforms/app-plus/service/api/index.js b/src/platforms/app-plus/service/api/index.js
index ffcd2a4db..455a46fbd 100644
--- a/src/platforms/app-plus/service/api/index.js
+++ b/src/platforms/app-plus/service/api/index.js
@@ -1,4 +1,3 @@
-export * from './base/event-bus'
 export * from './context/audio'
 export * from './context/background-audio'
 
-- 
GitLab