@common-stack/client-react 0.5.29 → 0.5.31

package/lib/utils/hydrate.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hydrate = void 0;
-const client_core_1 = require("@common-stack/client-core");
-const hydrate = (handlers) => (container, state) => {
+import { logger } from '@common-stack/client-core';
+export const hydrate = (handlers) => (container, state) => {
     handlers.forEach((cb) => {
         if (typeof cb !== 'function')
             return;
@@ -10,9 +7,8 @@ const hydrate = (handlers) => (container, state) => {
             cb(container, state);
         }
         catch (e) {
-            client_core_1.logger.error('Error occurred in hydrate', e);
+            logger.error('Error occurred in hydrate', e);
         }
     });
 };
-exports.hydrate = hydrate;
 //# sourceMappingURL=hydrate.js.map

package/lib/utils/hydrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../../src/utils/hydrate.ts"],"names":[],"mappings":";;;AACA,2DAAmD;AAG5C,MAAM,OAAO,GAChB,CAAC,QAAuB,EAAe,EAAE,CACzC,CAAC,SAAoB,EAAE,KAAK,EAAE,EAAE;IAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACpB,IAAI,OAAO,EAAE,KAAK,UAAU;YAAE,OAAO;QACrC,IAAI;YACA,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACR,oBAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;SAChD;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAXO,QAAA,OAAO,WAWd"}
+{"version":3,"file":"hydrate.js","sourceRoot":"","sources":["../../src/utils/hydrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGnD,MAAM,CAAC,MAAM,OAAO,GAChB,CAAC,QAAuB,EAAe,EAAE,CACzC,CAAC,SAAoB,EAAE,KAAK,EAAE,EAAE;IAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;QACpB,IAAI,OAAO,EAAE,KAAK,UAAU;YAAE,OAAO;QACrC,IAAI;YACA,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;SAChD;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC"}

package/lib/utils/index.js

@@ -1,22 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./sort-keys"), exports);
-__exportStar(require("./utils"), exports);
-__exportStar(require("./combine"), exports);
-__exportStar(require("./hydrate"), exports);
-__exportStar(require("./before-ssr"), exports);
+export * from './sort-keys';
+export * from './utils';
+export * from './combine';
+export * from './hydrate';
+export * from './before-ssr';
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}

package/lib/utils/sort-keys.d.ts

@@ -1 +1,2 @@
 export declare function sortKeys(routeData: any): any;
+export declare function sortByPaths(routes: any): any[];

package/lib/utils/sort-keys.js

@@ -1,14 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortKeys = void 0;
-const sort_keys_1 = __importDefault(require("sort-keys"));
-function sortKeys(routeData) {
-    return (0, sort_keys_1.default)(routeData, { compare });
+import defaultSortKeys from 'sort-keys';
+export function sortKeys(routeData) {
+    return defaultSortKeys(routeData, { compare });
+}
+export function sortByPaths(routes) {
+    const routeData = {};
+    routes.forEach((route) => {
+        if (typeof route.path === 'undefined') {
+            route.path = "*";
+        }
+        routeData[route.path] = route;
+    });
+    const sortedRoutes = defaultSortKeys(routeData, { compare });
+    return Object.keys(sortedRoutes).map(key => sortedRoutes[key]);
 }
-exports.sortKeys = sortKeys;
 const compare = ((a, b) => {
     const aStr = String(a).toLowerCase();
     const bStr = String(b).toLowerCase();

package/lib/utils/sort-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-keys.js","sourceRoot":"","sources":["../../src/utils/sort-keys.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAwC;AAExC,SAAgB,QAAQ,CAAC,SAAS;IAChC,OAAO,IAAA,mBAAe,EAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;AAChD,CAAC;AAFD,4BAEC;AAED,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;IACxB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,eAAe,GAAG,eAAe,KAAK,CAAC,CAAC,EAAE;QAC5C,IAAI,eAAe,GAAG,eAAe,GAAG,CAAC,EAAE;YACzC,IAAI,eAAe,KAAK,eAAe,EAAE;gBACvC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;aACjC;YACD,OAAO,eAAe,GAAG,eAAe,CAAC;SAC1C;QACD,IAAI,eAAe,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC,CAAC;SACX;aAAM,IAAI,eAAe,GAAG,CAAC,EAAE;YAC9B,OAAO,CAAC,CAAC;SACV;KACF;IAED,4DAA4D;IAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACvB,wEAAwE;IACxE,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO,IAAI,GAAG,IAAI,CAAC;QACnB,8CAA8C;KAC/C;SAAM,IAAI,IAAI,EAAE;QACf,OAAO,CAAC,CAAC,CAAC;QACV,8CAA8C;KAC/C;SAAM,IAAI,IAAI,EAAE;QACf,OAAO,CAAC,CAAC;KACV;IAED,mDAAmD;IACnD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,GAAG;IAC5B,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;QAChB,OAAO,CAAC,CAAC,CAAC;KACX;IACD,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;IACrB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,CAAC,EAAE,EAAE;QACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,IAAI,GAAG,KAAK,GAAG,EAAE,EAAE,wCAAwC;gBACzD,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;aACnB;iBAAM;gBACL,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;aACnB;SACF;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE;YACvB,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;SACnB;aAAM,IAAI,IAAI,KAAK,GAAG,EAAE;YACvB,KAAK,GAAG,KAAK,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"sort-keys.js","sourceRoot":"","sources":["../../src/utils/sort-keys.ts"],"names":[],"mappings":"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"}

package/lib/utils/sort-keys.test.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const sort_keys_1 = require("./sort-keys");
+import { sortKeys, sortByPaths } from './sort-keys';
 function MyComponent(props) {
     return {};
 }
@@ -22,12 +20,40 @@ describe('utility with basic routes', () => {
         ["/o/:orgName/account/line2/"]: { exact: false, component: MyComponent },
         ["/o/orgname"]: { exact: false, component: MyComponent },
     };
+    const routerConfig64 = [
+        { path: '//menu', component: MyComponent },
+        { path: '/login', component: MyComponent },
+        { path: '/:orgName/usermenu/logout', component: MyComponent },
+        { path: '/callback', component: MyComponent },
+        { path: "/", component: MyComponent },
+        { path: "/:orgName/usermenu/profile", component: MyComponent },
+        { path: "/authenticate-popup", component: MyComponent },
+        { path: "/reset-password", component: MyComponent },
+        { path: "/:orgName/usermenu/account/", component: MyComponent },
+        { path: "/o/orgname2", component: MyComponent },
+        { path: "/o/profile", component: MyComponent },
+        { path: "/o/profile/upload-photo", component: MyComponent },
+        { path: "/o/:orgName/account/line/", component: MyComponent },
+        { path: "/o/:orgName/account/line2/", component: MyComponent },
+        { path: "/o/orgname", component: MyComponent },
+    ];
+    let sortedRoutes = {};
+    let keys = [];
+    beforeAll(() => {
+        sortedRoutes = sortKeys(routerConfig);
+        keys = Object.keys(sortedRoutes);
+    });
     it('sort will have `root` at the top', () => {
-        const sortedRoutes = (0, sort_keys_1.sortKeys)(routerConfig);
-        const keys = Object.keys(sortedRoutes)[0];
-        // expect(keys).toEqual('/')
-        expect(keys).toMatchSnapshot();
+        expect(keys[0]).toEqual('/');
+        expect(keys[0]).toMatchSnapshot();
         expect(sortedRoutes).toMatchSnapshot();
     });
+    it('sort will be same as sortByPaths for react-router 6.4', () => {
+        const sortedRoutes2 = sortByPaths(routerConfig64);
+        const paths = sortedRoutes2.map(route => route.path);
+        expect(keys.length).toEqual(paths.length);
+        expect(keys[0]).toEqual(paths[0]);
+        expect(keys[keys.length - 1]).toEqual(paths[keys.length - 1]);
+    });
 });
 //# sourceMappingURL=sort-keys.test.js.map

package/lib/utils/sort-keys.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-keys.test.js","sourceRoot":"","sources":["../../src/utils/sort-keys.test.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AAEvC,SAAS,WAAW,CAAC,KAAK;IACtB,OAAO,EAAE,CAAC;AACd,CAAC;AACD,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAGvC,MAAM,YAAY,GAAG;QACjB,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACnD,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACnD,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACtD,CAAC,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACtE,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QAC/C,CAAC,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACvE,CAAC,qBAAqB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QAChE,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QAC5D,CAAC,6BAA6B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACzE,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACzD,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACvD,CAAC,yBAAyB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE;QACpE,CAAC,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACvE,CAAC,4BAA4B,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;QACxE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE;KAC3D,CAAC;IAEF,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QACxC,MAAM,YAAY,GAAG,IAAA,oBAAQ,EAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,4BAA4B;QAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QAC/B,MAAM,CAAC,YAAY,CAAC,CAAC,eAAe,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"sort-keys.test.js","sourceRoot":"","sources":["../../src/utils/sort-keys.test.ts"],"names":[],"mappings":"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"}

package/lib/utils/utils.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatSlash = void 0;
 const startWithMoreThanOneSlash = /^(\/)\1+/; // for exame `//abc, ///abc, ...`
-const formatSlash = (route) => {
+export const formatSlash = (route) => {
     // replaced `//` with `/` in the routes.
     return {
         path: route.replace(startWithMoreThanOneSlash, '/'),
         _pathPrefix: (route.match(/^\/(\/{1,})/) || ['', ''])[1],
     };
 };
-exports.formatSlash = formatSlash;
 //# sourceMappingURL=utils.js.map

package/lib/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":";;;AAEA,MAAM,yBAAyB,GAAG,UAAU,CAAC,CAAC,iCAAiC;AACxE,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE;IACnC,wCAAwC;IACxC,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,yBAAyB,EAAE,GAAG,CAAC;QACnD,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KACzD,CAAA;AACH,CAAC,CAAA;AANY,QAAA,WAAW,eAMvB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAEA,MAAM,yBAAyB,GAAG,UAAU,CAAC,CAAC,iCAAiC;AAC/E,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE;IACnC,wCAAwC;IACxC,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,yBAAyB,EAAE,GAAG,CAAC;QACnD,WAAW,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KACzD,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/client-react",
-    "version": "0.5.29",
+    "version": "0.5.31",
     "description": "browser plugin for git",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -13,6 +13,7 @@
     "license": "MIT",
     "author": "CDMBase LLC",
     "main": "lib/index.js",
+    "module": "lib/index.js",
     "react-native": "lib/index.native.js",
     "typings": "lib/index.d.ts",
     "scripts": {
@@ -28,8 +29,8 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/client-core": "^0.5.29",
-        "@common-stack/core": "^0.5.29",
+        "@common-stack/client-core": "^0.5.31",
+        "@common-stack/core": "^0.5.31",
         "@wordpress/hooks": "^2.10.0",
         "browser-bunyan": "^1.6.3",
         "history-with-query": "^4.10.4",
@@ -48,7 +49,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "4463f38cbb94646a5f8ee74a00f8158e9d36a854",
+    "gitHead": "f3e288ca7e3bd9107cecbd5e3a02e673da017549",
     "typescript": {
         "definition": "lib/index.d.ts"
     }

package/lib/route/render-routes.native.d.ts

@@ -1,4 +0,0 @@
-import * as React from 'react';
-import { IRouterRederOptions } from '../interfaces/new-router';
-declare function renderRoutes(opts: IRouterRederOptions): React.JSX.Element;
-export { renderRoutes };

package/lib/route/render-routes.native.js

@@ -1,162 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRoutes = void 0;
-const React = __importStar(require("react"));
-const react_1 = require("react");
-const react_router_native_1 = require("react-router-native");
-function wrapInitialPropsFetch(route, opts) {
-    const { component } = route, restRouteParams = __rest(route, ["component"]);
-    let Component = route.component;
-    function ComponentWithInitialPropsFetch(props) {
-        const [initialProps, setInitialProps] = (0, react_1.useState)(() => window.g_initialProps);
-        (0, react_1.useEffect)(() => {
-            /**
-             * 1. 首次渲染时，此时 window.g_initialProps 变量存在，不需要再走一次 getInitialProps，这样一次 SSR 就走了 2 次 getInitialProps
-             * 2. 但是路由切换时，window.getInitialProps 会被赋为 null，这时候就走 getInitialProps 逻辑
-             * 3. 如果任何时候都走 2 次，配置 forceInitial: true，这个场景用于静态站点的首屏加载希望走最新数据
-             * 4. 开启动态加载后，会在执行 getInitialProps 前预加载下
-             */
-            const handleGetInitialProps = () => __awaiter(this, void 0, void 0, function* () {
-                // preload when enalbe dynamicImport
-                if (Component.preload) {
-                    const preloadComponent = yield Component.preload();
-                    // for test case, really use .default
-                    Component = preloadComponent.default || preloadComponent;
-                }
-                // @sri not suppported
-                // const defaultCtx = {
-                //   isServer: false,
-                //   match: props?.match,
-                //   route,
-                //   ...(opts.getInitialPropsCtx || {}),
-                //   ...restRouteParams,
-                // };
-                // @sri not suppported
-                // if (Component?.getInitialProps) {
-                //   const ctx = await opts.plugin.applyPlugins({
-                //     key: 'ssr.modifyGetInitialPropsCtx',
-                //     type: ApplyPluginsType.modify,
-                //     initialValue: defaultCtx,
-                //     async: true,
-                //   });
-                //   const initialProps = await Component!.getInitialProps!(
-                //     ctx || defaultCtx,
-                //   );
-                //   setInitialProps(initialProps);
-                // }
-            });
-            // null 时，一定会触发 getInitialProps 执行
-            if (!window.g_initialProps) {
-                handleGetInitialProps();
-            }
-        }, [window.location.pathname, window.location.search]);
-        return React.createElement(Component, Object.assign({}, props, initialProps));
-    }
-    // flag for having wrappered
-    ComponentWithInitialPropsFetch.wrapInitialPropsLoaded = true;
-    ComponentWithInitialPropsFetch.displayName = 'ComponentWithInitialPropsFetch';
-    return ComponentWithInitialPropsFetch;
-}
-function render({ route, opts, props }) {
-    const routes = renderRoutes(Object.assign(Object.assign({}, opts), { routes: route.routes || [], rootRoutes: opts.rootRoutes }));
-    const { component: Component, wrappers } = route;
-    if (Component) {
-        const defaultPageInitialProps = opts.isServer ? {} : window.g_initialProps;
-        const newProps = Object.assign(Object.assign(Object.assign(Object.assign({}, props), opts.extraProps), (opts.pageInitialProps || defaultPageInitialProps)), { route, routes: opts.rootRoutes });
-        // @ts-ignore
-        let ret = React.createElement(Component, Object.assign({}, newProps), routes);
-        // route.wrappers
-        if (wrappers) {
-            let len = wrappers.length - 1;
-            while (len >= 0) {
-                ret = (0, react_1.createElement)(wrappers[len], newProps, ret);
-                len -= 1;
-            }
-        }
-        return ret;
-    }
-    return routes;
-}
-function getRouteElement({ route, index, opts }) {
-    const routeProps = {
-        key: route.key || index,
-        exact: route.exact,
-        strict: route.strict,
-        sensitive: route.sensitive,
-        path: route.path,
-    };
-    if (route.redirect) {
-        return React.createElement(react_router_native_1.Redirect, Object.assign({}, routeProps, { from: route.path, to: route.redirect }));
-    }
-    // avoid mount and unmount with url hash change
-    // @sri not supproted yet
-    // if (
-    //   // only when SSR config enable
-    //   opts.ssrProps &&
-    //   !opts.isServer &&
-    //   // make sure loaded once
-    //   !(route.component as any)?.wrapInitialPropsLoaded &&
-    //   (route.component?.getInitialProps || route.component?.preload)
-    // ) {
-    //   // client Render for enable ssr, but not sure SSR success
-    //   route.component = wrapInitialPropsFetch(route, opts);
-    // }
-    return (React.createElement(react_router_native_1.Route, Object.assign({}, routeProps, { render: (props) => {
-            return render({ route, opts, props });
-        } })));
-}
-function renderRoutes(opts) {
-    return opts.routes ? (React.createElement(react_router_native_1.Switch, null, opts.routes.map((route, index) => {
-        const renderedR = getRouteElement({
-            route,
-            index,
-            opts: Object.assign(Object.assign({}, opts), { rootRoutes: opts.rootRoutes || opts.routes }),
-        });
-        return renderedR;
-    }))) : null;
-}
-exports.renderRoutes = renderRoutes;
-//# sourceMappingURL=render-routes.native.js.map

package/lib/route/render-routes.native.js.map

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