@shuvi/platform-web 1.0.18 → 1.0.19

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

@@ -11,7 +11,6 @@ import { getRoutes } from '@shuvi/app/core/platform';
 import { runPreload, runLoaders, getRouteMatchesWithInvalidLoader, isRedirect, isResponse } from '@shuvi/platform-shared/shared';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createBrowserHistory, createHashHistory } from '@shuvi/router';
-import pageLoaders from '@shuvi/app/files/page-loaders';
 import { historyMode } from '@shuvi/app/files/routerConfig';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
 import { serializeServerError } from '../helper/serializeServerError';
@@ -59,6 +58,7 @@ export const createApp = ({ routes, appData, appComponent }) => {
             next();
             return;
         }
+        const pageLoaders = yield app.getLoaders();
         const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
         try {
             const loaderDatas = yield new Promise((resolve, reject) => {
@@ -131,6 +131,3 @@ export const createApp = ({ routes, appData, appComponent }) => {
     }));
     return app;
 };
-if (module.hot) {
-    module.hot.accept('@shuvi/app/files/page-loaders');
-}

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

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import routes from '@shuvi/app/files/routes';
 import { getRoutes, app as AppComponent } from '@shuvi/app/core/platform';
 import { runLoaders, getRouteMatchesWithInvalidLoader, isResponse, isRedirect } from '@shuvi/platform-shared/shared';
-import pageLoaders from '@shuvi/app/files/page-loaders';
 import application from '@shuvi/platform-shared/shuvi-app/application';
 import { createRouter, createMemoryHistory, pathToString } from '@shuvi/router';
 import logger from '@shuvi/utils/logger';
@@ -28,6 +27,7 @@ export const createApp = options => {
     let app;
     if (ssr) {
         router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
+            const pageLoaders = yield app.getLoaders();
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
             try {
                 const loaderResult = yield runLoaders(matches, pageLoaders, {

package/esm/shuvi-app/react/view/ReactView.client.jsx

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as React from 'react';
 import { SHUVI_ERROR } from '@shuvi/shared/constants';
 import { Router } from '@shuvi/router-react';
-import { getServerError } from '@shuvi/error-overlay';
 import AppContainer from '../AppContainer';
 import { HeadManager, HeadManagerContext } from '../head';
 import Loadable from '../loadable';
@@ -27,6 +26,7 @@ export class ReactClientView {
             const TypedAppComponent = AppComponent;
             if (ssr && isInitialRender) {
                 if (process.env.NODE_ENV === 'development') {
+                    const { getServerError } = require('@shuvi/error-overlay');
                     if (appError && appError.source === 'server') {
                         setTimeout(() => {
                             var _a;

package/esm/shuvi-app/react/view/ReactView.server.bare.d.ts

@@ -0,0 +1,4 @@
+import { IReactServerView } from '../types';
+export declare class ReactServerView implements IReactServerView {
+    renderApp: IReactServerView['renderApp'];
+}

package/esm/shuvi-app/react/view/ReactView.server.bare.jsx

@@ -0,0 +1,28 @@
+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());
+    });
+};
+export class ReactServerView {
+    constructor() {
+        this.renderApp = () => __awaiter(this, void 0, void 0, function* () {
+            const htmlContent = '';
+            const appData = {
+                dynamicIds: []
+            };
+            return {
+                appData,
+                content: htmlContent,
+                htmlAttrs: {},
+                headBeginTags: [],
+                headEndTags: [],
+                bodyBeginTags: [],
+                bodyEndTags: []
+            };
+        });
+    }
+}

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

@@ -46,7 +46,7 @@ Object.defineProperty(exports, "getPageMiddleware", { enumerable: true, get: fun
 /** This plugin uses `platformContext` so that it is set to a plugin getter */
 const getPlugin = (platformContext) => {
     const core = (0, service_1.createPlugin)({
-        configWebpack: (chain, { name, mode }, ctx) => {
+        configWebpack: (chain, { webpack, name, mode }, ctx) => {
             const isDev = mode === 'development';
             const pkgVersion = (0, version_1.getVersion)();
             const isServer = name === shared_1.BUNDLER_TARGET_SERVER;
@@ -79,6 +79,19 @@ const getPlugin = (platformContext) => {
             else if (isServer) {
                 if (!ctx.config.ssr) {
                     chain.resolve.alias.set('@shuvi/platform-shared/shuvi-app/application$', '@shuvi/platform-shared/shuvi-app/application.bare');
+                    chain
+                        .plugin('replace/ReactView.server')
+                        .use(webpack.NormalModuleReplacementPlugin, [
+                        /\.\/ReactView\.server/,
+                        function (resource) {
+                            const { context } = resource;
+                            // form shuvi internal request
+                            if (context.endsWith('esm/shuvi-app/react/view')) {
+                                resource.request = './ReactView.server.bare';
+                            }
+                            return resource;
+                        }
+                    ]);
                 }
                 chain.plugin('private/build-manifest').use(build_manifest_plugin_1.default, [
                     {

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

@@ -102,12 +102,6 @@ const configWebpack = (config, { name, webpack }, context) => {
             }
         ]);
         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]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,17 +72,17 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.18",
-    "@shuvi/hook": "1.0.18",
-    "@shuvi/platform-shared": "1.0.18",
+    "@shuvi/error-overlay": "1.0.19",
+    "@shuvi/hook": "1.0.19",
+    "@shuvi/platform-shared": "1.0.19",
     "doura": "0.0.8",
     "react-doura": "0.0.8",
-    "@shuvi/router": "1.0.18",
-    "@shuvi/router-react": "1.0.18",
-    "@shuvi/runtime": "1.0.18",
-    "@shuvi/shared": "1.0.18",
-    "@shuvi/toolpack": "1.0.18",
-    "@shuvi/utils": "1.0.18",
+    "@shuvi/router": "1.0.19",
+    "@shuvi/router-react": "1.0.19",
+    "@shuvi/runtime": "1.0.19",
+    "@shuvi/shared": "1.0.19",
+    "@shuvi/toolpack": "1.0.19",
+    "@shuvi/utils": "1.0.19",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "ejs": "3.1.5",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.18"
+    "@shuvi/service": "1.0.19"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",

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

@@ -10,13 +10,6 @@ declare module '@shuvi/app/files/routerConfig' {
   export const historyMode: 'browser' | 'hash';
 }
 
-declare module '@shuvi/app/files/page-loaders' {
-  import { IRouteLoaderContext, Loader } from '@shuvi/platform-shared/shared';
-
-  const loaders: Record<string, Loader>;
-  export default loaders;
-}
-
 declare module '@shuvi/app/files/apiRoutes' {
   import { IApiRoutes } from '@shuvi/platform-web/shared';