ssr-plugin-react 6.1.48 → 6.1.49

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.1.49](https://github.com/zhangyuang/ssr/compare/v6.1.48...v6.1.49) (2022-01-19)
+
+
+### Bug Fixes
+
+* babelExtraModule ([503f3e6](https://github.com/zhangyuang/ssr/commit/503f3e618a8918fbd482267349059d743af75787))
+
+
+### Features
+
+* vite mode support extract children common module chunks ([4896c6c](https://github.com/zhangyuang/ssr/commit/4896c6cde8e39238f7d34183698acb480f2be9b6))
+
+
+
+
+
 ## [6.1.48](https://github.com/zhangyuang/ssr/compare/v6.1.47...v6.1.48) (2022-01-13)
 
 **Note:** Version bump only for package ssr-plugin-react

package/README.md

@@ -13,12 +13,11 @@
 </div>
 <br />
 <div align="center">
-<a href="https://github.com/zhangyuang/ssr/actions" target="_blank"><img src="https://github.com/zhangyuang/ssr/workflows/CI/badge.svg" alt="githubActions"></a>
-<a href="https://www.cypress.io/" target="_blank"><img src="https://img.shields.io/badge/cypress-dashboard-brightgreen.svg" alt="cypress"></a>
-<a href="https://npmcharts.com/compare/ssr" target="_blank"><img src="https://img.shields.io/npm/dm/ssr" alt="download"></a>
-<a href="https://standardjs.com" target="_blank"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="standardjs"></a>
-<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/npm/l/vue.svg" alt="License"></a>
-<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/badge/node-%3E=12-green.svg" alt="Node"></a>
+<a href="https://github.com/zhangyuang/ssr/actions" target="_blank"><img src="https://github.com/zhangyuang/ssr/workflows/CI/badge.svg" alt="githubActions" />
+<a href="https://www.cypress.io/" target="_blank"><img src="https://img.shields.io/badge/cypress-dashboard-brightgreen.svg" alt="cypress" />
+<a href="https://npmcharts.com/compare/ssr" target="_blank"><img src="https://img.shields.io/npm/dm/ssr" alt="download" />
+<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/tokei/lines/github/zhangyuang/ssr-lines?color=97b93b" alt="Node" />
+<a href="https://github.com/zhangyuang/ssr" target="_blank"><img src="https://img.shields.io/badge/node-%3E=12-green.svg" alt="Node" ></a>
 </div>
 <br />
 
@@ -273,7 +272,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/7SpflSUP3RJ5InL7FkN0-9JeTj18T_lvqJXXHLNNpY_owTyqtgVH8qMqjk4w7S6YeDWZmUP-N_4vLLAUCdySTA" width="300">
+<img src="https://res.wx.qq.com/op_res/UXZQkqMG9Ej1Ox4pro3iDJPugn8EGQN7xKWXTDh0L0xgK7BOUZvT-MQ_Diks_iTtCL3Kregp-lS52WXsiDctuw" width="300">
 </div>
 
 ## 前端开发手册
@@ -283,3 +282,7 @@ $ npm run start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
 ## 项目 Star 数增长趋势
 
 [![Stargazers over time](https://starchart.cc/zhangyuang/ssr.svg)](https://starchart.cc/zhangyuang/ssr)
+
+## 代码行数
+
+![](https://res.wx.qq.com/op_res/sE2C4qCTn9IN1dyiw4MMTEU9dW40eFXbfWe6-o31-kWEJN0ddQKR41_ZbAwAE01oW5yQj4zV3UJ_rVbX0D99Mw)

package/cjs/config/base.js

@@ -86,10 +86,10 @@ const getBaseConfig = (chain, isServer) => {
         .add([/ssr-plugin-react/, /ssr-client-utils/, /ssr-hoc-react/]);
     let babelForExtraModule;
     if (babelExtraModule) {
-        babelForExtraModule = module.add(babelExtraModule).end();
+        babelForExtraModule = module.add(babelExtraModule).end().exclude.add(/node_modules|core-js/).end();
     }
     else {
-        babelForExtraModule = module.end();
+        babelForExtraModule = module.end().exclude.add(/node_modules|core-js/).end();
     }
     addBabelLoader(babelModule, envOptions);
     addBabelLoader(babelForExtraModule, envOptions);

package/cjs/tools/vite.d.ts

@@ -1,4 +1,4 @@
-import type { UserConfig } from 'vite';
+import { UserConfig } from 'vite';
 declare const serverConfig: UserConfig;
 declare const clientConfig: UserConfig;
 declare const viteStart: () => Promise<void>;

package/cjs/tools/vite.js

@@ -2,10 +2,10 @@
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientConfig = exports.serverConfig = exports.viteStart = exports.viteBuild = void 0;
+const vite_1 = require("vite");
 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, isDev, define, babelOptions } = (0, ssr_server_utils_1.loadConfig)();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {
@@ -94,7 +94,7 @@ const viteStart = async () => {
 };
 exports.viteStart = viteStart;
 const viteBuild = async () => {
-    await build({ ...clientConfig, mode: 'production' });
-    await build({ ...serverConfig, mode: 'production' });
+    await (0, vite_1.build)({ ...clientConfig, mode: 'production' });
+    await (0, vite_1.build)({ ...serverConfig, mode: 'production' });
 };
 exports.viteBuild = viteBuild;

package/esm/config/base.js

@@ -83,10 +83,10 @@ const getBaseConfig = (chain, isServer) => {
         .add([/ssr-plugin-react/, /ssr-client-utils/, /ssr-hoc-react/]);
     let babelForExtraModule;
     if (babelExtraModule) {
-        babelForExtraModule = module.add(babelExtraModule).end();
+        babelForExtraModule = module.add(babelExtraModule).end().exclude.add(/node_modules|core-js/).end();
     }
     else {
-        babelForExtraModule = module.end();
+        babelForExtraModule = module.end().exclude.add(/node_modules|core-js/).end();
     }
     addBabelLoader(babelModule, envOptions);
     addBabelLoader(babelForExtraModule, envOptions);

package/esm/tools/vite.d.ts

@@ -1,4 +1,4 @@
-import type { UserConfig } from 'vite';
+import { UserConfig } from 'vite';
 declare const serverConfig: UserConfig;
 declare const clientConfig: UserConfig;
 declare const viteStart: () => Promise<void>;

package/esm/tools/vite.js

@@ -1,8 +1,8 @@
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+import { build } from 'vite';
 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, isDev, define, babelOptions } = loadConfig();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.48",
+  "version": "6.1.49",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -55,10 +55,10 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.1.48",
-    "ssr-hoc-react": "^6.1.48",
-    "ssr-server-utils": "^6.1.48",
-    "ssr-webpack": "^6.1.48",
+    "ssr-client-utils": "^6.1.49",
+    "ssr-hoc-react": "^6.1.49",
+    "ssr-server-utils": "^6.1.49",
+    "ssr-webpack": "^6.1.49",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
     "vite": "^2.7.0",
@@ -74,7 +74,7 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
     "concurrently": "^5.1.0",
-    "ssr-types-react": "^6.1.48"
+    "ssr-types-react": "^6.1.49"
   },
-  "gitHead": "104b30653d5e3860cda1a4ed321a432306e5832d"
+  "gitHead": "4425a2049f65cd6865f7648611f89854f1982625"
 }

package/src/config/base.ts

@@ -93,9 +93,9 @@ const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
 
   let babelForExtraModule
   if (babelExtraModule) {
-    babelForExtraModule = module.add(babelExtraModule).end()
+    babelForExtraModule = module.add(babelExtraModule).end().exclude.add(/node_modules|core-js/).end()
   } else {
-    babelForExtraModule = module.end()
+    babelForExtraModule = module.end().exclude.add(/node_modules|core-js/).end()
   }
 
   addBabelLoader(babelModule, envOptions)

package/src/config/client.ts

@@ -9,7 +9,7 @@ const safePostCssParser = require('postcss-safe-parser')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 const generateAnalysis = Boolean(process.env.GENERATE_ANALYSIS)
 const loadModule = loadModuleFromFramework
-let asyncChunkMap: Record<string, string> = {}
+let asyncChunkMap: Record<string, string[]> = {}
 
 const getClientWebpack = (chain: WebpackChain) => {
   const { isDev, chunkName, getOutput, cwd, useHash, chainClientConfig } = loadConfig()

package/src/tools/vite.ts

@@ -1,15 +1,8 @@
-import type { build as BuildType, UserConfig } from 'vite'
+import { build, UserConfig } from 'vite'
 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'
+import styleImport, { AndDesignVueResolve, VantResolve, ElementPlusResolve, NutuiResolve, AntdResolve } from 'vite-plugin-style-import'
 
-const build: typeof BuildType = require('vite').build
 const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev, define, babelOptions } = loadConfig()
 
 const { clientOutPut, serverOutPut } = getOutput()