ssr-plugin-react 6.2.55 → 6.2.56

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
- ssr-plugin-react:build: cache hit, replaying output d51f66135476edb6
1
+ ssr-plugin-react:build: cache hit, replaying output 663ddd9030a0edec
2
2
  ssr-plugin-react:build:
3
- ssr-plugin-react:build: > ssr-plugin-react@6.2.55 build /home/runner/work/ssr/ssr/packages/plugin-react
3
+ ssr-plugin-react:build: > ssr-plugin-react@6.2.56 build /home/runner/work/ssr/ssr/packages/plugin-react
4
4
  ssr-plugin-react:build: > concurrently "tsc -p ./tsconfig.cjs.json " " tsc -p ./tsconfig.esm.json"
5
5
  ssr-plugin-react:build:
6
6
  ssr-plugin-react:build: [1] tsc -p ./tsconfig.esm.json exited with code 0
package/CHANGELOG.md CHANGED
@@ -1,3 +1,20 @@
1
+ ## [6.2.56](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.55...plugin-react@6.2.56) (2022-11-22)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * call judgeServerFramework in node environment prevent utils be ([47cd81a](https://github.com/zhangyuang/ssr/commit/47cd81a18a85be507c7d43c323c294f2d5b8775d))
7
+ * gernerate html ([08e5678](https://github.com/zhangyuang/ssr/commit/08e567877e7b6d0b4b3a6fab6ad4ea2546b0c041))
8
+ * pinia alias ([2256194](https://github.com/zhangyuang/ssr/commit/22561948b9d27ea6296b5f60cefb3f42d6c1d4c1))
9
+
10
+
11
+ ### Features
12
+
13
+ * support antd5 close [#250](https://github.com/zhangyuang/ssr/issues/250) ([c999536](https://github.com/zhangyuang/ssr/commit/c9995365fbd82faa30a006b51e5cd76ab307bab5))
14
+ * update vue alias ([36e15ac](https://github.com/zhangyuang/ssr/commit/36e15ac5d2d1398ced6abef2727970947177e6bc))
15
+
16
+
17
+
1
18
  ## [6.2.55](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.54...plugin-react@6.2.55) (2022-11-01)
2
19
 
3
20
 
package/README.md CHANGED
@@ -229,6 +229,7 @@ $ yarn start:vite # 以 vite 模式启动,等价于 npx ssr start --vite
229
229
  - http://vue.ssr-fc.com?csr=true 部署到阿里云的 Vue SSR 应用, 以 CSR 模式访问
230
230
  - http://vue3.ssr-fc.com?csr=true 部署到阿里云的 Vue3 SSR 应用, 以 CSR 模式访问
231
231
 
232
+
232
233
  ## 生态系统
233
234
 
234
235
  | Project | Status | Description |
@@ -260,6 +261,8 @@ $ yarn start:vite # 以 vite 模式启动,等价于 npx ssr start --vite
260
261
  [ssr-plugin-vue-status]: https://img.shields.io/npm/v/ssr-plugin-vue.svg
261
262
  [ssr-plugin-vue3-status]: https://img.shields.io/npm/v/ssr-plugin-vue3.svg
262
263
  [ssr-webpack-status]: https://img.shields.io/npm/v/ssr-webpack.svg
264
+ [ssr-types-status]: https://img.shields.io/npm/v/ssr-types.svg
265
+
263
266
 
264
267
  [ssr]: https://github.com/zhangyuang/ssr/tree/dev/packages/cli
265
268
  [ssr-core-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/core-react
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAgD7C,QAAA,MAAM,aAAa,UAAW,YAAY,YAAY,OAAO,gCA8F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAyD7C,QAAA,MAAM,aAAa,UAAW,YAAY,YAAY,OAAO,gCA8F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
@@ -1,15 +1,42 @@
1
1
  "use strict";
2
+ var _a, _b, _c, _d;
2
3
  Object.defineProperty(exports, "__esModule", { value: true });
3
4
  exports.getBaseConfig = void 0;
4
5
  const path_1 = require("path");
5
6
  const ssr_common_utils_1 = require("ssr-common-utils");
6
7
  const webpack = require("webpack");
8
+ const semver_1 = require("semver");
7
9
  const MiniCssExtractPlugin = require((0, ssr_common_utils_1.loadModuleFromFramework)('ssr-mini-css-extract-plugin'));
8
10
  const WebpackBar = require('webpackbar');
9
11
  const loadModule = ssr_common_utils_1.loadModuleFromFramework;
12
+ const antdVersion = (_b = (_a = (0, ssr_common_utils_1.getPkgJson)().dependencies) === null || _a === void 0 ? void 0 : _a['antd']) !== null && _b !== void 0 ? _b : (_c = (0, ssr_common_utils_1.getPkgJson)().devDependencies) === null || _c === void 0 ? void 0 : _c['antd'];
13
+ const isAntd4 = ((_d = (0, semver_1.coerce)(antdVersion)) === null || _d === void 0 ? void 0 : _d.major) === 4;
10
14
  const addBabelLoader = (chain, envOptions, isServer) => {
11
15
  var _a, _b;
12
16
  const { babelOptions, isDev } = (0, ssr_common_utils_1.loadConfig)();
17
+ const plugins = [
18
+ [loadModule('@babel/plugin-transform-runtime'), {
19
+ regenerator: false,
20
+ corejs: false,
21
+ helpers: true
22
+ }],
23
+ [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
24
+ [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
25
+ ...(_a = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) !== null && _a !== void 0 ? _a : []
26
+ ];
27
+ if (isAntd4) {
28
+ plugins.push([
29
+ loadModule('babel-plugin-import'),
30
+ {
31
+ libraryName: 'antd',
32
+ libraryDirectory: 'lib',
33
+ style: true
34
+ }, 'antd'
35
+ ]);
36
+ }
37
+ if (!isServer && isDev) {
38
+ plugins.push(loadModule('react-refresh/babel'));
39
+ }
13
40
  chain.use('babel-loader')
14
41
  .loader(loadModule('babel-loader'))
15
42
  .options({
@@ -26,26 +53,9 @@ const addBabelLoader = (chain, envOptions, isServer) => {
26
53
  typescript: true,
27
54
  runtime: 'automatic'
28
55
  }],
29
- ...(_a = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.presets) !== null && _a !== void 0 ? _a : []
56
+ ...(_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.presets) !== null && _b !== void 0 ? _b : []
30
57
  ],
31
- plugins: [
32
- [loadModule('@babel/plugin-transform-runtime'), {
33
- regenerator: false,
34
- corejs: false,
35
- helpers: true
36
- }],
37
- [
38
- loadModule('babel-plugin-import'),
39
- {
40
- libraryName: 'antd',
41
- libraryDirectory: 'lib',
42
- style: true
43
- }, 'antd'
44
- ],
45
- [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
46
- [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
47
- ...(_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) !== null && _b !== void 0 ? _b : []
48
- ].concat((!isServer && isDev) ? loadModule('react-refresh/babel') : [])
58
+ plugins: plugins
49
59
  })
50
60
  .end();
51
61
  };
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAgD7C,QAAA,MAAM,aAAa,UAAW,YAAY,YAAY,OAAO,gCA8F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAyD7C,QAAA,MAAM,aAAa,UAAW,YAAY,YAAY,OAAO,gCA8F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
@@ -1,12 +1,39 @@
1
+ var _a, _b, _c, _d;
1
2
  import { join } from 'path';
2
- import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-common-utils';
3
+ import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson } from 'ssr-common-utils';
3
4
  import * as webpack from 'webpack';
5
+ import { coerce } from 'semver';
4
6
  const MiniCssExtractPlugin = require(loadModuleFromFramework('ssr-mini-css-extract-plugin'));
5
7
  const WebpackBar = require('webpackbar');
6
8
  const loadModule = loadModuleFromFramework;
9
+ const antdVersion = (_b = (_a = getPkgJson().dependencies) === null || _a === void 0 ? void 0 : _a['antd']) !== null && _b !== void 0 ? _b : (_c = getPkgJson().devDependencies) === null || _c === void 0 ? void 0 : _c['antd'];
10
+ const isAntd4 = ((_d = coerce(antdVersion)) === null || _d === void 0 ? void 0 : _d.major) === 4;
7
11
  const addBabelLoader = (chain, envOptions, isServer) => {
8
12
  var _a, _b;
9
13
  const { babelOptions, isDev } = loadConfig();
14
+ const plugins = [
15
+ [loadModule('@babel/plugin-transform-runtime'), {
16
+ regenerator: false,
17
+ corejs: false,
18
+ helpers: true
19
+ }],
20
+ [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
21
+ [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
22
+ ...(_a = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) !== null && _a !== void 0 ? _a : []
23
+ ];
24
+ if (isAntd4) {
25
+ plugins.push([
26
+ loadModule('babel-plugin-import'),
27
+ {
28
+ libraryName: 'antd',
29
+ libraryDirectory: 'lib',
30
+ style: true
31
+ }, 'antd'
32
+ ]);
33
+ }
34
+ if (!isServer && isDev) {
35
+ plugins.push(loadModule('react-refresh/babel'));
36
+ }
10
37
  chain.use('babel-loader')
11
38
  .loader(loadModule('babel-loader'))
12
39
  .options({
@@ -23,26 +50,9 @@ const addBabelLoader = (chain, envOptions, isServer) => {
23
50
  typescript: true,
24
51
  runtime: 'automatic'
25
52
  }],
26
- ...(_a = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.presets) !== null && _a !== void 0 ? _a : []
53
+ ...(_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.presets) !== null && _b !== void 0 ? _b : []
27
54
  ],
28
- plugins: [
29
- [loadModule('@babel/plugin-transform-runtime'), {
30
- regenerator: false,
31
- corejs: false,
32
- helpers: true
33
- }],
34
- [
35
- loadModule('babel-plugin-import'),
36
- {
37
- libraryName: 'antd',
38
- libraryDirectory: 'lib',
39
- style: true
40
- }, 'antd'
41
- ],
42
- [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
43
- [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
44
- ...(_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.plugins) !== null && _b !== void 0 ? _b : []
45
- ].concat((!isServer && isDev) ? loadModule('react-refresh/babel') : [])
55
+ plugins: plugins
46
56
  })
47
57
  .end();
48
58
  };
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ssr-plugin-react",
3
- "version": "6.2.55",
3
+ "version": "6.2.56",
4
4
  "description": "plugin-react for ssr",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
@@ -37,6 +37,7 @@
37
37
  "@babel/plugin-transform-runtime": "^7.9.6",
38
38
  "@babel/preset-env": "^7.5.5",
39
39
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
40
+ "@types/semver": "^7.3.13",
40
41
  "@vitejs/plugin-react": "^1.3.2",
41
42
  "babel-loader": "^8.0.4",
42
43
  "babel-plugin-import": "1.13.3",
@@ -46,7 +47,6 @@
46
47
  "file-loader": "^6.2.0",
47
48
  "less": "^4.1.1",
48
49
  "less-loader": "^7.3.0",
49
- "ssr-mini-css-extract-plugin": "^1.0.0",
50
50
  "optimize-css-assets-webpack-plugin": "^6.0.0",
51
51
  "ora": "^4.0.4",
52
52
  "postcss": "^8.0.0",
@@ -62,8 +62,10 @@
62
62
  "react-refresh": "^0.12.0",
63
63
  "react-router": "^5.2.1",
64
64
  "react-router-dom": "^5.1.2",
65
+ "semver": "^7.3.8",
65
66
  "ssr-common-utils": "^6.0.0",
66
67
  "ssr-hoc-react": "^6.2.7",
68
+ "ssr-mini-css-extract-plugin": "^1.0.0",
67
69
  "ssr-serialize-javascript": "^6.0.0",
68
70
  "ssr-vite-plugin-style-import": "^2.0.1",
69
71
  "ssr-webpack": "^6.2.10",
@@ -1,16 +1,42 @@
1
1
 
2
2
  import { join } from 'path'
3
3
  import { Mode } from 'ssr-types'
4
- import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-common-utils'
4
+ import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson } from 'ssr-common-utils'
5
5
  import * as WebpackChain from 'webpack-chain'
6
6
  import * as webpack from 'webpack'
7
+ import { coerce } from 'semver'
7
8
 
8
9
  const MiniCssExtractPlugin = require(loadModuleFromFramework('ssr-mini-css-extract-plugin'))
9
10
  const WebpackBar = require('webpackbar')
10
11
  const loadModule = loadModuleFromFramework
11
12
 
13
+ const antdVersion = getPkgJson().dependencies?.['antd'] ?? getPkgJson().devDependencies?.['antd']
14
+ const isAntd4 = coerce(antdVersion)?.major === 4
12
15
  const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOptions: any, isServer: boolean) => {
13
16
  const { babelOptions, isDev } = loadConfig()
17
+ const plugins = [
18
+ [loadModule('@babel/plugin-transform-runtime'), {
19
+ regenerator: false,
20
+ corejs: false,
21
+ helpers: true
22
+ }],
23
+ [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
24
+ [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
25
+ ...babelOptions?.plugins ?? []
26
+ ]
27
+ if (isAntd4) {
28
+ plugins.push([
29
+ loadModule('babel-plugin-import'),
30
+ {
31
+ libraryName: 'antd',
32
+ libraryDirectory: 'lib',
33
+ style: true
34
+ }, 'antd'
35
+ ])
36
+ }
37
+ if (!isServer && isDev) {
38
+ plugins.push(loadModule('react-refresh/babel'))
39
+ }
14
40
  chain.use('babel-loader')
15
41
  .loader(loadModule('babel-loader'))
16
42
  .options({
@@ -29,24 +55,7 @@ const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOption
29
55
  }],
30
56
  ...babelOptions?.presets ?? []
31
57
  ],
32
- plugins: [
33
- [loadModule('@babel/plugin-transform-runtime'), {
34
- regenerator: false,
35
- corejs: false,
36
- helpers: true
37
- }],
38
- [
39
- loadModule('babel-plugin-import'),
40
- {
41
- libraryName: 'antd',
42
- libraryDirectory: 'lib',
43
- style: true
44
- }, 'antd'
45
- ],
46
- [loadModule('@babel/plugin-proposal-private-methods'), { loose: true }],
47
- [loadModule('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
48
- ...babelOptions?.plugins ?? []
49
- ].concat((!isServer && isDev) ? loadModule('react-refresh/babel') : [])
58
+ plugins: plugins
50
59
  })
51
60
  .end()
52
61
  }