@umijs/renderer-react 4.0.0-canary.20220707.1 → 4.0.0-canary.20220718.2

package/dist/appContext.d.ts

@@ -20,3 +20,4 @@ export declare function useClientLoaderData(): {
     data: any;
 };
 export {};
+//# sourceMappingURL=appContext.d.ts.map

package/dist/appContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appContext.d.ts","sourceRoot":"","sources":["../src/appContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EACL,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,UAAU,eAAe;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,eAAe,EAAE,gBAAgB,CAAC;IAClC,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,WAAW,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,gBAAgB,EAAE,WAAW,CAAC;CAC/B;AAED,eAAO,MAAM,UAAU,gCAEtB,CAAC;AAEF,wBAAgB,UAAU,oBAEzB;AAED,wBAAgB,mBAAmB;;EAIlC;AAED,wBAAgB,mBAAmB;;EAIlC"}

package/dist/browser.d.ts

@@ -14,3 +14,4 @@ export declare function renderClient(opts: {
     history: History;
     hydrate?: boolean;
 }): void;
+//# sourceMappingURL=browser.d.ts.map

package/dist/browser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,KAA2C,MAAM,OAAO,CAAC;AAMhE,OAAO,EAAe,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA2CrE,wBAAgB,MAAM,8EAGrB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,WAAW,CAAC;IACpB,eAAe,EAAE,gBAAgB,CAAC;IAClC,aAAa,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,QA8JA"}

package/dist/browser.js

@@ -84,25 +84,31 @@ export function renderClient(opts) {
                 const manifest = window.__umi_manifest__;
                 if (manifest) {
                     const routeIdReplaced = id.replace(/[\/\-]/g, '_');
-                    const preloadId = 'preload-' + routeIdReplaced;
+                    const preloadId = `preload-${routeIdReplaced}.js`;
                     if (!document.getElementById(preloadId)) {
-                        const key = Object.keys(manifest).find((k) => k.startsWith(routeIdReplaced + '.'));
-                        if (!key)
-                            return;
-                        let file = manifest[key];
-                        const link = document.createElement('link');
-                        link.id = preloadId;
-                        link.rel = 'preload';
-                        link.as = 'script';
-                        // publicPath already in the manifest,
-                        // but if runtimePublicPath is true, we need to replace it
-                        if (opts.runtimePublicPath) {
-                            file = file.replace(new RegExp(`^${opts.publicPath}`), 
-                            // @ts-ignore
-                            window.publicPath);
-                        }
-                        link.href = file;
-                        document.head.appendChild(link);
+                        const keys = Object.keys(manifest).filter((k) => k.startsWith(routeIdReplaced + '.'));
+                        keys.forEach((key) => {
+                            if (!/\.(js|css)$/.test(key)) {
+                                throw Error(`preload not support ${key} file`);
+                            }
+                            let file = manifest[key];
+                            const link = document.createElement('link');
+                            link.rel = 'preload';
+                            link.as = 'style';
+                            if (key.endsWith('.js')) {
+                                link.as = 'script';
+                                link.id = preloadId;
+                            }
+                            // publicPath already in the manifest,
+                            // but if runtimePublicPath is true, we need to replace it
+                            if (opts.runtimePublicPath) {
+                                file = file.replace(new RegExp(`^${opts.publicPath}`), 
+                                // @ts-ignore
+                                window.publicPath);
+                            }
+                            link.href = file;
+                            document.head.appendChild(link);
+                        });
                     }
                 }
                 // server loader

package/dist/index.d.ts

@@ -5,3 +5,5 @@ export { renderClient } from './browser';
 export { LinkWithPrefetch as Link } from './link';
 export { useRouteData } from './routeContext';
 export { __useFetcher } from './useFetcher';
+export { withRouter, type RouteComponentProps } from './withRouter';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,OAAO,GACR,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,kBAAkB,EAClB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,OAAO,EACP,MAAM,EACN,WAAW,EACX,WAAW,EACX,QAAQ,EACR,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,SAAS,EACT,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,gBAAgB,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC"}

package/dist/index.js

@@ -5,3 +5,4 @@ export { renderClient } from './browser';
 export { LinkWithPrefetch as Link } from './link';
 export { useRouteData } from './routeContext';
 export { __useFetcher } from './useFetcher';
+export { withRouter } from './withRouter';

package/dist/link.d.ts

@@ -3,3 +3,4 @@ import { LinkProps } from 'react-router-dom';
 export declare function LinkWithPrefetch(props: PropsWithChildren<{
     prefetch?: boolean;
 } & LinkProps & React.RefAttributes<HTMLAnchorElement>>): JSX.Element;
+//# sourceMappingURL=link.d.ts.map

package/dist/link.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../src/link.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAQ,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGnD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,iBAAiB,CACtB;IACE,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,SAAS,GACX,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CACzC,eAYF"}

package/dist/routeContext.d.ts

@@ -5,3 +5,4 @@ export interface IRouteContextType {
 }
 export declare const RouteContext: React.Context<IRouteContextType | undefined>;
 export declare function useRouteData(): IRouteContextType;
+//# sourceMappingURL=routeContext.d.ts.map

package/dist/routeContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routeContext.d.ts","sourceRoot":"","sources":["../src/routeContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;CACf;AACD,eAAO,MAAM,YAAY,8CAExB,CAAC;AAEF,wBAAgB,YAAY,IAAI,iBAAiB,CAEhD"}

package/dist/routes.d.ts

@@ -6,3 +6,4 @@ export declare function createClientRoutes(opts: {
     parentId?: string;
     loadingComponent?: React.ReactNode;
 }): IClientRoute[];
+//# sourceMappingURL=routes.d.ts.map

package/dist/routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAU,WAAW,EAAE,MAAM,SAAS,CAAC;AAE5D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,UAAU,EAAE,WAAW,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACpC,kBAwBA"}

package/dist/server.d.ts

@@ -10,3 +10,4 @@ export declare function getClientRootComponent(opts: {
     };
     manifest: any;
 }): Promise<JSX.Element>;
+//# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGxD,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,MAAM,EAAE,WAAW,CAAC;IACpB,eAAe,EAAE,gBAAgB,CAAC;IAClC,aAAa,EAAE,GAAG,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACxC,QAAQ,EAAE,GAAG,CAAC;CACf,wBA6CA"}

package/dist/types.d.ts

@@ -27,3 +27,4 @@ export interface IRouteComponents {
 export interface ILoaderData {
     [routeKey: string]: any;
 }
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAC;CACzB"}

package/dist/useFetcher.d.ts

@@ -1,3 +1,4 @@
 export declare function __useFetcher(): {
     load(path?: string): void;
 };
+//# sourceMappingURL=useFetcher.d.ts.map

package/dist/useFetcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFetcher.d.ts","sourceRoot":"","sources":["../src/useFetcher.ts"],"names":[],"mappings":"AAGA,wBAAgB,YAAY;gBAIZ,MAAM;EAIrB"}

package/dist/withRouter.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { useLocation, useNavigate, useParams } from 'react-router-dom';
+export interface RouteComponentProps<T = ReturnType<typeof useParams>> {
+    history: {
+        back: () => void;
+        goBack: () => void;
+        location: ReturnType<typeof useLocation>;
+        push: (url: string, state?: any) => void;
+    };
+    location: ReturnType<typeof useLocation>;
+    match: {
+        params: T;
+    };
+    params: T;
+    navigate: ReturnType<typeof useNavigate>;
+}
+export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => JSX.Element;
+//# sourceMappingURL=withRouter.d.ts.map

package/dist/withRouter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withRouter.d.ts","sourceRoot":"","sources":["../src/withRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEvE,MAAM,WAAW,mBAAmB,CAAC,CAAC,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC;IACnE,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,IAAI,CAAC;QACjB,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;QACzC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;KAC1C,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACzC,KAAK,EAAE;QACL,MAAM,EAAE,CAAC,CAAC;KACX,CAAC;IACF,MAAM,EAAE,CAAC,CAAC;IACV,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;CAC1C;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,mBAAmB,CAAC,CAAC,CAAC,EACzD,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,WAEO,CAAC,iBA8B1C"}

package/dist/withRouter.js

@@ -0,0 +1,22 @@
+import React from 'react';
+import { useLocation, useNavigate, useParams } from 'react-router-dom';
+export function withRouter(Component) {
+    function ComponentWithRouterProp(props) {
+        const location = useLocation();
+        const navigate = useNavigate();
+        const params = useParams();
+        const match = { params };
+        const history = {
+            back: () => navigate(-1),
+            goBack: () => navigate(-1),
+            location,
+            push: (url, state) => navigate(url, { state }),
+            replace: (url, state) => navigate(url, {
+                replace: true,
+                state,
+            }),
+        };
+        return (React.createElement(Component, { ...props, history: history, location: location, match: match, params: params, navigate: navigate }));
+    }
+    return ComponentWithRouterProp;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-canary.20220707.1",
+  "version": "4.0.0-canary.20220718.2",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",