ssr-plugin-react 6.1.15 → 6.1.16

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.16](https://github.com/zhangyuang/ssr/compare/v6.1.15...v6.1.16) (2021-12-06)
+
+
+### Bug Fixes
+
+* add keepNames when esbuild compile plugin-react jsxRuntime use classic ([8502e6c](https://github.com/zhangyuang/ssr/commit/8502e6ca898fd99e936e60af2093fb6b174f6aab))
+* component evaluating in csr mode ([#138](https://github.com/zhangyuang/ssr/issues/138)) ([66f5f09](https://github.com/zhangyuang/ssr/commit/66f5f09963502588bd59a09ff839d1dae8947817))
+* plugin-react csr ([572c6c0](https://github.com/zhangyuang/ssr/commit/572c6c092c63c915da15883e1d34ad26a5a6cadd))
+* plugin-react csr ([ab51062](https://github.com/zhangyuang/ssr/commit/ab510626946234de436a55184937d018c8c0e514))
+
+
+
+
+
 ## [6.1.15](https://github.com/zhangyuang/ssr/compare/v6.1.14...v6.1.15) (2021-12-05)
 
 **Note:** Version bump only for package ssr-plugin-react

package/cjs/entry/server-entry.js

@@ -74,7 +74,7 @@ const serverRender = async (ctx, config) => {
     };
     const isCsr = !!(mode === 'csr' || ((_a = ctx.request.query) === null || _a === void 0 ? void 0 : _a.csr));
     const { component, fetch } = routeItem;
-    const Component = (await component()).default;
+    const Component = isCsr ? React.Fragment : (await component()).default;
     if (isCsr) {
         (0, ssr_server_utils_1.logGreen)(`Current path ${path} use csr render mode`);
     }
@@ -100,6 +100,7 @@ const serverRender = async (ctx, config) => {
         } });
     return (React.createElement(react_router_dom_1.StaticRouter, { location: ctx.request.url },
         React.createElement(create_context_1.STORE_CONTEXT.Provider, { value: { state: combineData } },
-            React.createElement(index_tsx_1.default, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null)))));
+            React.createElement(index_tsx_1.default, { ctx: ctx, config: config, staticList: staticList, injectState: injectState },
+                React.createElement(Component, null)))));
 };
 exports.serverRender = serverRender;

package/cjs/tools/vite.js

@@ -9,7 +9,9 @@ const { clientOutPut, serverOutPut } = getOutput();
 const serverConfig = {
     ...(0, ssr_server_utils_1.commonConfig)(),
     plugins: [
-        (0, plugin_react_1.default)()
+        (0, plugin_react_1.default)({
+            jsxRuntime: 'classic'
+        })
     ],
     build: {
         ssr: reactServerEntry,
@@ -27,8 +29,13 @@ const serverConfig = {
 exports.serverConfig = serverConfig;
 const clientConfig = {
     ...(0, ssr_server_utils_1.commonConfig)(),
+    esbuild: {
+        keepNames: true
+    },
     plugins: [
-        (0, plugin_react_1.default)()
+        (0, plugin_react_1.default)({
+            jsxRuntime: 'classic'
+        })
     ],
     build: {
         ssrManifest: true,

package/esm/entry/server-entry.js

@@ -71,7 +71,7 @@ const serverRender = async (ctx, config) => {
     };
     const isCsr = !!(mode === 'csr' || ((_a = ctx.request.query) === null || _a === void 0 ? void 0 : _a.csr));
     const { component, fetch } = routeItem;
-    const Component = (await component()).default;
+    const Component = isCsr ? React.Fragment : (await component()).default;
     if (isCsr) {
         logGreen(`Current path ${path} use csr render mode`);
     }
@@ -97,6 +97,7 @@ const serverRender = async (ctx, config) => {
         } });
     return (React.createElement(StaticRouter, { location: ctx.request.url },
         React.createElement(Context.Provider, { value: { state: combineData } },
-            React.createElement(Layout, { ctx: ctx, config: config, staticList: staticList, injectState: injectState }, isCsr ? React.createElement(React.Fragment, null) : React.createElement(Component, null)))));
+            React.createElement(Layout, { ctx: ctx, config: config, staticList: staticList, injectState: injectState },
+                React.createElement(Component, null)))));
 };
 export { serverRender };

package/esm/tools/vite.js

@@ -6,7 +6,9 @@ const { clientOutPut, serverOutPut } = getOutput();
 const serverConfig = {
     ...commonConfig(),
     plugins: [
-        react()
+        react({
+            jsxRuntime: 'classic'
+        })
     ],
     build: {
         ssr: reactServerEntry,
@@ -23,8 +25,13 @@ const serverConfig = {
 };
 const clientConfig = {
     ...commonConfig(),
+    esbuild: {
+        keepNames: true
+    },
     plugins: [
-        react()
+        react({
+            jsxRuntime: 'classic'
+        })
     ],
     build: {
         ssrManifest: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.15",
+  "version": "6.1.16",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -73,5 +73,5 @@
     "@types/webpack": "^4.41.10",
     "ssr-types-react": "^6.1.15"
   },
-  "gitHead": "d75838dfbd8191231c6cdd5e82b79bd94f50a32e"
+  "gitHead": "e8e142e95ad7d0b11864bf7caf982de0c2af38d6"
 }

package/src/entry/server-entry.tsx

@@ -80,7 +80,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
 
   const isCsr = !!(mode === 'csr' || ctx.request.query?.csr)
   const { component, fetch } = routeItem
-  const Component = (await component()).default
+  const Component = isCsr ? React.Fragment : (await component()).default
 
   if (isCsr) {
     logGreen(`Current path ${path} use csr render mode`)
@@ -111,7 +111,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
     <StaticRouter location={ctx.request.url}>
       <Context.Provider value={{ state: combineData }}>
         <Layout ctx={ctx} config={config} staticList={staticList} injectState={injectState}>
-          {isCsr ? <></> : <Component />}
+          <Component />
         </Layout>
       </Context.Provider>
     </StaticRouter>

package/src/tools/vite.ts

@@ -8,7 +8,9 @@ const { clientOutPut, serverOutPut } = getOutput()
 const serverConfig: UserConfig = {
   ...commonConfig(),
   plugins: [
-    react()
+    react({
+      jsxRuntime: 'classic'
+    })
   ],
   build: {
     ssr: reactServerEntry,
@@ -26,8 +28,13 @@ const serverConfig: UserConfig = {
 
 const clientConfig: UserConfig = {
   ...commonConfig(),
+  esbuild: {
+    keepNames: true
+  },
   plugins: [
-    react()
+    react({
+      jsxRuntime: 'classic'
+    })
   ],
   build: {
     ssrManifest: true,