@tarojs/router 4.0.0-canary.9 → 4.0.0

package/LICENSE

@@ -154,15 +154,8 @@ See `/LICENSE` for details of the license.
 
 ==================
 
-MIT (stencil-vue2-output-target):
-The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
-`/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
-See `/LICENSE` for details of the license.
-
-==================
-
 MIT (weui):
-The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
+The following files embed [weui](https://github.com/Tencent/weui) MIT:
 `/packages/taro-components/src/components/*.scss`
 See `/LICENSE.txt` for details of the license.
 
@@ -172,3 +165,10 @@ Apache-2.0 (intersection-observer):
 The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
 `/packages/taro-api/src/polyfill/intersection-observer.ts`
 See `/LICENSE.txt` for details of the license.
+
+==================
+
+MIT (babel-plugin-jsx-dom-expressions):
+The following files embed [babel-plugin-jsx-dom-expressions](https://github.com/ryansolid/dom-expressions/blob/main/packages/babel-plugin-jsx-dom-expressions) MIT:
+`/packages/babel-plugin-transform-solid-jsx/src/*`
+See `/LICENSE` for details of the license.

package/README.md

@@ -20,7 +20,7 @@ H5 端路由系统。
 
 #### `type`
 
-框架类型，`react` | `vue` | `nerv` 三选一。
+框架类型，`react` | `vue` | `solid` | `preact` 四选一。
 
 #### `framework`
 

package/dist/api.d.ts

@@ -1,8 +1,7 @@
 import Taro from '@tarojs/taro';
-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[];
-export { navigateTo, redirectTo, navigateBack, switchTab, reLaunch, getCurrentPages };
+export declare function navigateTo(option: Taro.navigateTo.Option): ReturnType<typeof Taro.navigateTo>;
+export declare function redirectTo(option: Taro.redirectTo.Option): ReturnType<typeof Taro.redirectTo>;
+export declare function navigateBack(option?: Taro.navigateBack.Option): ReturnType<typeof Taro.navigateBack>;
+export declare function switchTab(option: Taro.switchTab.Option): ReturnType<typeof Taro.switchTab>;
+export declare function reLaunch(option: Taro.reLaunch.Option): ReturnType<typeof Taro.reLaunch>;
+export declare function getCurrentPages(): Taro.Page[];

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);
@@ -14,13 +16,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
-            if (item === '.') {
+            if (item === '.')
                 return;
-            }
             item === '..' ? parts.pop() : parts.push(item);
         });
         pathPieces.pathname = parts.join('/');
     }
+    // 确保是 / 开头的路径
+    pathPieces.pathname = addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -37,6 +40,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);
@@ -47,6 +54,7 @@ function navigate(option, method) {
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
+                        // Note: 由于 spa 会针对弱网情况下，短时间内多次跳转同一个页面跳转加了锁，后续如果有用户反馈返回无效，那可能是这个问题
                         history.push(pathPieces, state);
                     }
                     else if (method === 'redirectTo' || method === 'switchTab') {
@@ -71,7 +79,12 @@ function navigate(option, method) {
                 const res = { errMsg: `${method}:fail ${error.message || error}` };
                 fail === null || fail === void 0 ? void 0 : fail(res);
                 complete === null || complete === void 0 ? void 0 : complete(res);
-                reject(res);
+                if (fail || complete) {
+                    return resolve(res);
+                }
+                else {
+                    return reject(res);
+                }
             }
         });
     });

package/dist/events/resize.d.ts

@@ -1,3 +1,2 @@
-import { PageInstance } from '@tarojs/runtime';
-declare function bindPageResize(page: PageInstance): void;
-export { bindPageResize };
+import type { PageInstance } from '@tarojs/runtime';
+export declare function bindPageResize(page: PageInstance): void;

package/dist/events/resize.js

@@ -2,12 +2,18 @@ let pageResizeFn;
 function bindPageResize(page) {
     pageResizeFn && window.removeEventListener('resize', pageResizeFn);
     pageResizeFn = function () {
-        page.onResize && page.onResize({
-            size: {
-                windowHeight: window.innerHeight,
-                windowWidth: window.innerWidth
-            }
-        });
+        if (page.onResize) {
+            const mediaQuery = window.matchMedia('(orientation: portrait)');
+            page.onResize({
+                deviceOrientation: mediaQuery.matches ? 'portrait' : 'landscape',
+                size: {
+                    windowHeight: window.innerHeight,
+                    windowWidth: window.innerWidth,
+                    screenHeight: window.screen.height,
+                    screenWidth: window.screen.width,
+                }
+            });
+        }
     };
     window.addEventListener('resize', pageResizeFn, false);
 }

package/dist/events/scroll.d.ts

@@ -1,3 +1,2 @@
-import { PageInstance } from '@tarojs/runtime';
-declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;
-export { bindPageScroll };
+import type { PageInstance } from '@tarojs/runtime';
+export declare function bindPageScroll(page: PageInstance, scrollEl: HTMLElement | Window, distance?: number): void;

package/dist/history.d.ts

@@ -1,6 +1,8 @@
-import { IH5RouterConfig } from '@tarojs/taro/types/compile';
-import { StateEvent } from '../types/history';
-declare let history: History;
+import { Action, createBrowserHistory, createHashHistory } from 'history';
+import type { IH5RouterConfig } from '@tarojs/taro/types/compile';
+import type { Blocker, BrowserHistoryOptions, HashHistoryOptions, History, Listener, Location, Path, To } from 'history';
+import type { StateEvent } from '../types/history';
+export declare let history: History;
 declare class MpaHistory implements History {
     action: Action;
     get location(): Location;
@@ -17,8 +19,8 @@ declare class MpaHistory implements History {
     replaceState: globalThis.History['replaceState'];
     eventState(action: Required<StateEvent>['action']): (data: any, unused: string, url?: string | URL | null) => any;
 }
-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;
-export { history, setHistory, createMpaHistory, createBrowserHistory, createHashHistory, setHistoryMode, prependBasename };
+export declare function setHistory(h: History, base?: string): void;
+export declare function createMpaHistory(_?: HashHistoryOptions | BrowserHistoryOptions): MpaHistory;
+export { createBrowserHistory, createHashHistory };
+export declare function setHistoryMode(mode?: IH5RouterConfig['mode'], base?: string): void;
+export declare function prependBasename(url?: string): string;

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,14 +26,14 @@ class MpaHistory {
     }
     parseUrl(to) {
         let url = to.pathname || '';
-        if (RouterConfig.isPage(url)) {
+        if (RouterConfig.isPage(addLeadingSlash(url))) {
             url += '.html';
         }
         if (to.search) {
             url += `?${to.search}`;
         }
         if (to.hash) {
-            url += `#${to.hash}`;
+            url += to.hash.startsWith('#') ? to.hash : `#${to.hash}`;
         }
         return url;
     }