@shuvi/router 1.0.44 → 1.0.45

package/esm/history/base.d.ts

@@ -38,13 +38,19 @@ export interface PushOptions {
     redirectedFrom?: Path;
     skipGuards?: boolean;
 }
+export declare type BaseHistoryOptions = {
+    basename?: string;
+};
 export default abstract class BaseHistory {
     action: Action;
     location: Location;
+    basename: string;
+    constructor({ basename }?: BaseHistoryOptions);
     doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean, isReplace?: boolean, redirectedFrom?: Path) => void;
     protected _index: number;
     protected _blockers: import("../utils").Events<Blocker<State>>;
     protected abstract getIndexAndLocation(): [number, Location];
+    /** setup will be called at `onTransition` and `onAbort` */
     abstract setup(): void;
     /**
      * Jump to the specified route

package/esm/history/base.js

@@ -1,4 +1,4 @@
-import { createLocation, createEvents, resolvePath, pathToString } from '../utils';
+import { createLocation, createEvents, resolvePath, pathToString, normalizeBase } from '../utils';
 /**
  * A POP indicates a change to an arbitrary index in the history stack, such
  * as a back or forward navigation. It does not describe the direction of the
@@ -19,12 +19,13 @@ export const ACTION_PUSH = 'PUSH';
  */
 export const ACTION_REPLACE = 'REPLACE';
 export default class BaseHistory {
-    constructor() {
+    constructor({ basename = '' } = {}) {
         this.action = ACTION_POP;
         this.location = createLocation('/');
         this.doTransition = () => void 0;
         this._index = 0;
         this._blockers = createEvents();
+        this.basename = normalizeBase(basename);
     }
     back() {
         this.go(-1);
@@ -36,7 +37,7 @@ export default class BaseHistory {
         const toPath = resolvePath(to, from);
         return {
             path: toPath,
-            href: pathToString(toPath)
+            href: pathToString(toPath, this.basename)
         };
     }
     transitionTo(to, { onTransition, onAbort, action = ACTION_PUSH, state = null, redirectedFrom, skipGuards }) {

package/esm/history/browser.d.ts

@@ -1,8 +1,9 @@
 import { PathRecord, Location, Blocker } from '../types';
-import BaseHistory, { PushOptions } from './base';
+import BaseHistory, { PushOptions, BaseHistoryOptions } from './base';
+export declare type BrowserHistoryOptions = BaseHistoryOptions;
 export default class BrowserHistory extends BaseHistory {
     private _history;
-    constructor();
+    constructor({ basename }?: BrowserHistoryOptions);
     push(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     go(delta: number): void;

package/esm/history/browser.js

@@ -1,13 +1,25 @@
 import { createLocation, pushState, replaceState, addBlocker, warning } from '../utils';
 import BaseHistory, { ACTION_POP, ACTION_REPLACE } from './base';
 export default class BrowserHistory extends BaseHistory {
-    constructor() {
-        super();
+    constructor({ basename } = {}) {
+        super({ basename });
         this._history = window.history;
         [this._index, this.location] = this.getIndexAndLocation();
-        if (this._index == null) {
-            this._index = 0;
-            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '');
+        // redirect immediately if
+        // 1. no index
+        // 2. we're not on the right url (redirectedFrom means url not match basename)
+        const { notMatchBasename } = this.location;
+        if (this._index == null || notMatchBasename) {
+            this._index = this._index || 0;
+            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '', notMatchBasename ? this.resolve(this.location).href : undefined);
+        }
+        // recalculate location if not match basename
+        if (notMatchBasename) {
+            const state = this._history.state || {};
+            this.location = createLocation(this.location, {
+                state: state.usr || null,
+                key: state.key || 'default'
+            });
         }
     }
     push(to, { state, redirectedFrom } = {}) {
@@ -96,6 +108,7 @@ export default class BrowserHistory extends BaseHistory {
                 search,
                 hash
             }, {
+                basename: this.basename,
                 state: state.usr || null,
                 key: state.key || 'default'
             })

package/esm/history/hash.d.ts

@@ -1,8 +1,9 @@
 import { PathRecord, Location, Blocker, ResolvedPath } from '../types';
-import BaseHistory, { PushOptions } from './base';
+import BaseHistory, { PushOptions, BaseHistoryOptions } from './base';
+export declare type HashHistoryOptions = BaseHistoryOptions;
 export default class HashHistory extends BaseHistory {
     private _history;
-    constructor();
+    constructor({ basename }?: HashHistoryOptions);
     push(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     go(delta: number): void;

package/esm/history/hash.js

@@ -1,28 +1,28 @@
 import { createLocation, pushState, replaceState, addBlocker, resolvePath, pathToString, warning } from '../utils';
 import BaseHistory, { ACTION_POP, ACTION_REPLACE } from './base';
-function getBaseHref() {
-    let base = document.querySelector('base');
-    let href = '';
-    if (base && base.getAttribute('href')) {
-        let url = window.location.href;
-        let hashIndex = url.indexOf('#');
-        href = hashIndex === -1 ? url : url.slice(0, hashIndex);
-    }
-    return href;
-}
-function createHref(to) {
-    return (getBaseHref() +
-        '#' +
-        (typeof to === 'string' ? to : pathToString(resolvePath(to))));
+function createHref(to, basename) {
+    return '#' + pathToString(resolvePath(to), basename);
 }
 export default class HashHistory extends BaseHistory {
-    constructor() {
-        super();
+    constructor({ basename } = {}) {
+        super({ basename });
         this._history = window.history;
         [this._index, this.location] = this.getIndexAndLocation();
-        if (this._index == null) {
-            this._index = 0;
-            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '');
+        // redirect immediately if
+        // 1. no index
+        // 2. we're not on the right url (redirectedFrom means url not match basename)
+        const { notMatchBasename } = this.location;
+        if (this._index == null || notMatchBasename) {
+            this._index = this._index || 0;
+            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '', notMatchBasename ? this.resolve(this.location).href : undefined);
+        }
+        // recalculate location if not match basename
+        if (notMatchBasename) {
+            const state = this._history.state || {};
+            this.location = createLocation(this.location, {
+                state: state.usr || null,
+                key: state.key || 'default'
+            });
         }
     }
     push(to, { state, redirectedFrom } = {}) {
@@ -54,7 +54,7 @@ export default class HashHistory extends BaseHistory {
         const toPath = resolvePath(to, from);
         return {
             path: toPath,
-            href: createHref(toPath)
+            href: createHref(toPath, this.basename)
         };
     }
     setup() {
@@ -127,6 +127,7 @@ export default class HashHistory extends BaseHistory {
                 search,
                 hash
             }, {
+                basename: this.basename,
                 state: state.usr || null,
                 key: state.key || 'default'
             })

package/esm/history/index.d.ts

@@ -1,8 +1,8 @@
 import MemoryHistory, { MemoryHistoryOptions, InitialEntry } from './memory';
-import BrowserHistory from './browser';
-import HashHistory from './hash';
+import BrowserHistory, { BrowserHistoryOptions } from './browser';
+import HashHistory, { HashHistoryOptions } from './hash';
 export * from './base';
 export { MemoryHistory, MemoryHistoryOptions, InitialEntry };
-export declare function createBrowserHistory(): BrowserHistory;
-export declare function createHashHistory(): HashHistory;
+export declare function createBrowserHistory(options?: BrowserHistoryOptions): BrowserHistory;
+export declare function createHashHistory(options?: HashHistoryOptions): HashHistory;
 export declare function createMemoryHistory(options?: MemoryHistoryOptions): MemoryHistory;

package/esm/history/index.js

@@ -3,11 +3,11 @@ import BrowserHistory from './browser';
 import HashHistory from './hash';
 export * from './base';
 export { MemoryHistory };
-export function createBrowserHistory() {
-    return new BrowserHistory();
+export function createBrowserHistory(options = {}) {
+    return new BrowserHistory(options);
 }
-export function createHashHistory() {
-    return new HashHistory();
+export function createHashHistory(options = {}) {
+    return new HashHistory(options);
 }
 export function createMemoryHistory(options = {}) {
     return new MemoryHistory(options);

package/esm/history/memory.d.ts

@@ -1,4 +1,4 @@
-import { PathRecord, Location, Blocker, PartialLocation, ResolvedPath } from '../types';
+import { PathRecord, Location, Blocker, PartialLocation } from '../types';
 import BaseHistory, { PushOptions } from './base';
 /**
  * A user-supplied object that describes a location. Used when providing
@@ -8,15 +8,15 @@ export declare type InitialEntry = string | PartialLocation;
 export declare type MemoryHistoryOptions = {
     initialEntries?: InitialEntry[];
     initialIndex?: number;
+    basename?: string;
 };
 export default class MemoryHistory extends BaseHistory {
     private _entries;
-    constructor({ initialEntries, initialIndex }?: MemoryHistoryOptions);
+    constructor({ initialEntries, initialIndex, basename }?: MemoryHistoryOptions);
     setup(): void;
     push(to: PathRecord, { state, redirectedFrom, skipGuards }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom, skipGuards }?: PushOptions): void;
     go(delta: number): void;
     block(blocker: Blocker): () => void;
-    resolve(to: PathRecord, from?: string): ResolvedPath;
     protected getIndexAndLocation(): [number, Location];
 }

package/esm/history/memory.js

@@ -1,14 +1,14 @@
-import { createLocation, resolvePath, pathToString, warning } from '../utils';
+import { createLocation, resolvePath, warning } from '../utils';
 import BaseHistory, { ACTION_POP, ACTION_REPLACE } from './base';
 function clamp(n, lowerBound, upperBound) {
     return Math.min(Math.max(n, lowerBound), upperBound);
 }
 export default class MemoryHistory extends BaseHistory {
-    constructor({ initialEntries = ['/'], initialIndex } = {}) {
-        super();
+    constructor({ initialEntries = ['/'], initialIndex, basename = '' } = {}) {
+        super({ basename });
         this._entries = [];
         this._entries = initialEntries.map(entry => {
-            let location = createLocation(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? resolvePath(entry) : entry)));
+            let location = createLocation(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? resolvePath(entry) : entry)), { basename: this.basename });
             warning(location.pathname.charAt(0) === '/', `Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: ${JSON.stringify(entry)})`);
             return location;
         });
@@ -63,13 +63,6 @@ export default class MemoryHistory extends BaseHistory {
     block(blocker) {
         return this._blockers.push(blocker);
     }
-    resolve(to, from) {
-        const toPath = resolvePath(to, from);
-        return {
-            path: toPath,
-            href: pathToString(toPath)
-        };
-    }
     getIndexAndLocation() {
         const index = this._index;
         return [index, this._entries[index]];

package/esm/matchRoutes.js

@@ -1,5 +1,5 @@
 import { matchPathname } from './matchPathname';
-import { joinPaths, resolvePath } from './utils';
+import { joinPaths, normalizeBase, resolvePath, stripBase } from './utils';
 import { tokensToParser, comparePathParserScore } from './pathParserRanker';
 import { tokenizePath } from './pathTokenizer';
 function matchRouteBranch(branch, pathname) {
@@ -67,12 +67,12 @@ export function matchRoutes(routes, location, basename = '') {
     }
     let pathname = location.pathname || '/';
     if (basename) {
-        let base = basename.replace(/^\/*/, '/').replace(/\/+$/, '');
-        if (pathname.startsWith(base)) {
-            pathname = pathname === base ? '/' : pathname.slice(base.length);
+        const normalizedBasename = normalizeBase(basename);
+        const pathnameWithoutBase = stripBase(pathname, normalizedBasename);
+        if (pathnameWithoutBase) {
+            pathname = pathnameWithoutBase;
         }
         else {
-            // Pathname does not start with the basename, no match.
             return null;
         }
     }

package/esm/router.d.ts

@@ -4,7 +4,6 @@ interface IRouterOptions<RouteRecord extends IPartialRouteRecord> {
     history: History;
     routes: RouteRecord[];
     caseSensitive?: boolean;
-    basename?: string;
 }
 export declare const createRouter: <RouteRecord extends {
     path: string;

package/esm/router.js

@@ -1,7 +1,7 @@
 import { createDefer } from '@shuvi/utils/defer';
 import { matchRoutes } from './matchRoutes';
 import { createRoutesFromArray } from './createRoutesFromArray';
-import { normalizeBase, joinPaths, createEvents, resolvePath } from './utils';
+import { createEvents, resolvePath } from './utils';
 import { isError, isFunction } from './utils/error';
 import { runQueue } from './utils/async';
 import { getRedirectFromRoutes } from './getRedirectFromRoutes';
@@ -17,7 +17,7 @@ const START = {
     redirected: false
 };
 class Router {
-    constructor({ basename = '', history, routes }) {
+    constructor({ history, routes }) {
         this._pending = null;
         this._cancleHandler = null;
         this._ready = false;
@@ -28,9 +28,14 @@ class Router {
         this._afterEachs = createEvents();
         this.init = () => {
             const setup = () => this._history.setup();
-            this._history.transitionTo(this._getCurrent(), {
+            const current = this._getCurrent();
+            this._history.transitionTo(current, {
                 onTransition: setup,
-                onAbort: setup
+                onAbort: setup,
+                // current.redirected means the initial url does not match basename and should redirect
+                // so we just skip all guards
+                // this logic only applies to memory history
+                skipGuards: Boolean(current.redirected)
             });
             return this;
         };
@@ -65,11 +70,11 @@ class Router {
             return this._afterEachs.push(listener);
         };
         this.resolve = (to, from) => {
-            return this._history.resolve(to, from ? joinPaths([this._basename, from]) : this._basename);
+            return this._history.resolve(to, from);
         };
         this.match = (to) => {
-            const { _routes: routes, _basename: basename } = this;
-            const matches = matchRoutes(routes, to, basename);
+            const { _routes: routes } = this;
+            const matches = matchRoutes(routes, to);
             return matches || [];
         };
         this.replaceRoutes = (routes) => {
@@ -94,7 +99,6 @@ class Router {
                 onAbort: setup
             });
         };
-        this._basename = normalizeBase(basename);
         this._history = history;
         this._routes = createRoutesFromArray(routes);
         this._current = START;
@@ -112,6 +116,9 @@ class Router {
     get action() {
         return this._history.action;
     }
+    get basename() {
+        return this._history.basename;
+    }
     /*
       The Full Navigation Resolution Flow for shuvi/router
       1. Navigation triggered.
@@ -255,7 +262,7 @@ class Router {
             hash: location.hash,
             query: location.query,
             state: location.state,
-            redirected: !!location.redirectedFrom,
+            redirected: Boolean(location.redirectedFrom) || location.notMatchBasename,
             key: location.key
         };
     }

package/esm/types/history.d.ts

@@ -96,6 +96,7 @@ export interface PartialPath {
  */
 export interface Location<S extends State = State> extends Path {
     redirectedFrom?: Path;
+    notMatchBasename?: boolean;
     /**
      * An object of arbitrary data associated with this location.
      *
@@ -114,6 +115,7 @@ export interface Location<S extends State = State> extends Path {
  * A partial Location object that may be missing some properties.
  */
 export interface PartialLocation<S extends State = State> extends PartialPath {
+    redirectedFrom?: Path;
     /**
      * An object of arbitrary data associated with this location.
      *

package/esm/types/router.d.ts

@@ -63,6 +63,7 @@ export interface IRouter<RouteRecord extends {
 } = any> {
     current: IRoute<RouteRecord>;
     action: History['action'];
+    basename: string;
     push(to: PathRecord, state?: any): void;
     replace(to: PathRecord, state?: any): void;
     go: History['go'];

package/esm/utils/history.d.ts

@@ -1,6 +1,7 @@
 import { HistoryState, Location, PathRecord, State, Key, Blocker, Path } from '../types';
 import { Events } from './misc';
-export declare function createLocation(to: PathRecord, { state, key, redirectedFrom }?: {
+export declare function createLocation(to: PathRecord, { basename, state, key, redirectedFrom }?: {
+    basename?: string;
     state?: State;
     key?: Key;
     redirectedFrom?: Path;

package/esm/utils/history.js

@@ -1,5 +1,5 @@
 import { readOnly } from './misc';
-import { resolvePath } from './path';
+import { resolvePath, stripBase } from './path';
 const BeforeUnloadEventType = 'beforeunload';
 function promptBeforeUnload(event) {
     // Cancel the event.
@@ -10,8 +10,15 @@ function promptBeforeUnload(event) {
 function createKey() {
     return Math.random().toString(36).substr(2, 8);
 }
-export function createLocation(to, { state = null, key, redirectedFrom } = {}) {
-    return readOnly(Object.assign(Object.assign({}, resolvePath(to)), { redirectedFrom,
+export function createLocation(to, { basename, state = null, key, redirectedFrom } = {}) {
+    const resolved = resolvePath(to);
+    const pathnameWithoutBase = stripBase(resolved.pathname, basename || '/');
+    if (pathnameWithoutBase) {
+        resolved.pathname = pathnameWithoutBase;
+    }
+    const notMatchBasename = Boolean(basename) && !pathnameWithoutBase;
+    return readOnly(Object.assign(Object.assign({}, resolved), { redirectedFrom,
+        notMatchBasename,
         state, key: key || createKey() }));
 }
 export function pushState(state, url, { replace = false } = {}) {

package/esm/utils/path.d.ts

@@ -6,8 +6,16 @@ export declare const joinPaths: (paths: string[]) => string;
 export declare const splitPath: (path: string) => string[];
 export declare function normalizeBase(base: string): string;
 export declare function parseQuery(queryStr: string): qs.ParsedQuery<string>;
-export declare function pathToString({ pathname, search, hash, query }: PartialPath): string;
+export declare function pathToString({ pathname, search, hash, query }: PartialPath, basename?: string): string;
 /**
  * Parses a string URL path into its separate pathname, search, and hash components.
  */
 export declare function resolvePath(to: PathRecord, fromPathname?: string): Path;
+/**
+ * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
+ *
+ * @param pathname - location.pathname
+ * @param base - base to strip off
+ */
+export declare function stripBase(pathname: string, base: string): string | null;

package/esm/utils/path.js

@@ -1,21 +1,11 @@
 import * as qs from 'query-string';
-import { inBrowser } from './dom';
 export const trimTrailingSlashes = (path) => path.replace(/\/+$/, '');
 export const normalizeSlashes = (path) => path.replace(/\/\/+/g, '/');
 export const joinPaths = (paths) => normalizeSlashes(paths.join('/'));
 export const splitPath = (path) => normalizeSlashes(path).split('/');
 export function normalizeBase(base) {
     if (!base) {
-        if (inBrowser) {
-            // respect <base> tag
-            const baseEl = document.querySelector('base');
-            base = (baseEl && baseEl.getAttribute('href')) || '/';
-            // strip full URL origin
-            base = base.replace(/^https?:\/\/[^\/]+/, '');
-        }
-        else {
-            base = '/';
-        }
+        base = '/';
     }
     // make sure there's the starting slash
     if (base.charAt(0) !== '/') {
@@ -27,12 +17,16 @@ export function normalizeBase(base) {
 export function parseQuery(queryStr) {
     return qs.parse(queryStr);
 }
-export function pathToString({ pathname = '/', search = '', hash = '', query = {} }) {
+export function pathToString({ pathname = '/', search = '', hash = '', query = {} }, basename) {
     if (!search) {
         const queryString = qs.stringify(query);
         search = queryString ? `?${queryString}` : '';
     }
-    return pathname + search + hash;
+    const pathString = pathname + search + hash;
+    if (basename) {
+        return joinPaths([basename, pathString]);
+    }
+    return pathString;
 }
 function resolvePathname(toPathname, fromPathname) {
     let segments = splitPath(trimTrailingSlashes(fromPathname));
@@ -99,3 +93,19 @@ export function resolvePath(to, fromPathname = '/') {
         : fromPathname;
     return parsedPath;
 }
+/**
+ * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
+ *
+ * @param pathname - location.pathname
+ * @param base - base to strip off
+ */
+export function stripBase(pathname, base) {
+    if (!base || base === '/')
+        return pathname;
+    // no base or base is not found at the beginning
+    if (!pathname.toLowerCase().startsWith(base.toLowerCase())) {
+        return null;
+    }
+    return pathname.slice(base.length) || '/';
+}

package/lib/history/base.d.ts

@@ -38,13 +38,19 @@ export interface PushOptions {
     redirectedFrom?: Path;
     skipGuards?: boolean;
 }
+export declare type BaseHistoryOptions = {
+    basename?: string;
+};
 export default abstract class BaseHistory {
     action: Action;
     location: Location;
+    basename: string;
+    constructor({ basename }?: BaseHistoryOptions);
     doTransition: (to: PathRecord, onComplete: Function, onAbort?: Function, skipGuards?: boolean, isReplace?: boolean, redirectedFrom?: Path) => void;
     protected _index: number;
     protected _blockers: import("../utils").Events<Blocker<State>>;
     protected abstract getIndexAndLocation(): [number, Location];
+    /** setup will be called at `onTransition` and `onAbort` */
     abstract setup(): void;
     /**
      * Jump to the specified route

package/lib/history/base.js

@@ -22,12 +22,13 @@ exports.ACTION_PUSH = 'PUSH';
  */
 exports.ACTION_REPLACE = 'REPLACE';
 class BaseHistory {
-    constructor() {
+    constructor({ basename = '' } = {}) {
         this.action = exports.ACTION_POP;
         this.location = (0, utils_1.createLocation)('/');
         this.doTransition = () => void 0;
         this._index = 0;
         this._blockers = (0, utils_1.createEvents)();
+        this.basename = (0, utils_1.normalizeBase)(basename);
     }
     back() {
         this.go(-1);
@@ -39,7 +40,7 @@ class BaseHistory {
         const toPath = (0, utils_1.resolvePath)(to, from);
         return {
             path: toPath,
-            href: (0, utils_1.pathToString)(toPath)
+            href: (0, utils_1.pathToString)(toPath, this.basename)
         };
     }
     transitionTo(to, { onTransition, onAbort, action = exports.ACTION_PUSH, state = null, redirectedFrom, skipGuards }) {

package/lib/history/browser.d.ts

@@ -1,8 +1,9 @@
 import { PathRecord, Location, Blocker } from '../types';
-import BaseHistory, { PushOptions } from './base';
+import BaseHistory, { PushOptions, BaseHistoryOptions } from './base';
+export declare type BrowserHistoryOptions = BaseHistoryOptions;
 export default class BrowserHistory extends BaseHistory {
     private _history;
-    constructor();
+    constructor({ basename }?: BrowserHistoryOptions);
     push(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     go(delta: number): void;

package/lib/history/browser.js

@@ -3,13 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const base_1 = require("./base");
 class BrowserHistory extends base_1.default {
-    constructor() {
-        super();
+    constructor({ basename } = {}) {
+        super({ basename });
         this._history = window.history;
         [this._index, this.location] = this.getIndexAndLocation();
-        if (this._index == null) {
-            this._index = 0;
-            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '');
+        // redirect immediately if
+        // 1. no index
+        // 2. we're not on the right url (redirectedFrom means url not match basename)
+        const { notMatchBasename } = this.location;
+        if (this._index == null || notMatchBasename) {
+            this._index = this._index || 0;
+            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '', notMatchBasename ? this.resolve(this.location).href : undefined);
+        }
+        // recalculate location if not match basename
+        if (notMatchBasename) {
+            const state = this._history.state || {};
+            this.location = (0, utils_1.createLocation)(this.location, {
+                state: state.usr || null,
+                key: state.key || 'default'
+            });
         }
     }
     push(to, { state, redirectedFrom } = {}) {
@@ -98,6 +110,7 @@ class BrowserHistory extends base_1.default {
                 search,
                 hash
             }, {
+                basename: this.basename,
                 state: state.usr || null,
                 key: state.key || 'default'
             })

package/lib/history/hash.d.ts

@@ -1,8 +1,9 @@
 import { PathRecord, Location, Blocker, ResolvedPath } from '../types';
-import BaseHistory, { PushOptions } from './base';
+import BaseHistory, { PushOptions, BaseHistoryOptions } from './base';
+export declare type HashHistoryOptions = BaseHistoryOptions;
 export default class HashHistory extends BaseHistory {
     private _history;
-    constructor();
+    constructor({ basename }?: HashHistoryOptions);
     push(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom }?: PushOptions): void;
     go(delta: number): void;

package/lib/history/hash.js

@@ -2,29 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const base_1 = require("./base");
-function getBaseHref() {
-    let base = document.querySelector('base');
-    let href = '';
-    if (base && base.getAttribute('href')) {
-        let url = window.location.href;
-        let hashIndex = url.indexOf('#');
-        href = hashIndex === -1 ? url : url.slice(0, hashIndex);
-    }
-    return href;
-}
-function createHref(to) {
-    return (getBaseHref() +
-        '#' +
-        (typeof to === 'string' ? to : (0, utils_1.pathToString)((0, utils_1.resolvePath)(to))));
+function createHref(to, basename) {
+    return '#' + (0, utils_1.pathToString)((0, utils_1.resolvePath)(to), basename);
 }
 class HashHistory extends base_1.default {
-    constructor() {
-        super();
+    constructor({ basename } = {}) {
+        super({ basename });
         this._history = window.history;
         [this._index, this.location] = this.getIndexAndLocation();
-        if (this._index == null) {
-            this._index = 0;
-            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '');
+        // redirect immediately if
+        // 1. no index
+        // 2. we're not on the right url (redirectedFrom means url not match basename)
+        const { notMatchBasename } = this.location;
+        if (this._index == null || notMatchBasename) {
+            this._index = this._index || 0;
+            this._history.replaceState(Object.assign(Object.assign({}, this._history.state), { idx: this._index }), '', notMatchBasename ? this.resolve(this.location).href : undefined);
+        }
+        // recalculate location if not match basename
+        if (notMatchBasename) {
+            const state = this._history.state || {};
+            this.location = (0, utils_1.createLocation)(this.location, {
+                state: state.usr || null,
+                key: state.key || 'default'
+            });
         }
     }
     push(to, { state, redirectedFrom } = {}) {
@@ -56,7 +56,7 @@ class HashHistory extends base_1.default {
         const toPath = (0, utils_1.resolvePath)(to, from);
         return {
             path: toPath,
-            href: createHref(toPath)
+            href: createHref(toPath, this.basename)
         };
     }
     setup() {
@@ -129,6 +129,7 @@ class HashHistory extends base_1.default {
                 search,
                 hash
             }, {
+                basename: this.basename,
                 state: state.usr || null,
                 key: state.key || 'default'
             })

package/lib/history/index.d.ts

@@ -1,8 +1,8 @@
 import MemoryHistory, { MemoryHistoryOptions, InitialEntry } from './memory';
-import BrowserHistory from './browser';
-import HashHistory from './hash';
+import BrowserHistory, { BrowserHistoryOptions } from './browser';
+import HashHistory, { HashHistoryOptions } from './hash';
 export * from './base';
 export { MemoryHistory, MemoryHistoryOptions, InitialEntry };
-export declare function createBrowserHistory(): BrowserHistory;
-export declare function createHashHistory(): HashHistory;
+export declare function createBrowserHistory(options?: BrowserHistoryOptions): BrowserHistory;
+export declare function createHashHistory(options?: HashHistoryOptions): HashHistory;
 export declare function createMemoryHistory(options?: MemoryHistoryOptions): MemoryHistory;

package/lib/history/index.js

@@ -20,12 +20,12 @@ exports.MemoryHistory = memory_1.default;
 const browser_1 = require("./browser");
 const hash_1 = require("./hash");
 __exportStar(require("./base"), exports);
-function createBrowserHistory() {
-    return new browser_1.default();
+function createBrowserHistory(options = {}) {
+    return new browser_1.default(options);
 }
 exports.createBrowserHistory = createBrowserHistory;
-function createHashHistory() {
-    return new hash_1.default();
+function createHashHistory(options = {}) {
+    return new hash_1.default(options);
 }
 exports.createHashHistory = createHashHistory;
 function createMemoryHistory(options = {}) {

package/lib/history/memory.d.ts

@@ -1,4 +1,4 @@
-import { PathRecord, Location, Blocker, PartialLocation, ResolvedPath } from '../types';
+import { PathRecord, Location, Blocker, PartialLocation } from '../types';
 import BaseHistory, { PushOptions } from './base';
 /**
  * A user-supplied object that describes a location. Used when providing
@@ -8,15 +8,15 @@ export declare type InitialEntry = string | PartialLocation;
 export declare type MemoryHistoryOptions = {
     initialEntries?: InitialEntry[];
     initialIndex?: number;
+    basename?: string;
 };
 export default class MemoryHistory extends BaseHistory {
     private _entries;
-    constructor({ initialEntries, initialIndex }?: MemoryHistoryOptions);
+    constructor({ initialEntries, initialIndex, basename }?: MemoryHistoryOptions);
     setup(): void;
     push(to: PathRecord, { state, redirectedFrom, skipGuards }?: PushOptions): void;
     replace(to: PathRecord, { state, redirectedFrom, skipGuards }?: PushOptions): void;
     go(delta: number): void;
     block(blocker: Blocker): () => void;
-    resolve(to: PathRecord, from?: string): ResolvedPath;
     protected getIndexAndLocation(): [number, Location];
 }

package/lib/history/memory.js

@@ -6,11 +6,11 @@ function clamp(n, lowerBound, upperBound) {
     return Math.min(Math.max(n, lowerBound), upperBound);
 }
 class MemoryHistory extends base_1.default {
-    constructor({ initialEntries = ['/'], initialIndex } = {}) {
-        super();
+    constructor({ initialEntries = ['/'], initialIndex, basename = '' } = {}) {
+        super({ basename });
         this._entries = [];
         this._entries = initialEntries.map(entry => {
-            let location = (0, utils_1.createLocation)(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? (0, utils_1.resolvePath)(entry) : entry)));
+            let location = (0, utils_1.createLocation)(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? (0, utils_1.resolvePath)(entry) : entry)), { basename: this.basename });
             (0, utils_1.warning)(location.pathname.charAt(0) === '/', `Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: ${JSON.stringify(entry)})`);
             return location;
         });
@@ -65,13 +65,6 @@ class MemoryHistory extends base_1.default {
     block(blocker) {
         return this._blockers.push(blocker);
     }
-    resolve(to, from) {
-        const toPath = (0, utils_1.resolvePath)(to, from);
-        return {
-            path: toPath,
-            href: (0, utils_1.pathToString)(toPath)
-        };
-    }
     getIndexAndLocation() {
         const index = this._index;
         return [index, this._entries[index]];

package/lib/matchRoutes.js

@@ -71,12 +71,12 @@ function matchRoutes(routes, location, basename = '') {
     }
     let pathname = location.pathname || '/';
     if (basename) {
-        let base = basename.replace(/^\/*/, '/').replace(/\/+$/, '');
-        if (pathname.startsWith(base)) {
-            pathname = pathname === base ? '/' : pathname.slice(base.length);
+        const normalizedBasename = (0, utils_1.normalizeBase)(basename);
+        const pathnameWithoutBase = (0, utils_1.stripBase)(pathname, normalizedBasename);
+        if (pathnameWithoutBase) {
+            pathname = pathnameWithoutBase;
         }
         else {
-            // Pathname does not start with the basename, no match.
             return null;
         }
     }

package/lib/router.d.ts

@@ -4,7 +4,6 @@ interface IRouterOptions<RouteRecord extends IPartialRouteRecord> {
     history: History;
     routes: RouteRecord[];
     caseSensitive?: boolean;
-    basename?: string;
 }
 export declare const createRouter: <RouteRecord extends {
     path: string;

package/lib/router.js

@@ -20,7 +20,7 @@ const START = {
     redirected: false
 };
 class Router {
-    constructor({ basename = '', history, routes }) {
+    constructor({ history, routes }) {
         this._pending = null;
         this._cancleHandler = null;
         this._ready = false;
@@ -31,9 +31,14 @@ class Router {
         this._afterEachs = (0, utils_1.createEvents)();
         this.init = () => {
             const setup = () => this._history.setup();
-            this._history.transitionTo(this._getCurrent(), {
+            const current = this._getCurrent();
+            this._history.transitionTo(current, {
                 onTransition: setup,
-                onAbort: setup
+                onAbort: setup,
+                // current.redirected means the initial url does not match basename and should redirect
+                // so we just skip all guards
+                // this logic only applies to memory history
+                skipGuards: Boolean(current.redirected)
             });
             return this;
         };
@@ -68,11 +73,11 @@ class Router {
             return this._afterEachs.push(listener);
         };
         this.resolve = (to, from) => {
-            return this._history.resolve(to, from ? (0, utils_1.joinPaths)([this._basename, from]) : this._basename);
+            return this._history.resolve(to, from);
         };
         this.match = (to) => {
-            const { _routes: routes, _basename: basename } = this;
-            const matches = (0, matchRoutes_1.matchRoutes)(routes, to, basename);
+            const { _routes: routes } = this;
+            const matches = (0, matchRoutes_1.matchRoutes)(routes, to);
             return matches || [];
         };
         this.replaceRoutes = (routes) => {
@@ -97,7 +102,6 @@ class Router {
                 onAbort: setup
             });
         };
-        this._basename = (0, utils_1.normalizeBase)(basename);
         this._history = history;
         this._routes = (0, createRoutesFromArray_1.createRoutesFromArray)(routes);
         this._current = START;
@@ -115,6 +119,9 @@ class Router {
     get action() {
         return this._history.action;
     }
+    get basename() {
+        return this._history.basename;
+    }
     /*
       The Full Navigation Resolution Flow for shuvi/router
       1. Navigation triggered.
@@ -258,7 +265,7 @@ class Router {
             hash: location.hash,
             query: location.query,
             state: location.state,
-            redirected: !!location.redirectedFrom,
+            redirected: Boolean(location.redirectedFrom) || location.notMatchBasename,
             key: location.key
         };
     }

package/lib/types/history.d.ts

@@ -96,6 +96,7 @@ export interface PartialPath {
  */
 export interface Location<S extends State = State> extends Path {
     redirectedFrom?: Path;
+    notMatchBasename?: boolean;
     /**
      * An object of arbitrary data associated with this location.
      *
@@ -114,6 +115,7 @@ export interface Location<S extends State = State> extends Path {
  * A partial Location object that may be missing some properties.
  */
 export interface PartialLocation<S extends State = State> extends PartialPath {
+    redirectedFrom?: Path;
     /**
      * An object of arbitrary data associated with this location.
      *

package/lib/types/router.d.ts

@@ -63,6 +63,7 @@ export interface IRouter<RouteRecord extends {
 } = any> {
     current: IRoute<RouteRecord>;
     action: History['action'];
+    basename: string;
     push(to: PathRecord, state?: any): void;
     replace(to: PathRecord, state?: any): void;
     go: History['go'];

package/lib/utils/history.d.ts

@@ -1,6 +1,7 @@
 import { HistoryState, Location, PathRecord, State, Key, Blocker, Path } from '../types';
 import { Events } from './misc';
-export declare function createLocation(to: PathRecord, { state, key, redirectedFrom }?: {
+export declare function createLocation(to: PathRecord, { basename, state, key, redirectedFrom }?: {
+    basename?: string;
     state?: State;
     key?: Key;
     redirectedFrom?: Path;

package/lib/utils/history.js

@@ -13,8 +13,15 @@ function promptBeforeUnload(event) {
 function createKey() {
     return Math.random().toString(36).substr(2, 8);
 }
-function createLocation(to, { state = null, key, redirectedFrom } = {}) {
-    return (0, misc_1.readOnly)(Object.assign(Object.assign({}, (0, path_1.resolvePath)(to)), { redirectedFrom,
+function createLocation(to, { basename, state = null, key, redirectedFrom } = {}) {
+    const resolved = (0, path_1.resolvePath)(to);
+    const pathnameWithoutBase = (0, path_1.stripBase)(resolved.pathname, basename || '/');
+    if (pathnameWithoutBase) {
+        resolved.pathname = pathnameWithoutBase;
+    }
+    const notMatchBasename = Boolean(basename) && !pathnameWithoutBase;
+    return (0, misc_1.readOnly)(Object.assign(Object.assign({}, resolved), { redirectedFrom,
+        notMatchBasename,
         state, key: key || createKey() }));
 }
 exports.createLocation = createLocation;

package/lib/utils/path.d.ts

@@ -6,8 +6,16 @@ export declare const joinPaths: (paths: string[]) => string;
 export declare const splitPath: (path: string) => string[];
 export declare function normalizeBase(base: string): string;
 export declare function parseQuery(queryStr: string): qs.ParsedQuery<string>;
-export declare function pathToString({ pathname, search, hash, query }: PartialPath): string;
+export declare function pathToString({ pathname, search, hash, query }: PartialPath, basename?: string): string;
 /**
  * Parses a string URL path into its separate pathname, search, and hash components.
  */
 export declare function resolvePath(to: PathRecord, fromPathname?: string): Path;
+/**
+ * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
+ *
+ * @param pathname - location.pathname
+ * @param base - base to strip off
+ */
+export declare function stripBase(pathname: string, base: string): string | null;

package/lib/utils/path.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePath = exports.pathToString = exports.parseQuery = exports.normalizeBase = exports.splitPath = exports.joinPaths = exports.normalizeSlashes = exports.trimTrailingSlashes = void 0;
+exports.stripBase = exports.resolvePath = exports.pathToString = exports.parseQuery = exports.normalizeBase = exports.splitPath = exports.joinPaths = exports.normalizeSlashes = exports.trimTrailingSlashes = void 0;
 const qs = require("query-string");
-const dom_1 = require("./dom");
 const trimTrailingSlashes = (path) => path.replace(/\/+$/, '');
 exports.trimTrailingSlashes = trimTrailingSlashes;
 const normalizeSlashes = (path) => path.replace(/\/\/+/g, '/');
@@ -13,16 +12,7 @@ const splitPath = (path) => (0, exports.normalizeSlashes)(path).split('/');
 exports.splitPath = splitPath;
 function normalizeBase(base) {
     if (!base) {
-        if (dom_1.inBrowser) {
-            // respect <base> tag
-            const baseEl = document.querySelector('base');
-            base = (baseEl && baseEl.getAttribute('href')) || '/';
-            // strip full URL origin
-            base = base.replace(/^https?:\/\/[^\/]+/, '');
-        }
-        else {
-            base = '/';
-        }
+        base = '/';
     }
     // make sure there's the starting slash
     if (base.charAt(0) !== '/') {
@@ -36,12 +26,16 @@ function parseQuery(queryStr) {
     return qs.parse(queryStr);
 }
 exports.parseQuery = parseQuery;
-function pathToString({ pathname = '/', search = '', hash = '', query = {} }) {
+function pathToString({ pathname = '/', search = '', hash = '', query = {} }, basename) {
     if (!search) {
         const queryString = qs.stringify(query);
         search = queryString ? `?${queryString}` : '';
     }
-    return pathname + search + hash;
+    const pathString = pathname + search + hash;
+    if (basename) {
+        return (0, exports.joinPaths)([basename, pathString]);
+    }
+    return pathString;
 }
 exports.pathToString = pathToString;
 function resolvePathname(toPathname, fromPathname) {
@@ -110,3 +104,20 @@ function resolvePath(to, fromPathname = '/') {
     return parsedPath;
 }
 exports.resolvePath = resolvePath;
+/**
+ * Strips off the base from the beginning of a location.pathname in a non-case-sensitive way.
+ * If the base does not match at the beginning, null will be returned.
+ *
+ * @param pathname - location.pathname
+ * @param base - base to strip off
+ */
+function stripBase(pathname, base) {
+    if (!base || base === '/')
+        return pathname;
+    // no base or base is not found at the beginning
+    if (!pathname.toLowerCase().startsWith(base.toLowerCase())) {
+        return null;
+    }
+    return pathname.slice(base.length) || '/';
+}
+exports.stripBase = stripBase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/router",
-  "version": "1.0.44",
+  "version": "1.0.45",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -28,7 +28,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/utils": "1.0.44",
+    "@shuvi/utils": "1.0.45",
     "query-string": "6.13.8"
   }
 }

package/esm/utils/dom.d.ts

@@ -1 +0,0 @@
-export declare const inBrowser: boolean;

package/esm/utils/dom.js

@@ -1 +0,0 @@
-export const inBrowser = typeof window !== 'undefined';

package/lib/utils/dom.d.ts

@@ -1 +0,0 @@
-export declare const inBrowser: boolean;

package/lib/utils/dom.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.inBrowser = void 0;
-exports.inBrowser = typeof window !== 'undefined';