@tarojs/router 3.5.0-theta.0 → 3.5.1

package/dist/router/page.js

@@ -6,7 +6,7 @@ import { bindPageResize } from '../events/resize';
 import { bindPageScroll } from '../events/scroll';
 import { setHistoryMode } from '../history';
 import { initTabbar } from '../tabbar';
-import { addLeadingSlash, routesAlias, stripBasename } from '../utils';
+import { addLeadingSlash, routesAlias, stripBasename, stripTrailing } from '../utils';
 import stacks from './stack';
 function setDisplay(el, type = '') {
     if (el) {
@@ -20,10 +20,10 @@ export default class PageHandler {
         this.mount();
     }
     get appId() { return 'app'; }
-    get router() { return this.config.router; }
+    get router() { return this.config.router || {}; }
     get routerMode() { return this.router.mode || 'hash'; }
     get customRoutes() { return this.router.customRoutes || {}; }
-    get routes() { return this.config.routes; }
+    get routes() { return this.config.routes || []; }
     get tabBarList() { var _a; return ((_a = this.config.tabBar) === null || _a === void 0 ? void 0 : _a.list) || []; }
     get PullDownRefresh() { return this.config.PullDownRefresh; }
     get animation() { var _a, _b; return (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.animation) !== null && _b !== void 0 ? _b : this.defaultAnimation; }
@@ -70,7 +70,7 @@ export default class PageHandler {
             }
             return false;
         })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
-        return !!pagePath && this.tabBarList.some(t => t.pagePath === pagePath);
+        return !!pagePath && this.tabBarList.some(t => stripTrailing(t.pagePath) === pagePath);
     }
     isSamePage(page) {
         const routePath = stripBasename(this.pathname, this.basename);

package/dist/router/spa.js

@@ -13,6 +13,7 @@ import { Action as LocationAction } from 'history';
 import UniversalRouter from 'universal-router';
 import { history, prependBasename } from '../history';
 import { addLeadingSlash, routesAlias, stripBasename } from '../utils';
+import { setTitle } from '../utils/navigate';
 import { RouterConfig } from '.';
 import PageHandler from './page';
 import stacks from './stack';
@@ -33,8 +34,9 @@ export function createRouter(app, config, framework) {
     const router = new UniversalRouter(routes, { baseUrl: basename || '' });
     const launchParam = handler.getQuery(stacks.length);
     (_a = app.onLaunch) === null || _a === void 0 ? void 0 : _a.call(app, launchParam);
+    app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
     const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
-        var _c, _d, _e, _f;
+        var _c, _d, _e, _f, _g;
         handler.pathname = decodeURI(location.pathname);
         let element, params;
         try {
@@ -47,6 +49,10 @@ export function createRouter(app, config, framework) {
                     path: handler.pathname
                 });
             }
+            else if (/Loading hot update .* failed./.test(error.message)) {
+                // NOTE: webpack5 与 prebundle 搭配使用时，开发环境下初次启动时偶发错误，由于 HMR 加载 chunk hash 错误，导致热更新失败
+                window.location.reload();
+            }
             else {
                 throw new Error(error);
             }
@@ -62,6 +68,7 @@ export function createRouter(app, config, framework) {
         });
         if (pageConfig) {
             document.title = (_e = pageConfig.navigationBarTitleText) !== null && _e !== void 0 ? _e : document.title;
+            setTitle((_f = pageConfig.navigationBarTitleText) !== null && _f !== void 0 ? _f : document.title);
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
             }
@@ -73,12 +80,15 @@ export function createRouter(app, config, framework) {
             // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
             const prevIndex = stacks.getPrevIndex(pathname);
             const delta = stacks.getDelta(pathname);
-            handler.unload(currentPage, delta, prevIndex > -1);
-            if (prevIndex > -1) {
-                handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
-            }
-            else {
-                shouldLoad = true;
+            // NOTE: Safari 内核浏览器在非应用页面返回上一页时，会触发额外的 POP 事件，此处需避免当前页面被错误卸载
+            if (currentPage !== stacks.getItem(prevIndex)) {
+                handler.unload(currentPage, delta, prevIndex > -1);
+                if (prevIndex > -1) {
+                    handler.show(stacks.getItem(prevIndex), pageConfig, prevIndex);
+                }
+                else {
+                    shouldLoad = true;
+                }
             }
         }
         else {
@@ -103,7 +113,7 @@ export function createRouter(app, config, framework) {
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = (_f = element.default) !== null && _f !== void 0 ? _f : element;
+            const el = (_g = element.default) !== null && _g !== void 0 ? _g : element;
             const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];

package/dist/{utils.d.ts → utils/index.d.ts}

@@ -1,6 +1,8 @@
 export declare const addLeadingSlash: (url?: string) => string;
 export declare const hasBasename: (path?: string, prefix?: string) => boolean;
 export declare const stripBasename: (path?: string, prefix?: string) => string;
+export declare const stripTrailing: (str?: string) => string;
+export declare const stripSuffix: (path?: string, suffix?: string) => string;
 declare class RoutesAlias {
     conf: Array<string[]>;
     set(customRoutes?: Record<string, string | string[]>): void;

package/dist/{utils.js → utils/index.js}

@@ -1,6 +1,10 @@
+// export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
+// export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
 export const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url);
 export const hasBasename = (path = '', prefix = '') => new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix;
-export const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substr(prefix.length) : path;
+export const stripBasename = (path = '', prefix = '') => hasBasename(path, prefix) ? path.substring(prefix.length) : path;
+export const stripTrailing = (str = '') => str.replace(/[?#][\s\S]*$/, '');
+export const stripSuffix = (path = '', suffix = '') => path.includes(suffix) ? path.substring(0, path.length - suffix.length) : path;
 class RoutesAlias {
     constructor() {
         this.conf = [];

package/dist/utils/navigate.d.ts

@@ -0,0 +1,5 @@
+import MobileDetect from 'mobile-detect';
+export declare function getMobileDetect(): MobileDetect;
+export declare function setTitle(title: string): Promise<string>;
+export declare function isWeixin(): boolean;
+export declare function isDingTalk(): boolean;

package/dist/utils/navigate.js

@@ -0,0 +1,44 @@
+var __awaiter = (this && this.__awaiter) || function (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());
+    });
+};
+import MobileDetect from 'mobile-detect';
+let md;
+let preTitle = document.title;
+let isLoadDdEntry = false;
+export function getMobileDetect() {
+    if (!md) {
+        md = new MobileDetect(navigator.userAgent);
+    }
+    return md;
+}
+export function setTitle(title) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (preTitle === title)
+            return title;
+        document.title = title;
+        preTitle = title;
+        if (process.env.SUPPORT_DINGTALK_NAVIGATE !== 'disabled' && isDingTalk()) {
+            if (!isLoadDdEntry) {
+                isLoadDdEntry = true;
+                require('dingtalk-jsapi/platform');
+            }
+            const setDingTitle = require('dingtalk-jsapi/api/biz/navigation/setTitle').default;
+            setDingTitle({ title });
+        }
+        return title;
+    });
+}
+export function isWeixin() {
+    const md = getMobileDetect();
+    return md.match(/MicroMessenger/ig);
+}
+export function isDingTalk() {
+    const md = getMobileDetect();
+    return md.match(/DingTalk/ig);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.5.0-theta.0",
+  "version": "3.5.1",
   "description": "Taro-router",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -12,12 +12,6 @@
     "types",
     "index.js"
   ],
-  "scripts": {
-    "build": "rimraf ./dist && tsc && rollup -c",
-    "dev": "tsc -w",
-    "test": "jest",
-    "test:dev": "jest --watch"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NervJS/taro.git"
@@ -28,10 +22,18 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/runtime": "workspace:*",
-    "@tarojs/taro": "workspace:*",
+    "@tarojs/runtime": "3.5.1",
+    "@tarojs/taro": "3.5.1",
+    "dingtalk-jsapi": "~2.15.2",
     "history": "^5.1.0",
+    "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",
     "universal-router": "^8.3.0"
+  },
+  "scripts": {
+    "build": "rimraf ./dist && tsc && rollup -c",
+    "dev": "tsc -w",
+    "test": "jest",
+    "test:dev": "jest --watch"
   }
-}
+}

package/types/router.d.ts

@@ -1,5 +1,5 @@
-import { AppConfig, PageConfig } from '@tarojs/taro'
-import { IH5RouterConfig } from '@tarojs/taro/types/compile'
+import type { AppConfig, PageConfig } from '@tarojs/taro'
+import type { IH5RouterConfig } from '@tarojs/taro/types/compile'
 
 export interface Route extends PageConfig {
   path?: string