@tarojs/router 3.6.25 → 3.6.26

package/dist/history.d.ts

@@ -1,4 +1,3 @@
-import { Action, createBrowserHistory, createHashHistory, Blocker, BrowserHistoryOptions, HashHistoryOptions, History, Listener, Location, Path, To } from 'history';
 import { IH5RouterConfig } from '@tarojs/taro/types/compile';
 import { StateEvent } from '../types/history';
 declare let history: History;

package/dist/index.cjs.d.ts

@@ -1,17 +1,11 @@
-import { History, Action, createBrowserHistory, createHashHistory, Blocker, BrowserHistoryOptions, HashHistoryOptions, Listener, Location, Path, To } from 'history';
-import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
-import Taro from "@tarojs/taro";
+import { Action, createBrowserHistory, createHashHistory, Blocker, BrowserHistoryOptions, HashHistoryOptions, History, Listener, Location, Path, To } from "history";
 import { IH5RouterConfig } from "@tarojs/taro/types/compile";
 import { StateEvent } from "../types/history";
+import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
+import Taro from "@tarojs/taro";
 import { AppInstance } from "@tarojs/runtime";
 import { MpaRouterConfig as MpaRouterConfig$0 } from "../../types/router";
 import { SpaRouterConfig as SpaRouterConfig$0 } from "../../types/router";
-declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
-declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
-declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
-declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
-declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
-declare function getCurrentPages(): Taro.Page[];
 declare let history: History;
 declare class MpaHistory implements History {
     action: Action;
@@ -33,6 +27,12 @@ declare function setHistory(h: History, base?: string): void;
 declare function createMpaHistory(_?: HashHistoryOptions | BrowserHistoryOptions): MpaHistory;
 declare function setHistoryMode(mode?: IH5RouterConfig["mode"], base?: string): void;
 declare function prependBasename(url?: string): string;
+declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
+declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
+declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
+declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
+declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
+declare function getCurrentPages(): Taro.Page[];
 // TODO 支持多路由 (APP 生命周期仅触发一次)
 /** Note: 关于多页面应用
  * - 需要配置路由映射（根目录跳转、404 页面……）

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { History } from 'history';
+import { History } from "./history.js";
 import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
 declare function handleAppMount(config: SpaRouterConfig | MpaRouterConfig, _: History, appId?: string): void;
 declare function handleAppMountWithTabbar(config: SpaRouterConfig | MpaRouterConfig, history: History, appId?: string): void;

package/dist/index.esm.d.ts

@@ -1,17 +1,11 @@
-import { History, Action, createBrowserHistory, createHashHistory, Blocker, BrowserHistoryOptions, HashHistoryOptions, Listener, Location, Path, To } from 'history';
-import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
-import Taro from "@tarojs/taro";
+import { Action, createBrowserHistory, createHashHistory, Blocker, BrowserHistoryOptions, HashHistoryOptions, History, Listener, Location, Path, To } from "history";
 import { IH5RouterConfig } from "@tarojs/taro/types/compile";
 import { StateEvent } from "../types/history";
+import { MpaRouterConfig, SpaRouterConfig } from '../types/router';
+import Taro from "@tarojs/taro";
 import { AppInstance } from "@tarojs/runtime";
 import { MpaRouterConfig as MpaRouterConfig$0 } from "../../types/router";
 import { SpaRouterConfig as SpaRouterConfig$0 } from "../../types/router";
-declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
-declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
-declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
-declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
-declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
-declare function getCurrentPages(): Taro.Page[];
 declare let history: History;
 declare class MpaHistory implements History {
     action: Action;
@@ -33,6 +27,12 @@ declare function setHistory(h: History, base?: string): void;
 declare function createMpaHistory(_?: HashHistoryOptions | BrowserHistoryOptions): MpaHistory;
 declare function setHistoryMode(mode?: IH5RouterConfig["mode"], base?: string): void;
 declare function prependBasename(url?: string): string;
+declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
+declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
+declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
+declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
+declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
+declare function getCurrentPages(): Taro.Page[];
 // TODO 支持多路由 (APP 生命周期仅触发一次)
 /** Note: 关于多页面应用
  * - 需要配置路由映射（根目录跳转、404 页面……）

package/dist/router/index.d.ts

@@ -4,7 +4,7 @@ declare class RouterConfig {
     static set config(e: SpaRouterConfig | MpaRouterConfig);
     static get config(): SpaRouterConfig | MpaRouterConfig;
     static get pages(): string[];
-    static get router(): import("taro-router/types/router").Router;
+    static get router(): import("../types/router").Router;
     static get mode(): "hash" | "browser" | "multi";
     static get customRoutes(): Record<string, string | string[]>;
     static isPage(url?: string): boolean;

package/dist/router/mpa.d.ts

@@ -1,5 +1,5 @@
 import { AppInstance } from '@tarojs/runtime';
-import { History } from 'history';
+import { History } from "../history.js";
 import { MpaRouterConfig } from '../../types/router';
 /** Note: 关于多页面应用
  * - 需要配置路由映射（根目录跳转、404 页面……）

package/dist/router/multi-page.d.ts

@@ -1,13 +1,13 @@
 import { PageInstance } from '@tarojs/runtime';
 import { PageConfig } from '@tarojs/taro';
-import { History } from 'history';
+import { History } from "../history.js";
 import { MpaRouterConfig, Route } from '../../types/router';
 declare class MultiPageHandler {
     history: History;
     protected config: MpaRouterConfig;
     constructor(config: MpaRouterConfig, history: History);
     get appId(): string;
-    get router(): import("taro-router/types/router").Router;
+    get router(): import("../types/router").Router;
     get routerMode(): "hash" | "browser" | "multi";
     get customRoutes(): Record<string, string | string[]>;
     get tabBarList(): import("@tarojs/taro").TabBarItem[];

package/dist/router/page.d.ts

@@ -1,7 +1,7 @@
 import NavigationBarHandler from "./navigation-bar.js";
 import { PageInstance } from '@tarojs/runtime';
 import { PageConfig, RouterAnimate } from '@tarojs/taro';
-import { History } from 'history';
+import { History } from "../history.js";
 import { Route, SpaRouterConfig } from '../../types/router';
 declare class PageHandler {
     history: History;
@@ -16,7 +16,7 @@ declare class PageHandler {
     constructor(config: SpaRouterConfig, history: History);
     get currentPage(): string;
     get appId(): string;
-    get router(): import("taro-router/types/router").Router;
+    get router(): import("../types/router").Router;
     get routerMode(): "hash" | "browser" | "multi";
     get customRoutes(): Record<string, string | string[]>;
     get routes(): Route[];

package/dist/router/spa.d.ts

@@ -1,5 +1,5 @@
 import { AppInstance } from '@tarojs/runtime';
-import { History } from 'history';
+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/tabbar.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.6.25",
+  "version": "3.6.26",
   "description": "Taro-router",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",
@@ -44,14 +44,14 @@
     "rollup-plugin-ts": "^3.0.2",
     "ts-jest": "^29.0.5",
     "typescript": "^4.7.4",
-    "@tarojs/runtime": "3.6.25",
-    "@tarojs/taro": "3.6.25",
-    "@tarojs/shared": "3.6.25"
+    "@tarojs/taro": "3.6.26",
+    "@tarojs/shared": "3.6.26",
+    "@tarojs/runtime": "3.6.26"
   },
   "peerDependencies": {
-    "@tarojs/runtime": "3.6.25",
-    "@tarojs/shared": "3.6.25",
-    "@tarojs/taro": "3.6.25"
+    "@tarojs/runtime": "3.6.26",
+    "@tarojs/taro": "3.6.26",
+    "@tarojs/shared": "3.6.26"
   },
   "scripts": {
     "prebuild": "pnpm run clean",