ssr-plugin-react 6.2.58 → 6.2.59
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.
- package/.turbo/turbo-build.log +3 -3
- package/CHANGELOG.md +23 -0
- package/README.md +8 -9
- package/cjs/config/base.d.ts.map +1 -1
- package/cjs/config/base.js +4 -8
- package/cjs/config/base.js.map +1 -1
- package/cjs/config/client.d.ts.map +1 -1
- package/cjs/config/client.js +4 -3
- package/cjs/config/client.js.map +1 -1
- package/cjs/entry/client-entry.js +1 -2
- package/cjs/entry/client-entry.js.map +1 -1
- package/cjs/entry/server-entry.d.ts +1 -1
- package/cjs/tools/vite.d.ts.map +1 -1
- package/cjs/tools/vite.js +3 -2
- package/cjs/tools/vite.js.map +1 -1
- package/esm/config/base.d.ts.map +1 -1
- package/esm/config/base.js +5 -9
- package/esm/config/base.js.map +1 -1
- package/esm/config/client.d.ts.map +1 -1
- package/esm/config/client.js +5 -4
- package/esm/config/client.js.map +1 -1
- package/esm/entry/client-entry.js +1 -2
- package/esm/entry/client-entry.js.map +1 -1
- package/esm/entry/server-entry.d.ts +1 -1
- package/esm/tools/vite.d.ts.map +1 -1
- package/esm/tools/vite.js +3 -2
- package/esm/tools/vite.js.map +1 -1
- package/package.json +1 -1
- package/src/config/base.ts +4 -8
- package/src/config/client.ts +6 -4
- package/src/entry/client-entry.tsx +1 -1
- package/src/tools/vite.ts +3 -2
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
ssr-plugin-react:build: cache hit, replaying output
|
|
1
|
+
ssr-plugin-react:build: cache hit, replaying output b797d3009f0d659e
|
|
2
2
|
ssr-plugin-react:build:
|
|
3
|
-
ssr-plugin-react:build: > ssr-plugin-react@6.2.
|
|
3
|
+
ssr-plugin-react:build: > ssr-plugin-react@6.2.59 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
|
-
ssr-plugin-react:build: [0] tsc -p ./tsconfig.cjs.json exited with code 0
|
|
7
6
|
ssr-plugin-react:build: [1] tsc -p ./tsconfig.esm.json exited with code 0
|
|
7
|
+
ssr-plugin-react:build: [0] tsc -p ./tsconfig.cjs.json exited with code 0
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,26 @@
|
|
|
1
|
+
## [6.2.59](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.58...plugin-react@6.2.59) (2023-03-02)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* react18 default exclude ([1747419](https://github.com/zhangyuang/ssr/commit/1747419b978d81e7abe5c6975884ca8a87c749de))
|
|
7
|
+
* use unshift replace pop in queue ([25e9513](https://github.com/zhangyuang/ssr/commit/25e9513ebc744c70e3d3061a6ef92f66436a116a))
|
|
8
|
+
* vite build ([6ad5079](https://github.com/zhangyuang/ssr/commit/6ad507976f38c5972e9785a0e528314c46a04431))
|
|
9
|
+
* vite build with babel ([b924353](https://github.com/zhangyuang/ssr/commit/b9243532cebbbf91fc61cd711f23ced0ef0c82ce))
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* improve babel options experience in vue3 vite build ([7f4d34b](https://github.com/zhangyuang/ssr/commit/7f4d34b23c81fbcb665c2f819000468910eb1944))
|
|
15
|
+
* move core-react core-vue2/3 to core ([54915f7](https://github.com/zhangyuang/ssr/commit/54915f76524997af61213bf3e95a19858746c776))
|
|
16
|
+
* remove unplugin-element-plus ([25231dc](https://github.com/zhangyuang/ssr/commit/25231dc2cab3455bb00de61df8306ddab1ac4c6a))
|
|
17
|
+
* support configuration config.assetDir ([#270](https://github.com/zhangyuang/ssr/issues/270)) ([885716c](https://github.com/zhangyuang/ssr/commit/885716cefa254dc812a5cae36627103fab3c449d))
|
|
18
|
+
* support react18 ([#264](https://github.com/zhangyuang/ssr/issues/264)) ([c992161](https://github.com/zhangyuang/ssr/commit/c992161c8ea0d2f1a9814dd4b30ffa82b1bbbe84))
|
|
19
|
+
* support route.name close [#266](https://github.com/zhangyuang/ssr/issues/266) ([4a4d27c](https://github.com/zhangyuang/ssr/commit/4a4d27ca46856d0a0349d1de599dc10b5ddb6434))
|
|
20
|
+
* upgrade midway-cli to v2 support deploy concurrency ([13a07f6](https://github.com/zhangyuang/ssr/commit/13a07f696629ebd3fadd366844f888ceaa66247c))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
1
24
|
## [6.2.58](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.57...plugin-react@6.2.58) (2023-02-17)
|
|
2
25
|
|
|
3
26
|
|
package/README.md
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
|
|
26
26
|
此框架脱胎于 [egg-react-ssr](https://github.com/zhangyuang/egg-react-ssr) 项目和 `ssr` v4版本`（midway-faas + react ssr）`，在之前的基础上做了诸多演进，通过插件化的代码组织形式，支持任意服务端框架与任意前端框架的组合使用。开发者可以选择通过 `Serverless` 方式部署或是以传统 `Node.js` 的应用形式部署，并且我们专注于提升 `Serverless` 场景下服务端渲染应用的开发体验，打造了一站式的开发，发布应用服务的功能。最大程度提升开发者的开发体验，将应用的开发，部署成本降到最低。
|
|
27
27
|
|
|
28
|
-
在最新的版本中，同时支持 `
|
|
28
|
+
在最新的版本中，同时支持 `React17/18` 和 `Vue2/Vue3` 作为服务端渲染框架且开发工具侧我们同样支持了最流行的 `Vite` 来提升应用的启动速度和 HMR 速度，且提供一键以 `Serverless` 的形式发布上云的功能。我们可以非常有自信说它是地球上最先进的 `ssr` 框架。如果你希望获得开箱即用的体验且能够一键部署上云，请选择 `ssr` 框架。
|
|
29
29
|
|
|
30
30
|
阅读我们的 [官方文档](http://doc.ssr-fc.com/) 获得更加详细的了解。事实上文档本身便是用 `ssr` 框架开发并通过 `Serverless` 部署到阿里云服务
|
|
31
31
|
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
|
|
145
145
|
## Features
|
|
146
146
|
|
|
147
|
-
- 🌱 极易定制：前端支持
|
|
147
|
+
- 🌱 极易定制：前端支持 React17/React18/Vue2/Vue3 等现代Web框架；
|
|
148
148
|
- 🚀 开箱即用：内置 10+ 脚手架配套扩展，如 [Pinia](https://pinia.vuejs.org/introduction.html#basic-example)、[antd](https://ant.design/components/overview-cn/)、[vant](https://github.com/youzan/vant)、TypeScript、Hooks等；
|
|
149
149
|
- 🧲 插件驱动：基于插件架构，用户更加专注于业务逻辑；
|
|
150
150
|
- 💯 Serverless优先：一键发布到各种Serverless平台，也支持传统Web Server，比如Egg、Midway、Nest等。
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
|
|
158
158
|
| 里程碑 | 状态 |
|
|
159
159
|
| ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
|
|
160
|
-
| 支持任意服务端框架与任意前端框架的组合使用。(Serverless/Midway/NestJS) + (
|
|
160
|
+
| 支持任意服务端框架与任意前端框架的组合使用。(Serverless/Midway/NestJS) + (React17/React18/Vue2/Vue3) | 🚀 |
|
|
161
161
|
| 最丝滑的 [vite](https://vite-design.surge.sh/) [支持](http://doc.ssr-fc.com/docs/features$vite) | 🚀 |
|
|
162
162
|
| 最小而美的实现服务端渲染功能 | 🚀 |
|
|
163
163
|
| 支持[预渲染](http://doc.ssr-fc.com/docs/features$ssg)能力 | 🚀 |
|
|
@@ -191,10 +191,12 @@
|
|
|
191
191
|
注意: 在 `Midway.js` `Nest.js` 场景下我们都已实现了一键部署到 `Serverless` 平台的能力。但底层实现略有差异。更加详细的介绍可以阅读 [Serverless](http://doc.ssr-fc.com/docs/features$serverless) 章节。如需要大量使用 `Serverless` 平台提供的能力，我们建议创建 `Midway.js` 类型的应用。强烈建议阅读我们的 [官方文档](http://doc.ssr-fc.com/) 来获得更加详细的了解
|
|
192
192
|
|
|
193
193
|
- [nestjs-react-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-react-ssr)
|
|
194
|
+
- [nestjs-react18-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-react18-ssr)
|
|
194
195
|
- [nestjs-vue-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-vue-ssr)
|
|
195
196
|
- [nestjs-vue3-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/nestjs-vue3-ssr)
|
|
196
197
|
- [nestjs-vue3-ssr-pinia](https://github.com/zhangyuang/nestjs-vue3-ssr-pinia)
|
|
197
198
|
- [midway-react-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-react-ssr)
|
|
199
|
+
- [midway-react18-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-react18-ssr)
|
|
198
200
|
- [midway-vue-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-vue-ssr)
|
|
199
201
|
- [midway-vue3-ssr](https://github.com/zhangyuang/ssr/tree/dev/example/midway-vue3-ssr)
|
|
200
202
|
|
|
@@ -236,8 +238,7 @@ $ yarn start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
|
|
|
236
238
|
| Project | Status | Description |
|
|
237
239
|
| ------------------- | ------------------------------------------------ | ----------------------------------------------------------------------- |
|
|
238
240
|
| [ssr] | [![ssr-status]][ssr] | cli for ssr framework |
|
|
239
|
-
| [ssr-core
|
|
240
|
-
| [ssr-core-react] | [![ssr-core-react-status]][ssr-core-react] | core render for react |
|
|
241
|
+
| [ssr-core] | [![ssr-core-status]][ssr-core] | core render for all framwork |
|
|
241
242
|
| [ssr-plugin-midway] | [![ssr-plugin-midway-status]][ssr-plugin-midway] | provide start and build fetature by [midway@2.0](https://midwayjs.org/) |
|
|
242
243
|
| [ssr-plugin-nestjs] | [![ssr-plugin-nestjs-status]][ssr-plugin-nestjs] | provide start and build feature by [NestJS](https://docs.nestjs.com/) |
|
|
243
244
|
| [ssr-plugin-react] | [![ssr-plugin-react-status]][ssr-plugin-react] | develop react application only be used in development |
|
|
@@ -251,8 +252,7 @@ $ yarn start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
|
|
|
251
252
|
|
|
252
253
|
|
|
253
254
|
[ssr-status]: https://img.shields.io/npm/v/ssr.svg
|
|
254
|
-
[ssr-core-
|
|
255
|
-
[ssr-core-vue-status]: https://img.shields.io/npm/v/ssr-core-vue.svg
|
|
255
|
+
[ssr-core-status]: https://img.shields.io/npm/v/ssr-core.svg
|
|
256
256
|
[ssr-hoc-react-status]: https://img.shields.io/npm/v/ssr-hoc-react.svg
|
|
257
257
|
[ssr-hoc-vue3-status]: https://img.shields.io/npm/v/ssr-hoc-vue3.svg
|
|
258
258
|
[ssr-common-utils-status]: https://img.shields.io/npm/v/ssr-common-utils.svg
|
|
@@ -266,8 +266,7 @@ $ yarn start:vite # 以 vite 模式启动，等价于 npx ssr start --vite
|
|
|
266
266
|
|
|
267
267
|
|
|
268
268
|
[ssr]: https://github.com/zhangyuang/ssr/tree/dev/packages/cli
|
|
269
|
-
[ssr-core
|
|
270
|
-
[ssr-core-vue]: https://github.com/zhangyuang/ssr/tree/dev/packages/core-vue
|
|
269
|
+
[ssr-core]: https://github.com/zhangyuang/ssr/tree/dev/packages/core
|
|
271
270
|
[ssr-hoc-react]: https://github.com/zhangyuang/ssr/tree/dev/packages/hoc-react
|
|
272
271
|
[ssr-hoc-vue3]: https://github.com/zhangyuang/ssr/tree/dev/packages/hoc-vue3
|
|
273
272
|
[ssr-plugin-midway]: https://github.com/zhangyuang/ssr/tree/dev/packages/plugin-midway
|
package/cjs/config/base.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,gCA0F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
|
package/cjs/config/base.js
CHANGED
|
@@ -62,7 +62,7 @@ const addBabelLoader = (chain, envOptions, isServer) => {
|
|
|
62
62
|
const getBaseConfig = (chain, isServer) => {
|
|
63
63
|
var _a, _b;
|
|
64
64
|
const config = (0, ssr_common_utils_1.loadConfig)();
|
|
65
|
-
const { moduleFileExtensions,
|
|
65
|
+
const { moduleFileExtensions, chainBaseConfig, corejsOptions, babelExtraModule, alias, define, babelOptions, assetsDir } = config;
|
|
66
66
|
const mode = process.env.NODE_ENV;
|
|
67
67
|
const envOptions = {
|
|
68
68
|
modules: false,
|
|
@@ -100,8 +100,7 @@ const getBaseConfig = (chain, isServer) => {
|
|
|
100
100
|
const module = chain.module
|
|
101
101
|
.rule('compileBabelForExtraModule')
|
|
102
102
|
.test(/\.(js|mjs|jsx|ts|tsx)$/)
|
|
103
|
-
.include
|
|
104
|
-
.add([/ssr-plugin-react/, /ssr-client-utils/, /ssr-hoc-react/, /ssr-common-utils/]);
|
|
103
|
+
.include;
|
|
105
104
|
const babelForExtraModule = module.add(babelExtraModule !== null && babelExtraModule !== void 0 ? babelExtraModule : []).add((_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.include) !== null && _b !== void 0 ? _b : []).end().exclude.add(/core-js/).end();
|
|
106
105
|
addBabelLoader(babelModule, envOptions, isServer);
|
|
107
106
|
addBabelLoader(babelForExtraModule, envOptions, isServer);
|
|
@@ -122,14 +121,11 @@ const getBaseConfig = (chain, isServer) => {
|
|
|
122
121
|
.use('file-loader')
|
|
123
122
|
.loader(loadModule('file-loader'))
|
|
124
123
|
.options({
|
|
125
|
-
name:
|
|
124
|
+
name: `${assetsDir}/[name].[hash:8].[ext]`,
|
|
126
125
|
esModule: false,
|
|
127
126
|
emitFile: !isServer
|
|
128
127
|
});
|
|
129
|
-
chain.plugin('minify-css').use(MiniCssExtractPlugin,
|
|
130
|
-
filename: useHash ? '[name].[contenthash:8].css' : 'static/[name].css',
|
|
131
|
-
chunkFilename: useHash ? '[name].[contenthash:8].chunk.css' : 'static/[name].chunk.css'
|
|
132
|
-
}]);
|
|
128
|
+
chain.plugin('minify-css').use(MiniCssExtractPlugin, (0, ssr_common_utils_1.getBuildConfig)().cssBuildConfig);
|
|
133
129
|
chain.plugin('webpackBar').use(new WebpackBar({
|
|
134
130
|
name: isServer ? 'server' : 'client',
|
|
135
131
|
color: isServer ? '#f173ac' : '#45b97c'
|
package/cjs/config/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":";;;;AACA,+BAA2B;AAE3B,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAe7C,QAAA,MAAM,gBAAgB,UAAW,YAAY,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAe7C,QAAA,MAAM,gBAAgB,UAAW,YAAY,oCAkG5C,CAAA;AAED,OAAO,EACL,gBAAgB,EACjB,CAAA"}
|
package/cjs/config/client.js
CHANGED
|
@@ -15,7 +15,8 @@ const asyncChunkMap = {
|
|
|
15
15
|
val: {}
|
|
16
16
|
};
|
|
17
17
|
const getClientWebpack = (chain) => {
|
|
18
|
-
const { isDev, chunkName, getOutput, cwd,
|
|
18
|
+
const { isDev, chunkName, getOutput, cwd, chainClientConfig, host, fePort, optimize } = (0, ssr_common_utils_1.loadConfig)();
|
|
19
|
+
const buildConfig = (0, ssr_common_utils_1.getBuildConfig)();
|
|
19
20
|
const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP);
|
|
20
21
|
const publicPath = (0, ssr_common_utils_1.getOutputPublicPath)();
|
|
21
22
|
(0, base_1.getBaseConfig)(chain, false);
|
|
@@ -25,8 +26,8 @@ const getClientWebpack = (chain) => {
|
|
|
25
26
|
.end()
|
|
26
27
|
.output
|
|
27
28
|
.path(getOutput().clientOutPut)
|
|
28
|
-
.filename(
|
|
29
|
-
.chunkFilename(
|
|
29
|
+
.filename(buildConfig.jsBuldConfig.fileName)
|
|
30
|
+
.chunkFilename(buildConfig.jsBuldConfig.chunkFileName)
|
|
30
31
|
.publicPath(publicPath)
|
|
31
32
|
.end();
|
|
32
33
|
chain.optimization
|
package/cjs/config/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":";;;AAAA,2BAA6B;AAC7B,+BAA8B;AAC9B,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,7 @@ const clientRender = async () => {
|
|
|
23
23
|
ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render']((0, react_1.createElement)(react_router_dom_1.BrowserRouter, {
|
|
24
24
|
basename: baseName
|
|
25
25
|
}, (0, react_1.createElement)(context_1.AppContext, {
|
|
26
|
-
children: (0, react_1.createElement)(react_router_dom_1.Switch, null, (0, react_1.createElement)(IApp, null, (0, react_1.createElement)(react_router_dom_1.Switch, null,
|
|
27
|
-
routes.map(item => {
|
|
26
|
+
children: (0, react_1.createElement)(react_router_dom_1.Switch, null, (0, react_1.createElement)(IApp, null, (0, react_1.createElement)(react_router_dom_1.Switch, null, routes.map(item => {
|
|
28
27
|
const { fetch, component, path } = item;
|
|
29
28
|
component.fetch = fetch;
|
|
30
29
|
component.layoutFetch = layoutFetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":";;;AAAA,iCAAqC;AACrC,sCAAqC;AACrC,wBAAqB,CAAC,0BAA0B;AAChD,uDAA+D;AAC/D,uDAA6E;AAC7E,iDAA6C;AAE7C,0DAAgE;AAChE,mDAAwC;AACxC,uCAAsC;AAEtC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,sBAAM,CAAA;AAE7C,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;;IAC7C,MAAM,IAAI,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,UAAU,KAAkB;QAC9C,OAAO,KAAK,CAAC,QAAS,CAAA;IACxB,CAAC,CAAA;IACD,IAAA,kCAAe,EAAC,8BAAO,CAAC,CAAA;IACxB,iBAAiB;IACjB,MAAM,QAAQ,GAAG,IAAA,0BAAO,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;IAChE,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjD,IAAA,qBAAa,EAAC,gCAAa,EAAE;QAC3B,QAAQ,EAAE,QAAQ;KACnB,EAAE,IAAA,qBAAa,EAAC,oBAAiB,EAAE;QAClC,QAAQ,EAAE,IAAA,qBAAa,EAAC,yBAAM,EAAE,IAAI,EAClC,IAAA,qBAAa,EAAC,IAAW,EAAE,IAAI,EAAE,IAAA,qBAAa,EAAC,yBAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":";;;AAAA,iCAAqC;AACrC,sCAAqC;AACrC,wBAAqB,CAAC,0BAA0B;AAChD,uDAA+D;AAC/D,uDAA6E;AAC7E,iDAA6C;AAE7C,0DAAgE;AAChE,mDAAwC;AACxC,uCAAsC;AAEtC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,sBAAM,CAAA;AAE7C,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;;IAC7C,MAAM,IAAI,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,UAAU,KAAkB;QAC9C,OAAO,KAAK,CAAC,QAAS,CAAA;IACxB,CAAC,CAAA;IACD,IAAA,kCAAe,EAAC,8BAAO,CAAC,CAAA;IACxB,iBAAiB;IACjB,MAAM,QAAQ,GAAG,IAAA,0BAAO,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;IAChE,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjD,IAAA,qBAAa,EAAC,gCAAa,EAAE;QAC3B,QAAQ,EAAE,QAAQ;KACnB,EAAE,IAAA,qBAAa,EAAC,oBAAiB,EAAE;QAClC,QAAQ,EAAE,IAAA,qBAAa,EAAC,yBAAM,EAAE,IAAI,EAClC,IAAA,qBAAa,EAAC,IAAW,EAAE,IAAI,EAAE,IAAA,qBAAa,EAAC,yBAAM,EAAE,IAAI,EACzD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAChB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;YACvC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;YACvB,SAAS,CAAC,WAAW,GAAG,WAAW,CAAA;YACnC,MAAM,gBAAgB,GAAG,IAAA,6BAAa,EAAC,SAAS,CAAC,CAAA;YACjD,OAAO,IAAA,qBAAa,EAAC,wBAAK,EAAE;gBAC1B,KAAK,EAAE,IAAI;gBACX,GAAG,EAAE,IAAI;gBACT,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,GAAG,EAAE,CAAC,IAAA,qBAAa,EAAC,gBAAgB,EAAE;oBAC5C,GAAG,EAAE,QAAQ,CAAC,QAAQ;iBACvB,CAAC;aACH,CAAC,CAAA;QACJ,CAAC,CAAC,CAAC,CAAC,CAAC;KACV,CAAC,CAAC,EACD,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,MAAA,MAAC,MAAc,aAAd,MAAM,uBAAN,MAAM,CAAU,GAAG,0CAAE,MAAM,kDAAI,CAAA;KACjC;AACH,CAAC,CAAA;AAKC,oCAAY;AAHd,YAAY,EAAE,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ISSRContext, IConfig } from 'ssr-types';
|
|
3
3
|
import { Routes } from './create-router';
|
|
4
|
-
declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<string | import("stream").Readable | NodeJS.ReadableStream | {
|
|
4
|
+
declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<string | import("stream").Readable | NodeJS.ReadableStream | import("ssr-types").PipeableStream | {
|
|
5
5
|
html: string;
|
|
6
6
|
teleportsContext: any;
|
|
7
7
|
}>;
|
package/cjs/tools/vite.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAoBxC,QAAA,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAoBxC,QAAA,MAAM,YAAY,EAAE,UAoDnB,CAAA;AACD,QAAA,MAAM,YAAY,EAAE,UA0CnB,CAAA;AACD,QAAA,MAAM,SAAS,qBAEd,CAAA;AACD,QAAA,MAAM,SAAS,qBAGd,CAAA;AAED,QAAA,MAAM,eAAe,qBAEpB,CAAA;AACD,QAAA,MAAM,eAAe,qBAEpB,CAAA;AAED,OAAO,EACL,SAAS,EACT,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,CAAA"}
|
package/cjs/tools/vite.js
CHANGED
|
@@ -59,7 +59,8 @@ const serverConfig = {
|
|
|
59
59
|
...(_q = (_p = (_o = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig().server) === null || _o === void 0 ? void 0 : _o.otherConfig) === null || _p === void 0 ? void 0 : _p.build) === null || _q === void 0 ? void 0 : _q.rollupOptions,
|
|
60
60
|
input: isDev ? reactClientEntry : reactServerEntry,
|
|
61
61
|
output: {
|
|
62
|
-
entryFileNames: 'Page.server.js'
|
|
62
|
+
entryFileNames: 'Page.server.js',
|
|
63
|
+
assetFileNames: (0, ssr_common_utils_1.rollupOutputOptions)().assetFileNames
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
66
|
},
|
|
@@ -103,7 +104,7 @@ const clientConfig = {
|
|
|
103
104
|
rollupOptions: {
|
|
104
105
|
...(_16 = (_15 = (_14 = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig().client) === null || _14 === void 0 ? void 0 : _14.otherConfig) === null || _15 === void 0 ? void 0 : _15.build) === null || _16 === void 0 ? void 0 : _16.rollupOptions,
|
|
105
106
|
input: reactClientEntry,
|
|
106
|
-
output: ssr_common_utils_1.rollupOutputOptions,
|
|
107
|
+
output: (0, ssr_common_utils_1.rollupOutputOptions)(),
|
|
107
108
|
plugins: [(0, ssr_common_utils_1.chunkNamePlugin)(), (0, ssr_common_utils_1.asyncOptimizeChunkPlugin)(), (0, ssr_common_utils_1.manifestPlugin)()]
|
|
108
109
|
}
|
|
109
110
|
},
|
package/cjs/tools/vite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":";;;;AAAA,+BAAwC;AACxC,uDAGyB;AACzB,uDAAwC;AACxC,+EAAuJ;AACvJ,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAA,6BAAU,GAAE,CAAA;AACjJ,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAA;AAClD,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC;IAChF,QAAQ,EAAE;QACR,IAAA,kDAAmB,GAAE;QACrB,IAAA,0CAAW,GAAE;QACb,IAAA,iDAAkB,GAAE;QACpB,IAAA,2CAAY,GAAE;QACd,IAAA,0CAAW,GAAE;KACd;CACF,CAAA;AAED,MAAM,YAAY,GAAe;IAC/B,GAAG,IAAA,+BAAY,GAAE;IACjB,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW;IACrC,OAAO,EAAE;QACP,IAAA,sBAAK,EAAC;YACJ,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,oBAAoB;YAC/C,UAAU,EAAE,WAAW;YACvB,KAAK,EAAE;gBACL,GAAG,YAAY;gBACf,OAAO,EAAE;oBACP,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,mCAAI,EAAE;oBAC9B,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;wBAC3B,0CAA0C;wBAC1C,oDAAoD;qBACrD,CAAC,CAAC,CAAC,EAAE;iBACP;aACF;SACF,CAAC;QACF,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,WAAW;QACnC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,WAAW;QACnC,IAAA,sDAAuB,EAAC,iBAAiB,CAAC;KAC3C;IACD,OAAO,EAAE;QACP,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,OAAO;QAC9C,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,EAAE,0BAA0B,EAAE,QAAQ,EAAE;KACtD;IACD,YAAY,EAAE;QACZ,cAAc,EAAE;YACd,mBAAmB;YACnB,MAAM,EAAE,KAAK;SACd;KACF;IACD,KAAK,EAAE;QACL,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,KAAK;QAC5C,GAAG,EAAE,gBAAgB;QACrB,MAAM,EAAE,YAAY;QACpB,aAAa,EAAE;YACb,GAAG,MAAA,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,KAAK,0CAAE,aAAa;YAC3D,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB;YAClD,MAAM,EAAE;gBACN,cAAc,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"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"}
|
package/esm/config/base.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,gCA0F5D,CAAA;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
|
package/esm/config/base.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var _a, _b, _c, _d;
|
|
2
2
|
import { join } from 'path';
|
|
3
|
-
import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson } from 'ssr-common-utils';
|
|
3
|
+
import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson, getBuildConfig } from 'ssr-common-utils';
|
|
4
4
|
import * as webpack from 'webpack';
|
|
5
5
|
import { coerce } from 'semver';
|
|
6
6
|
const MiniCssExtractPlugin = require(loadModuleFromFramework('ssr-mini-css-extract-plugin'));
|
|
@@ -59,7 +59,7 @@ const addBabelLoader = (chain, envOptions, isServer) => {
|
|
|
59
59
|
const getBaseConfig = (chain, isServer) => {
|
|
60
60
|
var _a, _b;
|
|
61
61
|
const config = loadConfig();
|
|
62
|
-
const { moduleFileExtensions,
|
|
62
|
+
const { moduleFileExtensions, chainBaseConfig, corejsOptions, babelExtraModule, alias, define, babelOptions, assetsDir } = config;
|
|
63
63
|
const mode = process.env.NODE_ENV;
|
|
64
64
|
const envOptions = {
|
|
65
65
|
modules: false,
|
|
@@ -97,8 +97,7 @@ const getBaseConfig = (chain, isServer) => {
|
|
|
97
97
|
const module = chain.module
|
|
98
98
|
.rule('compileBabelForExtraModule')
|
|
99
99
|
.test(/\.(js|mjs|jsx|ts|tsx)$/)
|
|
100
|
-
.include
|
|
101
|
-
.add([/ssr-plugin-react/, /ssr-client-utils/, /ssr-hoc-react/, /ssr-common-utils/]);
|
|
100
|
+
.include;
|
|
102
101
|
const babelForExtraModule = module.add(babelExtraModule !== null && babelExtraModule !== void 0 ? babelExtraModule : []).add((_b = babelOptions === null || babelOptions === void 0 ? void 0 : babelOptions.include) !== null && _b !== void 0 ? _b : []).end().exclude.add(/core-js/).end();
|
|
103
102
|
addBabelLoader(babelModule, envOptions, isServer);
|
|
104
103
|
addBabelLoader(babelForExtraModule, envOptions, isServer);
|
|
@@ -119,14 +118,11 @@ const getBaseConfig = (chain, isServer) => {
|
|
|
119
118
|
.use('file-loader')
|
|
120
119
|
.loader(loadModule('file-loader'))
|
|
121
120
|
.options({
|
|
122
|
-
name:
|
|
121
|
+
name: `${assetsDir}/[name].[hash:8].[ext]`,
|
|
123
122
|
esModule: false,
|
|
124
123
|
emitFile: !isServer
|
|
125
124
|
});
|
|
126
|
-
chain.plugin('minify-css').use(MiniCssExtractPlugin,
|
|
127
|
-
filename: useHash ? '[name].[contenthash:8].css' : 'static/[name].css',
|
|
128
|
-
chunkFilename: useHash ? '[name].[contenthash:8].chunk.css' : 'static/[name].chunk.css'
|
|
129
|
-
}]);
|
|
125
|
+
chain.plugin('minify-css').use(MiniCssExtractPlugin, getBuildConfig().cssBuildConfig);
|
|
130
126
|
chain.plugin('webpackBar').use(new WebpackBar({
|
|
131
127
|
name: isServer ? 'server' : 'client',
|
|
132
128
|
color: isServer ? '#f173ac' : '#45b97c'
|
package/esm/config/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAe7C,QAAA,MAAM,gBAAgB,UAAW,YAAY,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAA;AAe7C,QAAA,MAAM,gBAAgB,UAAW,YAAY,oCAkG5C,CAAA;AAED,OAAO,EACL,gBAAgB,EACjB,CAAA"}
|
package/esm/config/client.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { promises } from 'fs';
|
|
2
2
|
import { resolve } from 'path';
|
|
3
|
-
import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework } from 'ssr-common-utils';
|
|
3
|
+
import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework, getBuildConfig } from 'ssr-common-utils';
|
|
4
4
|
import { getBaseConfig } from './base';
|
|
5
5
|
const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
|
|
6
6
|
const safePostCssParser = require('postcss-safe-parser');
|
|
@@ -12,7 +12,8 @@ const asyncChunkMap = {
|
|
|
12
12
|
val: {}
|
|
13
13
|
};
|
|
14
14
|
const getClientWebpack = (chain) => {
|
|
15
|
-
const { isDev, chunkName, getOutput, cwd,
|
|
15
|
+
const { isDev, chunkName, getOutput, cwd, chainClientConfig, host, fePort, optimize } = loadConfig();
|
|
16
|
+
const buildConfig = getBuildConfig();
|
|
16
17
|
const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP);
|
|
17
18
|
const publicPath = getOutputPublicPath();
|
|
18
19
|
getBaseConfig(chain, false);
|
|
@@ -22,8 +23,8 @@ const getClientWebpack = (chain) => {
|
|
|
22
23
|
.end()
|
|
23
24
|
.output
|
|
24
25
|
.path(getOutput().clientOutPut)
|
|
25
|
-
.filename(
|
|
26
|
-
.chunkFilename(
|
|
26
|
+
.filename(buildConfig.jsBuldConfig.fileName)
|
|
27
|
+
.chunkFilename(buildConfig.jsBuldConfig.chunkFileName)
|
|
27
28
|
.publicPath(publicPath)
|
|
28
29
|
.end();
|
|
29
30
|
chain.optimization
|
package/esm/config/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,7 @@ const clientRender = async () => {
|
|
|
20
20
|
ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](createElement(BrowserRouter, {
|
|
21
21
|
basename: baseName
|
|
22
22
|
}, createElement(AppContext, {
|
|
23
|
-
children: createElement(Switch, null, createElement(IApp, null, createElement(Switch, null,
|
|
24
|
-
routes.map(item => {
|
|
23
|
+
children: createElement(Switch, null, createElement(IApp, null, createElement(Switch, null, routes.map(item => {
|
|
25
24
|
const { fetch, component, path } = item;
|
|
26
25
|
component.fetch = fetch;
|
|
27
26
|
component.layoutFetch = layoutFetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AACrC,OAAO,cAAc,CAAA,CAAC,0BAA0B;AAChD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;AAE7C,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;;IAC7C,MAAM,IAAI,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,UAAU,KAAkB;QAC9C,OAAO,KAAK,CAAC,QAAS,CAAA;IACxB,CAAC,CAAA;IACD,eAAe,CAAC,OAAO,CAAC,CAAA;IACxB,iBAAiB;IACjB,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;IAChE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjD,aAAa,CAAC,aAAa,EAAE;QAC3B,QAAQ,EAAE,QAAQ;KACnB,EAAE,aAAa,CAAC,UAAiB,EAAE;QAClC,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAClC,aAAa,CAAC,IAAW,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AACrC,OAAO,cAAc,CAAA,CAAC,0BAA0B;AAChD,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,MAAM,CAAA;AAE7C,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;;IAC7C,MAAM,IAAI,GAAG,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,UAAU,KAAkB;QAC9C,OAAO,KAAK,CAAC,QAAS,CAAA;IACxB,CAAC,CAAA;IACD,eAAe,CAAC,OAAO,CAAC,CAAA;IACxB,iBAAiB;IACjB,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;IAChE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACzD,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CACjD,aAAa,CAAC,aAAa,EAAE;QAC3B,QAAQ,EAAE,QAAQ;KACnB,EAAE,aAAa,CAAC,UAAiB,EAAE;QAClC,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EAClC,aAAa,CAAC,IAAW,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,EAAE,IAAI,EACzD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAChB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;YACvC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;YACvB,SAAS,CAAC,WAAW,GAAG,WAAW,CAAA;YACnC,MAAM,gBAAgB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;YACjD,OAAO,aAAa,CAAC,KAAK,EAAE;gBAC1B,KAAK,EAAE,IAAI;gBACX,GAAG,EAAE,IAAI;gBACT,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE;oBAC5C,GAAG,EAAE,QAAQ,CAAC,QAAQ;iBACvB,CAAC;aACH,CAAC,CAAA;QACJ,CAAC,CAAC,CAAC,CAAC,CAAC;KACV,CAAC,CAAC,EACD,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IACnC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,MAAA,MAAC,MAAc,aAAd,MAAM,uBAAN,MAAM,CAAU,GAAG,0CAAE,MAAM,kDAAI,CAAA;KACjC;AACH,CAAC,CAAA;AAED,YAAY,EAAE,CAAA;AAEd,OAAO,EACL,YAAY,EACb,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ISSRContext, IConfig } from 'ssr-types';
|
|
3
3
|
import { Routes } from './create-router';
|
|
4
|
-
declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<string | import("stream").Readable | NodeJS.ReadableStream | {
|
|
4
|
+
declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<string | import("stream").Readable | NodeJS.ReadableStream | import("ssr-types").PipeableStream | {
|
|
5
5
|
html: string;
|
|
6
6
|
teleportsContext: any;
|
|
7
7
|
}>;
|
package/esm/tools/vite.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAoBxC,QAAA,MAAM,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAoBxC,QAAA,MAAM,YAAY,EAAE,UAoDnB,CAAA;AACD,QAAA,MAAM,YAAY,EAAE,UA0CnB,CAAA;AACD,QAAA,MAAM,SAAS,qBAEd,CAAA;AACD,QAAA,MAAM,SAAS,qBAGd,CAAA;AAED,QAAA,MAAM,eAAe,qBAEpB,CAAA;AACD,QAAA,MAAM,eAAe,qBAEpB,CAAA;AAED,OAAO,EACL,SAAS,EACT,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,CAAA"}
|
package/esm/tools/vite.js
CHANGED
|
@@ -56,7 +56,8 @@ const serverConfig = {
|
|
|
56
56
|
...(_q = (_p = (_o = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig().server) === null || _o === void 0 ? void 0 : _o.otherConfig) === null || _p === void 0 ? void 0 : _p.build) === null || _q === void 0 ? void 0 : _q.rollupOptions,
|
|
57
57
|
input: isDev ? reactClientEntry : reactServerEntry,
|
|
58
58
|
output: {
|
|
59
|
-
entryFileNames: 'Page.server.js'
|
|
59
|
+
entryFileNames: 'Page.server.js',
|
|
60
|
+
assetFileNames: rollupOutputOptions().assetFileNames
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
},
|
|
@@ -99,7 +100,7 @@ const clientConfig = {
|
|
|
99
100
|
rollupOptions: {
|
|
100
101
|
...(_16 = (_15 = (_14 = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig().client) === null || _14 === void 0 ? void 0 : _14.otherConfig) === null || _15 === void 0 ? void 0 : _15.build) === null || _16 === void 0 ? void 0 : _16.rollupOptions,
|
|
101
102
|
input: reactClientEntry,
|
|
102
|
-
output: rollupOutputOptions,
|
|
103
|
+
output: rollupOutputOptions(),
|
|
103
104
|
plugins: [chunkNamePlugin(), asyncOptimizeChunkPlugin(), manifestPlugin()]
|
|
104
105
|
}
|
|
105
106
|
},
|
package/esm/tools/vite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAc,MAAM,MAAM,CAAA;AACxC,OAAO,EACL,UAAU,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAC9E,wBAAwB,EAAE,mBAAmB,EAC9C,MAAM,kBAAkB,CAAA;AACzB,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,WAAW,EAAE,kBAAkB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AACvJ,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,UAAU,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,UAAU,EAAE,CAAA;AACjJ,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAA;AAClD,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC;IAChF,QAAQ,EAAE;QACR,mBAAmB,EAAE;QACrB,WAAW,EAAE;QACb,kBAAkB,EAAE;QACpB,YAAY,EAAE;QACd,WAAW,EAAE;KACd;CACF,CAAA;AAED,MAAM,YAAY,GAAe;IAC/B,GAAG,YAAY,EAAE;IACjB,GAAG,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW;IACrC,OAAO,EAAE;QACP,KAAK,CAAC;YACJ,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,oBAAoB;YAC/C,UAAU,EAAE,WAAW;YACvB,KAAK,EAAE;gBACL,GAAG,YAAY;gBACf,OAAO,EAAE;oBACP,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,mCAAI,EAAE;oBAC9B,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;wBAC3B,0CAA0C;wBAC1C,oDAAoD;qBACrD,CAAC,CAAC,CAAC,EAAE;iBACP;aACF;SACF,CAAC;QACF,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,WAAW;QACnC,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,EAAI,0CAAE,MAAM,0CAAE,WAAW;QACnC,uBAAuB,CAAC,iBAAiB,CAAC;KAC3C;IACD,OAAO,EAAE;QACP,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,OAAO;QAC9C,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,EAAE,0BAA0B,EAAE,QAAQ,EAAE;KACtD;IACD,YAAY,EAAE;QACZ,cAAc,EAAE;YACd,mBAAmB;YACnB,MAAM,EAAE,KAAK;SACd;KACF;IACD,KAAK,EAAE;QACL,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,KAAK;QAC5C,GAAG,EAAE,gBAAgB;QACrB,MAAM,EAAE,YAAY;QACpB,aAAa,EAAE;YACb,GAAG,MAAA,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,GAAK,MAAM,0CAAE,WAAW,0CAAE,KAAK,0CAAE,aAAa;YAC3D,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB;YAClD,MAAM,EAAE;gBACN,cAAc,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/config/base.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { join } from 'path'
|
|
3
3
|
import { Mode } from 'ssr-types'
|
|
4
|
-
import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson } from 'ssr-common-utils'
|
|
4
|
+
import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework, getPkgJson, getBuildConfig } from 'ssr-common-utils'
|
|
5
5
|
import * as WebpackChain from 'webpack-chain'
|
|
6
6
|
import * as webpack from 'webpack'
|
|
7
7
|
import { coerce } from 'semver'
|
|
@@ -61,7 +61,7 @@ const addBabelLoader = (chain: WebpackChain.Rule<WebpackChain.Module>, envOption
|
|
|
61
61
|
}
|
|
62
62
|
const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
|
|
63
63
|
const config = loadConfig()
|
|
64
|
-
const { moduleFileExtensions,
|
|
64
|
+
const { moduleFileExtensions, chainBaseConfig, corejsOptions, babelExtraModule, alias, define, babelOptions, assetsDir } = config
|
|
65
65
|
const mode = process.env.NODE_ENV as Mode
|
|
66
66
|
const envOptions = {
|
|
67
67
|
modules: false,
|
|
@@ -105,7 +105,6 @@ const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
|
|
|
105
105
|
.rule('compileBabelForExtraModule')
|
|
106
106
|
.test(/\.(js|mjs|jsx|ts|tsx)$/)
|
|
107
107
|
.include
|
|
108
|
-
.add([/ssr-plugin-react/, /ssr-client-utils/, /ssr-hoc-react/, /ssr-common-utils/])
|
|
109
108
|
|
|
110
109
|
const babelForExtraModule = module.add(babelExtraModule ?? []).add(babelOptions?.include as Array<string|RegExp> ?? []).end().exclude.add(/core-js/).end()
|
|
111
110
|
|
|
@@ -131,15 +130,12 @@ const getBaseConfig = (chain: WebpackChain, isServer: boolean) => {
|
|
|
131
130
|
.use('file-loader')
|
|
132
131
|
.loader(loadModule('file-loader'))
|
|
133
132
|
.options({
|
|
134
|
-
name:
|
|
133
|
+
name: `${assetsDir}/[name].[hash:8].[ext]`,
|
|
135
134
|
esModule: false,
|
|
136
135
|
emitFile: !isServer
|
|
137
136
|
})
|
|
138
137
|
|
|
139
|
-
chain.plugin('minify-css').use(MiniCssExtractPlugin,
|
|
140
|
-
filename: useHash ? '[name].[contenthash:8].css' : 'static/[name].css',
|
|
141
|
-
chunkFilename: useHash ? '[name].[contenthash:8].chunk.css' : 'static/[name].chunk.css'
|
|
142
|
-
}])
|
|
138
|
+
chain.plugin('minify-css').use(MiniCssExtractPlugin, getBuildConfig().cssBuildConfig)
|
|
143
139
|
|
|
144
140
|
chain.plugin('webpackBar').use(new WebpackBar({
|
|
145
141
|
name: isServer ? 'server' : 'client',
|
package/src/config/client.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { promises } from 'fs'
|
|
2
2
|
import { resolve } from 'path'
|
|
3
|
-
import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework } from 'ssr-common-utils'
|
|
3
|
+
import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework, getBuildConfig } from 'ssr-common-utils'
|
|
4
4
|
import * as WebpackChain from 'webpack-chain'
|
|
5
5
|
import { Compiler } from 'webpack'
|
|
6
6
|
import { getBaseConfig } from './base'
|
|
@@ -17,7 +17,9 @@ const asyncChunkMap: {
|
|
|
17
17
|
val: {}
|
|
18
18
|
}
|
|
19
19
|
const getClientWebpack = (chain: WebpackChain) => {
|
|
20
|
-
const { isDev, chunkName, getOutput, cwd,
|
|
20
|
+
const { isDev, chunkName, getOutput, cwd, chainClientConfig, host, fePort, optimize } = loadConfig()
|
|
21
|
+
const buildConfig = getBuildConfig()
|
|
22
|
+
|
|
21
23
|
const shouldUseSourceMap = isDev || Boolean(process.env.GENERATE_SOURCEMAP)
|
|
22
24
|
const publicPath = getOutputPublicPath()
|
|
23
25
|
getBaseConfig(chain, false)
|
|
@@ -27,8 +29,8 @@ const getClientWebpack = (chain: WebpackChain) => {
|
|
|
27
29
|
.end()
|
|
28
30
|
.output
|
|
29
31
|
.path(getOutput().clientOutPut)
|
|
30
|
-
.filename(
|
|
31
|
-
.chunkFilename(
|
|
32
|
+
.filename(buildConfig.jsBuldConfig.fileName)
|
|
33
|
+
.chunkFilename(buildConfig.jsBuldConfig.chunkFileName)
|
|
32
34
|
.publicPath(publicPath)
|
|
33
35
|
.end()
|
|
34
36
|
chain.optimization
|
|
@@ -24,7 +24,7 @@ const clientRender = async (): Promise<void> => {
|
|
|
24
24
|
basename: baseName
|
|
25
25
|
}, createElement(AppContext as any, {
|
|
26
26
|
children: createElement(Switch, null,
|
|
27
|
-
createElement(IApp as any, null, createElement(Switch, null,
|
|
27
|
+
createElement(IApp as any, null, createElement(Switch, null,
|
|
28
28
|
routes.map(item => {
|
|
29
29
|
const { fetch, component, path } = item
|
|
30
30
|
component.fetch = fetch
|
package/src/tools/vite.ts
CHANGED
|
@@ -59,7 +59,8 @@ const serverConfig: UserConfig = {
|
|
|
59
59
|
...viteConfig?.().server?.otherConfig?.build?.rollupOptions,
|
|
60
60
|
input: isDev ? reactClientEntry : reactServerEntry, // setting prebundle list by client-entry in dev
|
|
61
61
|
output: {
|
|
62
|
-
entryFileNames: 'Page.server.js'
|
|
62
|
+
entryFileNames: 'Page.server.js',
|
|
63
|
+
assetFileNames: rollupOutputOptions().assetFileNames
|
|
63
64
|
}
|
|
64
65
|
}
|
|
65
66
|
},
|
|
@@ -102,7 +103,7 @@ const clientConfig: UserConfig = {
|
|
|
102
103
|
rollupOptions: {
|
|
103
104
|
...viteConfig?.().client?.otherConfig?.build?.rollupOptions,
|
|
104
105
|
input: reactClientEntry,
|
|
105
|
-
output: rollupOutputOptions,
|
|
106
|
+
output: rollupOutputOptions(),
|
|
106
107
|
plugins: [chunkNamePlugin(), asyncOptimizeChunkPlugin(), manifestPlugin()]
|
|
107
108
|
}
|
|
108
109
|
},
|