@tarojs/router 4.0.0-canary.8 → 4.0.0

package/LICENSE

@@ -154,7 +154,21 @@ 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`
+MIT (weui):
+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.
+
+==================
+
+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.js

@@ -1,17 +1,13 @@
-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 { __awaiter } from 'tslib';
+import { addLeadingSlash } from '@tarojs/runtime';
+import { EventChannel } from '@tarojs/shared';
 import { parsePath } from 'history';
-import { history, prependBasename } from './history';
-import { RouterConfig } from './router';
-import stacks from './router/stack';
-import { addLeadingSlash, routesAlias } from './utils';
+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);
@@ -20,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
@@ -43,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);
@@ -53,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') {
@@ -77,33 +79,40 @@ 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);
+                }
             }
         });
     });
 }
-export function navigateTo(option) {
+function navigateTo(option) {
     return navigate(option, 'navigateTo');
 }
-export function redirectTo(option) {
+function redirectTo(option) {
     return navigate(option, 'redirectTo');
 }
-export function navigateBack(option = { delta: 1 }) {
+function navigateBack(option = { delta: 1 }) {
     if (!option.delta || option.delta < 1) {
         option.delta = 1;
     }
     return navigate(option, 'navigateBack');
 }
-export function switchTab(option) {
+function switchTab(option) {
     return navigate(option, 'switchTab');
 }
-export function reLaunch(option) {
+function reLaunch(option) {
     return navigate(option, 'reLaunch');
 }
-export function getCurrentPages() {
+function getCurrentPages() {
     if (process.env.NODE_ENV !== 'production' && RouterConfig.mode === 'multi') {
         console.warn('多页面路由模式不支持使用 getCurrentPages 方法！');
     }
     const pages = stacks.get();
     return pages.map(e => { var _a; return (Object.assign(Object.assign({}, e), { route: ((_a = e.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) || '' })); });
 }
+
+export { getCurrentPages, navigateBack, navigateTo, reLaunch, redirectTo, switchTab };

package/dist/events/resize.d.ts

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

package/dist/events/resize.js

@@ -1,13 +1,21 @@
 let pageResizeFn;
-export function bindPageResize(page) {
+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);
 }
+
+export { bindPageResize };

package/dist/events/scroll.d.ts

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

package/dist/events/scroll.js

@@ -1,7 +1,8 @@
 import { Current } from '@tarojs/runtime';
+
 const pageScrollFn = {};
 let pageDOM = window;
-export function bindPageScroll(page, scrollEl, distance = 50) {
+function bindPageScroll(page, scrollEl, distance = 50) {
     var _a;
     const pagePath = (page ? page === null || page === void 0 ? void 0 : page.path : (_a = Current.router) === null || _a === void 0 ? void 0 : _a.path);
     pageScrollFn[pagePath] && scrollEl.removeEventListener('scroll', pageScrollFn[pagePath]);
@@ -32,3 +33,5 @@ function getOffset() {
         return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
     }
 }
+
+export { bindPageScroll };

package/dist/history.d.ts

@@ -1,5 +1,26 @@
+import { Action, createBrowserHistory, createHashHistory } from 'history';
 import type { IH5RouterConfig } from '@tarojs/taro/types/compile';
-import type { History } from 'history';
+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;
+    createHref(_to: To): string;
+    parseUrl(to: Partial<Path>): string;
+    push(to: Partial<Path>, _state?: Record<string, unknown>): void;
+    replace(to: Partial<Path>, _state?: Record<string, unknown>): void;
+    go(delta: number): void;
+    back: () => void;
+    forward: () => void;
+    listen(listener: Listener): () => void;
+    block(_blocker: Blocker): () => void;
+    pushState: globalThis.History['pushState'];
+    replaceState: globalThis.History['replaceState'];
+    eventState(action: Required<StateEvent>['action']): (data: any, unused: string, url?: string | URL | null) => any;
+}
+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,6 +1,9 @@
-import { Action, createBrowserHistory, createHashHistory } from 'history';
-import { RouterConfig } from './router';
-export let history;
+import { addLeadingSlash } from '@tarojs/runtime';
+import { createBrowserHistory, createHashHistory, Action } from 'history';
+export { createBrowserHistory, createHashHistory } from 'history';
+import { RouterConfig } from './router/index.js';
+
+let history;
 let basename = '/';
 class MpaHistory {
     constructor() {
@@ -23,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;
     }
@@ -79,7 +82,14 @@ class MpaHistory {
         };
     }
 }
-export function setHistoryMode(mode, base = '/') {
+function setHistory(h, base = '/') {
+    history = h;
+    basename = base;
+}
+function createMpaHistory(_) {
+    return new MpaHistory();
+}
+function setHistoryMode(mode, base = '/') {
     const options = {
         window
     };
@@ -88,13 +98,15 @@ export function setHistoryMode(mode, base = '/') {
         history = createBrowserHistory(options);
     }
     else if (mode === 'multi') {
-        history = new MpaHistory();
+        history = createMpaHistory();
     }
     else {
         // default is hash
         history = createHashHistory(options);
     }
 }
-export function prependBasename(url = '') {
+function prependBasename(url = '') {
     return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
+
+export { createMpaHistory, history, prependBasename, setHistory, setHistoryMode };