ssr-plugin-react 6.1.30 → 6.1.36

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.36](https://github.com/zhangyuang/ssr/compare/v6.1.35...v6.1.36) (2021-12-30)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.35](https://github.com/zhangyuang/ssr/compare/v6.1.34...v6.1.35) (2021-12-30)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.34](https://github.com/zhangyuang/ssr/compare/v6.1.33...v6.1.34) (2021-12-29)
+
+
+### Features
+
+* support dynamic css preload in vite mode ([3979b42](https://github.com/zhangyuang/ssr/commit/3979b4236c3fdcc0312987f86783f8485892276e))
+
+
+
+
+
+## [6.1.31](https://github.com/zhangyuang/ssr/compare/v6.1.30...v6.1.31) (2021-12-17)
+
+
+### Bug Fixes
+
+* node12 vite ssr optimize ([941a405](https://github.com/zhangyuang/ssr/commit/941a40507303606859ecd08a8594010929c4aaaa))
+
+
+
+
+
 ## [6.1.30](https://github.com/zhangyuang/ssr/compare/v6.1.29...v6.1.30) (2021-12-17)
 
 

package/README.md

@@ -273,7 +273,7 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 
 <div style="display:flex">
 <img src="https://res.wx.qq.com/op_res/7F1t4Z8yCHWilehbcFGjAj0yVn0URMiWBGVJa-TVu_eqw5IwUXA2kPYBnfX6YRHy0FVBB-yC6l0IEL02QTJkLg" width="300">
-<img src="https://res.wx.qq.com/op_res/i1X1OIr2VfQ9MLcvsFOCyN4UWghSc85u64U8OeXxQWKrpdXvpnhe-gms1sUgtRr_QOHZPqanJ2G_lNzuN00ZvQ" width="300">
+<img src="https://res.wx.qq.com/op_res/QHEy-aukLNwJhw1OYtAnYlslZscEeZ8SyyTcolA3wSnHM-wpfwLJYbzQMtfEeD44sN9tAYryDJQkmWSlElMJkw" width="300">
 </div>
 
 ## 前端开发手册

package/cjs/entry/server-entry.js

@@ -4,7 +4,7 @@ exports.serverRender = void 0;
 const React = require("react");
 const react_router_dom_1 = require("react-router-dom");
 const ssr_server_utils_1 = require("ssr-server-utils");
-//@ts-expect-error
+// @ts-expect-error
 const serializeWrap = require("serialize-javascript");
 // @ts-expect-error
 const Routes = require("_build/ssr-temporary-routes");
@@ -32,7 +32,8 @@ const serverRender = async (ctx, config) => {
     let dynamicCssOrder = cssOrder;
     if (dynamic) {
         dynamicCssOrder = cssOrder.concat([`${routeItem.webpackChunkName}.css`]);
-        if (!isVite) {
+        if (!isVite || (isVite && !isDev)) {
+            // call it when webpack mode or vite prod mode
             dynamicCssOrder = await (0, ssr_server_utils_1.addAsyncChunk)(dynamicCssOrder, routeItem.webpackChunkName);
         }
     }

package/cjs/tools/vite.js

@@ -6,7 +6,7 @@ const ssr_server_utils_1 = require("ssr-server-utils");
 const plugin_react_1 = require("@vitejs/plugin-react");
 const vite_plugin_style_import_1 = require("vite-plugin-style-import");
 const build = require('vite').build;
-const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining } = (0, ssr_server_utils_1.loadConfig)();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev } = (0, ssr_server_utils_1.loadConfig)();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {
     include: ['**/*.vue', '**/*.ts', '**/*.js', '**/*.tsx', '**/*.jsx', /chunkName/],
@@ -20,10 +20,6 @@ const styleImportConfig = {
 };
 const serverConfig = {
     ...(0, ssr_server_utils_1.commonConfig)(),
-    optimizeDeps: {
-        include: ['path-to-regexp', 'react-dom'],
-        exclude: ['ssr-server-utils']
-    },
     plugins: [
         (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,
@@ -43,6 +39,7 @@ const serverConfig = {
         ssr: reactServerEntry,
         outDir: serverOutPut,
         rollupOptions: {
+            input: isDev ? reactClientEntry : '',
             output: {
                 entryFileNames: 'Page.server.js'
             }
@@ -74,7 +71,7 @@ const clientConfig = {
         rollupOptions: {
             input: reactClientEntry,
             output: ssr_server_utils_1.rollupOutputOptions,
-            plugins: [(0, ssr_server_utils_1.chunkNamePlugin)(), (0, ssr_server_utils_1.manifestPlugin)()]
+            plugins: [(0, ssr_server_utils_1.chunkNamePlugin)(), (0, ssr_server_utils_1.asyncOptimizeChunkPlugin)(), (0, ssr_server_utils_1.manifestPlugin)()]
         }
     },
     define: {

package/esm/entry/server-entry.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { StaticRouter } from 'react-router-dom';
 import { findRoute, getManifest, logGreen, normalizePath, addAsyncChunk } from 'ssr-server-utils';
-//@ts-expect-error
+// @ts-expect-error
 import * as serializeWrap from 'serialize-javascript';
 // @ts-expect-error
 import * as Routes from '_build/ssr-temporary-routes';
@@ -29,7 +29,8 @@ const serverRender = async (ctx, config) => {
     let dynamicCssOrder = cssOrder;
     if (dynamic) {
         dynamicCssOrder = cssOrder.concat([`${routeItem.webpackChunkName}.css`]);
-        if (!isVite) {
+        if (!isVite || (isVite && !isDev)) {
+            // call it when webpack mode or vite prod mode
             dynamicCssOrder = await addAsyncChunk(dynamicCssOrder, routeItem.webpackChunkName);
         }
     }

package/esm/tools/vite.js

@@ -1,9 +1,9 @@
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig } from 'ssr-server-utils';
+import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig, asyncOptimizeChunkPlugin } from 'ssr-server-utils';
 import react from '@vitejs/plugin-react';
 import styleImport, { AndDesignVueResolve, VantResolve, ElementPlusResolve, NutuiResolve, AntdResolve } from 'vite-plugin-style-import';
 const build = require('vite').build;
-const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining } = loadConfig();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev } = loadConfig();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {
     include: ['**/*.vue', '**/*.ts', '**/*.js', '**/*.tsx', '**/*.jsx', /chunkName/],
@@ -17,10 +17,6 @@ const styleImportConfig = {
 };
 const serverConfig = {
     ...commonConfig(),
-    optimizeDeps: {
-        include: ['path-to-regexp', 'react-dom'],
-        exclude: ['ssr-server-utils']
-    },
     plugins: [
         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,
@@ -40,6 +36,7 @@ const serverConfig = {
         ssr: reactServerEntry,
         outDir: serverOutPut,
         rollupOptions: {
+            input: isDev ? reactClientEntry : '',
             output: {
                 entryFileNames: 'Page.server.js'
             }
@@ -70,7 +67,7 @@ const clientConfig = {
         rollupOptions: {
             input: reactClientEntry,
             output: rollupOutputOptions,
-            plugins: [chunkNamePlugin(), manifestPlugin()]
+            plugins: [chunkNamePlugin(), asyncOptimizeChunkPlugin(), manifestPlugin()]
         }
     },
     define: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.30",
+  "version": "6.1.36",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -58,8 +58,8 @@
     "serialize-javascript": "^6.0.0",
     "ssr-client-utils": "^6.1.29",
     "ssr-hoc-react": "^6.1.29",
-    "ssr-server-utils": "^6.1.29",
-    "ssr-webpack": "^6.1.29",
+    "ssr-server-utils": "^6.1.36",
+    "ssr-webpack": "^6.1.36",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0",
@@ -76,5 +76,5 @@
     "@types/webpack": "^4.41.10",
     "ssr-types-react": "^6.1.29"
   },
-  "gitHead": "880fd2d12752666a1d89dd37f30bf1fef801b0b2"
+  "gitHead": "1383b509801fc3912fe8a498a10ffe78040a29f5"
 }

package/src/entry/server-entry.tsx

@@ -2,7 +2,7 @@ import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
 import { findRoute, getManifest, logGreen, normalizePath, addAsyncChunk } from 'ssr-server-utils'
 import { ISSRContext, IConfig, ReactRoutesType, ReactESMFeRouteItem } from 'ssr-types-react'
-//@ts-expect-error
+// @ts-expect-error
 import * as serializeWrap from 'serialize-javascript'
 // @ts-expect-error
 import * as Routes from '_build/ssr-temporary-routes'
@@ -34,7 +34,8 @@ const serverRender = async (ctx: ISSRContext, config: IConfig): Promise<React.Re
 
   if (dynamic) {
     dynamicCssOrder = cssOrder.concat([`${routeItem.webpackChunkName}.css`])
-    if (!isVite) {
+    if (!isVite || (isVite && !isDev)) {
+      // call it when webpack mode or vite prod mode
       dynamicCssOrder = await addAsyncChunk(dynamicCssOrder, routeItem.webpackChunkName)
     }
   }

package/src/tools/vite.ts

@@ -1,5 +1,5 @@
 import type { build as BuildType, UserConfig } from 'vite'
-import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig } from 'ssr-server-utils'
+import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig, asyncOptimizeChunkPlugin } from 'ssr-server-utils'
 import react from '@vitejs/plugin-react'
 import styleImport, {
   AndDesignVueResolve,
@@ -10,7 +10,7 @@ import styleImport, {
 } from 'vite-plugin-style-import'
 
 const build: typeof BuildType = require('vite').build
-const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining } = loadConfig()
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev } = loadConfig()
 
 const { clientOutPut, serverOutPut } = getOutput()
 const styleImportConfig = {
@@ -25,10 +25,6 @@ const styleImportConfig = {
 }
 const serverConfig: UserConfig = {
   ...commonConfig(),
-  optimizeDeps: {
-    include: ['path-to-regexp', 'react-dom'],
-    exclude: ['ssr-server-utils']
-  },
   plugins: [
     react({
       ...viteConfig?.()?.server?.defaultPluginOptions,
@@ -48,6 +44,7 @@ const serverConfig: UserConfig = {
     ssr: reactServerEntry,
     outDir: serverOutPut,
     rollupOptions: {
+      input: isDev ? reactClientEntry : '',
       output: {
         entryFileNames: 'Page.server.js'
       }
@@ -79,7 +76,7 @@ const clientConfig: UserConfig = {
     rollupOptions: {
       input: reactClientEntry,
       output: rollupOutputOptions,
-      plugins: [chunkNamePlugin(), manifestPlugin()]
+      plugins: [chunkNamePlugin(), asyncOptimizeChunkPlugin(), manifestPlugin()]
     }
   },
   define: {