From 5c1d23b218d7a9c42a6c89402587108e64dbcaa8 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 11 Oct 2019 15:01:31 +0800
Subject: [PATCH] refactor(app-plus): requireNativePlugin

---
 packages/uni-app-plus/dist/index.v3.js                       | 5 +++++
 .../webpack-uni-pages-loader/lib/platforms/app-plus/index.js | 5 +++--
 src/platforms/app-plus-nvue/service/api/index.js             | 2 --
 src/platforms/app-plus/service/api/index.js                  | 3 ++-
 .../service/api/plugin/require-native-plugin.js              | 0
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename src/platforms/{app-plus-nvue => app-plus}/service/api/plugin/require-native-plugin.js (100%)

diff --git a/packages/uni-app-plus/dist/index.v3.js b/packages/uni-app-plus/dist/index.v3.js
index 9bc2f22a4..272425e48 100644
--- a/packages/uni-app-plus/dist/index.v3.js
+++ b/packages/uni-app-plus/dist/index.v3.js
@@ -6831,6 +6831,10 @@ var serviceContext = (function () {
     }
   }
 
+  function requireNativePlugin$1 (name) {
+    return weex.requireModule(name)
+  }
+
   // 0:图文，1:纯文字，2:纯图片，3:音乐，4:视频，5:小程序
   const TYPES = {
     '0': {
@@ -7757,6 +7761,7 @@ var serviceContext = (function () {
     unsubscribePush: unsubscribePush,
     onPush: onPush,
     offPush: offPush,
+    requireNativePlugin: requireNativePlugin$1,
     shareAppMessageDirectly: shareAppMessageDirectly,
     share: share,
     navigateBack: navigateBack$1,
diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index bce1b21df..9267d59b0 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -438,8 +438,9 @@ module.exports = function (pagesJson, userManifestJson) {
     return [manifest, parseConfig(appJson)]
   }
   if (process.env.UNI_USING_V3) {
-    appJson.entryPagePath = appJson.pages[0]
-
+    appJson.entryPagePath = appJson.pages[0]
+    // timeout
+    normalizeNetworkTimeout(appJson)
     appJson.page = Object.create(null)
 
     const addPage = function (pagePath, windowOptions) {
diff --git a/src/platforms/app-plus-nvue/service/api/index.js b/src/platforms/app-plus-nvue/service/api/index.js
index 8c0f1100a..c0d041b39 100644
--- a/src/platforms/app-plus-nvue/service/api/index.js
+++ b/src/platforms/app-plus-nvue/service/api/index.js
@@ -3,5 +3,3 @@ export * from './context/map'
 export * from './context/video'
 
 export * from './ui/create-selector-query'
-
-export * from './plugin/require-native-plugin'
diff --git a/src/platforms/app-plus/service/api/index.js b/src/platforms/app-plus/service/api/index.js
index 93a920123..cdf33cc91 100644
--- a/src/platforms/app-plus/service/api/index.js
+++ b/src/platforms/app-plus/service/api/index.js
@@ -39,7 +39,8 @@ export * from './network/upload-file'
 export * from './plugin/get-provider'
 export * from './plugin/oauth'
 export * from './plugin/payment'
-export * from './plugin/push'
+export * from './plugin/push'
+export * from './plugin/require-native-plugin'
 export * from './plugin/share'
 
 export * from './route/navigate-back'
diff --git a/src/platforms/app-plus-nvue/service/api/plugin/require-native-plugin.js b/src/platforms/app-plus/service/api/plugin/require-native-plugin.js
similarity index 100%
rename from src/platforms/app-plus-nvue/service/api/plugin/require-native-plugin.js
rename to src/platforms/app-plus/service/api/plugin/require-native-plugin.js
-- 
GitLab