@tarojs/router 4.0.0-beta.86 → 4.0.0-beta.88

package/dist/router/spa.d.ts

@@ -1,4 +1,5 @@
-import type { AppInstance } from '@tarojs/runtime';
-import type { History } from 'history';
-import type { SpaRouterConfig } from '../../types/router';
-export declare function createRouter(history: History, app: AppInstance, config: SpaRouterConfig, framework?: string): () => void;
+import { AppInstance } from '@tarojs/runtime';
+import { History } from "../history.js";
+import { SpaRouterConfig } from '../../types/router';
+declare function createRouter(history: History, app: AppInstance, config: SpaRouterConfig, framework?: string): () => void;
+export { createRouter };

package/dist/router/spa.js

@@ -17,10 +17,6 @@ function createRouter(history, app, config, framework) {
     }
     RouterConfig.config = config;
     const handler = new PageHandler(config, history);
-    // Note: 弱网情况下，快速切换 tab，会造成同个页面实例被多次挂在到页面上，原因是资源请求是异步的，短时间内发起多个请求，
-    // 会在资源加载完成后，同时走到挂载的逻辑，造成 pageStampId 更新不及时，两个 page 的Id 相同，后面很多操作是通过 getElementById 来进行的
-    // 所以需要加一个锁来应对这个情况
-    const pageLock = {};
     routesAlias.set(handler.router.customRoutes);
     const basename = handler.router.basename;
     const routes = handler.routes.map(route => {
@@ -42,35 +38,29 @@ function createRouter(history, app, config, framework) {
     eventCenter.trigger('__taroRouterLaunch', launchParam);
     (_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 = (_c) => __awaiter(this, [_c], void 0, function* ({ location, action }) {
-        var _d, _e, _f, _g, _h, _j, _k, _l;
-        // Note: 由于下面有异步加载操作 先不要在这里去设置 handler.pathname
-        const currentPathname = decodeURI(location.pathname);
-        if ((_d = window.__taroAppConfig) === null || _d === void 0 ? void 0 : _d.usingWindowScroll)
+    const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
+        var _c, _d, _e, _f, _g, _h, _j, _k;
+        handler.pathname = decodeURI(location.pathname);
+        if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
             window.scrollTo(0, 0);
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
-                path: currentPathname
+                path: handler.pathname
             }
         });
-        let element, context, params;
-        const routerPath = handler.router.forcePath || currentPathname;
-        pageLock[routerPath] = typeof pageLock[routerPath] === 'number' ? pageLock[routerPath] + 1 : 1;
-        const currentLock = pageLock[routerPath];
-        let postLock;
+        let element, params;
         try {
-            const result = yield router.resolve(routerPath);
-            [element, context, params] = yield Promise.all(result);
-            postLock = pageLock[routerPath];
+            const result = yield router.resolve(handler.router.forcePath || handler.pathname);
+            [element, , params] = yield Promise.all(result);
         }
         catch (error) {
             if (error.status === 404) {
                 const notFoundEvent = {
                     isEntryPage: stacks.length === 0,
-                    path: currentPathname,
+                    path: handler.pathname,
                     query: handler.getQuery(createStampId()),
                 };
-                (_e = app.onPageNotFound) === null || _e === void 0 ? void 0 : _e.call(app, notFoundEvent);
+                (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
                 eventCenter.trigger('__taroRouterNotFound', notFoundEvent);
             }
             else if (/Loading hot update .* failed./.test(error.message)) {
@@ -81,16 +71,13 @@ function createRouter(history, app, config, framework) {
                 throw error;
             }
         }
-        if (!element || currentLock !== postLock)
+        if (!element)
             return;
-        // Note: 异步结束后，在设置 handler.pathname
-        // context.pathname 在 universal-router 被处理过了，是发起资源请求的时候传入的 pathname，即 await router.resolve(routerPath) 这个 routerPath
-        handler.pathname = context.pathname;
-        const { pathname, pageConfig } = handler;
-        let enablePullDownRefresh = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.enablePullDownRefresh) || false;
-        let navigationStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationStyle) || 'default';
-        let navigationBarTextStyle = ((_h = config === null || config === void 0 ? void 0 : config.window) === null || _h === void 0 ? void 0 : _h.navigationBarTextStyle) || 'white';
-        let navigationBarBackgroundColor = ((_j = config === null || config === void 0 ? void 0 : config.window) === null || _j === void 0 ? void 0 : _j.navigationBarBackgroundColor) || '#000000';
+        const pageConfig = handler.pageConfig;
+        let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
+        let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
+        let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
+        let navigationBarBackgroundColor = ((_h = config === null || config === void 0 ? void 0 : config.window) === null || _h === void 0 ? void 0 : _h.navigationBarBackgroundColor) || '#000000';
         if (pageConfig) {
             if (typeof pageConfig.enablePullDownRefresh === 'boolean') {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
@@ -107,7 +94,8 @@ function createRouter(history, app, config, framework) {
         }
         eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = Current.page;
-        const methodName = (_k = stacks.method) !== null && _k !== void 0 ? _k : '';
+        const pathname = handler.pathname;
+        const methodName = (_j = stacks.method) !== null && _j !== void 0 ? _j : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
         stacks.method = '';
@@ -122,11 +110,10 @@ function createRouter(history, app, config, framework) {
             }
             shouldLoad = true;
         }
-        else if (currentPage && handler.isTabBar(pathname)) {
+        else if (currentPage && handler.isTabBar(handler.pathname)) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
-                // NOTE: 从 tabBar 页面切换到 tabBar 页面
                 handler.hide(currentPage);
                 stacks.pushTab(currentPage.path.split('?')[0]);
             }
@@ -140,8 +127,8 @@ function createRouter(history, app, config, framework) {
                     handler.unload(currentPage, stacks.length, true);
                 }
             }
-            if (cacheTabs[pathname]) {
-                stacks.popTab(pathname);
+            if (cacheTabs[handler.pathname]) {
+                stacks.popTab(handler.pathname);
                 return handler.show(stacks.getItem(0), pageConfig, 0);
             }
             shouldLoad = true;
@@ -170,11 +157,11 @@ function createRouter(history, app, config, framework) {
             shouldLoad = true;
         }
         else if (action === 'PUSH') {
-            handler.hide(currentPage, true);
+            handler.hide(currentPage);
             shouldLoad = true;
         }
         if (shouldLoad || stacks.length < 1) {
-            const el = (_l = element.default) !== null && _l !== void 0 ? _l : element;
+            const el = (_k = element.default) !== null && _k !== void 0 ? _k : element;
             const loadConfig = Object.assign({}, pageConfig);
             const stacksIndex = stacks.length;
             delete loadConfig['path'];

package/dist/router/stack.d.ts

@@ -1,4 +1,4 @@
-import type { PageInstance } from '@tarojs/runtime';
+import { PageInstance } from '@tarojs/runtime';
 declare class Stacks {
     stacks: PageInstance[];
     backDelta: number;
@@ -23,4 +23,4 @@ declare class Stacks {
     removeTab(path: string): void;
 }
 declare const stacks: Stacks;
-export default stacks;
+export { stacks as default };

package/dist/style.d.ts

@@ -1,13 +1,14 @@
 /**
  * 插入页面动画需要的样式
  */
-export declare function loadAnimateStyle(ms?: number): void;
+declare function loadAnimateStyle(ms?: number): void;
 /**
  * 插入路由相关样式
  */
-export declare function loadRouterStyle(enableTabBar: boolean, enableWindowScroll: boolean): void;
+declare function loadRouterStyle(enableTabBar: boolean, enableWindowScroll: boolean): void;
 /**
  * 插入导航栏相关的样式
 */
-export declare function loadNavigationBarStyle(): void;
-export declare function addStyle(css: any): void;
+declare function loadNavigationBarStyle(): void;
+declare function addStyle(css: any): void;
+export { loadAnimateStyle, loadRouterStyle, loadNavigationBarStyle, addStyle };

package/dist/style.js

@@ -4,8 +4,7 @@
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  /* 防止 iOS 页面滚动 */
-  overflow: hidden;
+  overflow: hidden; // 防止 iOS 页面滚动
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -62,9 +61,8 @@ ${enableTabBar ? `
   }
 
 ` : ''}
-  .taro_page_shade:has(+.taro_page_stationed),
-  .taro_page_shade.taro_tabbar_page,
-  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child):has(+.taro_page_stationed) {
+  .taro_page_shade,
+  .taro_router > .taro_page.taro_page_show.taro_page_stationed:not(.taro_page_shade):not(.taro_tabbar_page):not(:last-child) {
     display: none;
   }
 `;
@@ -132,7 +130,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }
+  }  
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;

package/dist/tabbar.d.ts

@@ -1,3 +1,4 @@
 import { AppConfig } from '@tarojs/taro';
-import type { History } from 'history';
-export declare function initTabbar(config: AppConfig, history: History): void;
+import { History } from "./history.js";
+declare function initTabbar(config: AppConfig, history: History): void;
+export { initTabbar };

package/dist/utils/index.d.ts

@@ -6,5 +6,6 @@ declare class RoutesAlias {
     getAlias: (url?: string) => string;
     getAll: (url?: string) => string[];
 }
-export declare const routesAlias: RoutesAlias;
-export * from './navigate';
+declare const routesAlias: RoutesAlias;
+export { routesAlias };
+export * from "./navigate.js";

package/dist/utils/navigate.d.ts

@@ -1,9 +1,10 @@
-export declare const isWeixin: () => boolean;
-export declare const isDingTalk: () => boolean;
-export declare function setMpaTitle(title: string): void;
-export declare function setTitle(title: string): void;
-export declare function setNavigationBarStyle(option: {
+declare const isWeixin: () => boolean;
+declare const isDingTalk: () => boolean;
+declare function setMpaTitle(title: string): void;
+declare function setTitle(title: string): void;
+declare function setNavigationBarStyle(option: {
     backgroundColor: string;
     frontColor: string;
 }): void;
-export declare function setNavigationBarLoading(loading: boolean): void;
+declare function setNavigationBarLoading(loading: boolean): void;
+export { isWeixin, isDingTalk, setMpaTitle, setTitle, setNavigationBarStyle, setNavigationBarLoading };

package/package.json

@@ -1,9 +1,7 @@
 {
   "name": "@tarojs/router",
-  "version": "4.0.0-beta.86",
+  "version": "4.0.0-beta.88",
   "description": "Taro-router",
-  "author": "O2Team",
-  "license": "MIT",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",
   "main": "dist/index.js",
@@ -22,34 +20,47 @@
   "keywords": [
     "router"
   ],
-  "engines": {
-    "node": ">= 18"
-  },
+  "author": "O2Team",
+  "license": "MIT",
   "dependencies": {
     "dingtalk-jsapi": "~2.15.2",
-    "history": "^5.3.0",
+    "history": "^5.1.0",
     "mobile-detect": "^1.4.2",
-    "query-string": "^9.0.0",
+    "query-string": "^7.1.1",
     "tslib": "^2.6.2",
-    "universal-router": "^9.2.0"
+    "universal-router": "^8.3.0"
   },
   "devDependencies": {
-    "@tarojs/components": "4.0.0-beta.86",
-    "@tarojs/runtime": "4.0.0-beta.86",
-    "@tarojs/taro": "4.0.0-beta.86",
-    "@tarojs/shared": "4.0.0-beta.86"
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.0",
+    "@types/jest": "^29.4.0",
+    "jest": "^29.3.1",
+    "jest-cli": "^29.3.1",
+    "jest-environment-jsdom": "^29.6.4",
+    "jsdom": "^21.1.0",
+    "rollup": "^3.8.1",
+    "rollup-plugin-node-externals": "^5.0.0",
+    "rollup-plugin-ts": "^3.0.2",
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.7.4",
+    "@tarojs/runtime": "4.0.0-beta.88",
+    "@tarojs/taro": "4.0.0-beta.88",
+    "@tarojs/shared": "4.0.0-beta.88"
   },
   "peerDependencies": {
-    "@tarojs/runtime": "4.0.0-beta.86",
-    "@tarojs/taro": "4.0.0-beta.86",
-    "@tarojs/shared": "4.0.0-beta.86"
+    "@tarojs/runtime": "4.0.0-beta.88",
+    "@tarojs/taro": "4.0.0-beta.88",
+    "@tarojs/shared": "4.0.0-beta.88"
   },
   "scripts": {
-    "prod": "pnpm run build",
     "prebuild": "pnpm run clean",
     "build": "pnpm run rollup --environment NODE_ENV:production",
     "clean": "rimraf --impl=move-remove ./dist",
     "dev": "pnpm run rollup --environment NODE_ENV:development -w",
-    "rollup": "rollup --config rollup.config.mts --configPlugin typescript"
+    "rollup": "rollup --config rollup.config.ts --configPlugin @rollup/plugin-typescript --bundleConfigAsCjs",
+    "test": "cross-env NODE_ENV=jest jest",
+    "test:ci": "cross-env NODE_ENV=jest jest --ci -i --coverage --silent",
+    "test:dev": "cross-env NODE_ENV=jest jest --watch"
   }
 }