ssr-plugin-react 6.1.22-alpha.1 → 6.1.25

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.25](https://github.com/zhangyuang/ssr/compare/v6.1.24...v6.1.25) (2021-12-16)
+
+
+### Features
+
+* add vite test ([#148](https://github.com/zhangyuang/ssr/issues/148)) ([efce102](https://github.com/zhangyuang/ssr/commit/efce102ebe1be25c1275712042b1ee0e7b088568))
+
+
+
+
+
+## [6.1.24](https://github.com/zhangyuang/ssr/compare/v6.1.23...v6.1.24) (2021-12-13)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
+## [6.1.23](https://github.com/zhangyuang/ssr/compare/v6.1.22...v6.1.23) (2021-12-13)
+
+
+### Features
+
+* support alias config ([551c9be](https://github.com/zhangyuang/ssr/commit/551c9be1741f63443381cc897166fb640fa8718d))
+
+
+
+
+
+## [6.1.22](https://github.com/zhangyuang/ssr/compare/v6.1.22-alpha.1...v6.1.22) (2021-12-11)
+
+**Note:** Version bump only for package ssr-plugin-react
+
+
+
+
+
 ## [6.1.22-alpha.1](https://github.com/zhangyuang/ssr/compare/v6.1.22-alpha.0...v6.1.22-alpha.1) (2021-12-11)
 
 

package/README.md

@@ -53,22 +53,28 @@
 </b></td>
 <td align="center"><a target="_blank" href="https://yulebao.alibaba.com/"><img src="https://gw.alicdn.com/tfs/TB1CmlIIFT7gK0jSZFpXXaTkpXa-190-46.png" width="100px;"/><br><sub><b>阿里影业娱乐宝
 </b></sub></a></td>
-<td align="center"><a target="_blank" href="https://campaign.vmate.com/vrbollywood"><img src="https://img.alicdn.com/tfs/TB17p6Vhbj1gK0jSZFOXXc7GpXa-512-512.png" width="100px;" alt="vmate 积分商城"/><br />
-  <a target="_blank" href="https://job.alibaba.com/zhaopin/position_detail.htm?trace=qrcode_share&positionCode=GP524819"><sub><b>Vmate短视频
-</b></a></td>
-<td align="center"><a target="_blank" href="https://enjoysales.paat.com/"><img src="https://img.alicdn.com/tfs/TB1Ma0BiEY1gK0jSZFMXXaWcVXa-836-836.png" width="100px;" alt="火炽星原CRM"/><br />
-<a target="_blank" href="https://enjoysales.paat.com/"><sub><b>火炽星原CRM
-</b></a></td>
 <td align="center"><a href="https://www.niuniuda.com/mall" target="_blank"><img src="https://img.alicdn.com/tfs/TB1df_8pBr0gK0jSZFnXXbRRXXa-160-60.png" width="100px;" alt="牛牛搭"/><br />
 <a href="https://www.niuniuda.com/mall" target="_blank"><sub><b>牛牛搭
 </b></a></td>
+<td align="center"><a href="https://www.gszq.com/" target="_blank"><img src="https://www.gszq.com/static/media/icon-slogan.4d1c7974.png
+" width="100px;" alt="国盛证券"/><br />
+<a href="https://www.gszq.com/" target="_bvlank"><sub><b>国盛证券
+</b></a></td>
+<td align="center"><a href="https://m.isle.org.cn" target="_blank"><img src="https://res.wx.qq.com/op_res/qzBjcpT1AZDopDDkEJfj5gKFADotYHTgD33lz9xvZUIj7VJaIR_8HE4lfOxwaiYBgi4V2xXm0xLmAcdQxF4IrQ" width="100px;" alt="三易科技"/><br />
+<a href="https://m.isle.org.cn" target="_bvlank"><sub><b>三易科技
+</b></a></td>
 <td align="center"><a href="https://help.seewo.com/" target="_blank"><img src="https://img.alicdn.com/tfs/TB11Xo3q4v1gK0jSZFFXXb0sXXa-350-55.png" width="100px;" alt="cvte"/><br /><a href="https://help.seewo.com/" target="_blank"><sub><b>希沃帮助中心
 </b></a></td>
 <td align="center"><a href="https://wecard.qq.com/index/" target="_blank"><img src="https://img.alicdn.com/tfs/TB1pTZGrFT7gK0jSZFpXXaTkpXa-164-164.jpg" width="100px;" alt="腾讯微卡"/><br />
 <a href="https://wecard.qq.com/index/" target="_blank"><sub><b>腾讯微卡
 </b></a></td>
-<td align="center"><a href="https://www.myweimai.com/#sectionOne" target="_blank"><img src="https://img.alicdn.com/tfs/TB16i3VrQT2gK0jSZPcXXcKkpXa-400-400.jpg" width="100px;" alt="微脉"/><br />
-<a href="https://www.myweimai.com/#sectionOne" target="_bvlank"><sub><b>微脉
+<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="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="Happy"/><br />
+<a href="https://m.habisummercamp.com/" target="_bvlank"><b>HappyMobile
 </b></a></td>
 </tr>
 <tr>
@@ -82,21 +88,9 @@
 </b></sub></a></td>
 <td align="center"><a target="_blank" href="http://tx.ssr-fc.com/"><img src="http://s0.60logo.com/uploads/items/images/soft/180126/tengxunyun.svg" width="100px;"/><br><sub><b>部署于腾讯云示例应用
 </b></sub></a></td>
-<td align="center"><a href="https://www.gszq.com/" target="_blank"><img src="https://www.gszq.com/static/media/icon-slogan.4d1c7974.png
-" width="100px;" alt="国盛证券"/><br />
-<a href="https://www.gszq.com/" target="_bvlank"><sub><b>国盛证券
-</b></a></td>
-<td align="center"><a href="https://m.isle.org.cn" target="_blank"><img src="https://res.wx.qq.com/op_res/qzBjcpT1AZDopDDkEJfj5gKFADotYHTgD33lz9xvZUIj7VJaIR_8HE4lfOxwaiYBgi4V2xXm0xLmAcdQxF4IrQ" width="100px;" alt="三易科技"/><br />
-<a href="https://m.isle.org.cn" target="_bvlank"><sub><b>三易科技
-</b></a></td>
-<td align="center"><a href="https://www.66tools.com/" target="_blank"><img src="https://cdn.66tools.com/extension/chrome_qrcode_avatar.png" width="100px;" alt="极速二维码"/><br />
-<a href="https://www.66tools.com/" target="_bvlank"><sub><b>极速二维码
-</b></a></td>
 <td align="center"><a href="https://www.100.com/" target="_blank"><img src="https://oss.bs2dl.100.com/hippo/config/f13ee98cfca7ce13888752c1261081b44bd356fd.png" width="100px;" alt="100教育"/><br />
 <a href="https://www.100.com/" target="_bvlank"><sub><b>100教育
 </b></a></td>
-</tr>
-<tr>
 <td align="center" style="height: 100px"><a href="https://m.film.qq.com/x/tva-vip-center/" target="_blank"><img src="https://res.wx.qq.com/op_res/x7sWI9AfUK1QwH0EDhKp4e_bGWxYOQ_1RlZqBFy9JntJzaE4aRzNhVgmxLNloAFpSQ-mBr9X9pux3QlV9QHHvQ" width="200px;margin: 20px 0" alt="腾讯视频"/><br />
 <a href="https://m.film.qq.com/x/tva-vip-center/" target="_bvlank"><b>腾讯视频
 </b></a></td>
@@ -106,17 +100,23 @@
 <td align="center" style="height: 100px"><a href="https://jiawu.dewu.com" target="_blank"><img src="https://cdn.poizon.com/node-common/31116a45953ad8b468c6c832036aac88.png" width="200px;margin: 20px 0" alt="Dream2qBlog"/><br />
 <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="Happy"/><br />
-<a href="https://www.habisummercamp.com/" target="_bvlank"><b>HappyPC
+<td align="center"><a href="https://www.myweimai.com/#sectionOne" target="_blank"><img src="https://img.alicdn.com/tfs/TB16i3VrQT2gK0jSZPcXXcKkpXa-400-400.jpg" width="100px;" alt="微脉"/><br />
+<a href="https://www.myweimai.com/#sectionOne" target="_bvlank"><sub><b>微脉
 </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="Happy"/><br />
-<a href="https://m.habisummercamp.com/" target="_bvlank"><b>HappyMobile
+</tr>
+<tr>
+<td align="center"><a target="_blank" href="https://campaign.vmate.com/vrbollywood"><img src="https://img.alicdn.com/tfs/TB17p6Vhbj1gK0jSZFOXXc7GpXa-512-512.png" width="100px;" alt="vmate 积分商城"/><br />
+  <a target="_blank" href="https://job.alibaba.com/zhaopin/position_detail.htm?trace=qrcode_share&positionCode=GP524819"><sub><b>Vmate短视频
+</b></a></td>
+<td align="center"><a target="_blank" href="https://enjoysales.paat.com/"><img src="https://img.alicdn.com/tfs/TB1Ma0BiEY1gK0jSZFMXXaWcVXa-836-836.png" width="100px;" alt="火炽星原CRM"/><br />
+<a target="_blank" href="https://enjoysales.paat.com/"><sub><b>火炽星原CRM
 </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>
+<td align="center"><a href="https://www.66tools.com/" target="_blank"><img src="https://cdn.66tools.com/extension/chrome_qrcode_avatar.png" width="100px;" alt="极速二维码"/><br />
+<a href="https://www.66tools.com/" target="_bvlank"><sub><b>极速二维码
+</b></a></td>
 </tr>
 </table>
 

package/cjs/config/base.js

@@ -43,7 +43,7 @@ const addBabelLoader = (chain, envOptions) => {
 };
 const getBaseConfig = (chain, isServer) => {
     const config = (0, ssr_server_utils_1.loadConfig)();
-    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule } = config;
+    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config;
     const mode = process.env.NODE_ENV;
     const envOptions = {
         modules: false
@@ -72,12 +72,10 @@ const getBaseConfig = (chain, isServer) => {
         .end()
         .alias
         .end();
-    chain.resolve.alias
-        .set('@', (0, ssr_server_utils_1.getFeDir)())
-        .set('_build', (0, path_1.join)((0, ssr_server_utils_1.getCwd)(), './build'))
-        .set('react', loadModule('react')) // 用cwd的路径alias，否则可能会出现多个react实例
-        .set('react-router', loadModule('react-router'))
-        .set('react-router-dom', loadModule('react-router-dom'));
+    alias && Object.keys(alias).forEach(item => {
+        chain.resolve.alias
+            .set(item, alias[item]);
+    });
     (0, ssr_server_utils_1.addImageChain)(chain, isServer);
     const babelModule = chain.module
         .rule('compileBabel')

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 } = (0, ssr_server_utils_1.loadConfig)();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, isCI } = (0, ssr_server_utils_1.loadConfig)();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {
     include: ['**/*.vue', '**/*.ts', '**/*.js', '**/*.tsx', '**/*.jsx', /chunkName/],
@@ -23,7 +23,13 @@ const serverConfig = {
     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,
-            jsxRuntime: 'classic'
+            jsxRuntime: 'classic',
+            babel: isCI && {
+                plugins: [
+                    '@babel/plugin-proposal-optional-chaining',
+                    '@babel/plugin-proposal-nullish-coalescing-operator'
+                ]
+            }
         }),
         (_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,
         (0, vite_plugin_style_import_1.default)(styleImportConfig)

package/esm/config/base.js

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { getFeDir, getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils';
+import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils';
 import * as webpack from 'webpack';
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const WebpackBar = require('webpackbar');
@@ -40,7 +40,7 @@ const addBabelLoader = (chain, envOptions) => {
 };
 const getBaseConfig = (chain, isServer) => {
     const config = loadConfig();
-    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule } = config;
+    const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config;
     const mode = process.env.NODE_ENV;
     const envOptions = {
         modules: false
@@ -69,12 +69,10 @@ const getBaseConfig = (chain, isServer) => {
         .end()
         .alias
         .end();
-    chain.resolve.alias
-        .set('@', getFeDir())
-        .set('_build', join(getCwd(), './build'))
-        .set('react', loadModule('react')) // 用cwd的路径alias，否则可能会出现多个react实例
-        .set('react-router', loadModule('react-router'))
-        .set('react-router-dom', loadModule('react-router-dom'));
+    alias && Object.keys(alias).forEach(item => {
+        chain.resolve.alias
+            .set(item, alias[item]);
+    });
     addImageChain(chain, isServer);
     const babelModule = chain.module
         .rule('compileBabel')

package/esm/tools/vite.js

@@ -3,7 +3,7 @@ import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commo
 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 } = loadConfig();
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, isCI } = loadConfig();
 const { clientOutPut, serverOutPut } = getOutput();
 const styleImportConfig = {
     include: ['**/*.vue', '**/*.ts', '**/*.js', '**/*.tsx', '**/*.jsx', /chunkName/],
@@ -20,7 +20,13 @@ const serverConfig = {
     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,
-            jsxRuntime: 'classic'
+            jsxRuntime: 'classic',
+            babel: isCI && {
+                plugins: [
+                    '@babel/plugin-proposal-optional-chaining',
+                    '@babel/plugin-proposal-nullish-coalescing-operator'
+                ]
+            }
         }),
         (_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,
         styleImport(styleImportConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.1.22-alpha.1",
+  "version": "6.1.25",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -30,6 +30,8 @@
   "homepage": "https://github.com/zhangyuang/ssr#readme",
   "dependencies": {
     "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.5",
     "@babel/plugin-transform-runtime": "^7.9.6",
     "@babel/preset-env": "^7.5.5",
     "@vitejs/plugin-react": "^1.0.0",
@@ -54,13 +56,13 @@
     "postcss-safe-parser": "4.0.1",
     "react-dev-utils": "^11.0.4",
     "serialize-javascript": "^6.0.0",
-    "ssr-client-utils": "^6.1.18",
-    "ssr-hoc-react": "^6.1.18",
-    "ssr-server-utils": "^6.1.22-alpha.1",
-    "ssr-webpack": "^6.1.22-alpha.1",
+    "ssr-client-utils": "^6.1.25",
+    "ssr-hoc-react": "^6.1.25",
+    "ssr-server-utils": "^6.1.25",
+    "ssr-webpack": "^6.1.25",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
-    "vite": "^2.7.0-beta.10",
+    "vite": "^2.7.0",
     "vite-plugin-style-import": "^1.4.0",
     "webpack-bundle-analyzer": "^3.6.1",
     "webpack-chain": "^6.4.0",
@@ -72,7 +74,7 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
-    "ssr-types-react": "^6.1.18"
+    "ssr-types-react": "^6.1.25"
   },
-  "gitHead": "0da3318b02daad97eaddde35285470768e407064"
+  "gitHead": "7a1a65d728c7a91bd80a2d782ed259b4649bae63"
 }

package/src/config/base.ts

@@ -1,7 +1,7 @@
 
 import { join } from 'path'
 import { Mode } from 'ssr-types'
-import { getFeDir, getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils'
+import { getCwd, loadConfig, getLocalNodeModules, setStyle, addImageChain } from 'ssr-server-utils'
 import * as WebpackChain from 'webpack-chain'
 import * as webpack from 'webpack'
 
@@ -45,7 +45,7 @@ const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOption
 }
 const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
   const config = loadConfig()
-  const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule } = config
+  const { moduleFileExtensions, useHash, isDev, chainBaseConfig, corejs, babelExtraModule, alias } = config
   const mode = process.env.NODE_ENV as Mode
   const envOptions = {
     modules: false
@@ -75,12 +75,11 @@ const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
     .end()
     .alias
     .end()
-  chain.resolve.alias
-    .set('@', getFeDir())
-    .set('_build', join(getCwd(), './build'))
-    .set('react', loadModule('react')) // 用cwd的路径alias，否则可能会出现多个react实例
-    .set('react-router', loadModule('react-router'))
-    .set('react-router-dom', loadModule('react-router-dom'))
+
+  alias && Object.keys(alias).forEach(item => {
+    chain.resolve.alias
+      .set(item, alias[item])
+  })
 
   addImageChain(chain, isServer)
 

package/src/tools/vite.ts

@@ -10,7 +10,7 @@ import styleImport, {
 } from 'vite-plugin-style-import'
 
 const build: typeof BuildType = require('vite').build
-const { getOutput, reactServerEntry, reactClientEntry, viteConfig } = loadConfig()
+const { getOutput, reactServerEntry, reactClientEntry, viteConfig, isCI } = loadConfig()
 const { clientOutPut, serverOutPut } = getOutput()
 const styleImportConfig = {
   include: ['**/*.vue', '**/*.ts', '**/*.js', '**/*.tsx', '**/*.jsx', /chunkName/],
@@ -19,18 +19,24 @@ const styleImportConfig = {
     VantResolve(),
     ElementPlusResolve(),
     NutuiResolve(),
-    AntdResolve()]
+    AntdResolve()
+  ]
 }
 const serverConfig: UserConfig = {
   ...commonConfig(),
   plugins: [
     react({
       ...viteConfig?.()?.server?.defaultPluginOptions,
-      jsxRuntime: 'classic'
+      jsxRuntime: 'classic',
+      babel: isCI && {
+        plugins: [
+          '@babel/plugin-proposal-optional-chaining',
+          '@babel/plugin-proposal-nullish-coalescing-operator'
+        ]
+      }
     }),
     viteConfig?.()?.server?.extraPlugin,
     styleImport(styleImportConfig)
-
   ],
   build: {
     ssr: reactServerEntry,