@shuvi/platform-web 1.0.0-rc.7 → 1.0.0-rc.8

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

@@ -55,3 +55,10 @@ if (module.hot) {
     });
     module.hot.accept(['@shuvi/app/files/routes'], handleHotUpdate);
 }
+// For e2e test
+if (window.__SHUVI) {
+    window.__SHUVI.router = app.router;
+}
+else {
+    window.__SHUVI = { router: app.router };
+}

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

@@ -14,7 +14,7 @@ import { getServerError } from '@shuvi/error-overlay';
 import AppContainer from '../AppContainer';
 import { HeadManager, HeadManagerContext } from '../head';
 import Loadable from '../loadable';
-import { renderAction } from './render-action';
+import { doRender } from './render';
 const headManager = new HeadManager();
 export class ReactClientView {
     constructor() {
@@ -23,37 +23,30 @@ export class ReactClientView {
             const { _isInitialRender: isInitialRender } = this;
             const { router, appComponent: AppComponent, setError: setAppError, error: appError } = app;
             let { ssr, dynamicIds } = appData;
-            // For e2e test
-            if (window.__SHUVI) {
-                window.__SHUVI.router = router;
-            }
-            else {
-                window.__SHUVI = { router };
-            }
-            if (process.env.NODE_ENV === 'development') {
-                if (appError && appError.source === 'server') {
-                    setTimeout(() => {
-                        var _a;
-                        let error;
-                        try {
-                            // Generate a new error object. We `throw` it because some browsers
-                            // will set the `stack` when thrown, and we want to ensure ours is
-                            // not overridden when we re-throw it below.
-                            throw new Error(appError.message);
-                        }
-                        catch (e) {
-                            error = e;
-                        }
-                        error.name = (_a = appError.name) !== null && _a !== void 0 ? _a : '';
-                        error.stack = appError.stack;
-                        throw getServerError(error);
-                    });
-                }
-            }
+            const shouldHydrate = ssr && isInitialRender;
             const TypedAppComponent = AppComponent;
-            if (ssr) {
-                yield Loadable.preloadReady(dynamicIds);
-                yield router.ready;
+            if (ssr && isInitialRender) {
+                if (process.env.NODE_ENV === 'development') {
+                    if (appError && appError.source === 'server') {
+                        setTimeout(() => {
+                            var _a;
+                            let error;
+                            try {
+                                // Generate a new error object. We `throw` it because some browsers
+                                // will set the `stack` when thrown, and we want to ensure ours is
+                                // not overridden when we re-throw it below.
+                                throw new Error(appError.message);
+                            }
+                            catch (e) {
+                                error = e;
+                            }
+                            error.name = (_a = appError.name) !== null && _a !== void 0 ? _a : '';
+                            error.stack = appError.stack;
+                            throw getServerError(error);
+                        });
+                    }
+                }
+                yield Promise.all([Loadable.preloadReady(dynamicIds), router.ready]);
             }
             else {
                 yield router.ready;
@@ -70,15 +63,12 @@ export class ReactClientView {
           </HeadManagerContext.Provider>
         </AppContainer>
       </Router>);
-            const ssrCallback = () => {
-                this._isInitialRender = false;
-            };
-            renderAction({
-                ssr,
-                isInitialRender,
+            doRender({
                 root,
-                callback: ssrCallback,
-                appContainer
+                appContainer,
+                shouldHydrate
+            }, () => {
+                this._isInitialRender = false;
             });
         });
     }

package/esm/shuvi-app/react/view/render.d.ts

@@ -0,0 +1,8 @@
+import { ReactNode } from 'react';
+declare type RenderActionParam = {
+    appContainer: Element | Document;
+    root?: ReactNode;
+    shouldHydrate?: boolean;
+};
+declare let doRender: (options: RenderActionParam, callback: () => void) => void;
+export { doRender };

package/esm/shuvi-app/react/view/{render-action.js → render.js}

@@ -1,9 +1,9 @@
-let renderAction;
+let doRender;
 if (process.env.__SHUVI__AFTER__REACT__18__) {
     const { createRoot, hydrateRoot } = require('react-dom/client');
     let renderRoot;
-    renderAction = ({ ssr, isInitialRender, root, callback, appContainer }) => {
-        if (ssr && isInitialRender) {
+    doRender = ({ root, appContainer, shouldHydrate }, callback) => {
+        if (shouldHydrate) {
             renderRoot = hydrateRoot(appContainer, root);
             callback === null || callback === void 0 ? void 0 : callback();
         }
@@ -17,8 +17,8 @@ if (process.env.__SHUVI__AFTER__REACT__18__) {
 }
 else {
     const { hydrate, render } = require('react-dom');
-    renderAction = ({ ssr, isInitialRender, root, callback, appContainer }) => {
-        if (ssr && isInitialRender) {
+    doRender = ({ root, appContainer, shouldHydrate }, callback) => {
+        if (shouldHydrate) {
             hydrate(root, appContainer, callback);
         }
         else {
@@ -26,4 +26,4 @@ else {
         }
     };
 }
-export { renderAction };
+export { doRender };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.0-rc.7",
+  "version": "1.0.0-rc.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -65,18 +65,18 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/hook": "1.0.0-rc.7",
-    "@shuvi/platform-shared": "1.0.0-rc.7",
+    "@shuvi/hook": "1.0.0-rc.8",
+    "@shuvi/platform-shared": "1.0.0-rc.8",
     "@shuvi/redox": "0.0.6",
     "@shuvi/redox-react": "0.0.6",
-    "@shuvi/router": "1.0.0-rc.7",
-    "@shuvi/router-react": "1.0.0-rc.7",
-    "@shuvi/runtime": "1.0.0-rc.7",
-    "@shuvi/service": "1.0.0-rc.7",
-    "@shuvi/shared": "1.0.0-rc.7",
-    "@shuvi/toolpack": "1.0.0-rc.7",
-    "@shuvi/utils": "1.0.0-rc.7",
-    "@shuvi/error-overlay": "1.0.0-rc.7",
+    "@shuvi/router": "1.0.0-rc.8",
+    "@shuvi/router-react": "1.0.0-rc.8",
+    "@shuvi/runtime": "1.0.0-rc.8",
+    "@shuvi/service": "1.0.0-rc.8",
+    "@shuvi/shared": "1.0.0-rc.8",
+    "@shuvi/toolpack": "1.0.0-rc.8",
+    "@shuvi/utils": "1.0.0-rc.8",
+    "@shuvi/error-overlay": "1.0.0-rc.8",
     "content-type": "1.0.4",
     "cookie": "0.4.1",
     "ejs": "3.1.5",
@@ -92,7 +92,7 @@
     "use-sync-external-store": "1.1.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.0-rc.7"
+    "@shuvi/service": "1.0.0-rc.8"
   },
   "devDependencies": {
     "@types/react": "18.0.9",

package/esm/shuvi-app/react/view/render-action.d.ts

@@ -1,10 +0,0 @@
-import { ReactNode } from 'react';
-declare type RenderActionParam = {
-    ssr?: boolean;
-    isInitialRender?: boolean;
-    root?: ReactNode;
-    callback?: () => unknown;
-    appContainer?: Element | Document;
-};
-declare let renderAction: (options: RenderActionParam) => void;
-export { renderAction };