@shuvi/platform-web 1.0.0-rc.1 → 1.0.0-rc.4

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function generateFilesByRoutId(assetMap, routes) {
     let filesByRoutId = {};
     const loadable = assetMap.loadble;
-    routes.forEach(({ id, __componentSourceWithAffix__ }) => {
-        if (id && __componentSourceWithAffix__) {
-            filesByRoutId[id] = loadable[__componentSourceWithAffix__].files;
+    routes.forEach(({ id, __componentRawRequest__ }) => {
+        if (__componentRawRequest__) {
+            filesByRoutId[id] = loadable[__componentRawRequest__].files;
         }
     });
     return filesByRoutId;

package/lib/node/features/{main → html-render/lib}/generateResource.js

@@ -26,24 +26,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const fse = __importStar(require("fs-extra"));
 const service_1 = require("@shuvi/service");
+const file_utils_1 = require("@shuvi/service/lib/project/file-utils");
 const generateResources = (context) => {
     const { resolveUserFile } = context;
     const { buildDir } = context.paths;
-    const serverManifestPath = path.join(buildDir, service_1.BUILD_SERVER_DIR, service_1.SERVER_BUILD_MANIFEST_PATH);
+    const clientManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_DEFAULT_DIR, service_1.CLIENT_BUILD_MANIFEST_PATH));
+    const serverManifestRequest = (0, file_utils_1.urlToRequest)(path.join(buildDir, service_1.BUILD_SERVER_DIR, service_1.SERVER_BUILD_MANIFEST_PATH));
+    const serverModuleDir = path.join(buildDir, service_1.BUILD_SERVER_DIR);
     const result = [];
-    result.push([
-        'clientManifest',
-        path.join(buildDir, service_1.BUILD_DEFAULT_DIR, service_1.CLIENT_BUILD_MANIFEST_PATH)
-    ]);
-    result.push(['serverManifest', serverManifestPath]);
+    result.push(['clientManifest', clientManifestRequest]);
+    result.push(['serverManifest', serverManifestRequest]);
     result.push([
         `server = function() {
-    var path = require('path');
-    return require(path.join(
-      '${buildDir}',
-      '${service_1.BUILD_SERVER_DIR}',
-      require('${serverManifestPath}')['bundles']['${service_1.BUILD_SERVER_FILE_SERVER}']
-    ))
+    const path = require('path');
+    const relativeModulePath = require('${serverManifestRequest}')['bundles']['${service_1.BUILD_SERVER_FILE_SERVER}'];
+    const modulePath = require.resolve(path.join("${serverModuleDir}", relativeModulePath));
+    return require(modulePath)
   }`,
         undefined
     ]);

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 import { IHtmlDocument } from '../html-render';

package/lib/node/features/html-render/shuvi-app.d.ts

@@ -1,11 +1,6 @@
-import { extendedHooks } from './serverHooks';
+export {};
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
         pageData?: any;
     }
-    interface CustomServerPluginHooks {
-        getPageData: typeof extendedHooks.getPageData;
-        handlePageRequest: typeof extendedHooks.handlePageRequest;
-        modifyHtml: typeof extendedHooks.modifyHtml;
-    }
 }

package/lib/node/features/index.d.ts

@@ -1,43 +1,4 @@
-export { buildHtml } from './main/buildHtml';
+import { IPlatformContext, ResolvedPlugin } from '@shuvi/service/lib/core';
+export { buildHtml } from './html-render/lib/buildHtml';
 export { getMiddlewares, getMiddlewaresBeforeDevMiddlewares } from './middlewares';
-export { getPlugin as getMainPlugin } from './main';
-export declare const featurePlugins: (import("@shuvi/hook").IPluginInstance<{
-    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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext> | {
-    core: import("@shuvi/hook").IPluginInstance<{
-        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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    types: string;
-} | {
-    core: import("@shuvi/hook").IPluginInstance<{
-        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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
-    server: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/server/plugin").BuiltInServerPluginHooks & import("@shuvi/runtime").CustomServerPluginHooks, import("@shuvi/service").IServerPluginContext>;
-})[];
+export declare const getPlugins: (platformContext: IPlatformContext) => ResolvedPlugin[];

package/lib/node/features/index.js

@@ -3,23 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.featurePlugins = exports.getMainPlugin = exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = exports.buildHtml = void 0;
+exports.getPlugins = exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = exports.buildHtml = void 0;
 const on_demand_compile_page_1 = __importDefault(require("./on-demand-compile-page"));
-const html_render_1 = __importDefault(require("./html-render"));
+const html_render_1 = require("./html-render");
 const custom_server_1 = __importDefault(require("./custom-server"));
 const model_1 = __importDefault(require("./model"));
 const filesystem_routes_1 = __importDefault(require("./filesystem-routes"));
-var buildHtml_1 = require("./main/buildHtml");
+const webpack_watch_wait_for_file_builder_1 = __importDefault(require("./webpack-watch-wait-for-file-builder"));
+var buildHtml_1 = require("./html-render/lib/buildHtml");
 Object.defineProperty(exports, "buildHtml", { enumerable: true, get: function () { return buildHtml_1.buildHtml; } });
 var middlewares_1 = require("./middlewares");
 Object.defineProperty(exports, "getMiddlewares", { enumerable: true, get: function () { return middlewares_1.getMiddlewares; } });
 Object.defineProperty(exports, "getMiddlewaresBeforeDevMiddlewares", { enumerable: true, get: function () { return middlewares_1.getMiddlewaresBeforeDevMiddlewares; } });
-var main_1 = require("./main");
-Object.defineProperty(exports, "getMainPlugin", { enumerable: true, get: function () { return main_1.getPlugin; } });
-exports.featurePlugins = [
+const getPlugins = (platformContext) => [
+    (0, html_render_1.getPlugin)(platformContext),
     on_demand_compile_page_1.default,
     filesystem_routes_1.default,
-    html_render_1.default,
     custom_server_1.default,
-    model_1.default
+    model_1.default,
+    webpack_watch_wait_for_file_builder_1.default
 ];
+exports.getPlugins = getPlugins;

package/lib/node/features/middlewares.d.ts

@@ -1,4 +1,4 @@
 import { IServerPluginContext, IServerMiddleware } from '@shuvi/service';
 import { DevMiddleware } from '@shuvi/service/lib/server/middlewares/dev/devMiddleware';
 export declare const getMiddlewares: (context: IServerPluginContext) => IServerMiddleware[];
-export declare const getMiddlewaresBeforeDevMiddlewares: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware;
+export declare const getMiddlewaresBeforeDevMiddlewares: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware[];

package/lib/node/features/middlewares.js

@@ -4,10 +4,8 @@ exports.getMiddlewaresBeforeDevMiddlewares = exports.getMiddlewares = void 0;
 const on_demand_compile_page_1 = require("./on-demand-compile-page");
 const filesystem_routes_1 = require("./filesystem-routes");
 const html_render_1 = require("./html-render");
-let onDemandRouteManager;
 const getMiddlewares = (context) => {
     return [
-        onDemandRouteManager && onDemandRouteManager.ensureRoutesMiddleware(),
         (0, filesystem_routes_1.getMiddlewareMiddleware)(context),
         (0, filesystem_routes_1.getApiMiddleware)(context),
         (0, html_render_1.getPageMiddleware)(context)
@@ -15,8 +13,11 @@ const getMiddlewares = (context) => {
 };
 exports.getMiddlewares = getMiddlewares;
 const getMiddlewaresBeforeDevMiddlewares = (devMiddleware, context) => {
-    onDemandRouteManager = new on_demand_compile_page_1.OnDemandRouteManager(context);
+    const onDemandRouteManager = new on_demand_compile_page_1.OnDemandRouteManager(context);
     onDemandRouteManager.devMiddleware = devMiddleware;
-    return onDemandRouteManager.getServerMiddleware();
+    return [
+        onDemandRouteManager.getServerMiddleware(),
+        onDemandRouteManager.ensureRoutesMiddleware() // check page request
+    ];
 };
 exports.getMiddlewaresBeforeDevMiddlewares = getMiddlewaresBeforeDevMiddlewares;

package/lib/node/features/model/index.d.ts

@@ -1,5 +1,6 @@
 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>;
@@ -8,9 +9,9 @@ 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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {
         plugin: string;
     };

package/lib/node/features/model/runtime.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const redox_1 = require("@shuvi/redox");
 const shared_1 = require("@shuvi/platform-shared/shared");
-let currentStoreManager;
+let currentStore;
 const isServer = typeof window === 'undefined';
 // for client, singleton mode
 // for server, return new store
@@ -21,27 +21,21 @@ const initStore = ({ initialState, ctx }) => {
         return createStoreInstance();
     }
     // for client is singleton, just init once
-    if (currentStoreManager) {
-        return createStoreInstance();
+    if (!currentStore) {
+        currentStore = createStoreInstance();
     }
-    currentStoreManager = createStoreInstance();
-    return currentStoreManager;
+    return currentStore;
 };
 exports.default = (0, shared_1.createRuntimePlugin)({
     appContext: ctx => {
-        if (!ctx.storeManager) {
-            let initialState = {};
-            if (!isServer) {
-                initialState = (0, shared_1.getPageData)('redox');
-            }
-            if (ctx.pageData && ctx.pageData.redox) {
-                initialState = ctx.pageData.redox;
-            }
-            ctx.storeManager = initStore({
-                ctx,
-                initialState
-            });
+        let initialState = {};
+        if (!isServer) {
+            initialState = (0, shared_1.getPageData)('shuviInitialState', {});
         }
+        ctx.store = initStore({
+            ctx,
+            initialState
+        });
         return ctx;
     }
 });

package/lib/node/features/model/server.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
 exports.default = (0, service_1.createServerPlugin)({
     getPageData: appContext => {
-        const { storeManager } = appContext;
-        delete appContext.storeManager;
+        const { store } = appContext;
         return {
-            redox: storeManager === null || storeManager === void 0 ? void 0 : storeManager.getState()
+            shuviInitialState: store.getState()
         };
     }
 });

package/lib/node/features/model/shuvi-app.d.ts

@@ -1,6 +1,6 @@
 import type { IStoreManager } from '@shuvi/redox';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        storeManager?: IStoreManager;
+        store: IStoreManager;
     }
 }

package/lib/node/features/on-demand-compile-page/index.d.ts

@@ -1,14 +1,17 @@
-declare const _default: import("@shuvi/hook").IPluginInstance<{
-    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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+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").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>;
+};
 export default _default;
 export { default as OnDemandRouteManager } from './onDemandRouteManager';

package/lib/node/features/on-demand-compile-page/index.js

@@ -10,7 +10,7 @@ const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/web
 const require_cache_hot_reloader_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/require-cache-hot-reloader-plugin"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const dumbRouteComponent = require.resolve('./emptyComponent');
-exports.default = (0, service_1.createPlugin)({
+const plugin = (0, service_1.createPlugin)({
     configWebpack(config, _, ctx) {
         if (ctx.mode === 'development') {
             config.plugin('private/module-replace-plugin').use(module_replace_plugin_1.default, [
@@ -32,5 +32,8 @@ exports.default = (0, service_1.createPlugin)({
         return config;
     }
 });
+exports.default = {
+    core: plugin
+};
 var onDemandRouteManager_1 = require("./onDemandRouteManager");
 Object.defineProperty(exports, "OnDemandRouteManager", { enumerable: true, get: function () { return __importDefault(onDemandRouteManager_1).default; } });

package/lib/node/features/on-demand-compile-page/onDemandRouteManager.js

@@ -13,10 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const router_1 = require("@shuvi/router");
-const constants_1 = require("@shuvi/shared/lib/constants");
 const resources_1 = require("@shuvi/service/lib/resources");
 const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/module-replace-plugin"));
-const index_1 = require("../filesystem-routes/index");
 function acceptsHtml(header, { htmlAcceptHeaders = ['text/html', '*/*'] } = {}) {
     for (var i = 0; i < htmlAcceptHeaders.length; i++) {
         if (header.indexOf(htmlAcceptHeaders[i]) !== -1) {
@@ -79,9 +77,9 @@ class OnDemandRouteManager {
     }
     ensureRoutes(pathname) {
         return __awaiter(this, void 0, void 0, function* () {
-            const matchedRoutes = (0, router_1.matchRoutes)((0, index_1.getRoutes)(), pathname) || [];
+            const matchedRoutes = (0, router_1.matchRoutes)(resources_1.server.pageRoutes, pathname) || [];
             const modulesToActivate = matchedRoutes
-                .map(({ route: { component } }) => component ? `${component}?${constants_1.ROUTE_RESOURCE_QUERYSTRING}` : '')
+                .map(({ route: { __componentRawRequest__ } }) => __componentRawRequest__)
                 .filter(Boolean);
             return this._activateModules(modulesToActivate);
         });

package/lib/node/features/webpack-watch-wait-for-file-builder/index.d.ts

@@ -0,0 +1,16 @@
+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").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>;
+};
+export default _default;

package/lib/node/features/webpack-watch-wait-for-file-builder/index.js

@@ -0,0 +1,25 @@
+"use strict";
+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 webpack_watch_wait_for_file_builder_plugin_1 = __importDefault(require("./webpack-watch-wait-for-file-builder-plugin"));
+const plugin = (0, service_1.createPlugin)({
+    configWebpack(config, _, ctx) {
+        if (ctx.mode === 'development') {
+            config
+                .plugin('webpack-watch-wait-for-file-builder-plugin')
+                .use(webpack_watch_wait_for_file_builder_plugin_1.default, [
+                {
+                    onBuildStart: ctx.onBuildStart,
+                    onBuildEnd: ctx.onBuildEnd
+                }
+            ]);
+        }
+        return config;
+    }
+});
+exports.default = {
+    core: plugin
+};

package/lib/node/features/webpack-watch-wait-for-file-builder/webpack-watch-wait-for-file-builder-plugin.d.ts

@@ -0,0 +1,12 @@
+import { IPluginContext } from '@shuvi/service';
+import { Compiler, Plugin } from '@shuvi/toolpack/lib/webpack';
+declare type Options = {
+    onBuildStart: IPluginContext['onBuildStart'];
+    onBuildEnd: IPluginContext['onBuildEnd'];
+};
+export default class WebpackWatchWaitForFileBuilderPlugin implements Plugin {
+    options: Options;
+    constructor(options: Options);
+    apply(compiler: Compiler): void;
+}
+export {};

package/lib/node/features/webpack-watch-wait-for-file-builder/webpack-watch-wait-for-file-builder-plugin.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class WebpackWatchWaitForFileBuilderPlugin {
+    constructor(options) {
+        this.options = options;
+    }
+    apply(compiler) {
+        const { onBuildEnd, onBuildStart } = this.options;
+        /**
+         * watching.suspend will pause the real action in the watcher handler but still collecting changed files.
+         * watching.resume will resume its action
+         *
+         * We make sure onBuildStart is faster than webpack's watcher and make it suspend.
+         *
+         * And resume when onBuildEnd.
+         *
+         * In this way, during build of fileBuilder, webpack will not trigger any watchRun event but keep watching changed files.
+         */
+        onBuildStart(() => {
+            compiler.watching.suspend();
+        });
+        onBuildEnd(({ buildStatus }) => {
+            if (buildStatus === 'fulfilled') {
+                setTimeout(() => {
+                    compiler.watching.resume();
+                    // FIXME: timeout for resuming need further investigation
+                }, 100);
+            }
+        });
+    }
+}
+exports.default = WebpackWatchWaitForFileBuilderPlugin;

package/lib/node/index.d.ts

@@ -1,4 +1,6 @@
 import { IPlatform } from '@shuvi/service';
-import './shuvi-node-extensions';
-declare const platform: IPlatform;
+export { PlatformWebCustomConfig } from '../shared/configTypes';
+declare const platform: ({ framework }?: {
+    framework?: string | undefined;
+}) => IPlatform;
 export default platform;

package/lib/node/index.js

@@ -11,10 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@shuvi/platform-shared/node");
 const features_1 = require("./features");
-require("./shuvi-node-extensions");
 const paths_1 = require("./paths");
-const platform = ({ framework = 'react' } = {}, platformContext) => __awaiter(void 0, void 0, void 0, function* () {
-    const mainPlugin = (0, features_1.getMainPlugin)(platformContext);
+const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaiter(void 0, void 0, void 0, function* () {
     const platformFramework = require(`./targets/${framework}`).default;
     const platformFrameworkContent = yield platformFramework();
     const platformModule = platformFrameworkContent.platformModule;
@@ -27,8 +25,7 @@ const platform = ({ framework = 'react' } = {}, platformContext) => __awaiter(vo
         ],
         plugins: [
             ...node_1.SharedPlugins,
-            mainPlugin,
-            ...features_1.featurePlugins,
+            ...(0, features_1.getPlugins)(platformContext),
             ...platformFrameworkContent.plugins
         ],
         getPresetRuntimeFiles,

package/lib/node/paths.js

@@ -1,16 +1,36 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
-const path_1 = __importDefault(require("path"));
-const PACKAGE_DIR = path_1.default.resolve(__dirname, '..', '..');
+const path = __importStar(require("path"));
+const PACKAGE_DIR = path.resolve(__dirname, '..', '..');
 // export const resolveToModulePath = (...paths: string[]) =>
 //   `@shuvi/platform-web/${paths.join('/')}`;
 const resolveDep = (module) => require.resolve(module);
 exports.resolveDep = resolveDep;
-const resolveLib = (module) => path_1.default.dirname((0, exports.resolveDep)(path_1.default.join(module, 'package.json')));
+const resolveLib = (module) => path.dirname((0, exports.resolveDep)(path.join(module, 'package.json')));
 exports.resolveLib = resolveLib;
-const resolvePkgFile = (...paths) => path_1.default.join(PACKAGE_DIR, ...paths);
+const resolvePkgFile = (...paths) => path.join(PACKAGE_DIR, ...paths);
 exports.resolvePkgFile = resolvePkgFile;

package/lib/node/shuvi-type-extensions-node.d.ts

@@ -0,0 +1,44 @@
+import '@shuvi/platform-shared/shuvi-type-extensions-node';
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
+import { IMiddlewareRoutes, CreateAppServer, IApiRoutes, IServerModule, PlatformWebCustomConfig } from '../shared/index';
+import { IViewServer } from './features/html-render/index';
+import { addRoutes, addMiddlewareRoutes } from './features/filesystem-routes/hooks';
+import { extendedHooks } from './features/html-render/serverHooks';
+export {};
+declare module '@shuvi/service/lib/resources' {
+    const server: {
+        server: IServerModule;
+        pageRoutes: IPageRouteRecord[];
+        apiRoutes: IApiRoutes;
+        middlewareRoutes: IMiddlewareRoutes;
+        application: {
+            createApp: CreateAppServer;
+        };
+        view: IViewServer;
+    };
+    const documentPath: string;
+    const clientManifest: IManifest;
+    const serverManifest: IManifest;
+}
+declare global {
+    namespace ShuviService {
+        interface CustomConfig {
+            ssr: PlatformWebCustomConfig['ssr'];
+            router: PlatformWebCustomConfig['router'];
+            routes?: PlatformWebCustomConfig['routes'];
+            middlewareRoutes?: PlatformWebCustomConfig['middlewareRoutes'];
+            apiRoutes?: PlatformWebCustomConfig['apiRoutes'];
+            conventionRoutes: PlatformWebCustomConfig['conventionRoutes'];
+        }
+        interface CustomCorePluginHooks {
+            addRoutes: typeof addRoutes;
+            addMiddlewareRoutes: typeof addMiddlewareRoutes;
+        }
+        interface CustomServerPluginHooks {
+            getPageData: typeof extendedHooks.getPageData;
+            handlePageRequest: typeof extendedHooks.handlePageRequest;
+            modifyHtml: typeof extendedHooks.modifyHtml;
+        }
+    }
+}

package/lib/node/{shuvi-node-extensions.js → shuvi-type-extensions-node.js}

@@ -1,2 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+require("@shuvi/platform-shared/shuvi-type-extensions-node");

package/lib/node/targets/react/bundler/index.d.ts

@@ -1,5 +1,6 @@
 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>;
@@ -8,8 +9,8 @@ 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/runtime").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
+    } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };
 export default _default;