@shuvi/platform-web 1.0.0-rc.13 → 1.0.0-rc.16

package/esm/shared/appTypes.d.ts

@@ -1,17 +1,21 @@
-import { IPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
-import { Application } from '@shuvi/platform-shared/shuvi-app/application';
+import { IPageRouteRecord, IAppData, IAppState, Application as _Application } from '@shuvi/platform-shared/shared';
+import { ApplicationImpl as _ApplicationImpl } from '@shuvi/platform-shared/shuvi-app/application';
 import type { ShuviRequest } from '@shuvi/service';
+export interface AppConfig {
+    ssr: boolean;
+}
+export declare type InternalApplication = _ApplicationImpl<AppConfig>;
+export declare type Application = _Application<AppConfig>;
 export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
-        isDev: boolean;
-    }): Application;
+    }): InternalApplication;
 }
 export interface CreateAppClient {
     (options: {
         routes: IPageRouteRecord[];
         appComponent: any;
         appData: IAppData<any, IAppState>;
-    }): Application;
+    }): InternalApplication;
 }

package/esm/shared/constants.d.ts

@@ -0,0 +1,8 @@
+export { BUNDLER_TARGET_CLIENT, BUNDLER_TARGET_SERVER, CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/lib/constants';
+export declare const CLIENT_BUILD_MANIFEST_PATH = "../build-manifest.client.json";
+export declare const SERVER_BUILD_MANIFEST_PATH = "../build-manifest.server.json";
+export declare const BUILD_CLIENT_RUNTIME_POLYFILLS = "static/polyfills";
+export declare const BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL: unique symbol;
+export declare const BUILD_CLIENT_RUNTIME_WEBPACK = "static/webpack-runtime";
+export declare const BUILD_CLIENT_RUNTIME_MAIN = "static/main";
+export declare const BUILD_SERVER_FILE_SERVER = "server";

package/esm/shared/constants.js

@@ -0,0 +1,8 @@
+export { BUNDLER_TARGET_CLIENT, BUNDLER_TARGET_SERVER, CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/lib/constants';
+export const CLIENT_BUILD_MANIFEST_PATH = '../build-manifest.client.json';
+export const SERVER_BUILD_MANIFEST_PATH = '../build-manifest.server.json';
+export const BUILD_CLIENT_RUNTIME_POLYFILLS = `static/polyfills`;
+export const BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL = Symbol(`polyfills`);
+export const BUILD_CLIENT_RUNTIME_WEBPACK = `static/webpack-runtime`;
+export const BUILD_CLIENT_RUNTIME_MAIN = `static/main`;
+export const BUILD_SERVER_FILE_SERVER = `server`;

package/esm/shared/htmlRenderer.d.ts

@@ -0,0 +1,33 @@
+export interface IModuleItem {
+    id: string;
+    name: string;
+}
+export interface IModule {
+    files: string[];
+    children: IModuleItem[];
+}
+export declare type IAssetMap = {
+    js: string[];
+    css?: string[];
+} & {
+    [ext: string]: string[];
+};
+export interface IChunk {
+    file: string;
+    request: string;
+}
+export interface IManifest {
+    polyfillFiles?: string[];
+    entries: {
+        [s: string]: IAssetMap;
+    };
+    bundles: {
+        [name: string]: string;
+    };
+    chunkRequest: {
+        [file: string]: string;
+    };
+    loadble: {
+        [s: string]: IModule;
+    };
+}

package/esm/shared/htmlRenderer.js

@@ -0,0 +1 @@
+export {};

package/esm/shared/index.d.ts

@@ -1,5 +1,7 @@
 export * from './appTypes';
 export * from './configTypes';
+export * from './constants';
+export * from './htmlRenderer';
 export * from './renderTypes';
 export * from './routeTypes';
 export * from './serverTypes';

package/esm/shared/index.js

@@ -1,5 +1,7 @@
 export * from './appTypes';
 export * from './configTypes';
+export * from './constants';
+export * from './htmlRenderer';
 export * from './renderTypes';
 export * from './routeTypes';
 export * from './serverTypes';

package/esm/shared/renderTypes.d.ts

@@ -1,8 +1,9 @@
-import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import type { ShuviRequest } from '@shuvi/service';
-import { Response, IApplication, IAppData } from '@shuvi/platform-shared/shared';
+import { Response, IAppData } from '@shuvi/platform-shared/shared';
+import { IManifest } from '../shared';
+import { Application } from './appTypes';
 export declare type IRenderViewOptions = {
-    app: IApplication;
+    app: Application;
 };
 export interface IRenderOptions extends IRenderViewOptions {
 }
@@ -37,7 +38,6 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
 export interface IServerRendererOptions extends IRenderOptions {
     req: ShuviRequest;
     manifest: IManifest;
-    isDev?: boolean;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

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

@@ -1,4 +1,3 @@
-import { Application } from '@shuvi/platform-shared/shuvi-app/application';
-import { CreateAppClient } from '../../shared';
-export { Application };
+import { InternalApplication, CreateAppClient } from '../../shared';
+export { InternalApplication };
 export declare const createApp: CreateAppClient;

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

@@ -9,14 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getRoutes } from '@shuvi/app/core/platform';
 import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
-import application, { Application } from '@shuvi/platform-shared/shuvi-app/application';
+import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createBrowserHistory, createHashHistory } from '@shuvi/router';
 import pageLoaders from '@shuvi/app/files/page-loaders';
 import { historyMode } from '@shuvi/app/files/routerConfig';
 import { SHUVI_ERROR } from '@shuvi/shared/lib/constants';
 import { serializeServerError } from '../helper/serializeServerError';
 let app;
-export { Application };
 export const createApp = ({ routes, appData, appComponent }) => {
     // app is a singleton in client side
     if (app) {
@@ -37,7 +36,8 @@ export const createApp = ({ routes, appData, appComponent }) => {
     app = application({
         initialState: appState,
         AppComponent: appComponent,
-        router
+        router,
+        config: { ssr }
     });
     const loadersData = app.getLoadersData();
     const hasHydrateData = Object.keys(loadersData).length > 0;
@@ -109,7 +109,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
                 next();
                 return;
             }
-            app.setError(serializeServerError(error, process.env.NODE_ENV === 'development'));
+            app.setError(serializeServerError(error));
             next();
             return;
         }

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

@@ -16,7 +16,7 @@ import { createRouter, createMemoryHistory } from '@shuvi/router';
 import chalk from '@shuvi/utils/lib/chalk';
 import { serializeServerError } from '../helper/serializeServerError';
 export const createApp = options => {
-    const { req, ssr, isDev } = options;
+    const { req, ssr } = options;
     const history = createMemoryHistory({
         initialEntries: [(req && req.url) || '/'],
         initialIndex: 0
@@ -50,10 +50,10 @@ export const createApp = options => {
                     next();
                     return;
                 }
-                if (isDev) {
+                if (process.env.NODE_ENV === 'development') {
                     console.error(chalk.red('error') + ' - ' + error.stack);
                 }
-                app.setError(serializeServerError(error, isDev));
+                app.setError(serializeServerError(error));
                 next();
                 return;
             }
@@ -62,7 +62,10 @@ export const createApp = options => {
     }
     app = application({
         AppComponent,
-        router
+        router,
+        config: {
+            ssr
+        }
     });
     return app;
 };

package/esm/shuvi-app/dev/index.d.ts

@@ -1,3 +1,3 @@
-import { Application } from '@shuvi/platform-shared/shuvi-app/application';
+import { InternalApplication } from '../../shared';
 import { HotDevClient } from './hotDevClient';
-export declare const initHMRAndDevClient: (app: Application) => HotDevClient;
+export declare const initHMRAndDevClient: (app: InternalApplication) => HotDevClient;

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

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

package/esm/shuvi-app/helper/serializeServerError.d.ts

@@ -1,2 +1,2 @@
 import { IError } from '@shuvi/platform-shared/shared';
-export declare function serializeServerError(err: Error, dev: boolean | undefined): IError;
+export declare function serializeServerError(err: Error): IError;

package/esm/shuvi-app/helper/serializeServerError.js

@@ -9,8 +9,8 @@ function errorToJSON(err) {
         stack: err.stack
     };
 }
-export function serializeServerError(err, dev) {
-    if (dev) {
+export function serializeServerError(err) {
+    if (process.env.NODE_ENV === 'development') {
         return errorToJSON(err);
     }
     return {

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

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

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { errorModel } from '@shuvi/platform-shared/shared';
-import { AppProvider } from './applicationContext';
+import { AppProvider } from './ApplicationContext';
 import ErrorPage from './ErrorPage';
 import { ErrorBoundary } from './ErrorBoundary';
 import { Provider, useSharedModel } from './store';

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

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { Application } from '../../shared';
+export declare const ApplicationContext: React.Context<Application>;
+export declare function AppProvider({ app, children }: React.PropsWithChildren<{
+    app: Application;
+}>): JSX.Element;
+export declare function useApp(): Application;

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

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Head } from './head';
+import { useApp } from './ApplicationContext';
 const style = {
     container: {
         color: '#000',
@@ -25,13 +26,15 @@ const style = {
     }
 };
 export default function Error({ errorCode, errorDesc }) {
+    const app = useApp();
     return (<div style={style.container}>
       <Head>
         <title>Page Error</title>
       </Head>
 
       <div style={style.error}>
-        <div style={style.errorCode}>{errorCode}</div>
+        {/* 500 will cause confusion for SPA application, so only show error code on SSR */}
+        {app.config.ssr && <div style={style.errorCode}>{errorCode}</div>}
         <div style={style.errorDesc}>{errorDesc || 'Error'}</div>
       </div>
     </div>);

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/view/ReactView.server.jsx

@@ -19,7 +19,7 @@ import { Head } from '../head';
 import { serializeServerError } from '../../helper/serializeServerError';
 export class ReactServerView {
     constructor() {
-        this.renderApp = ({ req, app, manifest, isDev }) => __awaiter(this, void 0, void 0, function* () {
+        this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
             const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
@@ -46,10 +46,10 @@ export class ReactServerView {
                 htmlContent = renderToString(RootApp);
             }
             catch (error) {
-                if (isDev) {
+                if (process.env.NODE_ENV === 'development') {
                     console.error(chalk.red('error') + ' - ' + error.stack);
                 }
-                setAppError(serializeServerError(error, isDev));
+                setAppError(serializeServerError(error));
                 htmlContent = renderToString(RootApp); // Consistency on both server and client side
             }
             finally {
@@ -72,6 +72,18 @@ 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',

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

@@ -8,21 +8,29 @@ 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"));
+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)) || {};
+        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, context)) || {};
     },
     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);
+        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;
+            console.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, context)) || 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));
+        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, pluginContext));
     })
 });

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/index.js

@@ -20,6 +20,7 @@ const middleware_1 = require("./middleware");
 Object.defineProperty(exports, "getMiddlewareMiddleware", { enumerable: true, get: function () { return middleware_1.middleware; } });
 const api_1 = require("./api");
 Object.defineProperty(exports, "getApiMiddleware", { enumerable: true, get: function () { return api_1.middleware; } });
+let isWarnedAddMiddlewareRoutes = false;
 const plugin = (0, service_1.createPlugin)({
     setup: ({ addHooks }) => {
         addHooks({ addRoutes: hooks_1.addRoutes, addApiRoutes: hooks_1.addApiRoutes, addMiddlewareRoutes: hooks_1.addMiddlewareRoutes });
@@ -79,15 +80,23 @@ const plugin = (0, service_1.createPlugin)({
         const middlewareRoutesFile = defineFile({
             name: 'middlewareRoutes.js',
             content: () => __awaiter(void 0, void 0, void 0, function* () {
-                const { routes: _routes, warnings } = yield (0, node_1.getMiddlewareRoutes)(getContent(rawRoutes), conventionRoutes.exclude);
-                if (isBuildPhase) {
-                    warnings.forEach(warning => {
-                        console.warn(warning);
-                    });
-                }
-                const fsRoutes = _routes;
+                // Remove the 'middleware' file convention first, and deal with it in a future major update.
+                // const { routes: _routes, warnings } = await getMiddlewareRoutes(
+                //   getContent(rawRoutes),
+                //   conventionRoutes.exclude
+                // );
+                // if (isBuildPhase) {
+                //   warnings.forEach(warning => {
+                //     console.warn(warning);
+                //   });
+                // }
+                // let fsRoutes = _routes;
                 const pluginRoutes = (yield pluginRunner.addMiddlewareRoutes()).flat();
-                return (0, middleware_1.generateRoutesContent)(pluginRoutes.concat(fsRoutes), {
+                if (!isWarnedAddMiddlewareRoutes && pluginRoutes.length > 0) {
+                    console.warn('Warning: addMiddlewareRoutes is an experimental feature, we recommend using api routes instead.');
+                    isWarnedAddMiddlewareRoutes = true;
+                }
+                return (0, middleware_1.generateRoutesContent)(pluginRoutes, {
                     baseDir: paths.routesDir
                 });
             }),

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

@@ -8,14 +8,17 @@ 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"));
 function middleware(_api) {
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { middlewareRoutes = [] } = resources_1.server;
+            const { middlewareRoutes = [] } = resources_1.default.server;
             // match path for get middlewares
             let middlewares = [];
             for (let i = 0; i < middlewareRoutes.length; i++) {

package/lib/node/features/html-render/index.js

@@ -14,18 +14,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlugin = exports.getPageMiddleware = void 0;
 const service_1 = require("@shuvi/service");
-const constants_1 = require("@shuvi/shared/lib/constants");
 const config_1 = require("@shuvi/toolpack/lib/webpack/config");
 const copy_file_plugin_1 = require("@shuvi/toolpack/lib/webpack/plugins/copy-file-plugin");
+const shared_1 = require("../../../shared");
 const paths_1 = require("../../paths");
 const version_1 = require("../../version");
 const middlewares_1 = require("../middlewares");
 const generateResource_1 = __importDefault(require("./lib/generateResource"));
 const buildHtml_1 = require("./lib/buildHtml");
+const build_manifest_plugin_1 = __importDefault(require("./lib/webpack/build-manifest-plugin"));
 const server_1 = __importDefault(require("./server"));
+const ENTRY_FLAG = 'shuviEntry';
+function makeEntryRequest(req) {
+    return `${req}?${ENTRY_FLAG}=true`;
+}
+function getClientEntry() {
+    return {
+        [shared_1.BUILD_CLIENT_RUNTIME_MAIN]: [
+            makeEntryRequest((0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/client'))
+        ]
+    };
+}
 function getServerEntry() {
     return {
-        [service_1.BUILD_SERVER_FILE_SERVER]: [(0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/server')]
+        [shared_1.BUILD_SERVER_FILE_SERVER]: [
+            makeEntryRequest((0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/server'))
+        ]
     };
 }
 var lib_1 = require("./lib");
@@ -33,42 +47,58 @@ Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: fun
 /** This plugin uses `platformContext` so that it is set to a plugin getter */
 const getPlugin = (platformContext) => {
     const core = (0, service_1.createPlugin)({
-        configWebpack: (chain, { name }) => {
+        configWebpack: (chain, { name, mode }) => {
+            const isDev = mode === 'development';
             const pkgVersion = (0, version_1.getVersion)();
-            if (name === constants_1.BUNDLER_DEFAULT_TARGET) {
+            const isServer = name === shared_1.BUNDLER_TARGET_SERVER;
+            const isClient = name === shared_1.BUNDLER_TARGET_CLIENT;
+            if (isClient) {
                 chain.merge({
-                    entry: {
-                        [service_1.BUILD_CLIENT_RUNTIME_MAIN]: [
-                            (0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/client')
-                        ]
-                    }
+                    entry: getClientEntry()
                 });
+                chain.optimization.runtimeChunk({ name: shared_1.BUILD_CLIENT_RUNTIME_WEBPACK });
                 chain.plugin('polyfills').use(copy_file_plugin_1.CopyFilePlugin, [
                     {
                         filePath: (0, paths_1.resolvePkgFile)('polyfills/polyfills.js'),
                         cacheKey: pkgVersion,
-                        name: service_1.BUILD_CLIENT_RUNTIME_POLYFILLS,
+                        name: shared_1.BUILD_CLIENT_RUNTIME_POLYFILLS,
                         info: {
-                            [constants_1.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL]: 1,
+                            [shared_1.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL]: 1,
                             // This file is already minified
                             minimized: true
                         }
                     }
                 ]);
+                chain.plugin('private/build-manifest').use(build_manifest_plugin_1.default, [
+                    {
+                        filename: shared_1.CLIENT_BUILD_MANIFEST_PATH,
+                        modules: true,
+                        chunkRequest: isDev
+                    }
+                ]);
+            }
+            else if (isServer) {
+                chain.plugin('private/build-manifest').use(build_manifest_plugin_1.default, [
+                    {
+                        filename: shared_1.SERVER_BUILD_MANIFEST_PATH,
+                        modules: false,
+                        chunkRequest: isDev
+                    }
+                ]);
             }
             return chain;
         },
         addExtraTarget: ({ createConfig }, context) => {
             const serverWebpackHelpers = (0, config_1.webpackHelpers)();
             const serverChain = createConfig({
-                name: constants_1.BUNDLER_TARGET_SERVER,
+                name: shared_1.BUNDLER_TARGET_SERVER,
                 node: true,
                 entry: getServerEntry(),
-                outputDir: service_1.BUILD_SERVER_DIR,
+                outputDir: shared_1.SERVER_OUTPUT_DIR,
                 webpackHelpers: serverWebpackHelpers
             });
             return {
-                name: constants_1.BUNDLER_TARGET_SERVER,
+                name: shared_1.BUNDLER_TARGET_SERVER,
                 chain: serverChain
             };
         },
@@ -83,10 +113,6 @@ const getPlugin = (platformContext) => {
             return [routerConfigFile];
         },
         addRuntimeService: () => [
-            {
-                source: (0, paths_1.resolvePkgFile)('esm/shuvi-app/shuvi-runtime-index'),
-                exported: '*'
-            },
             {
                 source: (0, paths_1.resolvePkgFile)('lib/node/shuvi-runtime-server'),
                 filepath: 'server.ts',

package/lib/node/features/html-render/lib/buildHtml.js

@@ -38,6 +38,7 @@ const fse = __importStar(require("fs-extra"));
 const node_mocks_http_1 = require("node-mocks-http");
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
+const shared_1 = require("../../../../shared");
 const buildHtml = ({ context, serverPlugins, getMiddlewares, pathname, filename }) => __awaiter(void 0, void 0, void 0, function* () {
     return new Promise(resolve => {
         const request = (0, node_mocks_http_1.createRequest)({
@@ -48,7 +49,7 @@ const buildHtml = ({ context, serverPlugins, getMiddlewares, pathname, filename
         });
         response.on('end', () => {
             const html = response._getBuffer();
-            fse.writeFileSync(path.resolve(context.paths.buildDir, service_1.BUILD_DEFAULT_DIR, filename), html);
+            fse.writeFileSync(path.resolve(context.paths.buildDir, shared_1.CLIENT_OUTPUT_DIR, filename), html);
             resolve();
         });
         (0, service_1.createShuviServer)({

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

@@ -1,3 +1,3 @@
-import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
 import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+import { IManifest } from '../../../../shared';
 export default function generateFilesByRoutId(assetMap: IManifest, routes: IPageRouteRecord[]): Record<string, string[]>;