ssr-plugin-react 6.2.42 → 6.2.45

package/esm/entry/client-entry.js

@@ -1,8 +1,9 @@
-import * as React from 'react';
+import { createElement } from 'react';
 import * as ReactDOM from 'react-dom';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
-import { preloadComponent, isMicro } from 'ssr-client-utils';
+import { preloadComponent, isMicro, setStoreContext } from 'ssr-common-utils';
 import { wrapComponent } from 'ssr-hoc-react';
+import { STORE_CONTEXT as Context } from '_build/create-context';
 import { Routes } from './create-router';
 import { AppContext } from './context';
 const { FeRoutes, layoutFetch, App } = Routes;
@@ -10,22 +11,29 @@ const clientRender = async () => {
     const IApp = App !== null && App !== void 0 ? App : function (props) {
         return props.children;
     };
+    setStoreContext(Context);
     // 客户端渲染||hydrate
     const baseName = isMicro() ? window.clientPrefix : window.prefix;
     const routes = await preloadComponent(FeRoutes, baseName);
-    ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](React.createElement(BrowserRouter, { basename: baseName },
-        React.createElement(AppContext, null,
-            React.createElement(Switch, null,
-                React.createElement(IApp, null,
-                    React.createElement(Switch, null, 
-                    // 使用高阶组件wrapComponent使得csr首次进入页面以及csr/ssr切换路由时调用getInitialProps
-                    routes.map(item => {
-                        const { fetch, component, path } = item;
-                        component.fetch = fetch;
-                        component.layoutFetch = layoutFetch;
-                        const WrappedComponent = wrapComponent(component);
-                        return (React.createElement(Route, { exact: true, key: path, path: path, render: () => React.createElement(WrappedComponent, { key: location.pathname }) }));
-                    })))))), document.getElementById('app'));
+    ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](createElement(BrowserRouter, {
+        basename: baseName
+    }, createElement(AppContext, {
+        children: createElement(Switch, null, createElement(IApp, null, createElement(Switch, null, // 使用高阶组件wrapComponent使得csr首次进入页面以及csr/ssr切换路由时调用getInitialProps
+        routes.map(item => {
+            const { fetch, component, path } = item;
+            component.fetch = fetch;
+            component.layoutFetch = layoutFetch;
+            const WrappedComponent = wrapComponent(component);
+            return createElement(Route, {
+                exact: true,
+                key: path,
+                path: path,
+                render: () => createElement(WrappedComponent, {
+                    key: location.pathname
+                })
+            });
+        }))))
+    })), document.getElementById('app'));
 };
 clientRender();
 export { clientRender };

package/esm/entry/client-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-entry.js","sourceRoot":"","sources":["../../src/entry/client-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE7C,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,MAAyB,CAAA;AAEhE,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,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,oBAAC,aAAa,IAAC,QAAQ,EAAE,QAAQ;QAC/B,oBAAC,UAAU;YACT,oBAAC,MAAM;gBACL,oBAAC,IAAI;oBACH,oBAAC,MAAM;oBAEH,gEAAgE;oBAChE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;wBAChB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;wBACvC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;wBACvB,SAAS,CAAC,WAAW,GAAG,WAAW,CAAA;wBACnC,MAAM,gBAAgB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;wBACjD,OAAO,CACL,oBAAC,KAAK,IAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAC,gBAAgB,IAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,GAAG,GAAG,CACxG,CAAA;oBACH,CAAC,CAAC,CAEG,CACJ,CACA,CACE,CACC,EACd,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;AAErC,CAAC,CAAA;AAED,YAAY,EAAE,CAAA;AAEd,OAAO,EACL,YAAY,EACb,CAAA"}
+{"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,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,EAAE,gEAAgE;QAC3H,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;AAErC,CAAC,CAAA;AAED,YAAY,EAAE,CAAA;AAEd,OAAO,EACL,YAAY,EACb,CAAA"}

package/esm/entry/context.d.ts

@@ -1,3 +1,5 @@
-import { IProps } from 'ssr-types-react';
-export declare function AppContext(props: IProps): JSX.Element;
+/// <reference types="context" />
+/// <reference types="react" />
+import { IProps } from 'ssr-types';
+export declare function AppContext(props: IProps): import("react").FunctionComponentElement<import("react").ProviderProps<import("_build/create-context").IContext<any>>>;
 //# sourceMappingURL=context.d.ts.map

package/esm/entry/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/entry/context.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAoC,MAAM,iBAAiB,CAAA;AAgC1E,wBAAgB,UAAU,CAAE,KAAK,EAAE,MAAM,eAOxC"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/entry/context.tsx"],"names":[],"mappings":";;AACA,OAAO,EAAE,MAAM,EAAoC,MAAM,WAAW,CAAA;AA8BpE,wBAAgB,UAAU,CAAE,KAAK,EAAE,MAAM,0HAQxC"}

package/esm/entry/context.js

@@ -1,7 +1,5 @@
-import * as React from 'react';
-import { useReducer } from 'react';
-// @ts-expect-error
-import { STORE_CONTEXT } from '_build/create-context';
+import { useReducer, createElement } from 'react';
+import { STORE_CONTEXT as Context } from '_build/create-context';
 import { Routes } from './create-router';
 const { reducer, state } = Routes;
 const userState = state !== null && state !== void 0 ? state : {};
@@ -23,6 +21,11 @@ function combineReducer(state, action) {
 }
 export function AppContext(props) {
     const [state, dispatch] = useReducer(combineReducer, initialState);
-    return (React.createElement(STORE_CONTEXT.Provider, { value: { state, dispatch } }, props.children));
+    return createElement(Context.Provider, {
+        value: {
+            state,
+            dispatch
+        }
+    }, props.children);
 }
 //# sourceMappingURL=context.js.map

package/esm/entry/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/entry/context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAGlC,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAyB,CAAA;AAEpD,MAAM,SAAS,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;AAC7B,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,cAAa,CAAC,CAAA;AAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAKnD,SAAS,cAAc,CAAE,KAAU,EAAE,MAAc;IACjD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,eAAe;YAClB,IAAI,KAAK,EAAE;gBACT,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAA;gBACtE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;aACpB;YACD,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;KACzC;AACH,CAAC;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAA;AAEhF,SAAS,cAAc,CAAE,KAAU,EAAE,MAAW;IAC9C,OAAO,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AACpE,CAAC;AACD,MAAM,UAAU,UAAU,CAAE,KAAa;IACvC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IAClE,OAAO,CACL,oBAAC,aAAa,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAC/C,KAAK,CAAC,QAAQ,CACQ,CAC1B,CAAA;AACH,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/entry/context.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAEjD,OAAO,EAAE,aAAa,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAExC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,MAAyB,CAAA;AAEpD,MAAM,SAAS,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAA;AAC7B,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,cAAa,CAAC,CAAA;AAE7C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAA;AAKnD,SAAS,cAAc,CAAE,KAAU,EAAE,MAAc;IACjD,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,eAAe;YAClB,IAAI,KAAK,EAAE;gBACT,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAA;gBACtE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;aACpB;YACD,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;KACzC;AACH,CAAC;AAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAA;AAEhF,SAAS,cAAc,CAAE,KAAU,EAAE,MAAW;IAC9C,OAAO,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;AACpE,CAAC;AACD,MAAM,UAAU,UAAU,CAAE,KAAa;IACvC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IAClE,OAAO,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;QACrC,KAAK,EAAE;YACL,KAAK;YACL,QAAQ;SACT;KACF,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;AACpB,CAAC"}

package/esm/entry/create-context.d.ts

@@ -1,5 +1,5 @@
 import { Context } from 'react';
-import { IContext } from 'ssr-types-react';
+import { IContext } from 'ssr-types';
 declare let STORE_CONTEXT: Context<IContext>;
 export { STORE_CONTEXT };
 //# sourceMappingURL=create-context.d.ts.map

package/esm/entry/create-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-context.d.ts","sourceRoot":"","sources":["../../src/entry/create-context.ts"],"names":[],"mappings":"AAGA,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,QAAA,IAAI,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;AAYpC,OAAO,EACL,aAAa,EACd,CAAA"}
+{"version":3,"file":"create-context.d.ts","sourceRoot":"","sources":["../../src/entry/create-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAiB,MAAM,OAAO,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,QAAA,IAAI,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;AAYpC,OAAO,EACL,aAAa,EACd,CAAA"}

package/esm/entry/create-context.js

@@ -1,15 +1,14 @@
-// @ts-nocheck
-// The file is provisional，don't depend on it
-import React from 'react';
+// The file is provisional，don't modify it
+import { createContext } from 'react';
 let STORE_CONTEXT;
 if (__isBrowser__) {
-    STORE_CONTEXT = window.STORE_CONTEXT || React.createContext({
+    STORE_CONTEXT = window.STORE_CONTEXT || createContext({
         state: {}
     });
     window.STORE_CONTEXT = STORE_CONTEXT;
 }
 else {
-    STORE_CONTEXT = React.createContext({
+    STORE_CONTEXT = createContext({
         state: {}
     });
 }

package/esm/entry/create-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-context.js","sourceRoot":"","sources":["../../src/entry/create-context.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,6CAA6C;AAE7C,OAAO,KAAkB,MAAM,OAAO,CAAA;AAGtC,IAAI,aAAgC,CAAA;AACpC,IAAI,aAAa,EAAE;IACjB,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,CAAW;QACpE,KAAK,EAAE,EAAE;KACV,CAAC,CAAA;IACF,MAAM,CAAC,aAAa,GAAG,aAAa,CAAA;CACrC;KAAM;IACL,aAAa,GAAG,KAAK,CAAC,aAAa,CAAW;QAC5C,KAAK,EAAE,EAAE;KACV,CAAC,CAAA;CACH;AAED,OAAO,EACL,aAAa,EACd,CAAA"}
+{"version":3,"file":"create-context.js","sourceRoot":"","sources":["../../src/entry/create-context.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAE1C,OAAO,EAAW,aAAa,EAAE,MAAM,OAAO,CAAA;AAE9C,IAAI,aAAgC,CAAA;AACpC,IAAI,aAAa,EAAE;IACjB,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,aAAa,CAAW;QAC9D,KAAK,EAAE,EAAE;KACV,CAAC,CAAA;IACF,MAAM,CAAC,aAAa,GAAG,aAAa,CAAA;CACrC;KAAM;IACL,aAAa,GAAG,aAAa,CAAW;QACtC,KAAK,EAAE,EAAE;KACV,CAAC,CAAA;CACH;AAED,OAAO,EACL,aAAa,EACd,CAAA"}

package/esm/entry/create-router.d.ts

@@ -1,4 +1,4 @@
-import { ReactRoutesType } from 'ssr-types-react';
+import { ReactRoutesType } from 'ssr-types';
 declare const Routes: ReactRoutesType;
 export { Routes };
 //# sourceMappingURL=create-router.d.ts.map

package/esm/entry/create-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-router.d.ts","sourceRoot":"","sources":["../../src/entry/create-router.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAKjD,QAAA,MAAM,MAAM,EAAE,eAGb,CAAA;AAaD,OAAO,EACL,MAAM,EACP,CAAA"}
+{"version":3,"file":"create-router.d.ts","sourceRoot":"","sources":["../../src/entry/create-router.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,QAAA,MAAM,MAAM,iBAAgE,CAAA;AAE5E,OAAO,EACL,MAAM,EACP,CAAA"}

package/esm/entry/create-router.js

@@ -1,24 +1,6 @@
-// @ts-expect-error
+import { combineRoutes } from 'ssr-common-utils';
 import * as declareRoutes from '_build/ssr-declare-routes';
-// @ts-expect-error
 import * as ManualRoutes from '_build/ssr-manual-routes';
-const declareRoutesWithType = declareRoutes;
-const ManualRoutesWithType = ManualRoutes;
-const Routes = {
-    ...declareRoutes,
-    ...ManualRoutesWithType
-};
-if (ManualRoutesWithType.FeRoutes) {
-    // 声明式路由覆盖约定式路由同名path
-    const combineRoutes = declareRoutesWithType.FeRoutes.map(route => { var _a; return (_a = ManualRoutesWithType.FeRoutes.find(e => e.path === route.path)) !== null && _a !== void 0 ? _a : route; });
-    ManualRoutesWithType.FeRoutes.forEach(route => {
-        // 补充声明式路由新增的配置
-        const found = combineRoutes.find(e => e.path === route.path);
-        if (!found) {
-            combineRoutes.push(route);
-        }
-    });
-    Routes.FeRoutes = combineRoutes;
-}
+const Routes = combineRoutes(declareRoutes, ManualRoutes);
 export { Routes };
 //# sourceMappingURL=create-router.js.map

package/esm/entry/create-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../src/entry/create-router.ts"],"names":[],"mappings":"AAAA,mBAAmB;AACnB,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC1D,mBAAmB;AACnB,OAAO,KAAK,YAAY,MAAM,0BAA0B,CAAA;AAGxD,MAAM,qBAAqB,GAAG,aAAgC,CAAA;AAC9D,MAAM,oBAAoB,GAAG,YAA+B,CAAA;AAE5D,MAAM,MAAM,GAAoB;IAC9B,GAAG,aAAa;IAChB,GAAG,oBAAoB;CACxB,CAAA;AACD,IAAI,oBAAoB,CAAC,QAAQ,EAAE;IACjC,qBAAqB;IACrB,MAAM,aAAa,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,mCAAI,KAAK,CAAA,EAAA,CAAC,CAAA;IAC1I,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC5C,eAAe;QACf,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5D,IAAI,CAAC,KAAK,EAAE;YACV,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SAC1B;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,QAAQ,GAAG,aAAa,CAAA;CAChC;AACD,OAAO,EACL,MAAM,EACP,CAAA"}
+{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../src/entry/create-router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAA;AAC1D,OAAO,KAAK,YAAY,MAAM,0BAA0B,CAAA;AAGxD,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,EAAE,YAAY,CAAoB,CAAA;AAE5E,OAAO,EACL,MAAM,EACP,CAAA"}

package/esm/entry/server-entry.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { ISSRContext, IConfig } from 'ssr-types-react';
-declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<React.ReactElement>;
+import { StaticRouter } from 'react-router-dom';
+import { ISSRContext, IConfig } from 'ssr-types';
+declare const serverRender: (ctx: ISSRContext, config: IConfig) => Promise<React.CElement<import("react-router-dom").StaticRouterProps, StaticRouter>>;
 export { serverRender };
 //# sourceMappingURL=server-entry.d.ts.map

package/esm/entry/server-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,EAAE,WAAW,EAAE,OAAO,EAAoE,MAAM,iBAAiB,CAAA;AAQxH,QAAA,MAAM,YAAY,QAAe,WAAW,UAAU,OAAO,KAAG,QAAQ,MAAM,YAAY,CA0EzF,CAAA;AAED,OAAO,EACL,YAAY,EACb,CAAA"}
+{"version":3,"file":"server-entry.d.ts","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAmD,MAAM,WAAW,CAAA;AAOjG,QAAA,MAAM,YAAY,QAAe,WAAW,UAAU,OAAO,wFA+E5D,CAAA;AAED,OAAO,EACL,YAAY,EACb,CAAA"}

package/esm/entry/server-entry.js

@@ -1,8 +1,8 @@
 import * as React from 'react';
+import { createElement } from 'react';
 import { StaticRouter } from 'react-router-dom';
-import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, reactRefreshFragment } from 'ssr-server-utils';
+import { findRoute, getManifest, logGreen, normalizePath, getAsyncCssChunk, getAsyncJsChunk, reactRefreshFragment, setStoreContext } from 'ssr-common-utils';
 import { serialize } from 'ssr-serialize-javascript';
-// @ts-expect-error
 import { STORE_CONTEXT as Context } from '_build/create-context';
 import { Routes } from './create-router';
 const { FeRoutes, layoutFetch, state, Layout } = Routes;
@@ -11,6 +11,7 @@ const serverRender = async (ctx, config) => {
     const { mode, parallelFetch, prefix, isVite, isDev, clientPrefix } = config;
     const path = normalizePath(ctx.request.path, prefix);
     const routeItem = findRoute(FeRoutes, path);
+    setStoreContext(Context);
     if (!routeItem) {
         throw new Error(`
     With Path: ${path} search component failed
@@ -64,10 +65,20 @@ const serverRender = async (ctx, config) => {
     const injectState = isCsr ? React.createElement("script", { dangerouslySetInnerHTML: { __html: `window.prefix="${prefix}";${clientPrefix ? `window.clientPrefix="${clientPrefix}";` : ''}` } }) : React.createElement("script", { dangerouslySetInnerHTML: {
             __html: `window.__USE_SSR__=true; window.__INITIAL_DATA__ =${serialize(combineData)}; window.prefix="${prefix}";${clientPrefix ? `window.clientPrefix="${clientPrefix}";` : ''}`
         } });
-    return (React.createElement(StaticRouter, { location: ctx.request.url, basename: prefix === '/' ? undefined : prefix },
-        React.createElement(Context.Provider, { value: { state: combineData } },
-            React.createElement(Layout, { ctx: ctx, config: config, staticList: staticList, injectState: injectState },
-                React.createElement(Component, null)))));
+    // with jsx type error, use createElement here
+    return createElement(StaticRouter, {
+        location: ctx.request.url,
+        basename: prefix === '/' ? undefined : prefix
+    }, createElement(Context.Provider, {
+        value: {
+            state: combineData
+        }
+    }, createElement(Layout, {
+        ctx: ctx,
+        config: config,
+        staticList: staticList,
+        injectState: injectState
+    }, createElement(Component, null))));
 };
 export { serverRender };
 //# sourceMappingURL=server-entry.js.map

package/esm/entry/server-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"server-entry.js","sourceRoot":"","sources":["../../src/entry/server-entry.tsx"],"names":[],"mappings":"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"}

package/esm/index.js

@@ -1,4 +1,4 @@
-import { loadConfig } from 'ssr-server-utils';
+import { loadConfig } from 'ssr-common-utils';
 const { isVite, optimize } = loadConfig();
 const spinner = require('ora')('Building');
 export function clientPlugin() {

package/esm/tools/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAmBxC,QAAA,MAAM,YAAY,EAAE,UA6CnB,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"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAE,MAAM,MAAM,CAAA;AAmBxC,QAAA,MAAM,YAAY,EAAE,UAmDnB,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

@@ -1,6 +1,6 @@
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18;
 import { build } from 'vite';
-import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig, asyncOptimizeChunkPlugin, getOutputPublicPath } from 'ssr-server-utils';
+import { loadConfig, chunkNamePlugin, rollupOutputOptions, manifestPlugin, commonConfig, asyncOptimizeChunkPlugin, getOutputPublicPath } from 'ssr-common-utils';
 import react from '@vitejs/plugin-react';
 import { createStyleImportPlugin, AndDesignVueResolve, VantResolve, ElementPlusResolve, NutuiResolve, AntdResolve } from 'ssr-vite-plugin-style-import';
 const { getOutput, reactServerEntry, reactClientEntry, viteConfig, supportOptinalChaining, isDev, define, babelOptions, optimize } = loadConfig();
@@ -42,6 +42,12 @@ const serverConfig = {
         keepNames: true,
         logOverride: { 'this-is-undefined-in-esm': 'silent' }
     },
+    optimizeDeps: {
+        esbuildOptions: {
+            // @ts-expect-error
+            bundle: isDev
+        }
+    },
     build: {
         ...(_m = (_l = viteConfig === null || viteConfig === void 0 ? void 0 : viteConfig().server) === null || _l === void 0 ? void 0 : _l.otherConfig) === null || _m === void 0 ? void 0 : _m.build,
         ssr: reactServerEntry,

package/esm/tools/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vite.js","sourceRoot":"","sources":["../../src/tools/vite.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssr-plugin-react",
-  "version": "6.2.42",
+  "version": "6.2.45",
   "description": "plugin-react for ssr",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -26,6 +26,9 @@
   "bugs": {
     "url": "https://github.com/zhangyuang/ssr/issues"
   },
+  "engines": {
+    "node": ">=12.17.0"
+  },
   "homepage": "https://github.com/zhangyuang/ssr#readme",
   "dependencies": {
     "@babel/core": "^7.0.0",
@@ -61,10 +64,10 @@
     "react-router": "^5.2.1",
     "react-router-dom": "^5.1.2",
     "ssr-client-utils": "^6.2.7",
+    "ssr-common-utils": "^6.0.0",
     "ssr-hoc-react": "^6.2.7",
     "ssr-serialize-javascript": "^6.0.0",
-    "ssr-server-utils": "^6.2.10",
-    "ssr-vite-plugin-style-import": "^2.0.0",
+    "ssr-vite-plugin-style-import": "^2.0.1",
     "ssr-webpack": "^6.2.10",
     "terser-webpack-plugin": "^2.3.5",
     "url-loader": "^4.1.1",
@@ -81,6 +84,6 @@
     "@types/react-router-dom": "^5.1.3",
     "@types/webpack": "^4.41.10",
     "concurrently": "^5.1.0",
-    "ssr-types-react": "^6.2.7"
+    "ssr-types": "^6.2.7"
   }
 }

package/src/config/base.ts

@@ -1,7 +1,7 @@
 
 import { join } from 'path'
-import { Mode } from 'ssr-types-react'
-import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-server-utils'
+import { Mode } from 'ssr-types'
+import { getCwd, loadConfig, setStyle, addImageChain, loadModuleFromFramework } from 'ssr-common-utils'
 import * as WebpackChain from 'webpack-chain'
 import * as webpack from 'webpack'
 

package/src/config/client.ts

@@ -1,6 +1,6 @@
 import { promises } from 'fs'
 import { resolve } from 'path'
-import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework } from 'ssr-server-utils'
+import { loadConfig, getCwd, getSplitChunksOptions, getOutputPublicPath, loadModuleFromFramework } from 'ssr-common-utils'
 import * as WebpackChain from 'webpack-chain'
 import { Compiler } from 'webpack'
 import { getBaseConfig } from './base'

package/src/config/server.ts

@@ -1,5 +1,5 @@
 import { join } from 'path'
-import { loadConfig, nodeExternals, loadModuleFromFramework } from 'ssr-server-utils'
+import { loadConfig, nodeExternals, loadModuleFromFramework } from 'ssr-common-utils'
 import * as WebpackChain from 'webpack-chain'
 import * as webpack from 'webpack'
 import { getBaseConfig } from './base'

package/src/entry/client-entry.tsx

@@ -1,44 +1,44 @@
-import * as React from 'react'
+import { createElement } from 'react'
 import * as ReactDOM from 'react-dom'
 import { BrowserRouter, Route, Switch } from 'react-router-dom'
-import { preloadComponent, isMicro } from 'ssr-client-utils'
+import { preloadComponent, isMicro, setStoreContext } from 'ssr-common-utils'
 import { wrapComponent } from 'ssr-hoc-react'
-import { LayoutProps, ReactRoutesType } from 'ssr-types-react'
+import { LayoutProps } from 'ssr-types'
+import { STORE_CONTEXT as Context } from '_build/create-context'
 import { Routes } from './create-router'
 import { AppContext } from './context'
 
-const { FeRoutes, layoutFetch, App } = Routes as ReactRoutesType
+const { FeRoutes, layoutFetch, App } = Routes
 
 const clientRender = async (): Promise<void> => {
   const IApp = App ?? function (props: LayoutProps) {
     return props.children!
   }
+  setStoreContext(Context)
   // 客户端渲染||hydrate
   const baseName = isMicro() ? window.clientPrefix : window.prefix
   const routes = await preloadComponent(FeRoutes, baseName)
   ReactDOM[window.__USE_SSR__ ? 'hydrate' : 'render'](
-    <BrowserRouter basename={baseName}>
-      <AppContext>
-        <Switch>
-          <IApp>
-            <Switch>
-              {
-                // 使用高阶组件wrapComponent使得csr首次进入页面以及csr/ssr切换路由时调用getInitialProps
-                routes.map(item => {
-                  const { fetch, component, path } = item
-                  component.fetch = fetch
-                  component.layoutFetch = layoutFetch
-                  const WrappedComponent = wrapComponent(component)
-                  return (
-                    <Route exact={true} key={path} path={path} render={() => <WrappedComponent key={location.pathname}/>}/>
-                  )
-                })
-              }
-            </Switch>
-          </IApp>
-        </Switch>
-      </AppContext>
-    </BrowserRouter>
+    createElement(BrowserRouter, {
+      basename: baseName
+    }, createElement(AppContext as any, {
+      children: createElement(Switch, null,
+        createElement(IApp as any, null, createElement(Switch, null, // 使用高阶组件wrapComponent使得csr首次进入页面以及csr/ssr切换路由时调用getInitialProps
+          routes.map(item => {
+            const { fetch, component, path } = item
+            component.fetch = fetch
+            component.layoutFetch = layoutFetch
+            const WrappedComponent = wrapComponent(component)
+            return createElement(Route, {
+              exact: true,
+              key: path,
+              path: path,
+              render: () => createElement(WrappedComponent, {
+                key: location.pathname
+              })
+            })
+          }))))
+    }))
     , document.getElementById('app'))
 
 }

package/src/entry/context.tsx

@@ -1,9 +1,6 @@
-import * as React from 'react'
-import { useReducer } from 'react'
-import { IProps, Action, IWindow, ReactRoutesType } from 'ssr-types-react'
-
-// @ts-expect-error
-import { STORE_CONTEXT } from '_build/create-context'
+import { useReducer, createElement } from 'react'
+import { IProps, Action, IWindow, ReactRoutesType } from 'ssr-types'
+import { STORE_CONTEXT as Context } from '_build/create-context'
 import { Routes } from './create-router'
 
 const { reducer, state } = Routes as ReactRoutesType
@@ -34,9 +31,10 @@ function combineReducer (state: any, action: any) {
 }
 export function AppContext (props: IProps) {
   const [state, dispatch] = useReducer(combineReducer, initialState)
-  return (
-    <STORE_CONTEXT.Provider value={{ state, dispatch }}>
-      {props.children}
-    </STORE_CONTEXT.Provider>
-  )
+  return createElement(Context.Provider, {
+    value: {
+      state,
+      dispatch
+    }
+  }, props.children)
 }

package/src/entry/create-context.ts

@@ -1,17 +1,15 @@
-// @ts-nocheck
-// The file is provisional，don't depend on it
-
-import React, { Context } from 'react'
-import { IContext } from 'ssr-types-react'
+// The file is provisional，don't modify it
 
+import { Context, createContext } from 'react'
+import { IContext } from 'ssr-types'
 let STORE_CONTEXT: Context<IContext>
 if (__isBrowser__) {
-  STORE_CONTEXT = window.STORE_CONTEXT || React.createContext<IContext>({
+  STORE_CONTEXT = window.STORE_CONTEXT || createContext<IContext>({
     state: {}
   })
   window.STORE_CONTEXT = STORE_CONTEXT
 } else {
-  STORE_CONTEXT = React.createContext<IContext>({
+  STORE_CONTEXT = createContext<IContext>({
     state: {}
   })
 }

package/src/entry/create-router.ts

@@ -1,28 +1,10 @@
-// @ts-expect-error
+import { combineRoutes } from 'ssr-common-utils'
 import * as declareRoutes from '_build/ssr-declare-routes'
-// @ts-expect-error
 import * as ManualRoutes from '_build/ssr-manual-routes'
-import { ReactRoutesType } from 'ssr-types-react'
+import { ReactRoutesType } from 'ssr-types'
 
-const declareRoutesWithType = declareRoutes as ReactRoutesType
-const ManualRoutesWithType = ManualRoutes as ReactRoutesType
+const Routes = combineRoutes(declareRoutes, ManualRoutes) as ReactRoutesType
 
-const Routes: ReactRoutesType = {
-  ...declareRoutes,
-  ...ManualRoutesWithType
-}
-if (ManualRoutesWithType.FeRoutes) {
-  // 声明式路由覆盖约定式路由同名path
-  const combineRoutes = declareRoutesWithType.FeRoutes.map(route => ManualRoutesWithType.FeRoutes.find(e => e.path === route.path) ?? route)
-  ManualRoutesWithType.FeRoutes.forEach(route => {
-    // 补充声明式路由新增的配置
-    const found = combineRoutes.find(e => e.path === route.path)
-    if (!found) {
-      combineRoutes.push(route)
-    }
-  })
-  Routes.FeRoutes = combineRoutes
-}
 export {
   Routes
 }