@tarojs/router 4.0.0-beta.9 → 4.0.0-beta.90

package/dist/api.js

@@ -1,11 +1,13 @@
 import { __awaiter } from 'tslib';
 import { addLeadingSlash } from '@tarojs/runtime';
+import { EventChannel } from '@tarojs/shared';
 import { parsePath } from 'history';
 import { history, prependBasename } from './history.js';
 import { RouterConfig } from './router/index.js';
 import stacks from './router/stack.js';
 import { routesAlias } from './utils/index.js';
 
+const routeEvtChannel = EventChannel.routeChannel;
 function processNavigateUrl(option) {
     var _a;
     const pathPieces = parsePath(option.url);
@@ -37,6 +39,10 @@ function navigate(option, method) {
             const { success, complete, fail } = option;
             const unListen = history.listen(() => {
                 const res = { errMsg: `${method}:ok` };
+                if (method === 'navigateTo') {
+                    res.eventChannel = routeEvtChannel;
+                    routeEvtChannel.addEvents(option.events);
+                }
                 success === null || success === void 0 ? void 0 : success(res);
                 complete === null || complete === void 0 ? void 0 : complete(res);
                 resolve(res);
@@ -48,9 +54,8 @@ function navigate(option, method) {
                     const state = { timestamp: Date.now() };
                     if (pathPieces.pathname) {
                         const originPath = routesAlias.getOrigin(pathPieces.pathname);
-                        const pagePath = originPath.startsWith('/') ? originPath.substring(1) : originPath;
-                        if (!RouterConfig.pages.includes(pagePath)) {
-                            const res = { errMsg: `${method}:fail page ${pagePath} is not found` };
+                        if (!RouterConfig.isPage(addLeadingSlash(originPath)) && !RouterConfig.isPage(addLeadingSlash(pathPieces.pathname))) {
+                            const res = { errMsg: `${method}:fail page ${originPath} is not found` };
                             fail === null || fail === void 0 ? void 0 : fail(res);
                             complete === null || complete === void 0 ? void 0 : complete(res);
                             if (fail || complete) {

package/dist/history.js

@@ -1,3 +1,4 @@
+import { addLeadingSlash } from '@tarojs/runtime';
 import { createBrowserHistory, createHashHistory, Action } from 'history';
 export { createBrowserHistory, createHashHistory } from 'history';
 import { RouterConfig } from './router/index.js';
@@ -25,7 +26,7 @@ class MpaHistory {
     }
     parseUrl(to) {
         let url = to.pathname || '';
-        if (RouterConfig.isPage(url)) {
+        if (RouterConfig.isPage(addLeadingSlash(url))) {
             url += '.html';
         }
         if (to.search) {

package/dist/index.cjs.d.ts

@@ -60,6 +60,7 @@ declare function setNavigationBarStyle(option: {
     backgroundColor: string;
     frontColor: string;
 }): void;
+declare function setNavigationBarLoading(loading: boolean): void;
 declare function handleAppMount(config: SpaRouterConfig | MpaRouterConfig, _: History, appId?: string): void;
 declare function handleAppMountWithTabbar(config: SpaRouterConfig | MpaRouterConfig, history: History, appId?: string): void;
-export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages, history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename, createMultiRouter, createRouter, routesAlias, isWeixin, isDingTalk, setMpaTitle, setTitle, setNavigationBarStyle, handleAppMount, handleAppMountWithTabbar };
+export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages, history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename, createMultiRouter, createRouter, routesAlias, isWeixin, isDingTalk, setMpaTitle, setTitle, setNavigationBarStyle, setNavigationBarLoading, handleAppMount, handleAppMountWithTabbar };