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

package/lib/node/shuvi-runtime-server.d.ts

@@ -0,0 +1,26 @@
+import { ShuviRequestHandler, ServerPluginConstructor as _ServerPluginConstructor } from '@shuvi/service';
+import { IApiRequestHandler } from '../shared';
+import { extendedHooks } from './features/html-render/serverHooks';
+declare global {
+    namespace ShuviService {
+        interface CustomServerPluginHooks {
+            getPageData: typeof extendedHooks.getPageData;
+            handlePageRequest: typeof extendedHooks.handlePageRequest;
+            modifyHtml: typeof extendedHooks.modifyHtml;
+        }
+    }
+}
+declare type ServerPluginConstructor = Required<_ServerPluginConstructor>;
+declare type Head<T extends any[]> = T extends [...infer Head, any] ? Head : never;
+declare type RemoveLast<T extends (...args: any) => any> = (...args: Head<Parameters<T>>) => ReturnType<T>;
+export declare type ShuviMiddlewareHandler = ShuviRequestHandler;
+export declare type ShuviApiHandler = IApiRequestHandler;
+export declare type GetPageDataFunction = RemoveLast<ServerPluginConstructor['getPageData']>;
+export declare type HandlePageRequestFunction = RemoveLast<ServerPluginConstructor['handlePageRequest']>;
+export declare type ModifyHtmlFunction = RemoveLast<ServerPluginConstructor['modifyHtml']>;
+export interface IServerModule {
+    getPageData?: GetPageDataFunction;
+    handlePageRequest?: HandlePageRequestFunction;
+    modifyHtml?: ModifyHtmlFunction;
+}
+export {};

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

@@ -1,23 +1,26 @@
 import '@shuvi/platform-shared/shuvi-type-extensions-node';
-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';
+import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+import { IManifest, IMiddlewareRoutes, CreateAppServer, IApiRoutes, PlatformWebCustomConfig } from '../shared';
+import { IViewServer } from './features/html-render';
+import { IServerModule } from './shuvi-runtime-server';
+import { addRoutes, addMiddlewareRoutes, addApiRoutes } from './features/filesystem-routes/hooks';
 export {};
 declare module '@shuvi/service/lib/resources' {
-    const server: {
-        server: IServerModule;
-        apiRoutes: IApiRoutes;
-        middlewareRoutes: IMiddlewareRoutes;
-        application: {
-            createApp: CreateAppServer;
+    interface IResources {
+        server: {
+            server: IServerModule;
+            pageRoutes: IPageRouteRecord[];
+            apiRoutes: IApiRoutes;
+            middlewareRoutes: IMiddlewareRoutes;
+            application: {
+                createApp: CreateAppServer;
+            };
+            view: IViewServer;
         };
-        view: IViewServer;
-    };
-    const documentPath: string;
-    const clientManifest: IManifest;
-    const serverManifest: IManifest;
+        documentPath: string;
+        clientManifest: IManifest;
+        serverManifest: IManifest;
+    }
 }
 declare global {
     namespace ShuviService {
@@ -25,18 +28,12 @@ declare global {
             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;
+            addApiRoutes: typeof addApiRoutes;
         }
     }
 }

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

@@ -1,16 +1,4 @@
 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>;
 };
 export default _default;

package/lib/node/targets/react/bundler/index.js

@@ -29,8 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
 const ReactRefreshWebpackPlugin_1 = __importDefault(require("@next/react-refresh-utils/ReactRefreshWebpackPlugin"));
-const constants_1 = require("@shuvi/shared/lib/constants");
-const webpack_1 = require("webpack");
+const shared_1 = require("../../../../shared");
 const configWebpack = (config, { name, webpack }, context) => {
     const resolveLocal = (m, sub) => {
         const pck = path.dirname(require.resolve(`${m}/package.json`));
@@ -64,25 +63,32 @@ const configWebpack = (config, { name, webpack }, context) => {
         resolveLocal('react', 'jsx-runtime')
     ]);
     // @ts-ignore
+    config.resolve.alias.set('react/jsx-dev-runtime$', [
+        resolveUser('react/jsx-dev-runtime'),
+        resolveLocal('react', 'jsx-dev-runtime')
+    ]);
+    // @ts-ignore
     config.resolve.alias.set('react-dom$', [
         resolveUser('react-dom'),
         resolveLocal('react-dom')
     ]);
-    if (name === constants_1.BUNDLER_DEFAULT_TARGET && context.mode === 'development') {
-        config.module
-            .rule('main')
-            .oneOf('js')
-            .use('react-refresh-loader')
-            .loader(require.resolve('@next/react-refresh-utils/loader'))
-            .before('shuvi-swc-loader');
-        config
-            .plugin('react-refresh-plugin')
-            .use(ReactRefreshWebpackPlugin_1.default, [webpack]);
-        config.plugin('version-env-plugin').use(webpack_1.DefinePlugin, [
+    if (name === shared_1.BUNDLER_TARGET_CLIENT) {
+        config.plugin('version-env-plugin').use(webpack.DefinePlugin, [
             {
                 'process.env.__SHUVI__AFTER__REACT__18__': JSON.stringify(isReactVersionAfter18())
             }
         ]);
+        if (context.mode === 'development') {
+            config.module
+                .rule('main')
+                .oneOf('js')
+                .use('react-refresh-loader')
+                .loader(require.resolve('@next/react-refresh-utils/loader'))
+                .before('shuvi-swc-loader');
+            config
+                .plugin('react-refresh-plugin')
+                .use(ReactRefreshWebpackPlugin_1.default, [webpack]);
+        }
     }
     return config;
 };

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

@@ -1,32 +1,7 @@
 declare const platformWebReact: () => {
-    plugins: (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>;
+    plugins: (import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext> | {
+        core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
     })[];
     platformModule: string;
-    polyfills: string[];
 };
 export default platformWebReact;

package/lib/node/targets/react/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = require("@shuvi/service");
 const bundler_1 = __importDefault(require("./bundler"));
-const redox_react_1 = require("./redox-react");
+const model_1 = require("./model");
 const paths_1 = require("../../paths");
 const webReactMainPlugin = (0, service_1.createPlugin)({
     addRuntimeService: () => [
@@ -17,12 +17,8 @@ const webReactMainPlugin = (0, service_1.createPlugin)({
 });
 const platformWebReact = () => {
     return {
-        plugins: [webReactMainPlugin, bundler_1.default, redox_react_1.RedoxReactPlugin],
-        platformModule: (0, paths_1.resolvePkgFile)('esm/shuvi-app/react/index'),
-        polyfills: [
-            (0, paths_1.resolveDep)('react-app-polyfill/ie11'),
-            (0, paths_1.resolveDep)('react-app-polyfill/stable')
-        ]
+        plugins: [webReactMainPlugin, bundler_1.default, model_1.ModelReactPlugin],
+        platformModule: (0, paths_1.resolvePkgFile)('esm/shuvi-app/react/index')
     };
 };
 exports.default = platformWebReact;

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

@@ -0,0 +1,6 @@
+export declare const ModelReactPlugin: {
+    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
+    runtime: {
+        plugin: string;
+    };
+};

package/lib/node/targets/react/{redox-react → model}/index.js

@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedoxReactPlugin = void 0;
+exports.ModelReactPlugin = void 0;
 const path = __importStar(require("path"));
 const service_1 = require("@shuvi/service");
 const paths_1 = require("../../../paths");
-// todo: optimize this
-const runtimePath = require.resolve(path.join(__dirname, '../../../../../esm/shuvi-app/react/redox-react/runtime'));
-const core = (0, service_1.createPlugin)({
+const core = (0, service_1.createPluginAfter)({
     addRuntimeService: () => [
         {
             source: path.dirname(require.resolve('@shuvi/redox-react/package.json')),
@@ -41,10 +39,13 @@ const core = (0, service_1.createPlugin)({
         config.resolve.alias.set('@shuvi/redox', (0, paths_1.resolveLib)('@shuvi/redox'));
         return config;
     }
+}, {
+    name: 'model-react'
 });
-exports.RedoxReactPlugin = {
+exports.ModelReactPlugin = {
     core,
     runtime: {
-        plugin: runtimePath
+        // this need
+        plugin: (0, paths_1.resolvePkgFile)('esm/shuvi-app/react/model/runtime')
     }
 };

package/lib/node/version.d.ts

@@ -0,0 +1 @@
+export declare function getVersion(): string;

package/lib/node/version.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersion = void 0;
+const paths_1 = require("./paths");
+let version;
+function getVersion() {
+    if (!version) {
+        const pkg = require((0, paths_1.resolvePkgFile)('package.json'));
+        version = pkg.version;
+    }
+    return version;
+}
+exports.getVersion = getVersion;

package/lib/shared/appTypes.d.ts

@@ -1,15 +1,21 @@
-import { IRequest, IRawPageRouteRecord, 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: IRequest;
+        req: ShuviRequest;
         ssr: boolean;
-    }): Application;
+    }): InternalApplication;
 }
 export interface CreateAppClient {
     (options: {
-        routes: IRawPageRouteRecord[];
+        routes: IPageRouteRecord[];
         appComponent: any;
         appData: IAppData<any, IAppState>;
-    }): Application;
+    }): InternalApplication;
 }

package/lib/shared/configTypes.d.ts

@@ -1,4 +1,4 @@
-import { IRouterHistoryMode, IPageRouteConfig, IMiddlewareRouteConfig, IApiRouteConfig } from '@shuvi/platform-shared/shared';
+import { IRouterHistoryMode, IPageRouteConfig } from '@shuvi/platform-shared/shared';
 export interface IRouterConfig {
     history: IRouterHistoryMode | 'auto';
 }
@@ -6,8 +6,6 @@ export interface PlatformWebCustomConfig {
     ssr: boolean;
     router: IRouterConfig;
     routes?: IPageRouteConfig[];
-    middlewareRoutes?: IMiddlewareRouteConfig[];
-    apiRoutes?: IApiRouteConfig[];
     conventionRoutes: {
         exclude?: string[];
     };

package/lib/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/lib/shared/constants.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BUILD_SERVER_FILE_SERVER = exports.BUILD_CLIENT_RUNTIME_MAIN = exports.BUILD_CLIENT_RUNTIME_WEBPACK = exports.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL = exports.BUILD_CLIENT_RUNTIME_POLYFILLS = exports.SERVER_BUILD_MANIFEST_PATH = exports.CLIENT_BUILD_MANIFEST_PATH = exports.SERVER_OUTPUT_DIR = exports.CLIENT_OUTPUT_DIR = exports.BUNDLER_TARGET_SERVER = exports.BUNDLER_TARGET_CLIENT = void 0;
+var constants_1 = require("@shuvi/shared/lib/constants");
+Object.defineProperty(exports, "BUNDLER_TARGET_CLIENT", { enumerable: true, get: function () { return constants_1.BUNDLER_TARGET_CLIENT; } });
+Object.defineProperty(exports, "BUNDLER_TARGET_SERVER", { enumerable: true, get: function () { return constants_1.BUNDLER_TARGET_SERVER; } });
+Object.defineProperty(exports, "CLIENT_OUTPUT_DIR", { enumerable: true, get: function () { return constants_1.CLIENT_OUTPUT_DIR; } });
+Object.defineProperty(exports, "SERVER_OUTPUT_DIR", { enumerable: true, get: function () { return constants_1.SERVER_OUTPUT_DIR; } });
+exports.CLIENT_BUILD_MANIFEST_PATH = '../build-manifest.client.json';
+exports.SERVER_BUILD_MANIFEST_PATH = '../build-manifest.server.json';
+exports.BUILD_CLIENT_RUNTIME_POLYFILLS = `static/polyfills`;
+exports.BUILD_CLIENT_RUNTIME_POLYFILLS_SYMBOL = Symbol(`polyfills`);
+exports.BUILD_CLIENT_RUNTIME_WEBPACK = `static/webpack-runtime`;
+exports.BUILD_CLIENT_RUNTIME_MAIN = `static/main`;
+exports.BUILD_SERVER_FILE_SERVER = `server`;

package/lib/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/lib/shared/htmlRenderer.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/shared/index.d.ts

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

package/lib/shared/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./appTypes"), exports);
 __exportStar(require("./configTypes"), exports);
+__exportStar(require("./constants"), exports);
+__exportStar(require("./htmlRenderer"), exports);
 __exportStar(require("./renderTypes"), exports);
 __exportStar(require("./routeTypes"), exports);
-__exportStar(require("./serverTypes"), exports);

package/lib/shared/renderTypes.d.ts

@@ -1,10 +1,11 @@
-import { IManifest } from '@shuvi/toolpack/lib/webpack/types';
-import { Response, IApplication, IRequest, IAppData } from '@shuvi/platform-shared/shared';
-export declare type IRenderDocumentOptions = {
-    app: IApplication;
-    req?: IRequest;
+import type { ShuviRequest } from '@shuvi/service';
+import { Response, IAppData } from '@shuvi/platform-shared/shared';
+import { IManifest } from '../shared';
+import { Application } from './appTypes';
+export declare type IRenderViewOptions = {
+    app: Application;
 };
-export interface IRenderOptions extends IRenderDocumentOptions {
+export interface IRenderOptions extends IRenderViewOptions {
 }
 export interface IView<RenderOption extends IRenderOptions = any, RenderResult = void> {
     renderApp(options: RenderOption): RenderResult;
@@ -35,8 +36,8 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
     appData: IAppData<ExtraAppData>;
 }
 export interface IServerRendererOptions extends IRenderOptions {
+    req: ShuviRequest;
     manifest: IManifest;
-    getAssetPublicUrl(path: string): string;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/lib/shared/routeTypes.d.ts

@@ -1,10 +1,5 @@
-import { IURLParams, IURLQuery } from '@shuvi/platform-shared/shared';
-import { IRequestHandlerWithNext } from '@shuvi/service';
-import { IResponse, IRequest } from '@shuvi/service';
+import { ShuviRequest, ShuviResponse, ShuviRequestHandler } from '@shuvi/service';
 export interface IApiReq {
-    pathname: string;
-    query: IURLQuery;
-    params: IURLParams;
     cookies: {
         [key: string]: string;
     };
@@ -12,7 +7,7 @@ export interface IApiReq {
         [key: string]: any;
     };
 }
-export declare type IApiRequest = IRequest & IApiReq;
+export declare type IApiRequest = ShuviRequest & IApiReq;
 export declare type Send<T> = (body: T) => void;
 export declare type IApiRes<T = any> = {
     send: Send<T>;
@@ -21,7 +16,7 @@ export declare type IApiRes<T = any> = {
     redirect(url: string): IApiRes<T>;
     redirect(status: number, url: string): IApiRes<T>;
 };
-export declare type IApiResponse<T = any> = IResponse & IApiRes<T>;
+export declare type IApiResponse<T = any> = ShuviResponse & IApiRes<T>;
 export declare type IApiRequestHandler<T = any> = (req: IApiRequest, res: IApiResponse<T>) => void | Promise<void>;
 export interface IApiConfig {
     api?: {
@@ -35,7 +30,7 @@ export interface IApiHandler {
     config?: IApiConfig;
 }
 export interface IMiddlewareConfig {
-    default: IRequestHandlerWithNext;
+    default: ShuviRequestHandler;
 }
 export declare type IApiRoutes = {
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.20",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -12,9 +12,13 @@
     "**/shuvi-app/entry/client/**"
   ],
   "files": [
-    "lib",
     "esm",
+    "lib",
+    "polyfills",
+    "shuvi-env.d.ts",
+    "shuvi-image.d.ts",
     "shuvi-type-extensions-node.d.ts",
+    "shuvi-type-extensions-node.js",
     "shuvi-type-extensions-runtime.d.ts"
   ],
   "exports": {
@@ -28,10 +32,14 @@
       "default": "./lib/node/*.js"
     },
     "./shared": {
-      "default": "./esm/shared/index.js"
+      "require": "./lib/shared/index.js",
+      "import": "./esm/shared/index.js",
+      "default": "./lib/shared/index.js"
     },
     "./shared/*": {
-      "default": "./esm/shared/*.js"
+      "require": "./lib/shared/index.js",
+      "import": "./esm/shared/index.js",
+      "default": "./lib/shared/*.js"
     },
     "./shuvi-app": {
       "default": "./esm/shuvi-app/index.js"
@@ -46,58 +54,64 @@
       "types": "./shuvi-type-extensions-node.d.js",
       "default": "./shuvi-type-extensions-node.js"
     },
-    "./shuvi-type-extensions-runtime": "./shuvi-type-extensions-runtime.d.ts"
+    "./shuvi-type-extensions-runtime": "./shuvi-type-extensions-runtime.d.ts",
+    "./package.json": "./package.json"
   },
   "scripts": {
     "dev": "run-p watch:*",
     "watch:esm": "tsc -p tsconfig.build.browser.json -w",
     "watch:cjs": "tsc -p tsconfig.build.node.json -w",
-    "prebuild": "rimraf lib esm types",
+    "prebuild": "rimraf lib esm polyfills",
     "build": "run-p build:*",
     "build:esm": "tsc -p tsconfig.build.browser.json",
-    "build:cjs": "tsc -p tsconfig.build.node.json"
+    "build:cjs": "tsc -p tsconfig.build.node.json",
+    "build:polyfills": "microbundle -i src/polyfills/index.js -o polyfills/polyfills.js -f iife --no-sourcemap --external none --no-pkg-main"
   },
   "engines": {
     "node": ">= 12.0.0"
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.2",
-    "@shuvi/platform-shared": "1.0.0-rc.2",
-    "@shuvi/redox": "0.0.3",
-    "@shuvi/redox-react": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.2",
-    "@shuvi/router-react": "1.0.0-rc.2",
-    "@shuvi/runtime": "1.0.0-rc.2",
-    "@shuvi/service": "1.0.0-rc.2",
-    "@shuvi/shared": "1.0.0-rc.2",
-    "@shuvi/toolpack": "1.0.0-rc.2",
-    "@shuvi/utils": "1.0.0-rc.2",
+    "@shuvi/error-overlay": "1.0.0-rc.20",
+    "@shuvi/hook": "1.0.0-rc.20",
+    "@shuvi/platform-shared": "1.0.0-rc.20",
+    "@shuvi/redox": "0.0.7",
+    "@shuvi/redox-react": "0.0.7",
+    "@shuvi/router": "1.0.0-rc.20",
+    "@shuvi/router-react": "1.0.0-rc.20",
+    "@shuvi/runtime": "1.0.0-rc.20",
+    "@shuvi/service": "1.0.0-rc.20",
+    "@shuvi/shared": "1.0.0-rc.20",
+    "@shuvi/toolpack": "1.0.0-rc.20",
+    "@shuvi/utils": "1.0.0-rc.20",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
+    "core-js": "3.6.5",
     "ejs": "3.1.5",
     "fs-extra": "9.0.1",
     "node-mocks-http": "1.11.0",
+    "object-assign": "4.1.1",
     "raw-body": "2.4.1",
     "react": "18.1.0",
-    "react-app-polyfill": "2.0.0",
     "react-dom": "18.1.0",
     "react-refresh": "0.12.0",
-    "use-sync-external-store": "1.1.0"
+    "strip-ansi": "6.0.0",
+    "use-sync-external-store": "1.1.0",
+    "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.2"
+    "@shuvi/service": "1.0.0-rc.20"
   },
   "devDependencies": {
-    "@types/react": "18.0.9",
-    "@types/react-dom": "18.0.6",
-    "@types/react-test-renderer": "18.0.0",
-    "@shuvi/redox": "0.0.3",
     "@testing-library/react": "^13.2.0",
     "@types/content-type": "^1.1.5",
     "@types/cookie": "^0.4.1",
     "@types/ejs": "^3.1.0",
     "@types/raw-body": "^2.3.0",
-    "webpack": "5.73.0"
+    "@types/react": "18.0.9",
+    "@types/react-dom": "18.0.6",
+    "@types/react-test-renderer": "18.0.0",
+    "memfs": "3.1.2",
+    "microbundle": "0.15.1"
   }
 }