@tarojs/router 3.5.0-alpha.1 → 3.5.0-alpha.10

package/dist/api.js

@@ -1,12 +1,22 @@
+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 { parsePath } from 'history';
 import stacks from './router/stack';
 import { history, prependBasename } from './history';
 import { routesAlias, addLeadingSlash } from './utils';
 import { RouterConfig } from './router';
 function processNavigateUrl(option) {
+    var _a;
     const pathPieces = parsePath(option.url);
     // 处理相对路径
-    if (pathPieces.pathname?.includes('./')) {
+    if ((_a = pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
@@ -26,42 +36,44 @@ function processNavigateUrl(option) {
         pathPieces.search = '';
     return pathPieces;
 }
-async function navigate(option, method) {
-    return new Promise((resolve, reject) => {
-        const { success, complete, fail } = option;
-        const unListen = history.listen(() => {
-            const res = { errMsg: `${method}:ok` };
-            success?.(res);
-            complete?.(res);
-            resolve(res);
-            unListen();
-        });
-        try {
-            if ('url' in option) {
-                const pathPieces = processNavigateUrl(option);
-                const state = { timestamp: Date.now() };
-                if (method === 'navigateTo') {
-                    history.push(pathPieces, state);
+function navigate(option, method) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            const { success, complete, fail } = option;
+            const unListen = history.listen(() => {
+                const res = { errMsg: `${method}:ok` };
+                success === null || success === void 0 ? void 0 : success(res);
+                complete === null || complete === void 0 ? void 0 : complete(res);
+                resolve(res);
+                unListen();
+            });
+            try {
+                if ('url' in option) {
+                    const pathPieces = processNavigateUrl(option);
+                    const state = { timestamp: Date.now() };
+                    if (method === 'navigateTo') {
+                        history.push(pathPieces, state);
+                    }
+                    else if (method === 'redirectTo' || method === 'switchTab') {
+                        history.replace(pathPieces, state);
+                    }
+                    else if (method === 'reLaunch') {
+                        stacks.delta = stacks.length;
+                        history.replace(pathPieces, state);
+                    }
                 }
-                else if (method === 'redirectTo' || method === 'switchTab') {
-                    history.replace(pathPieces, state);
-                }
-                else if (method === 'reLaunch') {
-                    stacks.delta = stacks.length;
-                    history.replace(pathPieces, state);
+                else if (method === 'navigateBack') {
+                    stacks.delta = option.delta;
+                    history.go(-option.delta);
                 }
             }
-            else if (method === 'navigateBack') {
-                stacks.delta = option.delta;
-                history.go(-option.delta);
+            catch (error) {
+                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);
             }
-        }
-        catch (error) {
-            const res = { errMsg: `${method}:fail ${error.message || error}` };
-            fail?.(res);
-            complete?.(res);
-            reject(res);
-        }
+        });
     });
 }
 export function navigateTo(option) {
@@ -87,5 +99,5 @@ export function getCurrentPages() {
         console.warn('多页面路由模式不支持使用 getCurrentPages 方法！');
     }
     const pages = stacks.get();
-    return pages.map(e => ({ ...e, route: e.path || '' }));
+    return pages.map(e => (Object.assign(Object.assign({}, e), { route: e.path || '' })));
 }

package/dist/history.js

@@ -3,7 +3,12 @@ import { RouterConfig } from './router';
 export let history;
 let basename = '/';
 class MpaHistory {
-    action;
+    constructor() {
+        this.back = window.history.back;
+        this.forward = window.history.forward;
+        this.pushState = this.eventState('pushState');
+        this.replaceState = this.eventState('replaceState');
+    }
     get location() {
         return {
             pathname: window.location.pathname,
@@ -40,8 +45,6 @@ class MpaHistory {
     go(delta) {
         window.history.go(delta);
     }
-    back = window.history.back;
-    forward = window.history.forward;
     listen(listener) {
         function callback(e) {
             if (e.action === 'pushState') {
@@ -63,8 +66,6 @@ class MpaHistory {
     block(_blocker) {
         throw new Error('Method not implemented.');
     }
-    pushState = this.eventState('pushState');
-    replaceState = this.eventState('replaceState');
     eventState(action) {
         return (data, unused, url) => {
             const wrapper = window.history[action](data, unused, url);