diff --git a/build/webpack.config.js b/build/webpack.config.js index bb52b22b42e25faa64e44e7f092a23cf9971b02d..8f1ebb79e83a7d940a8aed2c511bde13510efc88 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 f55d92de87513b1ec578ea91c64a8b257ca39a66..63059ddfffe8ff831bda34196c8d4ed01a52e562 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 e1f05ff1832e098d083be9bec0918f2d73a8aa7f..d5b2d2e55b1a79fdb58e69d101b341721d2ae45b 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 3fc12d3dce55500f64bb9ed1b394efd07f8e1fdd..e4e365de5be25eec949c9a338c448c337447d031 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 ffcd2a4db3a8547cf8a476ca0937e81a2ce8fe01..455a46fbd077b881f37979dbedc281930ed28777 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'