ssr-plugin-react 6.2.16 → 6.2.17

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [6.2.17](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.16...plugin-react@6.2.17) (2022-05-05)
+
+
+### Bug Fixes
+
+* add build:publish disable sourcemap ([ef82b29](https://github.com/zhangyuang/ssr/commit/ef82b298ddf19b72b130d76c33bfbca67339b139))
+
+
+### Features
+
+*  optimize code remove disableClientRender fix vite ([eeff477](https://github.com/zhangyuang/ssr/commit/eeff4770f8d9ff400289cf4d1ca4dd32883be108))
+
+
+
 ## [6.2.16](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.15...plugin-react@6.2.16) (2022-05-04)
 
 

package/README.md

@@ -282,17 +282,17 @@ $ yarn start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 
 ```bash
 $ cloc packages --include-ext=ts
-     984 text files.
-     668 unique files.
-     823 files ignored.
+     993 text files.
+     679 unique files.
+     829 files ignored.
 
-github.com/AlDanial/cloc v 1.90  T=0.57 s (284.6 files/s, 10042.8 lines/s)
+github.com/AlDanial/cloc v 1.90  T=0.62 s (264.7 files/s, 9026.5 lines/s)
 -------------------------------------------------------------------------------
 Language                     files          blank        comment           code
 -------------------------------------------------------------------------------
-TypeScript                     161            480            197           5004
+TypeScript                     164            471            195           4927
 -------------------------------------------------------------------------------
-SUM:                           161            480            197           5004
+SUM:                           164            471            195           4927
 -------------------------------------------------------------------------------
 ```
 

package/cjs/config/base.js

@@ -138,4 +138,3 @@ const getBaseConfig = (chain, isServer) => {
     return config;
 };
 exports.getBaseConfig = getBaseConfig;
-//# sourceMappingURL=base.js.map

package/cjs/config/client.js

@@ -114,4 +114,3 @@ const getClientWebpack = (chain) => {
     return chain.toConfig();
 };
 exports.getClientWebpack = getClientWebpack;
-//# sourceMappingURL=client.js.map

package/cjs/config/index.js

@@ -16,4 +16,3 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./client"), exports);
 __exportStar(require("./server"), exports);
-//# sourceMappingURL=index.js.map

package/cjs/config/server.js

@@ -35,4 +35,3 @@ const getServerWebpack = (chain) => {
     return chain.toConfig();
 };
 exports.getServerWebpack = getServerWebpack;
-//# sourceMappingURL=server.js.map

package/cjs/entry/client-entry.js

@@ -31,9 +31,4 @@ const clientRender = async () => {
                     })))))), document.getElementById('app'));
 };
 exports.clientRender = clientRender;
-if (!window.__disableClientRender__) {
-    // 如果服务端直出的时候带上该记号，则默认不进行客户端渲染，将处理逻辑交给上层
-    // 可用于微前端场景下自定义什么时候进行组件渲染的逻辑调用
-    clientRender();
-}
-//# sourceMappingURL=client-entry.js.map
+clientRender();

package/cjs/entry/context.js

@@ -29,4 +29,3 @@ function AppContext(props) {
     return (React.createElement(create_context_1.STORE_CONTEXT.Provider, { value: { state, dispatch } }, props.children));
 }
 exports.AppContext = AppContext;
-//# sourceMappingURL=context.js.map

package/cjs/entry/create-context.js

@@ -17,4 +17,3 @@ else {
         state: {}
     });
 }
-//# sourceMappingURL=create-context.js.map

package/cjs/entry/create-router.js

@@ -24,4 +24,3 @@ if (ManualRoutesWithType.FeRoutes) {
     });
     Routes.FeRoutes = combineRoutes;
 }
-//# sourceMappingURL=create-router.js.map

package/cjs/entry/server-entry.js

@@ -11,7 +11,7 @@ const create_router_1 = require("./create-router");
 const { FeRoutes, layoutFetch, state, Layout } = create_router_1.Routes;
 const serverRender = async (ctx, config) => {
     var _a;
-    const { mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config;
+    const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config;
     const path = (0, ssr_server_utils_1.normalizePath)(ctx.request.path, prefix);
     const routeItem = (0, ssr_server_utils_1.findRoute)(FeRoutes, path);
     if (!routeItem) {
@@ -24,32 +24,18 @@ const serverRender = async (ctx, config) => {
     const dynamicCssOrder = await (0, ssr_server_utils_1.getAsyncCssChunk)(ctx, webpackChunkName);
     const dynamicJsOrder = await (0, ssr_server_utils_1.getAsyncJsChunk)(ctx);
     const manifest = await (0, ssr_server_utils_1.getManifest)(config);
-    const injectCss = [];
-    if (isVite && isDev) {
-        injectCss.push(React.createElement("script", { src: "/@vite/client", type: "module", key: "vite-client" }));
-        injectCss.push(React.createElement("script", { key: "vite-react-refresh", type: "module", dangerouslySetInnerHTML: {
+    const injectCss = (isVite && isDev) ? [
+        React.createElement("script", { src: "/@vite/client", type: "module", key: "vite-client" }),
+        React.createElement("script", { key: "vite-react-refresh", type: "module", dangerouslySetInnerHTML: {
                 __html: ssr_server_utils_1.reactRefreshFragment
-            } }));
-    }
-    else {
-        dynamicCssOrder.forEach(css => {
-            if (manifest[css]) {
-                const item = manifest[css];
-                injectCss.push(React.createElement("link", { rel: 'stylesheet', key: item, href: item }));
-            }
-        });
-    }
-    if (disableClientRender) {
-        injectCss.push(React.createElement("script", { key: "disableClientRender", dangerouslySetInnerHTML: {
-                __html: 'window.__disableClientRender__ = true'
-            } }));
-    }
+            } })
+    ] : dynamicCssOrder.map(css => manifest[css]).filter(Boolean).map(css => React.createElement("link", { rel: 'stylesheet', key: css, href: css }));
     const injectScript = [
         ...(isVite ? [React.createElement("script", { key: "viteWindowInit", dangerouslySetInnerHTML: {
                     __html: 'window.__USE_VITE__=true'
                 } })] : []),
         ...((isVite && isDev) ? [React.createElement("script", { type: "module", src: '/node_modules/ssr-plugin-react/esm/entry/client-entry.js', key: "vite-react-entry" })] : []),
-        ...dynamicJsOrder.map(js => manifest[js]).filter(item => !!item).map(item => React.createElement("script", { key: item, src: item, type: isVite ? 'module' : '' }))
+        ...dynamicJsOrder.map(js => manifest[js]).filter(Boolean).map(item => React.createElement("script", { key: item, src: item, type: isVite ? 'module' : '' }))
     ];
     const staticList = {
         injectCss,
@@ -86,4 +72,3 @@ const serverRender = async (ctx, config) => {
                 React.createElement(Component, null)))));
 };
 exports.serverRender = serverRender;
-//# sourceMappingURL=server-entry.js.map

package/cjs/index.js

@@ -44,4 +44,3 @@ function clientPlugin() {
 }
 exports.clientPlugin = clientPlugin;
 __exportStar(require("./tools/vite"), exports);
-//# sourceMappingURL=index.js.map

package/cjs/tools/vite.js

@@ -97,4 +97,3 @@ const viteBuild = async () => {
     await (0, vite_1.build)({ ...serverConfig, mode: 'production' });
 };
 exports.viteBuild = viteBuild;
-//# sourceMappingURL=vite.js.map

package/cjs/tools/webpack.js

@@ -20,4 +20,3 @@ const webpackBuild = async () => {
     await Promise.all([startServerBuild(getServerWebpack(serverConfigChain)), startClientBuild(getClientWebpack(clientConfigChain))]);
 };
 exports.webpackBuild = webpackBuild;
-//# sourceMappingURL=webpack.js.map

package/esm/config/base.js

@@ -135,4 +135,3 @@ const getBaseConfig = (chain, isServer) => {
     return config;
 };
 export { getBaseConfig };
-//# sourceMappingURL=base.js.map

package/esm/config/client.js

@@ -111,4 +111,3 @@ const getClientWebpack = (chain) => {
     return chain.toConfig();
 };
 export { getClientWebpack };
-//# sourceMappingURL=client.js.map

package/esm/config/index.js

@@ -1,3 +1,2 @@
 export * from './client';
 export * from './server';
-//# sourceMappingURL=index.js.map

package/esm/config/server.js

@@ -32,4 +32,3 @@ const getServerWebpack = (chain) => {
     return chain.toConfig();
 };
 export { getServerWebpack };
-//# sourceMappingURL=server.js.map

package/esm/entry/client-entry.js

@@ -27,10 +27,5 @@ const clientRender = async () => {
                         return (React.createElement(Route, { exact: true, key: path, path: path, render: () => React.createElement(WrappedComponent, { key: location.pathname }) }));
                     })))))), document.getElementById('app'));
 };
-if (!window.__disableClientRender__) {
-    // 如果服务端直出的时候带上该记号，则默认不进行客户端渲染，将处理逻辑交给上层
-    // 可用于微前端场景下自定义什么时候进行组件渲染的逻辑调用
-    clientRender();
-}
+clientRender();
 export { clientRender };
-//# sourceMappingURL=client-entry.js.map

package/esm/entry/context.js

@@ -25,4 +25,3 @@ export function AppContext(props) {
     const [state, dispatch] = useReducer(combineReducer, initialState);
     return (React.createElement(STORE_CONTEXT.Provider, { value: { state, dispatch } }, props.children));
 }
-//# sourceMappingURL=context.js.map

package/esm/entry/create-context.js

@@ -14,4 +14,3 @@ else {
     });
 }
 export { STORE_CONTEXT };
-//# sourceMappingURL=create-context.js.map

package/esm/entry/create-router.js

@@ -21,4 +21,3 @@ if (ManualRoutesWithType.FeRoutes) {
     Routes.FeRoutes = combineRoutes;
 }
 export { Routes };
-//# sourceMappingURL=create-router.js.map

package/esm/entry/server-entry.js

@@ -8,7 +8,7 @@ import { Routes } from './create-router';
 const { FeRoutes, layoutFetch, state, Layout } = Routes;
 const serverRender = async (ctx, config) => {
     var _a;
-    const { mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config;
+    const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config;
     const path = normalizePath(ctx.request.path, prefix);
     const routeItem = findRoute(FeRoutes, path);
     if (!routeItem) {
@@ -21,32 +21,18 @@ const serverRender = async (ctx, config) => {
     const dynamicCssOrder = await getAsyncCssChunk(ctx, webpackChunkName);
     const dynamicJsOrder = await getAsyncJsChunk(ctx);
     const manifest = await getManifest(config);
-    const injectCss = [];
-    if (isVite && isDev) {
-        injectCss.push(React.createElement("script", { src: "/@vite/client", type: "module", key: "vite-client" }));
-        injectCss.push(React.createElement("script", { key: "vite-react-refresh", type: "module", dangerouslySetInnerHTML: {
+    const injectCss = (isVite && isDev) ? [
+        React.createElement("script", { src: "/@vite/client", type: "module", key: "vite-client" }),
+        React.createElement("script", { key: "vite-react-refresh", type: "module", dangerouslySetInnerHTML: {
                 __html: reactRefreshFragment
-            } }));
-    }
-    else {
-        dynamicCssOrder.forEach(css => {
-            if (manifest[css]) {
-                const item = manifest[css];
-                injectCss.push(React.createElement("link", { rel: 'stylesheet', key: item, href: item }));
-            }
-        });
-    }
-    if (disableClientRender) {
-        injectCss.push(React.createElement("script", { key: "disableClientRender", dangerouslySetInnerHTML: {
-                __html: 'window.__disableClientRender__ = true'
-            } }));
-    }
+            } })
+    ] : dynamicCssOrder.map(css => manifest[css]).filter(Boolean).map(css => React.createElement("link", { rel: 'stylesheet', key: css, href: css }));
     const injectScript = [
         ...(isVite ? [React.createElement("script", { key: "viteWindowInit", dangerouslySetInnerHTML: {
                     __html: 'window.__USE_VITE__=true'
                 } })] : []),
         ...((isVite && isDev) ? [React.createElement("script", { type: "module", src: '/node_modules/ssr-plugin-react/esm/entry/client-entry.js', key: "vite-react-entry" })] : []),
-        ...dynamicJsOrder.map(js => manifest[js]).filter(item => !!item).map(item => React.createElement("script", { key: item, src: item, type: isVite ? 'module' : '' }))
+        ...dynamicJsOrder.map(js => manifest[js]).filter(Boolean).map(item => React.createElement("script", { key: item, src: item, type: isVite ? 'module' : '' }))
     ];
     const staticList = {
         injectCss,
@@ -83,4 +69,3 @@ const serverRender = async (ctx, config) => {
                 React.createElement(Component, null)))));
 };
 export { serverRender };
-//# sourceMappingURL=server-entry.js.map

package/esm/index.js

@@ -26,4 +26,3 @@ export function clientPlugin() {
     };
 }
 export * from './tools/vite';
-//# sourceMappingURL=index.js.map

package/esm/tools/vite.js

@@ -91,4 +91,3 @@ const viteBuild = async () => {
     await build({ ...serverConfig, mode: 'production' });
 };
 export { viteBuild, viteStart, serverConfig, clientConfig };
-//# sourceMappingURL=vite.js.map

package/esm/tools/webpack.js

@@ -15,4 +15,3 @@ export const webpackBuild = async () => {
     const clientConfigChain = new WebpackChain();
     await Promise.all([startServerBuild(getServerWebpack(serverConfigChain)), startClientBuild(getClientWebpack(clientConfigChain))]);
 };
-//# sourceMappingURL=webpack.js.map

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.2.16",
+  "version": "6.2.17",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
   "sideEffects": false,
   "scripts": {
     "build": "concurrently \"tsc -p ./tsconfig.cjs.json \" \" tsc -p ./tsconfig.esm.json\"",
+    "build:publish": "concurrently \"tsc -p ./tsconfig.cjs.json --sourcemap false\" \" tsc -p ./tsconfig.esm.json --sourcemap false\"",
     "watch": "concurrently \"tsc -w -p ./tsconfig.cjs.json \" \"tsc -w -p ./tsconfig.esm.json \""
   },
   "repository": {

package/src/entry/client-entry.tsx

@@ -44,11 +44,8 @@ const clientRender = async (): Promise<void> => {
     , document.getElementById('app'))
 
 }
-if (!window.__disableClientRender__) {
-  // 如果服务端直出的时候带上该记号，则默认不进行客户端渲染，将处理逻辑交给上层
-  // 可用于微前端场景下自定义什么时候进行组件渲染的逻辑调用
-  clientRender()
-}
+
+clientRender()
 
 export {
   clientRender

package/src/entry/server-entry.tsx

@@ -10,7 +10,7 @@ import { Routes } from './create-router'
 const { FeRoutes, layoutFetch, state, Layout } = Routes as ReactRoutesType
 
 const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.ReactElement> => {
-  const { mode, parallelFetch, disableClientRender, prefix, isVite, isDev, clientPrefix } = config
+  const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config
   const path = normalizePath(ctx.request.path, prefix)
   const routeItem = findRoute<ReactESMFeRouteItem>(FeRoutes, path)
 
@@ -26,34 +26,19 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
   const dynamicJsOrder = await getAsyncJsChunk(ctx)
   const manifest = await getManifest(config)
 
-  const injectCss: JSX.Element[] = []
-
-  if (isVite && isDev) {
-    injectCss.push(<script src="/@vite/client" type="module" key="vite-client"/>)
-    injectCss.push(<script key="vite-react-refresh" type="module" dangerouslySetInnerHTML={{
+  const injectCss = (isVite && isDev) ? [
+    <script src="/@vite/client" type="module" key="vite-client"/>,
+    <script key="vite-react-refresh" type="module" dangerouslySetInnerHTML={{
       __html: reactRefreshFragment
-    }} />)
-  } else {
-    dynamicCssOrder.forEach(css => {
-      if (manifest[css]) {
-        const item = manifest[css]
-        injectCss.push(<link rel='stylesheet' key={item} href={item} />)
-      }
-    })
-  }
-
-  if (disableClientRender) {
-    injectCss.push(<script key="disableClientRender" dangerouslySetInnerHTML={{
-      __html: 'window.__disableClientRender__ = true'
-    }}/>)
-  }
+    }} />
+  ] : dynamicCssOrder.map(css => manifest[css]).filter(Boolean).map(css => <link rel='stylesheet' key={css} href={css} />)
 
   const injectScript = [
     ...(isVite ? [<script key="viteWindowInit" dangerouslySetInnerHTML={{
       __html: 'window.__USE_VITE__=true'
     }} />] : []),
     ...((isVite && isDev) ? [<script type="module" src='/node_modules/ssr-plugin-react/esm/entry/client-entry.js' key="vite-react-entry" />] : []),
-    ...dynamicJsOrder.map(js => manifest[js]).filter(item => !!item).map(item => <script key={item} src={item} type={isVite ? 'module' : ''}/>)
+    ...dynamicJsOrder.map(js => manifest[js]).filter(Boolean).map(item => <script key={item} src={item} type={isVite ? 'module' : ''}/>)
   ]
   const staticList = {
     injectCss,