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

package/esm/shuvi-app/dev/websocket.js

@@ -0,0 +1,61 @@
+let source;
+const eventCallbacks = [];
+let lastActivity = Date.now();
+let initDataBeforeWsOnline = [];
+function getSocketProtocol(protocol) {
+    return protocol === 'http:' ? 'ws' : 'wss';
+}
+export function addMessageListener(cb) {
+    eventCallbacks.push(cb);
+}
+export function sendMessage(data) {
+    if (!source || source.readyState !== source.OPEN) {
+        initDataBeforeWsOnline.push(data);
+        return;
+    }
+    return source.send(data);
+}
+export function connectHMR(options) {
+    if (!options.timeout) {
+        options.timeout = 5000;
+    }
+    init();
+    let timer = setInterval(function () {
+        if (Date.now() - lastActivity > options.timeout) {
+            handleDisconnect();
+        }
+    }, options.timeout / 2);
+    function init() {
+        if (source)
+            source.close();
+        let { protocol, hostname, port } = options.location;
+        protocol = getSocketProtocol(protocol);
+        let url = `${protocol}://${hostname}:${port}`;
+        source = new WebSocket(`${url}${options.path}`);
+        source.onopen = handleOnline;
+        source.onerror = handleDisconnect;
+        source.onmessage = handleMessage;
+    }
+    function handleOnline() {
+        if (initDataBeforeWsOnline.length !== 0) {
+            initDataBeforeWsOnline.forEach(data => {
+                sendMessage(data);
+            });
+            initDataBeforeWsOnline = [];
+        }
+        if (options.log)
+            console.log('[HMR] connected');
+        lastActivity = Date.now();
+    }
+    function handleMessage(event) {
+        lastActivity = Date.now();
+        eventCallbacks.forEach(cb => {
+            cb(event);
+        });
+    }
+    function handleDisconnect() {
+        clearInterval(timer);
+        source.close();
+        setTimeout(init, options.timeout);
+    }
+}

package/esm/shuvi-app/entry/client/app.d.ts

@@ -1,2 +1,3 @@
+declare const app: import("../../app/client").Application;
 declare const run: () => Promise<void>;
-export { run };
+export { run, app };

package/esm/shuvi-app/entry/client/app.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { CLIENT_CONTAINER_ID } from '@shuvi/shared/lib/constants';
 // renderer must be imported before application
-// we need to init init renderer before import AppComponent
+// we need to init renderer before import AppComponent
 import { view, getRoutes, app as PlatformAppComponent } from '@shuvi/app/core/platform';
 import routes from '@shuvi/app/files/routes';
 import { getAppData } from '@shuvi/platform-shared/shared/helper/getAppData';
@@ -32,7 +32,7 @@ const run = () => __awaiter(void 0, void 0, void 0, function* () {
     yield app.init();
     render();
 });
-export { run };
+export { run, app };
 if (module.hot) {
     const handleHotUpdate = () => __awaiter(void 0, void 0, void 0, function* () {
         const rerender = () => __awaiter(void 0, void 0, void 0, function* () {

package/esm/shuvi-app/entry/client/run.dev.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 /// <reference lib="dom" />
 import { DEV_STYLE_HIDE_FOUC, DEV_STYLE_PREPARE } from '@shuvi/shared/lib/constants';
-import initWebpackHMR from '../../dev/webpackHotDevClient';
-import { run } from './app';
+import { initHMRAndDevClient } from '../../dev';
+import { run, app } from './app';
 function init() {
     return __awaiter(this, void 0, void 0, function* () {
-        initWebpackHMR();
+        initHMRAndDevClient(app);
         // reduce FOUC caused by style-loader
         const styleReady = new Promise(resolve => {
             (window.requestAnimationFrame || setTimeout)(() => __awaiter(this, void 0, void 0, function* () {
@@ -27,4 +27,4 @@ function init() {
         yield styleReady;
     });
 }
-init().then(run);
+init().then(() => run());

package/esm/shuvi-app/entry/server/index.d.ts

@@ -1,6 +1,7 @@
-import * as application from '../../app/server';
-import * as server from '@shuvi/app/user/server';
+import { default as pageRoutes } from '@shuvi/app/files/routes';
 import { default as apiRoutes } from '@shuvi/app/files/apiRoutes';
 import { default as middlewareRoutes } from '@shuvi/app/files/middlewareRoutes';
-export { server, application, apiRoutes, middlewareRoutes };
-export { view } from '@shuvi/app/core/platform';
+import { view } from '@shuvi/app/core/platform';
+import * as server from '@shuvi/app/user/server';
+import * as application from '../../app/server';
+export { pageRoutes, apiRoutes, middlewareRoutes, server, view, application };

package/esm/shuvi-app/entry/server/index.js

@@ -1,7 +1,8 @@
 // This is the shuvi server-side main module exports collection
-import * as application from '../../app/server';
-import * as server from '@shuvi/app/user/server';
+import { default as pageRoutes } from '@shuvi/app/files/routes';
 import { default as apiRoutes } from '@shuvi/app/files/apiRoutes';
 import { default as middlewareRoutes } from '@shuvi/app/files/middlewareRoutes';
-export { server, application, apiRoutes, middlewareRoutes };
-export { view } from '@shuvi/app/core/platform';
+import { view } from '@shuvi/app/core/platform';
+import * as server from '@shuvi/app/user/server';
+import * as application from '../../app/server';
+export { pageRoutes, apiRoutes, middlewareRoutes, server, view, application };

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

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { IApplication } from '@shuvi/platform-shared/shared';
-export default function AppContainer({ children, app }: {
+export default function AppContainer({ app, children }: React.PropsWithChildren<{
     app: IApplication;
-    children: React.ReactElement;
-}): JSX.Element;
+}>): JSX.Element;

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

@@ -1,10 +1,9 @@
 import * as React from 'react';
 import { errorModel } from '@shuvi/platform-shared/shared';
-import { createContainer } from '@shuvi/redox-react';
 import { AppProvider } from './applicationContext';
 import ErrorPage from './ErrorPage';
 import { ErrorBoundary } from './ErrorBoundary';
-const { Provider, useSharedModel } = createContainer();
+import { Provider, useSharedModel } from './store';
 function ErrorGuard({ children = null }) {
     const [errorState] = useSharedModel(errorModel);
     if (errorState.error !== undefined) {
@@ -12,10 +11,10 @@ function ErrorGuard({ children = null }) {
     }
     return <>{children}</>;
 }
-export default function AppContainer({ children, app }) {
+export default function AppContainer({ app, children }) {
     return (<ErrorBoundary>
       <AppProvider app={app}>
-        <Provider storeManager={app.storeManager}>
+        <Provider storeManager={app.store}>
           <ErrorGuard>{children}</ErrorGuard>
         </Provider>
       </AppProvider>

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,17 @@ 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 { __componentRawRequest__, __import__, __resolveWeak__, children } = originalRoute, rest = __rest(originalRoute, ["__componentRawRequest__", "__import__", "__resolveWeak__", "children"]);
         const route = Object.assign({}, rest);
         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);
+        return Object.assign({ __componentRawRequest__, __resolveWeak__ }, route);
     });
     const routesWithRequire = getRoutesWithRequire(routes || []);
     return routesWithRequire;

package/esm/shuvi-app/react/redox-react/RedoxWrapper.d.ts

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

package/esm/shuvi-app/react/redox-react/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 storeManager={appContext.store}>
+        <App />
       </RedoxRoot>);
     }
     RedoxAppWrapper.displayName = 'RedoxAppWrapper';

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

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

package/esm/shuvi-app/react/redox-react/runtime.js

@@ -11,6 +11,8 @@ import { createRuntimePlugin } from '@shuvi/platform-shared/shared';
 import { RedoxWrapper } from './RedoxWrapper';
 export default createRuntimePlugin({
     appComponent: (App, appContext) => __awaiter(void 0, void 0, void 0, function* () {
-        return RedoxWrapper(App, appContext);
+        return RedoxWrapper(App, {
+            store: appContext.store
+        });
     })
 });

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

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

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

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

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,18 @@
 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 { useSharedModel } from './store';
 export const noLoaderMessage = 'Warning: no loader found. Please make sure the page component where `useLoaderData` is called has a `loader` export.';
 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;
+    const [loader] = useSharedModel(loaderModel, s => {
+        return {
+            hasLoader: Object.prototype.hasOwnProperty.call(s.dataByRouteId, id),
+            data: s.dataByRouteId[id]
+        };
+    }, [id]);
+    if (!loader.hasLoader) {
         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 loader.data;
 };

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

@@ -20,8 +20,8 @@ export class ReactClientView {
         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;
+            const { router, appComponent: AppComponent, setError: setAppError } = app;
+            let { ssr, dynamicIds } = appData;
             // For e2e test
             if (window.__SHUVI) {
                 window.__SHUVI.router = router;
@@ -39,13 +39,13 @@ export class ReactClientView {
                 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>);

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

@@ -9,7 +9,7 @@ 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 Loadable, { LoadableContext } from '../loadable';
@@ -19,20 +19,17 @@ export class ReactServerView {
     constructor() {
         this.renderApp = ({ app, manifest, getAssetPublicUrl }) => __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 head;
@@ -47,7 +44,6 @@ export class ReactServerView {
                 htmlContent = renderToString(RootApp);
             }
             finally {
-                loaderManager.clearAllData();
                 head = Head.rewind() || [];
             }
             const { loadble } = manifest;
@@ -88,13 +84,11 @@ export class ReactServerView {
                 }
             }
             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/shuvi-runtime-index.js

@@ -1,2 +1,2 @@
-// exported by @shuvi/runtme
+// exported by @shuvi/runtime
 export {};

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

@@ -13,7 +13,7 @@ declare const _default: {
         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>[]>;
+        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<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>;
 };

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

@@ -50,9 +50,18 @@ const plugin = (0, service_1.createPlugin)({
     setup: ({ addHooks }) => {
         addHooks({ addRoutes: hooks_1.addRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
     },
-    addRuntimeFile: ({ defineFile }, context) => __awaiter(void 0, void 0, void 0, function* () {
+    addRuntimeFile: ({ defineFile, getContent }, context) => __awaiter(void 0, void 0, void 0, function* () {
         const { config: { routes: pageRoutes, middlewareRoutes, apiRoutes, conventionRoutes }, paths, pluginRunner, phase } = context;
         const isBuildPhase = phase === 'PHASE_PRODUCTION_BUILD';
+        const rawRoutes = defineFile({
+            name: 'virtual-raw-routes.js',
+            virtual: true,
+            content: () => __awaiter(void 0, void 0, void 0, function* () {
+                const rawRoutes = yield (0, node_1.getRawRoutesFromDir)(paths.routesDir, conventionRoutes.exclude);
+                return rawRoutes;
+            }),
+            dependencies: [paths.routesDir]
+        });
         const pageRoutesFile = defineFile({
             name: 'routes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
@@ -62,7 +71,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = pageRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getPageRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning.msg);
@@ -77,7 +86,7 @@ const plugin = (0, service_1.createPlugin)({
                 (0, page_1.setRoutes)(normalizedRoutes);
                 return (0, page_1.generateRoutesContent)(normalizedRoutes);
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const apiRoutesFile = defineFile({
             name: 'apiRoutes.js',
@@ -88,7 +97,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = apiRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getApiRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -98,7 +107,7 @@ const plugin = (0, service_1.createPlugin)({
                 }
                 return (0, api_1.generateRoutesContent)(routes, paths.routesDir);
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const middlewareRoutesFile = defineFile({
             name: 'middlewareRoutes.js',
@@ -109,7 +118,7 @@ const plugin = (0, service_1.createPlugin)({
                     routes = middlewareRoutes;
                 }
                 else {
-                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(paths.routesDir, conventionRoutes.exclude);
+                    const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
                     if (isBuildPhase) {
                         warnings.forEach(warning => {
                             console.warn(warning);
@@ -122,7 +131,7 @@ const plugin = (0, service_1.createPlugin)({
                     baseDir: paths.routesDir
                 });
             }),
-            dependencies: [paths.routesDir]
+            dependencies: [rawRoutes]
         });
         const loadersFile = defineFile({
             name: 'loaders.js',
@@ -167,6 +176,7 @@ const plugin = (0, service_1.createPlugin)({
             dependencies: [loadersFile]
         });
         return [
+            rawRoutes,
             pageRoutesFile,
             apiRoutesFile,
             middlewareRoutesFile,

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

@@ -1,8 +1,8 @@
 import { IPageRouteConfig, IPageRouteConfigWithId } from '@shuvi/platform-shared/shared';
 export { IPageRouteConfig };
 /**
- * returns JSON string of IRawPageRouteRecord
+ * returns JSON string of IPageRouteConfigWithId
  */
-export declare function serializeRoutes(routes: IPageRouteConfigWithId[]): string;
+export declare function serializeRoutes(routes: IPageRouteConfigWithId[], isServer: boolean): string;
 export declare function normalizeRoutes(routes: IPageRouteConfig[], componentDir: string, parentPath?: string): IPageRouteConfigWithId[];
 export declare const generateRoutesContent: (routes: IPageRouteConfigWithId[]) => string;

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

@@ -10,18 +10,23 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRoutesContent = exports.normalizeRoutes = exports.serializeRoutes = void 0;
 const crypto_1 = require("crypto");
+const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const file_1 = require("@shuvi/utils/lib/file");
 function genRouteId(filepath) {
     return (0, crypto_1.createHash)('md4').update(filepath).digest('hex').substr(0, 4);
 }
+const KEEP_SYMBOL = querystring_1.default.stringify({ keep: ['default'] });
 /**
- * returns JSON string of IRawPageRouteRecord
+ * returns JSON string of IPageRouteConfigWithId
  */
-function serializeRoutes(routes) {
+function serializeRoutes(routes, isServer) {
     let res = '';
     for (let index = 0; index < routes.length; index++) {
         const _a = routes[index], { children: childRoutes } = _a, route = __rest(_a, ["children"]);
@@ -33,16 +38,18 @@ function serializeRoutes(routes) {
             if (key === 'component') {
                 const { component } = route;
                 const componentSource = component;
-                const componentSourceWithAffix = `${componentSource}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}`;
+                const componentRequest = `${componentSource}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}&${KEEP_SYMBOL}`;
                 // `webpackExports` works with production and optimization.minimize, check compiled dist
-                strRoute +=
-                    `__componentSourceWithAffix__: "${componentSourceWithAffix}",
-__componentSource__: "${componentSource}",
+                if (isServer) {
+                    strRoute += `__componentRawRequest__: "${componentRequest}",\n`;
+                    strRoute += `__componentSource__: "${componentSource}",\n`;
+                }
+                strRoute += `
 __import__: () => import(
   /* webpackChunkName: "page-${id}" */
   /* webpackExports: "default" */
-  "${componentSourceWithAffix}"),
-__resolveWeak__: () => [require.resolveWeak("${componentSourceWithAffix}")]`.trim();
+  "${componentRequest}"),
+__resolveWeak__: () => [require.resolveWeak("${componentRequest}")]`.trim();
             }
             else {
                 strRoute += `${key}: ${JSON.stringify(route[key])}`;
@@ -50,7 +57,7 @@ __resolveWeak__: () => [require.resolveWeak("${componentSourceWithAffix}")]`.tri
             strRoute += `,\n`;
         }
         if (childRoutes && childRoutes.length > 0) {
-            strRoute += `children: ${serializeRoutes(childRoutes)},\n`;
+            strRoute += `children: ${serializeRoutes(childRoutes, isServer)},\n`;
         }
         res += `{${strRoute}},\n`;
     }
@@ -77,7 +84,18 @@ function normalizeRoutes(routes, componentDir, parentPath = '') {
 }
 exports.normalizeRoutes = normalizeRoutes;
 const generateRoutesContent = (routes) => {
-    const serialized = serializeRoutes(routes);
-    return `export default ${serialized}`;
+    const serverRoutes = serializeRoutes(routes, true);
+    const clientRoutes = serializeRoutes(routes, false);
+    return `
+let routes;
+
+if (typeof windows === 'undefined') {
+  routes = ${serverRoutes}
+} else {
+  routes = ${clientRoutes}
+}
+
+export default routes
+`;
 };
 exports.generateRoutesContent = generateRoutesContent;

package/lib/node/features/html-render/index.d.ts

@@ -1,19 +1,4 @@
+import { IPlatformContext, ResolvedPlugin } from '@shuvi/service/lib/core';
 export { getPageMiddleware, IHtmlDocument, ITemplateData, IViewServer, IViewClient } from './lib';
-declare const _default: {
-    core: import("@shuvi/hook").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>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/service/lib/server/pluginTypes").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
-    types: string;
-};
-export default _default;
+/** This plugin uses `platformContext` so that it is set to a plugin getter */
+export declare const getPlugin: (platformContext: IPlatformContext) => ResolvedPlugin;