@dcloudio/uni-app-plus 3.0.0-alpha-4080720251125001 → 3.0.0-alpha-5000020260104004

package/dist/uni.runtime.esm.js

@@ -1870,7 +1870,9 @@ function initAppVm(appVm) {
 function initPageVm(pageVm, page) {
     pageVm.route = page.route;
     pageVm.$vm = pageVm;
-    pageVm.$page = page;
+    {
+        pageVm.$page = page;
+    }
     pageVm.$mpType = 'page';
     pageVm.$fontFamilySet = new Set();
     if (page.meta.isTabBar) {
@@ -13401,10 +13403,13 @@ function parseTheme(pageStyle) {
     if (__uniConfig.darkmode) {
         let parsedStyle = {};
         let theme = plus.navigator.getUIStyle();
-        const systemInfo = weexGetSystemInfoSync();
-        // 小程序 SDK
-        if (systemInfo && systemInfo.hostTheme) {
-            theme = systemInfo.hostTheme;
+        // @ts-expect-error 鸿蒙端编译时写入 plus.os.name 鸿蒙暂不支持 hostTheme
+        if (plus.os.name !== 'HarmonyOS') {
+            const systemInfo = weexGetSystemInfoSync();
+            // 小程序 SDK
+            if (systemInfo && systemInfo.hostTheme) {
+                theme = systemInfo.hostTheme;
+            }
         }
         parsedStyle = normalizeStyles(pageStyle, __uniConfig.themeConfig, theme);
         return parsedStyle;
@@ -13672,7 +13677,9 @@ var tabBarInstance = {
     },
     removeEventListener(_name, callback) {
         const callbackIndex = maskClickCallback.indexOf(callback);
-        maskClickCallback.splice(callbackIndex, 1);
+        if (callbackIndex > -1) {
+            maskClickCallback.splice(callbackIndex, 1);
+        }
     },
 };
 
@@ -13816,7 +13823,10 @@ function weexGetSystemInfoSync() {
     if (!_initSystemInfo)
         return;
     const { getSystemInfoSync } = weex.requireModule('plus');
-    systemInfo = getSystemInfoSync();
+    try {
+        systemInfo = getSystemInfoSync();
+    }
+    catch (error) { }
     if (isString(systemInfo)) {
         try {
             systemInfo = JSON.parse(systemInfo);
@@ -16292,36 +16302,36 @@ const createLivePusherContext = defineSyncApi(API_CREATE_LIVE_PUSHER_CONTEXT, (i
     return new LivePusherContextVue(id, vm.$page.id);
 }, CreateLivePusherContextProtocol);
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
+
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 const PI = 3.1415926535897932384626;

package/dist/uni.vue.js

@@ -1,4 +1,4 @@
-import { invokeArrayFns, isUniLifecycleHook, decodedQuery, ON_LOAD, ON_SHOW, LINEFEED, RENDERJS_MODULES, formatLog, WXS_PROTOCOL, WXS_MODULES, ON_ERROR, UniLifecycleHooks, invokeCreateErrorHandler, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
+import { invokeArrayFns, isUniLifecycleHook, UTSJSONObject, decodedQuery, ON_LOAD, ON_SHOW, LINEFEED, RENDERJS_MODULES, formatLog, WXS_PROTOCOL, WXS_MODULES, ON_ERROR, UniLifecycleHooks, invokeCreateErrorHandler, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
 import { isString, isArray, hasOwn, isFunction } from '@vue/shared';
 import { injectHook, logError } from 'vue';
 

package/dist/uni.x.runtime.esm.js

@@ -1,4 +1,4 @@
-import { normalizeStyles as normalizeStyles$1, addLeadingSlash, invokeArrayFns, ON_HIDE, ON_SHOW, parseQuery, EventChannel, once, parseUrl, Emitter, ON_UNHANDLE_REJECTION, ON_PAGE_NOT_FOUND, ON_ERROR, removeLeadingSlash, getLen, ON_UNLOAD, ON_READY, ON_PAGE_SCROLL, ON_PULL_DOWN_REFRESH, ON_REACH_BOTTOM, ON_RESIZE, ON_BACK_PRESS, ON_LAUNCH, ON_EXIT, ON_LAST_PAGE_BACK_PRESS } from "@dcloudio/uni-shared";
+import { normalizeStyles as normalizeStyles$1, addLeadingSlash, invokeArrayFns, ON_HIDE, ON_SHOW, parseQuery, UTSJSONObject, EventChannel, once, parseUrl, Emitter, ON_UNHANDLE_REJECTION, ON_PAGE_NOT_FOUND, ON_ERROR, removeLeadingSlash, getLen, ON_UNLOAD, ON_READY, ON_PAGE_SCROLL, ON_PULL_DOWN_REFRESH, ON_REACH_BOTTOM, ON_RESIZE, ON_BACK_PRESS, ON_LAUNCH, ON_EXIT, ON_LAST_PAGE_BACK_PRESS } from "@dcloudio/uni-shared";
 import { extend, isString, isPlainObject, isFunction as isFunction$1, isArray, isPromise, hasOwn, remove, invokeArrayFns as invokeArrayFns$1, capitalize, toTypeString, toRawType } from "@vue/shared";
 import { createMountPage, unmountPage, ref, onMounted, onBeforeUnmount, getCurrentGenericInstance, injectHook, defineComponent, getCurrentInstance, camelize, createVNode, renderSlot } from "vue";
 function get$pageByPage(page) {
@@ -211,7 +211,9 @@ function dialogPageTriggerPrevDialogPageLifeCycle(parentPage, lifeCycle) {
 function initPageVm(pageVm, page) {
   pageVm.route = page.route;
   pageVm.$vm = pageVm;
-  pageVm.$page = page;
+  {
+    pageVm.$basePage = page;
+  }
   pageVm.$mpType = "page";
   pageVm.$fontFamilySet = /* @__PURE__ */ new Set();
   if (page.meta.isTabBar) {
@@ -707,8 +709,11 @@ function removePage(curPage) {
   }
   pages.splice(index2, 1);
   {
-    curPage.$page.vm = null;
-    curPage.$page = null;
+    var ins = curPage;
+    if (ins.$.page) {
+      ins.$.page.vm = null;
+      ins.$.page = null;
+    }
   }
 }
 function backbuttonListener() {
@@ -781,8 +786,7 @@ function setupXPage(instance, pageInstance, pageVm, pageId, pagePath) {
   } else {
     uniPage = new UniNormalPageImpl();
   }
-  pageVm.$basePage = pageVm.$page;
-  pageVm.$page = uniPage;
+  pageVm.$.page = uniPage;
   uniPage.route = pageVm.$basePage.route;
   uniPage.optionsByJS = pageVm.$basePage.options;
   Object.defineProperty(uniPage, "options", {
@@ -790,34 +794,27 @@ function setupXPage(instance, pageInstance, pageVm, pageId, pagePath) {
       return new UTSJSONObject(pageVm.$basePage.options);
     }
   });
-  uniPage.getElementById = (id2) => {
-    var _pageVm$$el;
-    var containerNode = (_pageVm$$el = pageVm.$el) === null || _pageVm$$el === void 0 ? void 0 : _pageVm$$el.parentElement;
-    if (containerNode == null) {
-      console.warn("bodyNode is null");
-      return null;
-    }
-    return containerNode.querySelector("#".concat(id2));
-  };
   uniPage.vm = pageVm;
   uniPage.$vm = pageVm;
   if (getPage$BasePage(pageVm).openType !== OPEN_DIALOG_PAGE) {
     addCurrentPageWithInitScope(pageId, pageVm, pageInstance);
   }
-  onMounted(() => {
-    var _pageVm$$el2;
-    var rootElement = (_pageVm$$el2 = pageVm.$el) === null || _pageVm$$el2 === void 0 ? void 0 : _pageVm$$el2.parentElement;
-    if (rootElement) {
-      rootElement._page = pageVm.$page;
-    }
-  });
-  onBeforeUnmount(() => {
-    var _pageVm$$el3;
-    var rootElement = (_pageVm$$el3 = pageVm.$el) === null || _pageVm$$el3 === void 0 ? void 0 : _pageVm$$el3.parentElement;
-    if (rootElement) {
-      rootElement._page = null;
-    }
-  });
+  {
+    onMounted(() => {
+      var _pageVm$$el;
+      var rootElement = (_pageVm$$el = pageVm.$el) === null || _pageVm$$el === void 0 ? void 0 : _pageVm$$el.parentElement;
+      if (rootElement) {
+        rootElement._page = pageVm.$page;
+      }
+    });
+    onBeforeUnmount(() => {
+      var _pageVm$$el2;
+      var rootElement = (_pageVm$$el2 = pageVm.$el) === null || _pageVm$$el2 === void 0 ? void 0 : _pageVm$$el2.parentElement;
+      if (rootElement) {
+        rootElement._page = null;
+      }
+    });
+  }
 }
 var beforeSetupPage = (props, ctx) => {
   var {
@@ -1433,6 +1430,27 @@ function fixBorderStyle(tabBarConfig) {
   tabBarConfig.set("borderStyle", borderStyle);
   tabBarConfig.delete("borderColor");
 }
+function parseRedirectInfo(app) {
+  var _redirectInfo$get, _redirectInfo$get2, _redirectInfo$get3, _redirectInfo$get4, _redirectInfo$get5;
+  var redirectInfo = app.getRedirectInfo();
+  var path = (_redirectInfo$get = redirectInfo.get("path")) !== null && _redirectInfo$get !== void 0 ? _redirectInfo$get : "";
+  var query = (_redirectInfo$get2 = redirectInfo.get("query")) !== null && _redirectInfo$get2 !== void 0 ? _redirectInfo$get2 : "";
+  var userAction = (_redirectInfo$get3 = redirectInfo.get("userAction")) !== null && _redirectInfo$get3 !== void 0 ? _redirectInfo$get3 : false;
+  var appScheme = (_redirectInfo$get4 = redirectInfo.get("appScheme")) !== null && _redirectInfo$get4 !== void 0 ? _redirectInfo$get4 : "";
+  var appLink = (_redirectInfo$get5 = redirectInfo.get("appLink")) !== null && _redirectInfo$get5 !== void 0 ? _redirectInfo$get5 : "";
+  var referrerInfo = {
+    appId: app.appid,
+    extraData: {}
+  };
+  return {
+    path: path || "",
+    query: query ? "?" + query : "",
+    referrerInfo,
+    userAction,
+    appScheme,
+    appLink
+  };
+}
 var onTabBarMidButtonTapCallback = [];
 var tabBar0 = null;
 var selected0 = -1;
@@ -2110,6 +2128,43 @@ function createVuePage(__pageId, __pagePath, __pageQuery, __pageInstance, pageOp
     }
   };
 }
+var isInitEntryPage = false;
+function initEntry(app) {
+  if (isInitEntryPage) {
+    return;
+  }
+  isInitEntryPage = true;
+  var entryPagePath;
+  var entryPageQuery;
+  var redirectInfo = app.getRedirectInfo();
+  if (redirectInfo.size > 0) {
+    var {
+      path,
+      query
+      /* referrerInfo, appScheme, appLink */
+    } = parseRedirectInfo(app);
+    if (path) {
+      entryPagePath = path;
+      entryPageQuery = query;
+    }
+  }
+  if (!entryPagePath || entryPagePath === __uniConfig.entryPagePath) {
+    if (entryPageQuery) {
+      __uniConfig.entryPageQuery = entryPageQuery;
+    }
+    return;
+  }
+  var entryRoute = addLeadingSlash(entryPagePath);
+  var routeOptions = getRouteOptions(entryRoute);
+  if (!routeOptions) {
+    return;
+  }
+  if (!routeOptions.meta.isTabBar) {
+    __uniConfig.realEntryPagePath = __uniConfig.realEntryPagePath || __uniConfig.entryPagePath;
+  }
+  __uniConfig.entryPagePath = entryPagePath;
+  __uniConfig.entryPageQuery = entryPageQuery;
+}
 function initGlobalEvent(app) {
   app.addKeyEventListener(ON_BACK_BUTTON, () => {
     var currentPage = getCurrentPage();
@@ -2422,7 +2477,9 @@ function _reLaunch(_ref3) {
 }
 var reLaunch = /* @__PURE__ */ defineAsyncApi(API_RE_LAUNCH, $reLaunch, ReLaunchProtocol, ReLaunchOptions);
 function closePage(page, animationType, animationDuration) {
-  clearDialogPages(page.$page);
+  if (page.$page) {
+    clearDialogPages(page.$page);
+  }
   var nativePage = page.$nativePage;
   nativePage && closeWebview(nativePage, animationType, animationDuration);
   removePage(page);
@@ -2712,7 +2769,7 @@ function initComponentInstance(app) {
     initNativePage,
     initFontFace
   };
-  app.mixin({
+  !app.vapor && app.mixin({
     beforeCreate() {
       initNativePage(this);
     },
@@ -2744,7 +2801,6 @@ function initUniApp(uniApp) {
   });
 }
 function registerApp(appVm, nativeApp2, uniApp) {
-  initEntryPagePath(nativeApp2);
   setNativeApp(nativeApp2);
   initVueApp(appVm);
   appCtx = appVm;
@@ -2756,6 +2812,8 @@ function registerApp(appVm, nativeApp2, uniApp) {
   extend(appCtx, defaultApp);
   defineGlobalData(appCtx, defaultApp.globalData);
   initService(nativeApp2, unregisterApp);
+  initEntry(nativeApp2);
+  initEntryPagePath(nativeApp2);
   initGlobalEvent(nativeApp2);
   initAppLaunch(appVm);
   initAppError(appVm, nativeApp2);
@@ -3289,17 +3347,11 @@ var setNavigationBarTitle = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_BA
   resolve();
 });
 var getElementById = /* @__PURE__ */ defineSyncApi("getElementById", (id2) => {
-  var _page$$el;
-  var page = getCurrentPage().vm;
+  var page = getCurrentPage();
   if (page == null) {
     return null;
   }
-  var bodyNode = (_page$$el = page.$el) === null || _page$$el === void 0 ? void 0 : _page$$el.parentNode;
-  if (bodyNode == null) {
-    console.warn("bodyNode is null");
-    return null;
-  }
-  return bodyNode.querySelector("#".concat(id2));
+  return page.getElementById(id2);
 });
 function isVueComponent(comp) {
   var has$instance = typeof comp.$ === "object";

package/dist/uni.x.runtime.harmony.esm.js

@@ -1,4 +1,4 @@
-import { normalizeStyles as normalizeStyles$1, addLeadingSlash, invokeArrayFns, ON_HIDE, ON_SHOW, parseQuery, EventChannel, once, parseUrl, Emitter, ON_UNHANDLE_REJECTION, ON_PAGE_NOT_FOUND, ON_ERROR, removeLeadingSlash, getLen, ON_UNLOAD, ON_READY, ON_PAGE_SCROLL, ON_PULL_DOWN_REFRESH, ON_REACH_BOTTOM, ON_RESIZE, ON_BACK_PRESS, ON_LAUNCH, ON_EXIT, ON_LAST_PAGE_BACK_PRESS } from "@dcloudio/uni-shared";
+import { normalizeStyles as normalizeStyles$1, addLeadingSlash, invokeArrayFns, ON_HIDE, ON_SHOW, parseQuery, UTSJSONObject, EventChannel, once, parseUrl, Emitter, ON_UNHANDLE_REJECTION, ON_PAGE_NOT_FOUND, ON_ERROR, removeLeadingSlash, getLen, ON_UNLOAD, ON_READY, ON_PAGE_SCROLL, ON_PULL_DOWN_REFRESH, ON_REACH_BOTTOM, ON_RESIZE, ON_BACK_PRESS, ON_LAUNCH, ON_EXIT, ON_LAST_PAGE_BACK_PRESS } from "@dcloudio/uni-shared";
 import { extend, isString, isPlainObject, isFunction as isFunction$1, isArray, isPromise, hasOwn, remove, invokeArrayFns as invokeArrayFns$1, capitalize, toTypeString, toRawType } from "@vue/shared";
 import { createMountPage, unmountPage, ref, onMounted, onBeforeUnmount, getCurrentGenericInstance, injectHook, defineComponent, getCurrentInstance, camelize, createVNode, renderSlot } from "vue";
 function get$pageByPage(page) {
@@ -211,7 +211,9 @@ function dialogPageTriggerPrevDialogPageLifeCycle(parentPage, lifeCycle) {
 function initPageVm(pageVm, page) {
   pageVm.route = page.route;
   pageVm.$vm = pageVm;
-  pageVm.$page = page;
+  {
+    pageVm.$basePage = page;
+  }
   pageVm.$mpType = "page";
   pageVm.$fontFamilySet = /* @__PURE__ */ new Set();
   if (page.meta.isTabBar) {
@@ -707,8 +709,11 @@ function removePage(curPage) {
   }
   pages.splice(index2, 1);
   {
-    curPage.$page.vm = null;
-    curPage.$page = null;
+    var ins = curPage;
+    if (ins.$.page) {
+      ins.$.page.vm = null;
+      ins.$.page = null;
+    }
   }
 }
 function backbuttonListener() {
@@ -781,8 +786,7 @@ function setupXPage(instance, pageInstance, pageVm, pageId, pagePath) {
   } else {
     uniPage = new UniNormalPageImpl();
   }
-  pageVm.$basePage = pageVm.$page;
-  pageVm.$page = uniPage;
+  pageVm.$.page = uniPage;
   uniPage.route = pageVm.$basePage.route;
   uniPage.optionsByJS = pageVm.$basePage.options;
   Object.defineProperty(uniPage, "options", {
@@ -790,34 +794,27 @@ function setupXPage(instance, pageInstance, pageVm, pageId, pagePath) {
       return new UTSJSONObject(pageVm.$basePage.options);
     }
   });
-  uniPage.getElementById = (id2) => {
-    var _pageVm$$el;
-    var containerNode = (_pageVm$$el = pageVm.$el) === null || _pageVm$$el === void 0 ? void 0 : _pageVm$$el.parentElement;
-    if (containerNode == null) {
-      console.warn("bodyNode is null");
-      return null;
-    }
-    return containerNode.querySelector("#".concat(id2));
-  };
   uniPage.vm = pageVm;
   uniPage.$vm = pageVm;
   if (getPage$BasePage(pageVm).openType !== OPEN_DIALOG_PAGE) {
     addCurrentPageWithInitScope(pageId, pageVm, pageInstance);
   }
-  onMounted(() => {
-    var _pageVm$$el2;
-    var rootElement = (_pageVm$$el2 = pageVm.$el) === null || _pageVm$$el2 === void 0 ? void 0 : _pageVm$$el2.parentElement;
-    if (rootElement) {
-      rootElement._page = pageVm.$page;
-    }
-  });
-  onBeforeUnmount(() => {
-    var _pageVm$$el3;
-    var rootElement = (_pageVm$$el3 = pageVm.$el) === null || _pageVm$$el3 === void 0 ? void 0 : _pageVm$$el3.parentElement;
-    if (rootElement) {
-      rootElement._page = null;
-    }
-  });
+  {
+    onMounted(() => {
+      var _pageVm$$el;
+      var rootElement = (_pageVm$$el = pageVm.$el) === null || _pageVm$$el === void 0 ? void 0 : _pageVm$$el.parentElement;
+      if (rootElement) {
+        rootElement._page = pageVm.$page;
+      }
+    });
+    onBeforeUnmount(() => {
+      var _pageVm$$el2;
+      var rootElement = (_pageVm$$el2 = pageVm.$el) === null || _pageVm$$el2 === void 0 ? void 0 : _pageVm$$el2.parentElement;
+      if (rootElement) {
+        rootElement._page = null;
+      }
+    });
+  }
 }
 var beforeSetupPage = (props, ctx) => {
   var {
@@ -1433,6 +1430,27 @@ function fixBorderStyle(tabBarConfig) {
   tabBarConfig.set("borderStyle", borderStyle);
   tabBarConfig.delete("borderColor");
 }
+function parseRedirectInfo(app) {
+  var _redirectInfo$get, _redirectInfo$get2, _redirectInfo$get3, _redirectInfo$get4, _redirectInfo$get5;
+  var redirectInfo = app.getRedirectInfo();
+  var path = (_redirectInfo$get = redirectInfo.get("path")) !== null && _redirectInfo$get !== void 0 ? _redirectInfo$get : "";
+  var query = (_redirectInfo$get2 = redirectInfo.get("query")) !== null && _redirectInfo$get2 !== void 0 ? _redirectInfo$get2 : "";
+  var userAction = (_redirectInfo$get3 = redirectInfo.get("userAction")) !== null && _redirectInfo$get3 !== void 0 ? _redirectInfo$get3 : false;
+  var appScheme = (_redirectInfo$get4 = redirectInfo.get("appScheme")) !== null && _redirectInfo$get4 !== void 0 ? _redirectInfo$get4 : "";
+  var appLink = (_redirectInfo$get5 = redirectInfo.get("appLink")) !== null && _redirectInfo$get5 !== void 0 ? _redirectInfo$get5 : "";
+  var referrerInfo = {
+    appId: app.appid,
+    extraData: {}
+  };
+  return {
+    path: path || "",
+    query: query ? "?" + query : "",
+    referrerInfo,
+    userAction,
+    appScheme,
+    appLink
+  };
+}
 var onTabBarMidButtonTapCallback = [];
 var tabBar0 = null;
 var selected0 = -1;
@@ -2110,6 +2128,43 @@ function createVuePage(__pageId, __pagePath, __pageQuery, __pageInstance, pageOp
     }
   };
 }
+var isInitEntryPage = false;
+function initEntry(app) {
+  if (isInitEntryPage) {
+    return;
+  }
+  isInitEntryPage = true;
+  var entryPagePath;
+  var entryPageQuery;
+  var redirectInfo = app.getRedirectInfo();
+  if (redirectInfo.size > 0) {
+    var {
+      path,
+      query
+      /* referrerInfo, appScheme, appLink */
+    } = parseRedirectInfo(app);
+    if (path) {
+      entryPagePath = path;
+      entryPageQuery = query;
+    }
+  }
+  if (!entryPagePath || entryPagePath === __uniConfig.entryPagePath) {
+    if (entryPageQuery) {
+      __uniConfig.entryPageQuery = entryPageQuery;
+    }
+    return;
+  }
+  var entryRoute = addLeadingSlash(entryPagePath);
+  var routeOptions = getRouteOptions(entryRoute);
+  if (!routeOptions) {
+    return;
+  }
+  if (!routeOptions.meta.isTabBar) {
+    __uniConfig.realEntryPagePath = __uniConfig.realEntryPagePath || __uniConfig.entryPagePath;
+  }
+  __uniConfig.entryPagePath = entryPagePath;
+  __uniConfig.entryPageQuery = entryPageQuery;
+}
 function initGlobalEvent(app) {
   app.addKeyEventListener(ON_BACK_BUTTON, () => {
     var currentPage = getCurrentPage();
@@ -2422,7 +2477,9 @@ function _reLaunch(_ref3) {
 }
 var reLaunch = /* @__PURE__ */ defineAsyncApi(API_RE_LAUNCH, $reLaunch, ReLaunchProtocol, ReLaunchOptions);
 function closePage(page, animationType, animationDuration) {
-  clearDialogPages(page.$page);
+  if (page.$page) {
+    clearDialogPages(page.$page);
+  }
   var nativePage = page.$nativePage;
   nativePage && closeWebview(nativePage, animationType, animationDuration);
   removePage(page);
@@ -2712,7 +2769,7 @@ function initComponentInstance(app) {
     initNativePage,
     initFontFace
   };
-  app.mixin({
+  !app.vapor && app.mixin({
     beforeCreate() {
       initNativePage(this);
     },
@@ -2744,7 +2801,6 @@ function initUniApp(uniApp) {
   });
 }
 function registerApp(appVm, nativeApp2, uniApp) {
-  initEntryPagePath(nativeApp2);
   setNativeApp(nativeApp2);
   initVueApp(appVm);
   appCtx = appVm;
@@ -2756,6 +2812,8 @@ function registerApp(appVm, nativeApp2, uniApp) {
   extend(appCtx, defaultApp);
   defineGlobalData(appCtx, defaultApp.globalData);
   initService(nativeApp2, unregisterApp);
+  initEntry(nativeApp2);
+  initEntryPagePath(nativeApp2);
   initGlobalEvent(nativeApp2);
   initAppLaunch(appVm);
   initAppError(appVm, nativeApp2);
@@ -3289,17 +3347,11 @@ var setNavigationBarTitle = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_BA
   resolve();
 });
 var getElementById = /* @__PURE__ */ defineSyncApi("getElementById", (id2) => {
-  var _page$$el;
-  var page = getCurrentPage().vm;
+  var page = getCurrentPage();
   if (page == null) {
     return null;
   }
-  var bodyNode = (_page$$el = page.$el) === null || _page$$el === void 0 ? void 0 : _page$$el.parentNode;
-  if (bodyNode == null) {
-    console.warn("bodyNode is null");
-    return null;
-  }
-  return bodyNode.querySelector("#".concat(id2));
+  return page.getElementById(id2);
 });
 function isVueComponent(comp) {
   var has$instance = typeof comp.$ === "object";