ssr-plugin-react 6.2.72 → 6.2.73
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 +9 -0
- package/cjs/entry/client-entry.d.ts.map +1 -1
- package/cjs/entry/client-entry.js +6 -8
- package/cjs/entry/client-entry.js.map +1 -1
- package/cjs/entry/create-store.d.ts +2 -0
- package/cjs/entry/create-store.d.ts.map +1 -0
- package/cjs/entry/create-store.js +16 -0
- package/cjs/entry/create-store.js.map +1 -0
- package/cjs/entry/server-entry.d.ts.map +1 -1
- package/cjs/entry/server-entry.js +3 -2
- package/cjs/entry/server-entry.js.map +1 -1
- package/esm/entry/client-entry.d.ts.map +1 -1
- package/esm/entry/client-entry.js +6 -8
- package/esm/entry/client-entry.js.map +1 -1
- package/esm/entry/create-store.d.ts +2 -0
- package/esm/entry/create-store.d.ts.map +1 -0
- package/esm/entry/create-store.js +12 -0
- package/esm/entry/create-store.js.map +1 -0
- package/esm/entry/server-entry.d.ts.map +1 -1
- package/esm/entry/server-entry.js +3 -2
- package/esm/entry/server-entry.js.map +1 -1
- package/package.json +2 -1
- package/src/entry/client-entry.tsx +3 -5
- package/src/entry/create-store.tsx +13 -0
- package/src/entry/server-entry.tsx +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 aa79e8f826d972dd
|
|
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.73 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,12 @@
|
|
|
1
|
+
## [6.2.73](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.72...plugin-react@6.2.73) (2024-03-25)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* valtio single instance error ([0474b30](https://github.com/zhangyuang/ssr/commit/0474b302110adc755285fdcefe9d58757e1b200f))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
1
10
|
## [6.2.72](https://github.com/zhangyuang/ssr/compare/plugin-react@6.2.70...plugin-react@6.2.72) (2024-03-19)
|
|
2
11
|
|
|
3
12
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-entry.d.ts","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-entry.d.ts","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"AAEA,OAAO,cAAc,CAAA;AAYrB,QAAA,MAAM,YAAY,QAAa,QAAQ,IAAI,CAkC1C,CAAA;AAID,OAAO,EACL,YAAY,EACb,CAAA"}
|
|
@@ -3,24 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.clientRender = void 0;
|
|
4
4
|
const react_1 = require("react");
|
|
5
5
|
const ReactDOM = require("react-dom");
|
|
6
|
-
const valtio_1 = require("valtio");
|
|
7
6
|
require("react-router"); // for vite prebundle list
|
|
8
7
|
const react_router_dom_1 = require("react-router-dom");
|
|
9
8
|
const ssr_common_utils_1 = require("ssr-common-utils");
|
|
10
9
|
const ssr_hoc_react_1 = require("ssr-hoc-react");
|
|
11
10
|
const create_context_1 = require("_build/create-context");
|
|
12
11
|
const create_router_1 = require("./create-router");
|
|
12
|
+
const create_store_1 = require("./create-store");
|
|
13
13
|
const context_1 = require("./context");
|
|
14
|
-
const { FeRoutes, layoutFetch, App
|
|
14
|
+
const { FeRoutes, layoutFetch, App } = create_router_1.Routes;
|
|
15
15
|
const clientRender = async () => {
|
|
16
|
-
var _a, _b, _c
|
|
16
|
+
var _a, _b, _c;
|
|
17
17
|
const IApp = App !== null && App !== void 0 ? App : function (props) {
|
|
18
18
|
return props.children;
|
|
19
19
|
};
|
|
20
20
|
(0, ssr_common_utils_1.setStoreContext)(create_context_1.STORE_CONTEXT);
|
|
21
|
-
|
|
22
|
-
store[key] = (0, valtio_1.proxy)((_a = window.__VALTIO_DATA__) === null || _a === void 0 ? void 0 : _a[key]);
|
|
23
|
-
}
|
|
21
|
+
const store = (0, create_store_1.createStore)(window.__VALTIO_DATA__);
|
|
24
22
|
(0, ssr_common_utils_1.setStore)(store !== null && store !== void 0 ? store : {});
|
|
25
23
|
const baseName = (0, ssr_common_utils_1.isMicro)() ? window.clientPrefix : window.prefix;
|
|
26
24
|
const routes = await (0, ssr_common_utils_1.preloadComponent)(FeRoutes, baseName);
|
|
@@ -41,9 +39,9 @@ const clientRender = async () => {
|
|
|
41
39
|
})
|
|
42
40
|
});
|
|
43
41
|
}))))
|
|
44
|
-
})), document.querySelector((
|
|
42
|
+
})), document.querySelector((_a = window.ssrDevInfo.rootId) !== null && _a !== void 0 ? _a : '#app'));
|
|
45
43
|
if (!window.__USE_VITE__) {
|
|
46
|
-
(
|
|
44
|
+
(_c = (_b = module === null || module === void 0 ? void 0 : module.hot) === null || _b === void 0 ? void 0 : _b.accept) === null || _c === void 0 ? void 0 : _c.call(_b);
|
|
47
45
|
}
|
|
48
46
|
};
|
|
49
47
|
exports.clientRender = clientRender;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":";;;AAAA,iCAAqC;AACrC,sCAAqC;AACrC,
|
|
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,uDAAuF;AACvF,iDAA6C;AAE7C,0DAAgE;AAChE,mDAAwC;AACxC,iDAA4C;AAC5C,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,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IACjD,IAAA,2BAAQ,EAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAA;IACrB,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,aAAa,CAAC,MAAA,MAAM,CAAC,UAAU,CAAC,MAAM,mCAAI,MAAM,CAAC,CAAC,CAAA;IAC/D,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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-store.d.ts","sourceRoot":"","sources":["../../src/entry/create-store.tsx"],"names":[],"mappings":"AAMA,wBAAgB,WAAW,CAAE,WAAW,CAAC,EAAE,GAAG,OAM7C"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createStore = void 0;
|
|
4
|
+
const valtio_1 = require("valtio");
|
|
5
|
+
const ssr_deepclone_1 = require("ssr-deepclone");
|
|
6
|
+
const create_router_1 = require("./create-router");
|
|
7
|
+
const { store } = create_router_1.Routes;
|
|
8
|
+
function createStore(initialData) {
|
|
9
|
+
const storeInstance = initialData ? store : (0, ssr_deepclone_1.deepClone)(store);
|
|
10
|
+
for (const key in storeInstance) {
|
|
11
|
+
storeInstance[key] = initialData ? (0, valtio_1.proxy)(initialData[key]) : (0, valtio_1.proxy)(storeInstance[key]);
|
|
12
|
+
}
|
|
13
|
+
return storeInstance;
|
|
14
|
+
}
|
|
15
|
+
exports.createStore = createStore;
|
|
16
|
+
//# sourceMappingURL=create-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-store.js","sourceRoot":"","sources":["../../src/entry/create-store.tsx"],"names":[],"mappings":";;;AAAA,mCAA8B;AAC9B,iDAAyC;AACzC,mDAAwC;AAExC,MAAM,EAAE,KAAK,EAAE,GAAG,sBAAM,CAAA;AAExB,SAAgB,WAAW,CAAE,WAAiB;IAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,yBAAS,EAAC,KAAK,CAAC,CAAA;IAC5D,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC/B,aAAa,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;KACvF;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAND,kCAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAKxC,QAAA,MAAM,YAAY,QAAe,WAAW,UAAU,OAAO;;;EAuF5D,CAAA;AAED,OAAO,EACL,YAAY,EACZ,MAAM,EACP,CAAA"}
|
|
@@ -11,7 +11,8 @@ const ssr_serialize_javascript_1 = require("ssr-serialize-javascript");
|
|
|
11
11
|
const create_context_1 = require("_build/create-context");
|
|
12
12
|
const create_router_1 = require("./create-router");
|
|
13
13
|
Object.defineProperty(exports, "Routes", { enumerable: true, get: function () { return create_router_1.Routes; } });
|
|
14
|
-
const
|
|
14
|
+
const create_store_1 = require("./create-store");
|
|
15
|
+
const { FeRoutes, layoutFetch, state, Layout } = create_router_1.Routes;
|
|
15
16
|
const serverRender = async (ctx, config) => {
|
|
16
17
|
var _a;
|
|
17
18
|
const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, stream, rootId, hashRouter } = config;
|
|
@@ -88,7 +89,7 @@ const serverRender = async (ctx, config) => {
|
|
|
88
89
|
return await ssr_common_utils_1.localStorageWrapper.run({
|
|
89
90
|
context: create_context_1.STORE_CONTEXT,
|
|
90
91
|
ctx,
|
|
91
|
-
store
|
|
92
|
+
store: (0, create_store_1.createStore)()
|
|
92
93
|
}, fn);
|
|
93
94
|
};
|
|
94
95
|
exports.serverRender = serverRender;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,+BAA8B;AAC9B,iCAAqC;AACrC,uDAA+C;AAC/C,6CAAqE;AACrE,uDAAqM;AAErM,uEAAoD;AACpD,0DAAgE;AAChE,mDAAwC;
|
|
1
|
+
{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-entry.d.ts","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client-entry.d.ts","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"AAEA,OAAO,cAAc,CAAA;AAYrB,QAAA,MAAM,YAAY,QAAa,QAAQ,IAAI,CAkC1C,CAAA;AAID,OAAO,EACL,YAAY,EACb,CAAA"}
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import { createElement } from 'react';
|
|
2
2
|
import * as ReactDOM from 'react-dom';
|
|
3
|
-
import { proxy } from 'valtio';
|
|
4
3
|
import 'react-router'; // for vite prebundle list
|
|
5
4
|
import { BrowserRouter, Route, Switch } from 'react-router-dom';
|
|
6
5
|
import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils';
|
|
7
6
|
import { wrapComponent } from 'ssr-hoc-react';
|
|
8
7
|
import { STORE_CONTEXT as Context } from '_build/create-context';
|
|
9
8
|
import { Routes } from './create-router';
|
|
9
|
+
import { createStore } from './create-store';
|
|
10
10
|
import { AppContext } from './context';
|
|
11
|
-
const { FeRoutes, layoutFetch, App
|
|
11
|
+
const { FeRoutes, layoutFetch, App } = Routes;
|
|
12
12
|
const clientRender = async () => {
|
|
13
|
-
var _a, _b, _c
|
|
13
|
+
var _a, _b, _c;
|
|
14
14
|
const IApp = App !== null && App !== void 0 ? App : function (props) {
|
|
15
15
|
return props.children;
|
|
16
16
|
};
|
|
17
17
|
setStoreContext(Context);
|
|
18
|
-
|
|
19
|
-
store[key] = proxy((_a = window.__VALTIO_DATA__) === null || _a === void 0 ? void 0 : _a[key]);
|
|
20
|
-
}
|
|
18
|
+
const store = createStore(window.__VALTIO_DATA__);
|
|
21
19
|
setStore(store !== null && store !== void 0 ? store : {});
|
|
22
20
|
const baseName = isMicro() ? window.clientPrefix : window.prefix;
|
|
23
21
|
const routes = await preloadComponent(FeRoutes, baseName);
|
|
@@ -38,9 +36,9 @@ const clientRender = async () => {
|
|
|
38
36
|
})
|
|
39
37
|
});
|
|
40
38
|
}))))
|
|
41
|
-
})), document.querySelector((
|
|
39
|
+
})), document.querySelector((_a = window.ssrDevInfo.rootId) !== null && _a !== void 0 ? _a : '#app'));
|
|
42
40
|
if (!window.__USE_VITE__) {
|
|
43
|
-
(
|
|
41
|
+
(_c = (_b = module === null || module === void 0 ? void 0 : module.hot) === null || _b === void 0 ? void 0 : _b.accept) === null || _c === void 0 ? void 0 : _c.call(_b);
|
|
44
42
|
}
|
|
45
43
|
};
|
|
46
44
|
clientRender();
|
|
@@ -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,
|
|
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,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACvF,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,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,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,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IACjD,QAAQ,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAA;IACrB,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,aAAa,CAAC,MAAA,MAAM,CAAC,UAAU,CAAC,MAAM,mCAAI,MAAM,CAAC,CAAC,CAAA;IAC/D,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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-store.d.ts","sourceRoot":"","sources":["../../src/entry/create-store.tsx"],"names":[],"mappings":"AAMA,wBAAgB,WAAW,CAAE,WAAW,CAAC,EAAE,GAAG,OAM7C"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { proxy } from 'valtio';
|
|
2
|
+
import { deepClone } from 'ssr-deepclone';
|
|
3
|
+
import { Routes } from './create-router';
|
|
4
|
+
const { store } = Routes;
|
|
5
|
+
export function createStore(initialData) {
|
|
6
|
+
const storeInstance = initialData ? store : deepClone(store);
|
|
7
|
+
for (const key in storeInstance) {
|
|
8
|
+
storeInstance[key] = initialData ? proxy(initialData[key]) : proxy(storeInstance[key]);
|
|
9
|
+
}
|
|
10
|
+
return storeInstance;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=create-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-store.js","sourceRoot":"","sources":["../../src/entry/create-store.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;AAExB,MAAM,UAAU,WAAW,CAAE,WAAiB;IAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC5D,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC/B,aAAa,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;KACvF;IACD,OAAO,aAAa,CAAA;AACtB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAKxC,QAAA,MAAM,YAAY,QAAe,WAAW,UAAU,OAAO;;;EAuF5D,CAAA;AAED,OAAO,EACL,YAAY,EACZ,MAAM,EACP,CAAA"}
|
|
@@ -7,7 +7,8 @@ import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getA
|
|
|
7
7
|
import { serialize } from 'ssr-serialize-javascript';
|
|
8
8
|
import { STORE_CONTEXT as Context } from '_build/create-context';
|
|
9
9
|
import { Routes } from './create-router';
|
|
10
|
-
|
|
10
|
+
import { createStore } from './create-store';
|
|
11
|
+
const { FeRoutes, layoutFetch, state, Layout } = Routes;
|
|
11
12
|
const serverRender = async (ctx, config) => {
|
|
12
13
|
var _a;
|
|
13
14
|
const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, stream, rootId, hashRouter } = config;
|
|
@@ -84,7 +85,7 @@ const serverRender = async (ctx, config) => {
|
|
|
84
85
|
return await localStorageWrapper.run({
|
|
85
86
|
context: Context,
|
|
86
87
|
ctx,
|
|
87
|
-
store
|
|
88
|
+
store: createStore()
|
|
88
89
|
}, fn);
|
|
89
90
|
};
|
|
90
91
|
export { serverRender, Routes };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAErM,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"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.
|
|
3
|
+
"version": "6.2.73",
|
|
4
4
|
"description": "plugin-react for ssr",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./esm/index.js",
|
|
@@ -65,6 +65,7 @@
|
|
|
65
65
|
"react-router-dom": "^5.1.2",
|
|
66
66
|
"semver": "^7.3.8",
|
|
67
67
|
"ssr-common-utils": "^6.0.0",
|
|
68
|
+
"ssr-deepclone": "^1.0.0",
|
|
68
69
|
"ssr-hoc-react": "^6.2.7",
|
|
69
70
|
"ssr-mini-css-extract-plugin": "^1.0.0",
|
|
70
71
|
"ssr-serialize-javascript": "^6.0.0",
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { createElement } from 'react'
|
|
2
2
|
import * as ReactDOM from 'react-dom'
|
|
3
|
-
import { proxy } from 'valtio'
|
|
4
3
|
import 'react-router' // for vite prebundle list
|
|
5
4
|
import { BrowserRouter, Route, Switch } from 'react-router-dom'
|
|
6
5
|
import { preloadComponent, isMicro, setStoreContext, setStore } from 'ssr-common-utils'
|
|
@@ -8,18 +7,17 @@ import { wrapComponent } from 'ssr-hoc-react'
|
|
|
8
7
|
import { LayoutProps } from 'ssr-types'
|
|
9
8
|
import { STORE_CONTEXT as Context } from '_build/create-context'
|
|
10
9
|
import { Routes } from './create-router'
|
|
10
|
+
import { createStore } from './create-store'
|
|
11
11
|
import { AppContext } from './context'
|
|
12
12
|
|
|
13
|
-
const { FeRoutes, layoutFetch, App
|
|
13
|
+
const { FeRoutes, layoutFetch, App } = Routes
|
|
14
14
|
|
|
15
15
|
const clientRender = async (): Promise<void> => {
|
|
16
16
|
const IApp = App ?? function (props: LayoutProps) {
|
|
17
17
|
return props.children!
|
|
18
18
|
}
|
|
19
19
|
setStoreContext(Context)
|
|
20
|
-
|
|
21
|
-
store[key] = proxy(window.__VALTIO_DATA__?.[key])
|
|
22
|
-
}
|
|
20
|
+
const store = createStore(window.__VALTIO_DATA__)
|
|
23
21
|
setStore(store ?? {})
|
|
24
22
|
const baseName = isMicro() ? window.clientPrefix : window.prefix
|
|
25
23
|
const routes = await preloadComponent(FeRoutes, baseName)
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { proxy } from 'valtio'
|
|
2
|
+
import { deepClone } from 'ssr-deepclone'
|
|
3
|
+
import { Routes } from './create-router'
|
|
4
|
+
|
|
5
|
+
const { store } = Routes
|
|
6
|
+
|
|
7
|
+
export function createStore (initialData?: any) {
|
|
8
|
+
const storeInstance = initialData ? store : deepClone(store)
|
|
9
|
+
for (const key in storeInstance) {
|
|
10
|
+
storeInstance[key] = initialData ? proxy(initialData[key]) : proxy(storeInstance[key])
|
|
11
|
+
}
|
|
12
|
+
return storeInstance
|
|
13
|
+
}
|
|
@@ -8,8 +8,9 @@ import { ISSRContext, IConfig, ReactESMPreloadFeRouteItem, DynamicFC, StaticFC }
|
|
|
8
8
|
import { serialize } from 'ssr-serialize-javascript'
|
|
9
9
|
import { STORE_CONTEXT as Context } from '_build/create-context'
|
|
10
10
|
import { Routes } from './create-router'
|
|
11
|
+
import { createStore } from './create-store'
|
|
11
12
|
|
|
12
|
-
const { FeRoutes, layoutFetch, state, Layout
|
|
13
|
+
const { FeRoutes, layoutFetch, state, Layout } = Routes
|
|
13
14
|
|
|
14
15
|
const serverRender = async (ctx: ISSRContext, config: IConfig) => {
|
|
15
16
|
const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix, stream, rootId, hashRouter } = config
|
|
@@ -96,7 +97,7 @@ const serverRender = async (ctx: ISSRContext, config: IConfig) => {
|
|
|
96
97
|
return await localStorageWrapper.run({
|
|
97
98
|
context: Context,
|
|
98
99
|
ctx,
|
|
99
|
-
store
|
|
100
|
+
store: createStore()
|
|
100
101
|
}, fn)
|
|
101
102
|
}
|
|
102
103
|
|