ssr-plugin-react 6.1.15 → 6.1.19

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.19](https://github.com/zhangyuang/ssr/compare/v6.1.18...v6.1.19) (2021-12-08)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.18](https://github.com/zhangyuang/ssr/compare/v6.1.17...v6.1.18) (2021-12-07)
+
+
+### Features
+
+* add viteConfig ([ee86006](https://github.com/zhangyuang/ssr/commit/ee8600688b832b36089128e18f63a4cc8d630a25))
+
+
+
+
+
+## [6.1.17](https://github.com/zhangyuang/ssr/compare/v6.1.15...v6.1.17) (2021-12-07)
+
+
+### 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.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/README.md

@@ -107,13 +107,16 @@
 <a href="https://jiawu.dewu.com" target="_bvlank"><b>得物
 </b></a></td>
 <td align="center" style="height: 100px"><a href="https://www.habisummercamp.com/" target="_blank"><img src="https://res.wx.qq.com/op_res/XXUpF56bDue53vZadoCSPSnqKF3bZqPOQnqsPa_ngEARa0OUIW22pX7eKsftPb6pc5ny62cR_wXM4g5xJ7G3DQ
-" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
+" width="200px;margin: 20px 0" alt="Happy"/><br />
 <a href="https://www.habisummercamp.com/" target="_bvlank"><b>HappyPC
 </b></a></td>
 <td align="center" style="height: 100px"><a href="https://m.habisummercamp.com/" target="_blank"><img src="https://res.wx.qq.com/op_res/XXUpF56bDue53vZadoCSPSnqKF3bZqPOQnqsPa_ngEARa0OUIW22pX7eKsftPb6pc5ny62cR_wXM4g5xJ7G3DQ
-" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
+" width="200px;margin: 20px 0" alt="Happy"/><br />
 <a href="https://m.habisummercamp.com/" target="_bvlank"><b>HappyMobile
 </b></a></td>
+<td align="center" style="height: 100px"><a href="https://www.paixin.com/" target="_blank"><img src="https://www.paixin.com/favicon.ico" width="200px;margin: 20px 0" alt="Happy"/><br />
+<a href="https://www.paixin.com/" target="_bvlank"><b>拍信创意
+</b></a></td>
 </tr>
 </table>
 

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

@@ -1,15 +1,20 @@
 "use strict";
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientConfig = exports.serverConfig = exports.viteStart = exports.viteBuild = void 0;
 const ssr_server_utils_1 = require("ssr-server-utils");
 const plugin_react_1 = require("@vitejs/plugin-react");
 const build = require('vite').build;
-const { getOutput, reactServerEntry, reactClientEntry } = (0, ssr_server_utils_1.loadConfig)();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig } = (0, ssr_server_utils_1.loadConfig)();
 const { clientOutPut, serverOutPut } = getOutput();
 const serverConfig = {
     ...(0, ssr_server_utils_1.commonConfig)(),
     plugins: [
-        (0, plugin_react_1.default)()
+        (0, plugin_react_1.default)({
+            ...(_b = (_a = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.defaultPluginOptions,
+            jsxRuntime: 'classic'
+        }),
+        (_d = (_c = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _c === void 0 ? void 0 : _c.server) === null || _d === void 0 ? void 0 : _d.extraPlugin
     ],
     build: {
         ssr: reactServerEntry,
@@ -21,14 +26,22 @@ const serverConfig = {
         }
     },
     define: {
-        __isBrowser__: false
+        __isBrowser__: false,
+        ...(_f = (_e = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _e === void 0 ? void 0 : _e.server) === null || _f === void 0 ? void 0 : _f.define
     }
 };
 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)({
+            ...(_h = (_g = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _g === void 0 ? void 0 : _g.client) === null || _h === void 0 ? void 0 : _h.defaultPluginOptions,
+            jsxRuntime: 'classic'
+        }),
+        (_k = (_j = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _j === void 0 ? void 0 : _j.client) === null || _k === void 0 ? void 0 : _k.extraPlugin
     ],
     build: {
         ssrManifest: true,
@@ -40,7 +53,8 @@ const clientConfig = {
         }
     },
     define: {
-        __isBrowser__: true
+        __isBrowser__: true,
+        ...(_m = (_l = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _l === void 0 ? void 0 : _l.client) === null || _m === void 0 ? void 0 : _m.define
     }
 };
 exports.clientConfig = clientConfig;

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

@@ -1,12 +1,17 @@
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 import { loadConfig, chunkNamePlugin, output, manifestPlugin, commonConfig } from 'ssr-server-utils';
 import react from '@vitejs/plugin-react';
 const build = require('vite').build;
-const { getOutput, reactServerEntry, reactClientEntry } = loadConfig();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig } = loadConfig();
 const { clientOutPut, serverOutPut } = getOutput();
 const serverConfig = {
     ...commonConfig(),
     plugins: [
-        react()
+        react({
+            ...(_b = (_a = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _a === void 0 ? void 0 : _a.server) === null || _b === void 0 ? void 0 : _b.defaultPluginOptions,
+            jsxRuntime: 'classic'
+        }),
+        (_d = (_c = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _c === void 0 ? void 0 : _c.server) === null || _d === void 0 ? void 0 : _d.extraPlugin
     ],
     build: {
         ssr: reactServerEntry,
@@ -18,13 +23,21 @@ const serverConfig = {
         }
     },
     define: {
-        __isBrowser__: false
+        __isBrowser__: false,
+        ...(_f = (_e = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _e === void 0 ? void 0 : _e.server) === null || _f === void 0 ? void 0 : _f.define
     }
 };
 const clientConfig = {
     ...commonConfig(),
+    esbuild: {
+        keepNames: true
+    },
     plugins: [
-        react()
+        react({
+            ...(_h = (_g = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _g === void 0 ? void 0 : _g.client) === null || _h === void 0 ? void 0 : _h.defaultPluginOptions,
+            jsxRuntime: 'classic'
+        }),
+        (_k = (_j = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _j === void 0 ? void 0 : _j.client) === null || _k === void 0 ? void 0 : _k.extraPlugin
     ],
     build: {
         ssrManifest: true,
@@ -36,7 +49,8 @@ const clientConfig = {
         }
     },
     define: {
-        __isBrowser__: true
+        __isBrowser__: true,
+        ...(_m = (_l = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig()) === null || _l === void 0 ? void 0 : _l.client) === null || _m === void 0 ? void 0 : _m.define
     }
 };
 const viteStart = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.15",
+  "version": "6.1.19",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -54,10 +54,10 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.1.15",
-    "ssr-hoc-react": "^6.1.15",
-    "ssr-server-utils": "^6.1.15",
-    "ssr-webpack": "^6.1.15",
+    "ssr-client-utils": "^6.1.18",
+    "ssr-hoc-react": "^6.1.18",
+    "ssr-server-utils": "^6.1.19",
+    "ssr-webpack": "^6.1.19",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0-beta.10",
@@ -71,7 +71,7 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
-    "ssr-types-react": "^6.1.15"
+    "ssr-types-react": "^6.1.18"
   },
-  "gitHead": "d75838dfbd8191231c6cdd5e82b79bd94f50a32e"
+  "gitHead": "698a18c1ed0ebd7d449cde88aaff86b17036ee3c"
 }

package/src/config/server.ts

@@ -23,7 +23,7 @@ const getServerWebpack = (chain: WebpackChain) => {
   const modulesDir = [join(cwd, './node_modules')]
   modulesDir.push(getLocalNodeModules())
   chain.externals(nodeExternals({
-    whitelist: [/\.(css|less|sass|scss)$/, /antd.*?(style)/].concat(whiteList || []),
+    whitelist: [/\.(css|less|sass|scss)$/, /antd.*?(style)/].concat(whiteList as RegExp[] || []),
     // externals Dir contains example/xxx/node_modules ssr/node_modules
     modulesDir
   }))

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

@@ -2,13 +2,17 @@ import type { build as BuildType, UserConfig } from 'vite'
 import { loadConfig, chunkNamePlugin, output, manifestPlugin, commonConfig } from 'ssr-server-utils'
 import react from '@vitejs/plugin-react'
 const build: typeof BuildType = require('vite').build
-const { getOutput, reactServerEntry, reactClientEntry } = loadConfig()
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig } = loadConfig()
 const { clientOutPut, serverOutPut } = getOutput()
 
 const serverConfig: UserConfig = {
   ...commonConfig(),
   plugins: [
-    react()
+    react({
+      ...viteConfig?.()?.server?.defaultPluginOptions,
+      jsxRuntime: 'classic'
+    }),
+    viteConfig?.()?.server?.extraPlugin
   ],
   build: {
     ssr: reactServerEntry,
@@ -20,14 +24,22 @@ const serverConfig: UserConfig = {
     }
   },
   define: {
-    __isBrowser__: false
+    __isBrowser__: false,
+    ...viteConfig?.()?.server?.define
   }
 }
 
 const clientConfig: UserConfig = {
   ...commonConfig(),
+  esbuild: {
+    keepNames: true
+  },
   plugins: [
-    react()
+    react({
+      ...viteConfig?.()?.client?.defaultPluginOptions,
+      jsxRuntime: 'classic'
+    }),
+    viteConfig?.()?.client?.extraPlugin
   ],
   build: {
     ssrManifest: true,
@@ -39,7 +51,8 @@ const clientConfig: UserConfig = {
     }
   },
   define: {
-    __isBrowser__: true
+    __isBrowser__: true,
+    ...viteConfig?.()?.client?.define
   }
 }
 const viteStart = async () => {