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

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

@@ -1,15 +1,17 @@
-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<{
+        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.js

@@ -13,7 +13,6 @@ const node_1 = require("@shuvi/platform-shared/node");
 const features_1 = require("./features");
 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 platformFramework = require(`./targets/${framework}`).default;
     const platformFrameworkContent = yield platformFramework();
     const platformModule = platformFrameworkContent.platformModule;
@@ -26,8 +25,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/shuvi-type-extensions-node.d.ts

@@ -1,4 +1,5 @@
 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';
@@ -8,6 +9,7 @@ export {};
 declare module '@shuvi/service/lib/resources' {
     const server: {
         server: IServerModule;
+        pageRoutes: IPageRouteRecord[];
         apiRoutes: IApiRoutes;
         middlewareRoutes: IMiddlewareRoutes;
         application: {

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

@@ -9,7 +9,7 @@ declare const _default: {
         configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
         addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
+        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
     } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
 };

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

@@ -64,6 +64,11 @@ 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')

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

@@ -9,7 +9,7 @@ declare const platformWebReact: () => {
         configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
         addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
+        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
     } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext> | {
         core: import("@shuvi/hook").IPluginInstance<{
@@ -22,7 +22,7 @@ declare const platformWebReact: () => {
             configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
             addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
             addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-            addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
+            addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<any, any>[]>;
             addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
         } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     })[];

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

@@ -9,7 +9,7 @@ export declare const RedoxReactPlugin: {
         configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<import("@shuvi/service/lib/core/lifecycleTypes").WebpackChainType, import("@shuvi/service/lib/core/lifecycleTypes").ConfigWebpackAssistant>;
         addExtraTarget: import("@shuvi/hook").AsyncParallelHook<import("@shuvi/service/lib/core/lifecycleTypes").ExtraTargetAssistant, void, import("@shuvi/service/lib/core/lifecycleTypes").TargetChain>;
         addResource: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").Resources | import("@shuvi/service/lib/core/lifecycleTypes").Resources[]>;
-        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOptions<any, any> | import("@shuvi/service/lib/project/index").FileOptions<any, any>[]>;
+        addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, import("@shuvi/service/lib/core/lifecycleTypes").AddRuntimeFileUtils, import("@shuvi/service/lib/project/index").FileOption<any, any> | import("@shuvi/service/lib/project/index").FileOption<any, any>[]>;
         addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService | import("@shuvi/service/lib/core/lifecycleTypes").RuntimeService[]>;
     } & import("@shuvi/service/lib/core/apiTypes").CustomCorePluginHooks, import("@shuvi/service").IPluginContext>;
     runtime: {

package/lib/shared/appTypes.d.ts

@@ -1,4 +1,4 @@
-import { IRequest, IRawPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
+import { IRequest, IPageRouteRecord, IAppData, IAppState } from '@shuvi/platform-shared/shared';
 import { Application } from '@shuvi/platform-shared/shuvi-app/application';
 export interface CreateAppServer {
     (options: {
@@ -8,7 +8,7 @@ export interface CreateAppServer {
 }
 export interface CreateAppClient {
     (options: {
-        routes: IRawPageRouteRecord[];
+        routes: IPageRouteRecord[];
         appComponent: any;
         appData: IAppData<any, IAppState>;
     }): Application;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -12,9 +12,12 @@
     "**/shuvi-app/entry/client/**"
   ],
   "files": [
-    "lib",
     "esm",
+    "lib",
+    "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": {
@@ -62,17 +65,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.3",
-    "@shuvi/platform-shared": "1.0.0-rc.3",
+    "@shuvi/hook": "1.0.0-rc.4",
+    "@shuvi/platform-shared": "1.0.0-rc.4",
     "@shuvi/redox": "0.0.3",
     "@shuvi/redox-react": "0.0.3",
-    "@shuvi/router": "1.0.0-rc.3",
-    "@shuvi/router-react": "1.0.0-rc.3",
-    "@shuvi/runtime": "1.0.0-rc.3",
-    "@shuvi/service": "1.0.0-rc.3",
-    "@shuvi/shared": "1.0.0-rc.3",
-    "@shuvi/toolpack": "1.0.0-rc.3",
-    "@shuvi/utils": "1.0.0-rc.3",
+    "@shuvi/router": "1.0.0-rc.4",
+    "@shuvi/router-react": "1.0.0-rc.4",
+    "@shuvi/runtime": "1.0.0-rc.4",
+    "@shuvi/service": "1.0.0-rc.4",
+    "@shuvi/shared": "1.0.0-rc.4",
+    "@shuvi/toolpack": "1.0.0-rc.4",
+    "@shuvi/utils": "1.0.0-rc.4",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
     "ejs": "3.1.5",
@@ -82,11 +85,13 @@
     "react": "18.1.0",
     "react-app-polyfill": "2.0.0",
     "react-dom": "18.1.0",
+    "react-error-overlay": "6.0.8",
     "react-refresh": "0.12.0",
+    "strip-ansi": "6.0.0",
     "use-sync-external-store": "1.1.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.3"
+    "@shuvi/service": "1.0.0-rc.4"
   },
   "devDependencies": {
     "@types/react": "18.0.9",

package/shuvi-env.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" />
+/// <reference types="react" />
+/// <reference types="react-dom" />
+
+// Extend the NodeJS namespace with Next.js-defined properties
+declare namespace NodeJS {
+  interface ProcessEnv {
+    readonly NODE_ENV: 'development' | 'production' | 'test';
+  }
+}

package/shuvi-image.d.ts

@@ -0,0 +1,54 @@
+declare module '*.bmp' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg' {
+  /**
+   * Use `any` to avoid conflicts with
+   * `@svgr/webpack` plugin or
+   * `babel-plugin-inline-react-svg` plugin.
+   */
+  const content: any;
+  export default content;
+}
+
+declare module '*.css' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.sass' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}
+
+declare module '*.scss' {
+  const classes: { readonly [key: string]: string };
+  export default classes;
+}

package/shuvi-type-extensions-node.js

@@ -0,0 +1 @@
+module.exports = {};

package/shuvi-type-extensions-runtime.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="@shuvi/platform-shared/shuvi-type-extensions-runtime" />
 
 declare module '@shuvi/app/files/routes' {
-  import { IRawPageRouteRecord } from '@shuvi/platform-shared/shared';
-  declare const routes: IRawPageRouteRecord[];
+  import { IPageRouteRecord } from '@shuvi/platform-shared/shared';
+  declare const routes: IPageRouteRecord[];
   export default routes;
 }
 

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

@@ -1,5 +0,0 @@
-declare const _default: (options?: {}) => {
-    subscribeToHmrEvent(handler: any): void;
-    reportRuntimeError(err: any): void;
-};
-export default _default;

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

@@ -1,34 +0,0 @@
-import connect from '@shuvi/toolpack/lib/utils/hotDevClient';
-import { DEV_HOT_MIDDLEWARE_PATH, DEV_HOT_LAUNCH_EDITOR_ENDPOINT } from '@shuvi/shared/lib/constants';
-let devClient;
-export default (options = {}) => {
-    if (devClient) {
-        return devClient;
-    }
-    devClient = connect(Object.assign(Object.assign({}, options), { launchEditorEndpoint: DEV_HOT_LAUNCH_EDITOR_ENDPOINT, path: DEV_HOT_MIDDLEWARE_PATH, location,
-        WebSocket }));
-    devClient.subscribeToHmrEvent((event) => {
-        // if (obj.action === "reloadPage") {
-        //   return window.location.reload();
-        // }
-        // if (obj.action === "removedPage") {
-        //   const [page] = obj.data;
-        //   if (page === window.next.router.pathname) {
-        //     return window.location.reload();
-        //   }
-        //   return;
-        // }
-        // if (obj.action === "addedPage") {
-        //   const [page] = obj.data;
-        //   if (
-        //     page === window.next.router.pathname &&
-        //     typeof window.next.router.components[page] === "undefined"
-        //   ) {
-        //     return window.location.reload();
-        //   }
-        //   return;
-        // }
-        // throw new Error("Unexpected action " + obj.action);
-    });
-    return devClient;
-};

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

@@ -1,3 +0,0 @@
-import { IPlatformContext, ResolvedPlugin } from '@shuvi/service/lib/core';
-/** This main plugin uses `platformContext` so that it is set to a plugin getter */
-export declare const getPlugin: (platformContext: IPlatformContext) => ResolvedPlugin;

package/lib/node/features/main/index.js

@@ -1,82 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlugin = void 0;
-const service_1 = require("@shuvi/service");
-const constants_1 = require("@shuvi/shared/lib/constants");
-const config_1 = require("@shuvi/toolpack/lib/webpack/config");
-const generateResource_1 = __importDefault(require("./generateResource"));
-const paths_1 = require("../../paths");
-const buildHtml_1 = require("./buildHtml");
-const middlewares_1 = require("../middlewares");
-function getServerEntry() {
-    return {
-        [service_1.BUILD_SERVER_FILE_SERVER]: [(0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/server')]
-    };
-}
-/** This main plugin uses `platformContext` so that it is set to a plugin getter */
-const getPlugin = (platformContext) => {
-    const core = (0, service_1.createPlugin)({
-        addExtraTarget: ({ createConfig }, context) => {
-            const serverWebpackHelpers = (0, config_1.webpackHelpers)();
-            const serverChain = createConfig({
-                name: constants_1.BUNDLER_TARGET_SERVER,
-                node: true,
-                entry: getServerEntry(),
-                outputDir: service_1.BUILD_SERVER_DIR,
-                webpackHelpers: serverWebpackHelpers
-            });
-            return {
-                name: constants_1.BUNDLER_TARGET_SERVER,
-                chain: serverChain
-            };
-        },
-        configWebpack: chain => {
-            chain.merge({
-                entry: {
-                    [service_1.BUILD_CLIENT_RUNTIME_POLYFILL]: ['@shuvi/app/core/polyfill'],
-                    [service_1.BUILD_CLIENT_RUNTIME_MAIN]: [
-                        (0, paths_1.resolvePkgFile)('esm/shuvi-app/entry/client')
-                    ]
-                }
-            });
-            return chain;
-        },
-        addRuntimeService: () => [
-            {
-                source: (0, paths_1.resolvePkgFile)('esm/shuvi-app/shuvi-runtime-index'),
-                exported: '*'
-            },
-            {
-                source: (0, paths_1.resolvePkgFile)('esm/shuvi-app/shuvi-runtime-server'),
-                filepath: 'server.ts',
-                exported: '*'
-            }
-        ],
-        addResource: context => (0, generateResource_1.default)(context),
-        afterBuild: (context) => __awaiter(void 0, void 0, void 0, function* () {
-            yield (0, buildHtml_1.buildHtml)({
-                context,
-                serverPlugins: platformContext.serverPlugins,
-                getMiddlewares: middlewares_1.getMiddlewares,
-                pathname: '/',
-                filename: 'index.html'
-            });
-        })
-    });
-    return {
-        core
-    };
-};
-exports.getPlugin = getPlugin;