@shuvi/platform-web 1.0.0-rc.2 → 1.0.0-rc.20

package/esm/shuvi-app/react/Link.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="react" />
 import { LinkProps } from '@shuvi/router-react';
-export declare const Link: ({ prefetch, onMouseEnter, to, ref, ...rest }: LinkWrapperProps) => JSX.Element;
+export declare const Link: ({ to, ref, prefetch, onMouseEnter, ...rest }: LinkWrapperProps) => JSX.Element;
 interface LinkWrapperProps extends LinkProps {
+    prefetch?: boolean;
     ref?: any;
 }
 export {};

package/esm/shuvi-app/react/Link.jsx

@@ -71,7 +71,7 @@ const isAbsoluteUrl = (url) => {
     return ABSOLUTE_URL_REGEX.test(url);
 };
 export const Link = function LinkWithPrefetch(_a) {
-    var { prefetch, onMouseEnter, to, ref } = _a, rest = __rest(_a, ["prefetch", "onMouseEnter", "to", "ref"]);
+    var { to, ref, prefetch, onMouseEnter } = _a, rest = __rest(_a, ["to", "ref", "prefetch", "onMouseEnter"]);
     const isHrefValid = typeof to === 'string' && !isAbsoluteUrl(to);
     const previousHref = React.useRef(to);
     const [setIntersectionRef, isVisible, resetVisible] = useIntersection({});

package/esm/shuvi-app/react/getRoutes.d.ts

@@ -1,2 +1,2 @@
-import { IPageRouteRecord, IRawPageRouteRecord } from '@shuvi/platform-shared/shared';
-export default function getRoutes(routes: IRawPageRouteRecord[]): IPageRouteRecord[];
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+export default function getRoutes(routes: IPageRouteRecord[]): IPageRouteRecord[];

package/esm/shuvi-app/react/getRoutes.js

@@ -13,18 +13,19 @@ import { loadRouteComponent } from './loadRouteComponent';
 export default function getRoutes(routes) {
     const getRoutesWithRequire = (routes) => routes.map(x => {
         const originalRoute = Object.assign({}, x);
-        const { __componentSource__, __componentSourceWithAffix__, __import__, __resolveWeak__, children } = originalRoute, rest = __rest(originalRoute, ["__componentSource__", "__componentSourceWithAffix__", "__import__", "__resolveWeak__", "children"]);
-        const route = Object.assign({}, rest);
+        const { __componentRawRequest__, __import__, __resolveWeak__, children } = originalRoute, route = __rest(originalRoute, ["__componentRawRequest__", "__import__", "__resolveWeak__", "children"]);
         if (children) {
             route.children = getRoutesWithRequire(children);
         }
-        if (__componentSourceWithAffix__ && __import__) {
-            route.component = loadRouteComponent(__import__, {
-                webpack: __resolveWeak__,
-                modules: [__componentSourceWithAffix__]
-            });
+        if (__import__) {
+            route.component = loadRouteComponent(__import__, Object.assign({ webpack: __resolveWeak__ }, (__componentRawRequest__ && {
+                modules: [__componentRawRequest__]
+            })));
         }
-        return Object.assign({ __componentSourceWithAffix__, __resolveWeak__ }, route);
+        if (__componentRawRequest__) {
+            route.__componentRawRequest__ = __componentRawRequest__;
+        }
+        return route;
     });
     const routesWithRequire = getRoutesWithRequire(routes || []);
     return routesWithRequire;

package/esm/shuvi-app/react/{redox-react → model}/RedoxWrapper.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
-import type { IStoreManager } from '@shuvi/redox';
+import type { RedoxStore } from '@shuvi/redox';
 export declare const RedoxWrapper: (App: any, appContext: {
-    storeManager: IStoreManager;
+    store: RedoxStore;
 }) => {
-    (appProps: any): JSX.Element;
+    (): JSX.Element;
     displayName: string;
 };

package/esm/shuvi-app/react/{redox-react → model}/RedoxWrapper.jsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { RedoxRoot } from '@shuvi/redox-react';
 export const RedoxWrapper = (App, appContext) => {
-    function RedoxAppWrapper(appProps) {
-        return (<RedoxRoot storeManager={appContext.storeManager}>
-        <App {...appProps}/>
+    function RedoxAppWrapper() {
+        return (<RedoxRoot store={appContext.store}>
+        <App />
       </RedoxRoot>);
     }
     RedoxAppWrapper.displayName = 'RedoxAppWrapper';

package/esm/shuvi-app/react/model/runtime.d.ts

@@ -0,0 +1,8 @@
+import { RedoxStore } from '@shuvi/redox';
+declare module '@shuvi/runtime' {
+    interface CustomAppContext {
+        store: RedoxStore;
+    }
+}
+declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").RuntimePluginHooks, void>;
+export default _default;

package/esm/shuvi-app/react/{redox-react → model}/runtime.js

@@ -7,10 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { createRuntimePlugin } from '@shuvi/platform-shared/shared';
+import { createRuntimePluginAfter } from '@shuvi/platform-shared/shared';
 import { RedoxWrapper } from './RedoxWrapper';
-export default createRuntimePlugin({
+// this needs to be run last
+export default createRuntimePluginAfter({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
-        return RedoxWrapper(App, appContext);
+        return RedoxWrapper(App, {
+            store: appContext.store
+        });
     })
+}, {
+    name: 'model-react'
 });

package/esm/shuvi-app/react/store.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+declare const Provider: (props: import("react").PropsWithChildren<{
+    store?: import("@shuvi/redox").RedoxStore | undefined;
+}>) => JSX.Element, useSharedModel: import("@shuvi/redox-react/esm/types").IUseModel, useStaticModel: import("@shuvi/redox-react/esm/types").IUseStaticModel;
+export { Provider, useSharedModel, useStaticModel };

package/esm/shuvi-app/react/store.js

@@ -0,0 +1,3 @@
+import { createContainer } from '@shuvi/redox-react';
+const { Provider, useSharedModel, useStaticModel } = createContainer();
+export { Provider, useSharedModel, useStaticModel };

package/esm/shuvi-app/react/types.d.ts

@@ -1,14 +1,7 @@
-import { IAppState } from '@shuvi/platform-shared/shared';
 import { IHtmlTag, IViewClient, IViewServer } from '../../shared';
 export { IHtmlTag };
 export declare type IReactAppData = {
-    appProps?: Record<string, any>;
-    errorProps?: {
-        notFound: boolean;
-    };
     dynamicIds?: Array<string | number>;
-    appState?: IAppState;
-    loadersData: any;
 };
 export declare type IReactServerView = IViewServer<IReactAppData>;
 export declare type IReactClientView = IViewClient<IReactAppData>;

package/esm/shuvi-app/react/useLoaderData.js

@@ -1,27 +1,16 @@
 import { useMatchedRoute } from '@shuvi/router-react';
-import { getLoaderManager } from '@shuvi/platform-shared/shared';
-import { useRef, useEffect, useReducer } from 'react';
+import { loaderModel } from '@shuvi/platform-shared/shared';
+import { useStaticModel } from './store';
 export const noLoaderMessage = 'Warning: no loader found. Please make sure the page component where `useLoaderData` is called has a `loader` export.';
+const hasOwn = Object.prototype.hasOwnProperty;
 export const useLoaderData = () => {
-    var _a;
     const currentMatch = useMatchedRoute();
-    const loaderManager = getLoaderManager();
-    const id = (_a = currentMatch.route) === null || _a === void 0 ? void 0 : _a.id;
-    const data = loaderManager.getData(id);
-    if (data === null) {
+    const id = currentMatch.route.id;
+    // we don't need to watch the model change, cause it always change with
+    // matched route
+    const [state] = useStaticModel(loaderModel);
+    if (!hasOwn.call(state.current.dataByRouteId, id)) {
         throw Error(noLoaderMessage);
     }
-    const dataRef = useRef(data);
-    const [_, forceUpdate] = useReducer(state => state * -1, 1);
-    useEffect(() => {
-        const cancel = loaderManager.subscribe(() => {
-            const newData = loaderManager.getData(id);
-            if (newData !== data) {
-                dataRef.current = newData;
-                forceUpdate();
-            }
-        });
-        return cancel;
-    }, []);
-    return dataRef.current;
+    return state.current.dataByRouteId[id];
 };

package/esm/shuvi-app/react/view/ReactView.client.jsx

@@ -10,54 +10,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as React from 'react';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { Router } from '@shuvi/router-react';
+import { getServerError } from '@shuvi/error-overlay';
 import AppContainer from '../AppContainer';
 import { HeadManager, HeadManagerContext } from '../head';
 import Loadable from '../loadable';
-import { renderAction } from './render-action';
+import { doRender } from './render';
 const headManager = new HeadManager();
 export class ReactClientView {
     constructor() {
         this._isInitialRender = true;
         this.renderApp = ({ appContainer, app, appData }) => __awaiter(this, void 0, void 0, function* () {
             const { _isInitialRender: isInitialRender } = this;
-            const { router, appComponent: AppComponent, error } = app;
-            let { ssr, appProps, dynamicIds } = appData;
-            // For e2e test
-            if (window.__SHUVI) {
-                window.__SHUVI.router = router;
-            }
-            else {
-                window.__SHUVI = { router };
-            }
+            const { router, appComponent: AppComponent, setError: setAppError, error: appError } = app;
+            let { ssr, dynamicIds } = appData;
+            const shouldHydrate = ssr && isInitialRender;
             const TypedAppComponent = AppComponent;
-            if (ssr) {
-                yield Loadable.preloadReady(dynamicIds);
-                yield router.ready;
+            if (ssr && isInitialRender) {
+                if (process.env.NODE_ENV === 'development') {
+                    if (appError && appError.source === 'server') {
+                        setTimeout(() => {
+                            var _a;
+                            let error;
+                            try {
+                                // Generate a new error object. We `throw` it because some browsers
+                                // will set the `stack` when thrown, and we want to ensure ours is
+                                // not overridden when we re-throw it below.
+                                throw new Error(appError.message);
+                            }
+                            catch (e) {
+                                error = e;
+                            }
+                            error.name = (_a = appError.name) !== null && _a !== void 0 ? _a : '';
+                            error.stack = appError.stack;
+                            throw getServerError(error);
+                        });
+                    }
+                }
+                yield Promise.all([Loadable.preloadReady(dynamicIds), router.ready]);
             }
             else {
                 yield router.ready;
                 const { matches } = router.current;
                 if (!matches.length) {
                     // no handler no matches
-                    error.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+                    setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
                 }
             }
             const root = (<Router router={router}>
         <AppContainer app={app}>
           <HeadManagerContext.Provider value={headManager.updateHead}>
-            <TypedAppComponent {...appProps}/>
+            <TypedAppComponent />
           </HeadManagerContext.Provider>
         </AppContainer>
       </Router>);
-            const ssrCallback = () => {
-                this._isInitialRender = false;
-            };
-            renderAction({
-                ssr,
-                isInitialRender,
+            doRender({
                 root,
-                callback: ssrCallback,
-                appContainer
+                appContainer,
+                shouldHydrate
+            }, () => {
+                this._isInitialRender = false;
             });
         });
     }

package/esm/shuvi-app/react/view/ReactView.server.jsx

@@ -9,32 +9,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import * as React from 'react';
 import { renderToString } from 'react-dom/server';
-import { getLoaderManager, redirect } from '@shuvi/platform-shared/shared';
+import { redirect } from '@shuvi/platform-shared/shared';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { Router } from '@shuvi/router-react';
+import logger from '@shuvi/utils/lib/logger';
 import Loadable, { LoadableContext } from '../loadable';
 import AppContainer from '../AppContainer';
 import { Head } from '../head';
+import { serializeServerError } from '../../helper/serializeServerError';
 export class ReactServerView {
     constructor() {
-        this.renderApp = ({ app, manifest, getAssetPublicUrl }) => __awaiter(this, void 0, void 0, function* () {
+        this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
-            const { storeManager, router, error: appError, appComponent: AppComponent } = app;
+            const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
             // todo: move these into renderer
             let { pathname, matches, redirected } = router.current;
             // handler no matches
             if (!matches.length) {
-                appError.error(SHUVI_ERROR.PAGE_NOT_FOUND);
+                setAppError(SHUVI_ERROR.PAGE_NOT_FOUND);
             }
             if (redirected) {
                 return redirect(pathname);
             }
-            // todo: move loader into app, avoid using global module
-            const loaderManager = getLoaderManager();
-            const loadersData = yield loaderManager.getAllData();
             const loadableModules = [];
-            let htmlContent;
+            let htmlContent = undefined;
             let head;
             const RootApp = (<Router static router={router}>
         <AppContainer app={app}>
@@ -46,8 +45,14 @@ export class ReactServerView {
             try {
                 htmlContent = renderToString(RootApp);
             }
+            catch (error) {
+                if (process.env.NODE_ENV === 'development') {
+                    logger.error(error.stack);
+                }
+                setAppError(serializeServerError(error));
+                htmlContent = renderToString(RootApp); // Consistency on both server and client side
+            }
             finally {
-                loaderManager.clearAllData();
                 head = Head.rewind() || [];
             }
             const { loadble } = manifest;
@@ -67,12 +72,24 @@ export class ReactServerView {
             const preloadDynamicChunks = [];
             const styles = [];
             for (const file of dynamicImportChunkSet) {
+                // Safari Bug: https://bugs.webkit.org/show_bug.cgi?id=187726
+                // If a request is preloaded, Safari will always retrieve it from the
+                // cache, regardless of the cache headers for that request.
+                // disable preload for safari on dev
+                if (process.env.NODE_ENV === 'development') {
+                    const ua = req.headers['user-agent'] || '';
+                    if (/safari/i.test(ua) && !/chrome/i.test(ua)) {
+                        if (/\.js$/.test(file)) {
+                            continue;
+                        }
+                    }
+                }
                 if (/\.js$/.test(file)) {
                     preloadDynamicChunks.push({
                         tagName: 'link',
                         attrs: {
                             rel: 'preload',
-                            href: getAssetPublicUrl(file),
+                            href: req.getAssetUrl(file),
                             as: 'script'
                         }
                     });
@@ -82,19 +99,17 @@ export class ReactServerView {
                         tagName: 'link',
                         attrs: {
                             rel: 'stylesheet',
-                            href: getAssetPublicUrl(file)
+                            href: req.getAssetUrl(file)
                         }
                     });
                 }
             }
             const appData = {
-                dynamicIds: [...dynamicImportIdSet],
-                loadersData
+                dynamicIds: [...dynamicImportIdSet]
             };
             if (dynamicImportIdSet.size) {
                 appData.dynamicIds = Array.from(dynamicImportIdSet);
             }
-            appData.appState = storeManager.getState();
             return {
                 appData,
                 content: htmlContent,

package/esm/shuvi-app/react/view/render.d.ts

@@ -0,0 +1,8 @@
+import { ReactNode } from 'react';
+declare type RenderActionParam = {
+    appContainer: Element | Document;
+    root?: ReactNode;
+    shouldHydrate?: boolean;
+};
+declare let doRender: (options: RenderActionParam, callback: () => void) => void;
+export { doRender };

package/esm/shuvi-app/react/view/{render-action.js → render.js}

@@ -1,9 +1,9 @@
-let renderAction;
+let doRender;
 if (process.env.__SHUVI__AFTER__REACT__18__) {
     const { createRoot, hydrateRoot } = require('react-dom/client');
     let renderRoot;
-    renderAction = ({ ssr, isInitialRender, root, callback, appContainer }) => {
-        if (ssr && isInitialRender) {
+    doRender = ({ root, appContainer, shouldHydrate }, callback) => {
+        if (shouldHydrate) {
             renderRoot = hydrateRoot(appContainer, root);
             callback === null || callback === void 0 ? void 0 : callback();
         }
@@ -17,8 +17,8 @@ if (process.env.__SHUVI__AFTER__REACT__18__) {
 }
 else {
     const { hydrate, render } = require('react-dom');
-    renderAction = ({ ssr, isInitialRender, root, callback, appContainer }) => {
-        if (ssr && isInitialRender) {
+    doRender = ({ root, appContainer, shouldHydrate }, callback) => {
+        if (shouldHydrate) {
             hydrate(root, appContainer, callback);
         }
         else {
@@ -26,4 +26,4 @@ else {
         }
     };
 }
-export { renderAction };
+export { doRender };

package/lib/node/features/custom-server/index.d.ts

@@ -1,4 +1,4 @@
 declare const _default: {
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").ServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 };
 export default _default;

package/lib/node/features/custom-server/server.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
+declare const _default: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").ServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
 export default _default;

package/lib/node/features/custom-server/server.js

@@ -8,21 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+let isWarnedhandlePageRequest = false;
 exports.default = (0, service_1.createServerPlugin)({
-    getPageData: (appContext, context) => {
-        var _a, _b;
-        return ((_b = (_a = resources_1.server === null || resources_1.server === void 0 ? void 0 : resources_1.server.server) === null || _a === void 0 ? void 0 : _a.getPageData) === null || _b === void 0 ? void 0 : _b.call(_a, appContext, context)) || {};
+    getPageData: appContext => {
+        var _a, _b, _c;
+        return ((_c = (_b = (_a = resources_1.default.server) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.getPageData) === null || _c === void 0 ? void 0 : _c.call(_b, appContext)) || {};
     },
-    handlePageRequest: (originalHandlePageRequest, context) => {
-        var _a, _b;
-        return (((_b = (_a = resources_1.server === null || resources_1.server === void 0 ? void 0 : resources_1.server.server) === null || _a === void 0 ? void 0 : _a.handlePageRequest) === null || _b === void 0 ? void 0 : _b.call(_a, originalHandlePageRequest, context)) ||
-            originalHandlePageRequest);
+    handlePageRequest: originalHandlePageRequest => {
+        var _a, _b, _c, _d, _e;
+        if (!isWarnedhandlePageRequest &&
+            ((_b = (_a = resources_1.default.server) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.handlePageRequest) !== undefined) {
+            isWarnedhandlePageRequest = true;
+            logger_1.default.warn('Warning: handlePageRequest is an experimental feature, please use with caution.');
+        }
+        return (((_e = (_d = (_c = resources_1.default.server) === null || _c === void 0 ? void 0 : _c.server) === null || _d === void 0 ? void 0 : _d.handlePageRequest) === null || _e === void 0 ? void 0 : _e.call(_d, originalHandlePageRequest)) || originalHandlePageRequest);
     },
-    modifyHtml: (document, context, pluginContext) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        yield ((_b = (_a = resources_1.server === null || resources_1.server === void 0 ? void 0 : resources_1.server.server) === null || _a === void 0 ? void 0 : _a.modifyHtml) === null || _b === void 0 ? void 0 : _b.call(_a, document, context, pluginContext));
+    modifyHtml: (document, context) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b, _c;
+        yield ((_c = (_b = (_a = resources_1.default.server) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.modifyHtml) === null || _c === void 0 ? void 0 : _c.call(_b, document, context));
     })
 });

package/lib/node/features/filesystem-routes/api/apiRouteHandler.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
-import { IResponse, IRequest } from '@shuvi/service';
+import { ShuviRequest, ShuviResponse } from '@shuvi/service';
 import { IApiRequestHandler, IApiResponse } from '../../../../shared';
 export { IApiRequestHandler };
-export declare function apiRouteHandler(req: IRequest, res: IResponse, resolver: IApiRequestHandler, apiRoutesConfig: any): Promise<void>;
+export declare function apiRouteHandler(req: ShuviRequest, res: ShuviResponse, resolver: IApiRequestHandler, apiRoutesConfig: any): Promise<void>;
 /**
  * Parse incoming message like `json` or `urlencoded`
  * @param req request object
  */
-export declare function parseBody(req: IRequest, limit: string | number): Promise<any>;
+export declare function parseBody(req: ShuviRequest, limit: string | number): Promise<any>;
 /**
  * Parse cookies from `req` header
  * @param req request object
@@ -21,27 +21,27 @@ export declare function getCookieParser(req: IncomingMessage): {
  * @param res ServerResponse object
  * @param statusCode `HTTP` status code of response
  */
-export declare function sendStatusCode<IRes extends IApiResponse>(res: IResponse, statusCode: number): IRes;
+export declare function sendStatusCode<IRes extends IApiResponse>(res: ShuviResponse, statusCode: number): IRes;
 /**
  *
  * @param res response object
  * @param [statusOrUrl] `HTTP` status code of redirect
  * @param url URL of redirect
  */
-export declare function redirect<IRes extends IApiResponse>(res: IResponse, statusOrUrl: string | number, url?: string): IRes;
+export declare function redirect<IRes extends IApiResponse>(res: ShuviResponse, statusOrUrl: string | number, url?: string): IRes;
 /**
  * Send `any` body to response
  * @param req request object
  * @param res response object
  * @param body of response
  */
-export declare function sendData(req: IRequest, res: IResponse, body: any): void;
+export declare function sendData(req: ShuviRequest, res: ShuviResponse, body: any): void;
 /**
  * Send `JSON` object
  * @param res response object
  * @param jsonBody of data
  */
-export declare function sendJson(req: IRequest, res: IResponse, jsonBody: any): void;
+export declare function sendJson(req: ShuviRequest, res: ShuviResponse, jsonBody: any): void;
 /**
  * Custom error class
  */

package/lib/node/features/filesystem-routes/api/apiRouteHandler.js

@@ -31,6 +31,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiError = exports.sendJson = exports.sendData = exports.redirect = exports.sendStatusCode = exports.getCookieParser = exports.parseBody = exports.apiRouteHandler = void 0;
 const stream_1 = require("stream");
@@ -38,15 +41,12 @@ const querystring = __importStar(require("querystring"));
 const cookie = __importStar(require("cookie"));
 const getRawBody = require('raw-body');
 const contentType = __importStar(require("content-type"));
+const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
 function apiRouteHandler(req, res, resolver, apiRoutesConfig) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const { bodyParser } = apiRoutesConfig || {};
-            const { pathname, query, params } = req;
             const apiReq = {
-                pathname,
-                query,
-                params,
                 // Parsing of cookies
                 cookies: getCookieParser(req)
             };
@@ -70,7 +70,7 @@ function apiRouteHandler(req, res, resolver, apiRoutesConfig) {
             if (process.env.NODE_ENV !== 'production' &&
                 !(res.finished || res.headersSent) &&
                 !wasPiped) {
-                console.warn(`API resolved without sending a response for ${req.url}, this may result in stalled requests.`);
+                logger_1.default.warn(`API resolved without sending a response for ${req.url}, this may result in stalled requests.`);
             }
         }
         catch (err) {

package/lib/node/features/filesystem-routes/api/middleware.d.ts

@@ -1,2 +1,2 @@
-import { IServerPluginContext, IRequestHandlerWithNext } from '@shuvi/service';
-export declare function middleware(_ctx: IServerPluginContext): IRequestHandlerWithNext;
+import { IServerPluginContext, ShuviRequestHandler } from '@shuvi/service';
+export declare function middleware(_ctx: IServerPluginContext): ShuviRequestHandler;

package/lib/node/features/filesystem-routes/api/middleware.js

@@ -8,15 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.middleware = void 0;
 const router_1 = require("@shuvi/router");
-const resources_1 = require("@shuvi/service/lib/resources");
+const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
 const apiRouteHandler_1 = require("./apiRouteHandler");
 function middleware(_ctx) {
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { apiRoutes } = resources_1.server;
+            const { apiRoutes } = resources_1.default.server;
             let tempApiModule;
             for (const { path, api } of apiRoutes) {
                 const match = (0, router_1.matchPathname)(path, req.pathname);

package/lib/node/features/filesystem-routes/hooks.d.ts

@@ -1,3 +1,4 @@
-import { IPageRouteConfig, IMiddlewareRouteConfig } from '@shuvi/platform-shared/shared';
+import { IPageRouteConfig, IMiddlewareRouteConfig, IApiRouteConfig } from '@shuvi/platform-shared/shared';
 export declare const addRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IPageRouteConfig[]>;
 export declare const addMiddlewareRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IMiddlewareRouteConfig[]>;
+export declare const addApiRoutes: import("@shuvi/hook").AsyncParallelHook<void, void, IApiRouteConfig[]>;

package/lib/node/features/filesystem-routes/hooks.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addMiddlewareRoutes = exports.addRoutes = void 0;
+exports.addApiRoutes = exports.addMiddlewareRoutes = exports.addRoutes = void 0;
 const hook_1 = require("@shuvi/hook");
 exports.addRoutes = (0, hook_1.createAsyncParallelHook)();
 exports.addMiddlewareRoutes = (0, hook_1.createAsyncParallelHook)();
+exports.addApiRoutes = (0, hook_1.createAsyncParallelHook)();

package/lib/node/features/filesystem-routes/index.d.ts

@@ -3,18 +3,6 @@ import { middleware as getMiddlewareMiddleware } from './middleware';
 import { IApiRequestHandler, middleware as getApiMiddleware } from './api';
 export { IApiRequestHandler, getRoutes, getMiddlewareMiddleware, getApiMiddleware };
 declare const _default: {
-    core: import("@shuvi/platform-shared/shared").IPluginInstance<{
-        extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
-        afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-        afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-        afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-        configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-        addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-        addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-        addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    core: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;