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

package/lib/node/features/html-render/lib/webpack/build-manifest-plugin.js

@@ -0,0 +1,223 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_1 = require("../../../../../shared");
+const webpack_1 = require("@shuvi/toolpack/lib/webpack");
+const Entrypoint = (0, webpack_1.resolveWebpackModule)('webpack/lib/Entrypoint');
+const { RawSource } = webpack_1.sources;
+const defaultOptions = {
+    filename: 'build-manifest.json',
+    modules: false,
+    chunkRequest: false
+};
+function getFileExt(filepath) {
+    const match = filepath.match(/\.(\w+)$/);
+    if (!match)
+        return '';
+    return match[1];
+}
+// function findEntrypointName(chunkGroup: any): string[] {
+//   const entrypoints: any[] = [];
+//   const queue: any[] = [chunkGroup];
+//   while (queue.length) {
+//     const item = queue.shift();
+//     for (const parent of item.getParents()) {
+//       if (parent instanceof Entrypoint) {
+//         entrypoints.push(parent.name);
+//       } else {
+//         queue.push(parent);
+//       }
+//     }
+//   }
+//   return entrypoints;
+// }
+// This plugin creates a build-manifest.json for all assets that are being output
+// It has a mapping of "entry" filename to real filename. Because the real filename can be hashed in production
+class BuildManifestPlugin {
+    constructor(options = {}) {
+        this._options = Object.assign(Object.assign({}, defaultOptions), options);
+    }
+    createAssets(compiler, compilation) {
+        const assetMap = (this._manifest = {
+            entries: {},
+            bundles: {},
+            chunkRequest: {},
+            loadble: {}
+        });
+        const chunkRootModulesMap = new Map();
+        compilation.chunks.forEach(chunk => {
+            const { chunkGraph } = compilation;
+            if (chunkGraph) {
+                chunkGraph.getChunkRootModules(chunk).forEach(module => {
+                    const id = chunkGraph.getModuleId(module);
+                    if (id !== '') {
+                        chunkRootModulesMap.set(id, true);
+                    }
+                });
+            }
+        });
+        compilation.chunkGroups.forEach(chunkGroup => {
+            if (chunkGroup instanceof Entrypoint) {
+                this._collectEntries(chunkGroup);
+            }
+            this._collect(chunkGroup, compiler, compilation, chunkRootModulesMap);
+        });
+        const compilationAssets = compilation.getAssets();
+        this._manifest.polyfillFiles = compilationAssets
+            .filter(p => {
+            // Ensure only .js files are passed through
+            if (!p.name.endsWith('.js')) {
+                return false;
+            }
+            return p.info && shared_1.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL in p.info;
+        })
+            .map(v => v.name);
+        this._manifest.loadble = Object.keys(this._manifest.loadble)
+            .sort()
+            // eslint-disable-next-line no-sequences
+            .reduce((a, c) => ((a[c] = this._manifest.loadble[c]), a), {});
+        return assetMap;
+    }
+    apply(compiler) {
+        compiler.hooks.make.tap('BuildManifestPlugin', compilation => {
+            compilation.hooks.processAssets.tap({
+                name: 'BuildManifestPlugin',
+                stage: webpack_1.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+            }, assets => {
+                assets[this._options.filename] = new RawSource(JSON.stringify(this.createAssets(compiler, compilation), null, 2), true);
+            });
+        });
+    }
+    _collectEntries(entrypoint) {
+        for (const chunk of entrypoint.chunks) {
+            // If there's no name or no files
+            if (!chunk.name || !chunk.files) {
+                continue;
+            }
+            for (const file of chunk.files) {
+                if (/\.map$/.test(file) || /\.hot-update\.js$/.test(file)) {
+                    continue;
+                }
+                const ext = getFileExt(file);
+                this._pushEntries(entrypoint.name, ext, file.replace(/\\/g, '/'));
+            }
+        }
+    }
+    _collect(chunkGroup, compiler, compilation, chunkRootModulesMap) {
+        const collectModules = this._options.modules;
+        chunkGroup.origins.forEach(chunkGroupOrigin => {
+            const { request } = chunkGroupOrigin;
+            const ctx = { request, compiler, compilation, chunkRootModulesMap };
+            chunkGroup.chunks.forEach(chunk => {
+                this._collectChunk(chunk, ctx);
+                if (collectModules) {
+                    this._collectChunkModule(chunk, ctx);
+                }
+            });
+        });
+    }
+    _collectChunk(chunk, { request }) {
+        if (!chunk.files) {
+            return;
+        }
+        for (const file of chunk.files) {
+            if (/\.map$/.test(file) || /\.hot-update\.js$/.test(file)) {
+                continue;
+            }
+            const ext = getFileExt(file);
+            const normalizedPath = file.replace(/\\/g, '/');
+            // normal chunk
+            if (ext === 'js') {
+                if (chunk.isOnlyInitial()) {
+                    this._pushBundle({
+                        name: chunk.name,
+                        file: normalizedPath
+                    });
+                }
+                this._pushChunkRequest({
+                    file: normalizedPath,
+                    request
+                });
+            }
+        }
+    }
+    _collectChunkModule(chunk, { request, compiler, compilation, chunkRootModulesMap }) {
+        if (chunk.canBeInitial()) {
+            return;
+        }
+        const context = compiler.options.context;
+        chunk.files.forEach((file) => {
+            const isJs = file.match(/\.js$/) && file.match(/^static\/chunks\//);
+            const isCss = file.match(/\.css$/) && file.match(/^static\/css\//);
+            if (isJs || isCss) {
+                this._pushLoadableModules(request, file);
+            }
+        });
+        const { chunkGraph } = compilation;
+        if (chunkGraph) {
+            for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
+                let id = chunkGraph.getModuleId(module);
+                if (!module.type.startsWith('javascript')) {
+                    continue;
+                }
+                let name = typeof module.libIdent === 'function'
+                    ? module.libIdent({ context })
+                    : null;
+                if (!name || name.endsWith('.css')) {
+                    continue;
+                }
+                if (chunkRootModulesMap.has(id)) {
+                    this._pushLoadableModules(request, {
+                        id,
+                        name
+                    });
+                }
+            }
+        }
+    }
+    _pushEntries(name, ext, value) {
+        const entries = this._manifest.entries;
+        if (!entries[name]) {
+            entries[name] = {
+                js: []
+            };
+        }
+        if (!entries[name][ext]) {
+            entries[name][ext] = [value];
+        }
+        else {
+            entries[name][ext].push(value);
+        }
+    }
+    _pushBundle({ name, file }) {
+        if (name) {
+            this._manifest.bundles[name] = file;
+        }
+    }
+    _pushChunkRequest({ file, request }) {
+        if (this._options.chunkRequest && request) {
+            this._manifest.chunkRequest[file] = request;
+        }
+    }
+    _pushLoadableModules(request, value) {
+        const modules = this._manifest.loadble;
+        if (!modules[request]) {
+            modules[request] = {
+                files: [],
+                children: []
+            };
+        }
+        if (typeof value === 'string') {
+            const existed = modules[request].files.some(file => file === value);
+            if (!existed) {
+                modules[request].files.push(value);
+            }
+        }
+        else {
+            const existed = modules[request].children.some(item => item.id === value.id);
+            if (!existed) {
+                modules[request].children.push(value);
+            }
+        }
+    }
+}
+exports.default = BuildManifestPlugin;

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

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

@@ -1,10 +1,15 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
+import { ShuviRequest } from '@shuvi/service';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 import { IHtmlDocument } from '../html-render';
+export interface ModifyHtmlContext {
+    req: ShuviRequest;
+    appContext: IAppContext;
+}
 export declare type IHandlePageRequest = (req: IncomingMessage, res: ServerResponse) => any;
 export declare const extendedHooks: {
     getPageData: import("@shuvi/hook").AsyncParallelHook<void, IAppContext, Record<string, unknown>>;
     handlePageRequest: import("@shuvi/hook").SyncWaterfallHook<IHandlePageRequest, void>;
-    modifyHtml: import("@shuvi/hook").AsyncParallelHook<IHtmlDocument, IAppContext, void>;
+    modifyHtml: import("@shuvi/hook").AsyncSeriesHook<IHtmlDocument, ModifyHtmlContext, void>;
 };

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

@@ -4,8 +4,7 @@ exports.extendedHooks = void 0;
 const hook_1 = require("@shuvi/hook");
 const getPageData = (0, hook_1.createAsyncParallelHook)();
 const handlePageRequest = (0, hook_1.createSyncWaterfallHook)();
-// todo: change to AsyncSeries
-const modifyHtml = (0, hook_1.createAsyncParallelHook)();
+const modifyHtml = (0, hook_1.createAsyncSeriesHook)();
 exports.extendedHooks = {
     getPageData,
     handlePageRequest,

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

@@ -1,32 +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<{
-    extendConfig: import("@shuvi/hook").SyncWaterfallHook<import("@shuvi/service").Config, void>;
-    afterInit: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-    afterBuild: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-    afterDestroy: import("@shuvi/hook").AsyncParallelHook<void, void, void>;
-    afterBundlerDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerDoneExtra, void, void>;
-    afterBundlerTargetDone: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").BundlerTargetDoneExtra, void, void>;
-    configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
-    addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
-    addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-    addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
-    addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
-} & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext> | {
-    core: import("@shuvi/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>;
-})[];
+export declare const getPlugins: (platformContext: IPlatformContext) => ResolvedPlugin[];

package/lib/node/features/index.js

@@ -3,23 +3,22 @@ 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");
+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
 ];
+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 getMiddlewares: (context: IServerPluginContext) => Promise<IServerMiddleware[]>;
 export declare const getMiddlewaresBeforeDevMiddlewares: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware[];

package/lib/node/features/middlewares.js

@@ -1,16 +1,25 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-const getMiddlewares = (context) => {
+const getMiddlewares = (context) => __awaiter(void 0, void 0, void 0, function* () {
     return [
         (0, filesystem_routes_1.getMiddlewareMiddleware)(context),
         (0, filesystem_routes_1.getApiMiddleware)(context),
-        (0, html_render_1.getPageMiddleware)(context)
+        yield (0, html_render_1.getPageMiddleware)(context)
     ].filter(Boolean);
-};
+});
 exports.getMiddlewares = getMiddlewares;
 const getMiddlewaresBeforeDevMiddlewares = (devMiddleware, context) => {
     const onDemandRouteManager = new on_demand_compile_page_1.OnDemandRouteManager(context);

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

@@ -1,17 +1,5 @@
 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>;
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {
         plugin: string;
     };

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

@@ -1,13 +1,8 @@
-import { IStoreManager } from '@shuvi/redox';
+import { RedoxStore } from '@shuvi/redox';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 export declare type InitRedox = (params: {
     initialState: any;
     ctx: IAppContext;
-}) => IStoreManager;
-declare module '@shuvi/runtime' {
-    interface CustomAppContext {
-        storeManager?: IStoreManager;
-    }
-}
-declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").BuiltInRuntimePluginHooks & import("@shuvi/runtime").CustomRuntimePluginHooks, void>;
+}) => RedoxStore;
+declare const _default: import("@shuvi/platform-shared/shared").IPluginInstance<import("@shuvi/platform-shared/shared").RuntimePluginHooks, void>;
 export default _default;

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,22 @@ const initStore = ({ initialState, ctx }) => {
         return createStoreInstance();
     }
     // for client is singleton, just init once
-    if (currentStoreManager) {
-        return currentStoreManager;
+    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', {});
         }
-        return ctx;
+        ctx.store = initStore({
+            ctx,
+            initialState
+        });
     }
+}, {
+    name: 'model'
 });

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';
+import type { RedoxStore } from '@shuvi/redox';
 declare module '@shuvi/runtime' {
     interface CustomAppContext {
-        storeManager?: IStoreManager;
+        store: RedoxStore;
     }
 }

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

@@ -1,15 +1,5 @@
-declare const _default: 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>;
+declare const _default: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, 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.d.ts

@@ -1,11 +1,11 @@
-import { IRequestHandlerWithNext, IServerPluginContext } from '@shuvi/service';
+import { ShuviRequestHandler, IServerPluginContext } from '@shuvi/service';
 import { DevMiddleware } from '@shuvi/service/lib/server/middlewares/dev';
 export default class OnDemandRouteManager {
     devMiddleware: DevMiddleware | null;
     _serverPluginContext: IServerPluginContext;
     constructor(serverPluginContext: IServerPluginContext);
-    getServerMiddleware(): IRequestHandlerWithNext;
-    ensureRoutesMiddleware(): IRequestHandlerWithNext;
+    getServerMiddleware(): ShuviRequestHandler;
+    ensureRoutesMiddleware(): ShuviRequestHandler;
     ensureRoutes(pathname: string): Promise<void>;
     private _activateModules;
 }

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 resources_1 = __importDefault(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) {
@@ -40,7 +38,7 @@ class OnDemandRouteManager {
                 return next();
             }
             const chunkName = pathname.replace(this._serverPluginContext.assetPublicPath, '');
-            const chunkInitiatorModule = resources_1.clientManifest.chunkRequest[chunkName];
+            const chunkInitiatorModule = resources_1.default.clientManifest.chunkRequest[chunkName];
             if (!chunkInitiatorModule) {
                 return next();
             }
@@ -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.default.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/index.d.ts

@@ -1,4 +1,5 @@
 import { IPlatform } from '@shuvi/service';
+export * from '../shared';
 export { PlatformWebCustomConfig } from '../shared/configTypes';
 declare const platform: ({ framework }?: {
     framework?: string | undefined;

package/lib/node/index.js

@@ -1,4 +1,18 @@
 "use strict";
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,13 +26,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@shuvi/platform-shared/node");
 const features_1 = require("./features");
 const paths_1 = require("./paths");
+__exportStar(require("../shared"), exports);
 const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaiter(void 0, void 0, void 0, function* () {
-    const mainPlugin = (0, features_1.getMainPlugin)(platformContext);
     const platformFramework = require(`./targets/${framework}`).default;
     const platformFrameworkContent = yield platformFramework();
     const platformModule = platformFrameworkContent.platformModule;
-    const polyfills = platformFrameworkContent.polyfills;
-    const getPresetRuntimeFiles = (0, node_1.getPresetRuntimeFilesCreator)(platformModule, polyfills);
+    const getPresetRuntimeFiles = (0, node_1.getPresetRuntimeFilesCreator)(platformModule);
     return {
         types: [
             (0, paths_1.resolvePkgFile)('shuvi-env.d.ts'),
@@ -26,8 +39,7 @@ const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaite
         ],
         plugins: [
             ...node_1.SharedPlugins,
-            mainPlugin,
-            ...features_1.featurePlugins,
+            ...(0, features_1.getPlugins)(platformContext),
             ...platformFrameworkContent.plugins
         ],
         getPresetRuntimeFiles,

package/lib/node/paths.js

@@ -26,8 +26,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePkgFile = exports.resolveLib = exports.resolveDep = void 0;
 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.dirname((0, exports.resolveDep)(path.join(module, 'package.json')));