@webiny/app 6.0.0-rc.3 → 6.0.0-rc.4

package/App.d.ts

@@ -12,6 +12,7 @@ declare const AppContext: React.Context<AppContext | undefined>;
 export declare const useApp: () => AppContext;
 export interface AppProps {
     routes?: Array<any>;
+    plugins?: any[];
     providers?: Array<Decorator<GenericComponent<ProviderProps>>>;
     decorators?: DecoratorsCollection;
     children?: React.ReactNode | React.ReactNode[];
@@ -19,6 +20,6 @@ export interface AppProps {
 interface ProviderProps {
     children: React.ReactNode;
 }
-export declare const AppBase: React.MemoExoticComponent<({ routes, providers, children }: AppProps) => React.JSX.Element>;
+export declare const AppBase: React.MemoExoticComponent<({ routes, plugins, providers, children }: AppProps) => React.JSX.Element>;
 export declare const App: ({ decorators, ...props }: AppProps) => React.JSX.Element;
 export {};

package/App.js

@@ -1,4 +1,4 @@
-import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
+import React, { createContext, Fragment, useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { compose, CompositionProvider } from "@webiny/react-composition";
 import { PluginsProvider } from "./core/Plugins.js";
 import { RouterWithConfig, useRouterConfig } from "./config/RouterConfig.js";
@@ -16,11 +16,12 @@ export const useApp = () => {
 };
 export const AppBase = /*#__PURE__*/React.memo(({
   routes = [],
+  plugins = [],
   providers = [],
   children
 }) => {
   const [state, setState] = useState({
-    plugins: [],
+    plugins,
     providers
   });
   const addProvider = useCallback(component => {
@@ -69,7 +70,9 @@ export const AppBase = /*#__PURE__*/React.memo(({
   Providers.displayName = "Providers";
   return /*#__PURE__*/React.createElement(AppContext.Provider, {
     value: appContext
-  }, children, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(Providers, null, /*#__PURE__*/React.createElement(PluginsProvider, null, state.plugins), /*#__PURE__*/React.createElement(RouterWithConfig, null, /*#__PURE__*/React.createElement(AppRouter, null), /*#__PURE__*/React.createElement(RouteContent, null)))));
+  }, children, /*#__PURE__*/React.createElement(AppContainer, null, /*#__PURE__*/React.createElement(Providers, null, /*#__PURE__*/React.createElement(PluginsProvider, null, state.plugins.map((plugin, index) => /*#__PURE__*/React.createElement(Fragment, {
+    key: index
+  }, plugin))), /*#__PURE__*/React.createElement(RouterWithConfig, null, /*#__PURE__*/React.createElement(AppRouter, null), /*#__PURE__*/React.createElement(RouteContent, null)))));
 });
 AppBase.displayName = "AppBase";
 export const App = ({

package/App.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","useCallback","useContext","useEffect","useMemo","useState","compose","CompositionProvider","PluginsProvider","RouterWithConfig","useRouterConfig","AppContainer","RouteContent","useRouter","AppContext","undefined","displayName","useApp","appContext","Error","AppBase","memo","routes","providers","children","state","setState","plugins","addProvider","component","findIndex","m","addPlugin","element","AppRouter","router","routerConfig","routesFromConfig","combinedRoutes","setRoutes","length","Providers","createElement","Fragment","Provider","value","App","decorators","props","Object","assign"],"sources":["App.tsx"],"sourcesContent":["import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from \"react\";\nimport {\n    compose,\n    CompositionProvider,\n    Decorator,\n    DecoratorsCollection,\n    GenericComponent\n} from \"@webiny/react-composition\";\nimport { PluginsProvider } from \"./core/Plugins.js\";\nimport { RouterWithConfig, useRouterConfig } from \"./config/RouterConfig.js\";\nimport { AppContainer } from \"./AppContainer.js\";\nimport { RouteContent } from \"~/presentation/router/components/RouteContent.js\";\nimport { useRouter } from \"~/router.js\";\n\ninterface State {\n    plugins: JSX.Element[];\n    providers: Decorator<GenericComponent<ProviderProps>>[];\n}\n\ninterface AppContext extends State {\n    addProvider(hoc: Decorator<GenericComponent<ProviderProps>>): void;\n\n    addPlugin(plugin: React.ReactNode): void;\n}\n\nconst AppContext = createContext<AppContext | undefined>(undefined);\n\nAppContext.displayName = \"AppContext\";\n\nexport const useApp = () => {\n    const appContext = useContext(AppContext);\n    if (!appContext) {\n        throw Error(\n            `AppContext provider was not found. Are you using the \"useApp()\" hook in the right place?`\n        );\n    }\n    return appContext;\n};\n\nexport interface AppProps {\n    routes?: Array<any>;\n    providers?: Array<Decorator<GenericComponent<ProviderProps>>>;\n    decorators?: DecoratorsCollection;\n    children?: React.ReactNode | React.ReactNode[];\n}\n\ninterface ProviderProps {\n    children: React.ReactNode;\n}\n\ntype ComponentWithChildren = React.ComponentType<{ children?: React.ReactNode }>;\n\nexport const AppBase = React.memo(({ routes = [], providers = [], children }: AppProps) => {\n    const [state, setState] = useState<State>({\n        plugins: [],\n        providers\n    });\n\n    const addProvider = useCallback((component: Decorator<any>) => {\n        setState(state => {\n            if (state.providers.findIndex(m => m === component) > -1) {\n                return state;\n            }\n\n            return {\n                ...state,\n                providers: [...state.providers, component]\n            };\n        });\n    }, []);\n\n    const addPlugin = useCallback((element: JSX.Element) => {\n        setState(state => {\n            return {\n                ...state,\n                plugins: [...state.plugins, element]\n            };\n        });\n    }, []);\n\n    const appContext = useMemo(\n        () => ({\n            ...state,\n            addProvider,\n            addPlugin\n        }),\n        [state]\n    );\n\n    const AppRouter = useMemo(() => {\n        return function AppRouter() {\n            const router = useRouter();\n            const routerConfig = useRouterConfig();\n            const routesFromConfig = routerConfig.routes;\n            const combinedRoutes = [...routes, ...routesFromConfig];\n\n            useEffect(() => {\n                router.setRoutes(combinedRoutes);\n            }, [combinedRoutes.length]);\n\n            return null;\n        };\n    }, []);\n\n    const Providers = useMemo(() => {\n        return React.memo(\n            compose(...(state.providers || []))(({ children }: ProviderProps) => {\n                return <>{children}</>;\n            })\n        );\n    }, [state.providers.length]) as ComponentWithChildren;\n\n    Providers.displayName = \"Providers\";\n\n    return (\n        <AppContext.Provider value={appContext}>\n            {children}\n            <AppContainer>\n                <Providers>\n                    <PluginsProvider>{state.plugins}</PluginsProvider>\n                    <RouterWithConfig>\n                        <AppRouter />\n                        <RouteContent />\n                    </RouterWithConfig>\n                </Providers>\n            </AppContainer>\n        </AppContext.Provider>\n    );\n});\n\nAppBase.displayName = \"AppBase\";\n\nexport const App = ({ decorators, ...props }: AppProps) => {\n    return (\n        <CompositionProvider decorators={decorators}>\n            <AppBase decorators={decorators} {...props} />\n        </CompositionProvider>\n    );\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","createContext","Fragment","useCallback","useContext","useEffect","useMemo","useState","compose","CompositionProvider","PluginsProvider","RouterWithConfig","useRouterConfig","AppContainer","RouteContent","useRouter","AppContext","undefined","displayName","useApp","appContext","Error","AppBase","memo","routes","plugins","providers","children","state","setState","addProvider","component","findIndex","m","addPlugin","element","AppRouter","router","routerConfig","routesFromConfig","combinedRoutes","setRoutes","length","Providers","createElement","Provider","value","map","plugin","index","key","App","decorators","props","Object","assign"],"sources":["App.tsx"],"sourcesContent":["import React, {\n    createContext,\n    Fragment,\n    useCallback,\n    useContext,\n    useEffect,\n    useMemo,\n    useState\n} from \"react\";\nimport {\n    compose,\n    CompositionProvider,\n    Decorator,\n    DecoratorsCollection,\n    GenericComponent\n} from \"@webiny/react-composition\";\nimport { PluginsProvider } from \"./core/Plugins.js\";\nimport { RouterWithConfig, useRouterConfig } from \"./config/RouterConfig.js\";\nimport { AppContainer } from \"./AppContainer.js\";\nimport { RouteContent } from \"~/presentation/router/components/RouteContent.js\";\nimport { useRouter } from \"~/router.js\";\n\ninterface State {\n    plugins: JSX.Element[];\n    providers: Decorator<GenericComponent<ProviderProps>>[];\n}\n\ninterface AppContext extends State {\n    addProvider(hoc: Decorator<GenericComponent<ProviderProps>>): void;\n    addPlugin(plugin: React.ReactNode): void;\n}\n\nconst AppContext = createContext<AppContext | undefined>(undefined);\n\nAppContext.displayName = \"AppContext\";\n\nexport const useApp = () => {\n    const appContext = useContext(AppContext);\n    if (!appContext) {\n        throw Error(\n            `AppContext provider was not found. Are you using the \"useApp()\" hook in the right place?`\n        );\n    }\n    return appContext;\n};\n\nexport interface AppProps {\n    routes?: Array<any>;\n    plugins?: any[];\n    providers?: Array<Decorator<GenericComponent<ProviderProps>>>;\n    decorators?: DecoratorsCollection;\n    children?: React.ReactNode | React.ReactNode[];\n}\n\ninterface ProviderProps {\n    children: React.ReactNode;\n}\n\ntype ComponentWithChildren = React.ComponentType<{ children?: React.ReactNode }>;\n\nexport const AppBase = React.memo(\n    ({ routes = [], plugins = [], providers = [], children }: AppProps) => {\n        const [state, setState] = useState<State>({\n            plugins,\n            providers\n        });\n\n        const addProvider = useCallback((component: Decorator<any>) => {\n            setState(state => {\n                if (state.providers.findIndex(m => m === component) > -1) {\n                    return state;\n                }\n\n                return {\n                    ...state,\n                    providers: [...state.providers, component]\n                };\n            });\n        }, []);\n\n        const addPlugin = useCallback((element: JSX.Element) => {\n            setState(state => {\n                return {\n                    ...state,\n                    plugins: [...state.plugins, element]\n                };\n            });\n        }, []);\n\n        const appContext = useMemo(\n            () => ({\n                ...state,\n                addProvider,\n                addPlugin\n            }),\n            [state]\n        );\n\n        const AppRouter = useMemo(() => {\n            return function AppRouter() {\n                const router = useRouter();\n                const routerConfig = useRouterConfig();\n                const routesFromConfig = routerConfig.routes;\n                const combinedRoutes = [...routes, ...routesFromConfig];\n\n                useEffect(() => {\n                    router.setRoutes(combinedRoutes);\n                }, [combinedRoutes.length]);\n\n                return null;\n            };\n        }, []);\n\n        const Providers = useMemo(() => {\n            return React.memo(\n                compose(...(state.providers || []))(({ children }: ProviderProps) => {\n                    return <>{children}</>;\n                })\n            );\n        }, [state.providers.length]) as ComponentWithChildren;\n\n        Providers.displayName = \"Providers\";\n\n        return (\n            <AppContext.Provider value={appContext}>\n                {children}\n                <AppContainer>\n                    <Providers>\n                        <PluginsProvider>\n                            {state.plugins.map((plugin, index) => (\n                                <Fragment key={index}>{plugin}</Fragment>\n                            ))}\n                        </PluginsProvider>\n                        <RouterWithConfig>\n                            <AppRouter />\n                            <RouteContent />\n                        </RouterWithConfig>\n                    </Providers>\n                </AppContainer>\n            </AppContext.Provider>\n        );\n    }\n);\n\nAppBase.displayName = \"AppBase\";\n\nexport const App = ({ decorators, ...props }: AppProps) => {\n    return (\n        <CompositionProvider decorators={decorators}>\n            <AppBase decorators={decorators} {...props} />\n        </CompositionProvider>\n    );\n};\n"],"mappings":"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","ignoreList":[]}

package/exports/admin/{envConfig.js → env-config.js}

@@ -1,3 +1,3 @@
 export { EnvConfig } from "../../features/envConfig/index.js";
 
-//# sourceMappingURL=envConfig.js.map
+//# sourceMappingURL=env-config.js.map

package/exports/admin/env-config.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["EnvConfig"],"sources":["env-config.ts"],"sourcesContent":["export { EnvConfig } from \"~/features/envConfig/index.js\";\n"],"mappings":"AAAA,SAASA,SAAS","ignoreList":[]}

package/exports/admin/{graphqlClient.js → graphql-client.js}

@@ -1,3 +1,3 @@
 export { GraphQLClient } from "../../features/graphqlClient/abstractions.js";
 
-//# sourceMappingURL=graphqlClient.js.map
+//# sourceMappingURL=graphql-client.js.map

package/exports/admin/graphql-client.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["GraphQLClient"],"sources":["graphql-client.ts"],"sourcesContent":["export { GraphQLClient } from \"~/features/graphqlClient/abstractions.js\";\n"],"mappings":"AAAA,SAASA,aAAa","ignoreList":[]}

package/exports/admin/{localStorage.js → local-storage.js}

@@ -1,4 +1,4 @@
 export { LocalStorage } from "../../features/localStorage/abstractions.js";
 export { useLocalStorage, useLocalStorageValue, useLocalStorageValues } from "../../presentation/localStorage/index.js";
 
-//# sourceMappingURL=localStorage.js.map
+//# sourceMappingURL=local-storage.js.map

package/exports/admin/local-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["LocalStorage","useLocalStorage","useLocalStorageValue","useLocalStorageValues"],"sources":["local-storage.ts"],"sourcesContent":["export { LocalStorage } from \"~/features/localStorage/abstractions.js\";\nexport {\n    useLocalStorage,\n    useLocalStorageValue,\n    useLocalStorageValues\n} from \"~/presentation/localStorage/index.js\";\n"],"mappings":"AAAA,SAASA,YAAY;AACrB,SACIC,eAAe,EACfC,oBAAoB,EACpBC,qBAAqB","ignoreList":[]}

package/exports/admin/router.d.ts

@@ -1,4 +1,5 @@
 export { Route } from "../../features/router/Route.js";
 export { RouteLinkComponent } from "../../presentation/router/components/RouteLink.js";
 export { LinkComponent } from "../../presentation/router/components/SimpleLink.js";
+export { RedirectComponent } from "../../presentation/router/components/Redirect.js";
 export { useRoute, useRouter } from "../../presentation/router/index.js";

package/exports/admin/router.js

@@ -1,6 +1,7 @@
 export { Route } from "../../features/router/Route.js";
 export { RouteLinkComponent } from "../../presentation/router/components/RouteLink.js";
 export { LinkComponent } from "../../presentation/router/components/SimpleLink.js";
+export { RedirectComponent } from "../../presentation/router/components/Redirect.js";
 export { useRoute, useRouter } from "../../presentation/router/index.js";
 
 //# sourceMappingURL=router.js.map

package/exports/admin/router.js.map

@@ -1 +1 @@
-{"version":3,"names":["Route","RouteLinkComponent","LinkComponent","useRoute","useRouter"],"sources":["router.ts"],"sourcesContent":["export { Route } from \"~/features/router/Route.js\";\nexport { RouteLinkComponent } from \"~/presentation/router/components/RouteLink.js\";\nexport { LinkComponent } from \"~/presentation/router/components/SimpleLink.js\";\nexport { useRoute, useRouter } from \"~/presentation/router/index.js\";\n"],"mappings":"AAAA,SAASA,KAAK;AACd,SAASC,kBAAkB;AAC3B,SAASC,aAAa;AACtB,SAASC,QAAQ,EAAEC,SAAS","ignoreList":[]}
+{"version":3,"names":["Route","RouteLinkComponent","LinkComponent","RedirectComponent","useRoute","useRouter"],"sources":["router.ts"],"sourcesContent":["export { Route } from \"~/features/router/Route.js\";\nexport { RouteLinkComponent } from \"~/presentation/router/components/RouteLink.js\";\nexport { LinkComponent } from \"~/presentation/router/components/SimpleLink.js\";\nexport { RedirectComponent } from \"~/presentation/router/components/Redirect.js\";\nexport { useRoute, useRouter } from \"~/presentation/router/index.js\";\n"],"mappings":"AAAA,SAASA,KAAK;AACd,SAASC,kBAAkB;AAC3B,SAASC,aAAa;AACtB,SAASC,iBAAiB;AAC1B,SAASC,QAAQ,EAAEC,SAAS","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app",
-	"version": "6.0.0-rc.3",
+	"version": "6.0.0-rc.4",
 	"type": "module",
 	"main": "index.js",
 	"repository": {
@@ -19,12 +19,12 @@
 		"@emotion/styled": "11.10.6",
 		"@types/react": "18.2.79",
 		"@webiny/di": "0.2.3",
-		"@webiny/feature": "6.0.0-rc.3",
-		"@webiny/i18n": "6.0.0-rc.3",
-		"@webiny/i18n-react": "6.0.0-rc.3",
-		"@webiny/plugins": "6.0.0-rc.3",
-		"@webiny/react-composition": "6.0.0-rc.3",
-		"@webiny/react-properties": "6.0.0-rc.3",
+		"@webiny/feature": "6.0.0-rc.4",
+		"@webiny/i18n": "6.0.0-rc.4",
+		"@webiny/i18n-react": "6.0.0-rc.4",
+		"@webiny/plugins": "6.0.0-rc.4",
+		"@webiny/react-composition": "6.0.0-rc.4",
+		"@webiny/react-properties": "6.0.0-rc.4",
 		"apollo-cache": "1.3.5",
 		"apollo-cache-inmemory": "1.6.6",
 		"apollo-client": "2.6.10",
@@ -51,7 +51,7 @@
 	"devDependencies": {
 		"@types/lodash": "4.17.24",
 		"@types/warning": "3.0.3",
-		"@webiny/build-tools": "6.0.0-rc.3",
+		"@webiny/build-tools": "6.0.0-rc.4",
 		"rimraf": "6.1.3",
 		"type-fest": "5.4.4",
 		"typescript": "5.9.3",
@@ -68,5 +68,5 @@
 			]
 		}
 	},
-	"gitHead": "228fe25e1a17f248d566bce1c33d11c291955513"
+	"gitHead": "e2758ee1cfa3b9a7152e9bb995a90ccabd33266f"
 }

package/presentation/router/components/Redirect.d.ts

@@ -0,0 +1,14 @@
+import type { Route, RouteParamsDefinition, RouteParamsInfer } from "../../../features/router/Route.js";
+import type { RequiredKeysOf } from "type-fest";
+export type RedirectProps<TParams extends RouteParamsDefinition | undefined> = [
+    TParams extends RouteParamsDefinition ? RequiredKeysOf<RouteParamsInfer<TParams>> extends never ? {
+        route: Route<TParams>;
+        params?: RouteParamsInfer<TParams>;
+    } : {
+        route: Route<TParams>;
+        params: RouteParamsInfer<TParams>;
+    } : {
+        route: Route<TParams>;
+    }
+][0];
+export declare const RedirectComponent: <TParams extends RouteParamsDefinition | undefined>(props: RedirectProps<TParams>) => null;

package/presentation/router/components/Redirect.js

@@ -0,0 +1,15 @@
+import { useEffect } from "react";
+import { useRouter } from "../../../router.js";
+export const RedirectComponent = props => {
+  const router = useRouter();
+  const {
+    route,
+    ...rest
+  } = props;
+  useEffect(() => {
+    router.goToRoute(route, rest.params);
+  }, []);
+  return null;
+};
+
+//# sourceMappingURL=Redirect.js.map

package/presentation/router/components/Redirect.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useEffect","useRouter","RedirectComponent","props","router","route","rest","goToRoute","params"],"sources":["Redirect.tsx"],"sourcesContent":["import { useEffect } from \"react\";\nimport type { Route, RouteParamsDefinition, RouteParamsInfer } from \"~/features/router/Route.js\";\nimport { useRouter } from \"~/router.js\";\nimport type { RequiredKeysOf } from \"type-fest\";\n\nexport type RedirectProps<TParams extends RouteParamsDefinition | undefined> = [\n    TParams extends RouteParamsDefinition\n        ? RequiredKeysOf<RouteParamsInfer<TParams>> extends never\n            ? { route: Route<TParams>; params?: RouteParamsInfer<TParams> }\n            : { route: Route<TParams>; params: RouteParamsInfer<TParams> }\n        : { route: Route<TParams> }\n][0];\n\nexport const RedirectComponent = <TParams extends RouteParamsDefinition | undefined>(\n    props: RedirectProps<TParams>\n) => {\n    const router = useRouter();\n    const { route, ...rest } = props as any;\n\n    useEffect(() => {\n        router.goToRoute(route, rest.params);\n    }, []);\n\n    return null;\n};\n"],"mappings":"AAAA,SAASA,SAAS,QAAQ,OAAO;AAEjC,SAASC,SAAS;AAWlB,OAAO,MAAMC,iBAAiB,GAC1BC,KAA6B,IAC5B;EACD,MAAMC,MAAM,GAAGH,SAAS,CAAC,CAAC;EAC1B,MAAM;IAAEI,KAAK;IAAE,GAAGC;EAAK,CAAC,GAAGH,KAAY;EAEvCH,SAAS,CAAC,MAAM;IACZI,MAAM,CAACG,SAAS,CAACF,KAAK,EAAEC,IAAI,CAACE,MAAM,CAAC;EACxC,CAAC,EAAE,EAAE,CAAC;EAEN,OAAO,IAAI;AACf,CAAC","ignoreList":[]}

package/core/Routes.d.ts

@@ -1,7 +0,0 @@
-import React from "react";
-import type { ReactRoute } from "../presentation/router/index.js";
-interface RoutesProps {
-    routes: ReactRoute[];
-}
-export declare const Routes: (props: RoutesProps) => React.JSX.Element;
-export {};

package/core/Routes.js

@@ -1,33 +0,0 @@
-import React from "react";
-import { useRouter } from "../router.js";
-import { RouteContent } from "../presentation/router/components/RouteContent.js";
-export const Routes = props => {
-  const {
-    setRoutes
-  } = useRouter();
-  const routes = props.routes.sort((a, b) => {
-    const pathA = a.route.path || "*";
-    const pathB = b.route.path || "*";
-
-    // This will sort paths at the very bottom of the list
-    if (pathA === "/" && pathB === "*") {
-      return -1;
-    }
-
-    // This will push * and / to the bottom of the list
-    if (pathA === "*" || pathA === "/") {
-      return 1;
-    }
-
-    // This will push * and / to the bottom of the list
-    if (["*", "/"].includes(pathB)) {
-      return -1;
-    }
-    return 0;
-  });
-  console.log("Call to setRoutes");
-  setRoutes(routes);
-  return /*#__PURE__*/React.createElement(RouteContent, null);
-};
-
-//# sourceMappingURL=Routes.js.map

package/core/Routes.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["React","useRouter","RouteContent","Routes","props","setRoutes","routes","sort","a","b","pathA","route","path","pathB","includes","console","log","createElement"],"sources":["Routes.tsx"],"sourcesContent":["import React from \"react\";\nimport { useRouter } from \"~/router.js\";\nimport type { ReactRoute } from \"~/presentation/router/index.js\";\nimport { RouteContent } from \"~/presentation/router/components/RouteContent.js\";\n\ninterface RoutesProps {\n    routes: ReactRoute[];\n}\n\nexport const Routes = (props: RoutesProps) => {\n    const { setRoutes } = useRouter();\n\n    const routes = props.routes.sort((a, b) => {\n        const pathA: string = a.route.path || \"*\";\n        const pathB: string = b.route.path || \"*\";\n\n        // This will sort paths at the very bottom of the list\n        if (pathA === \"/\" && pathB === \"*\") {\n            return -1;\n        }\n\n        // This will push * and / to the bottom of the list\n        if (pathA === \"*\" || pathA === \"/\") {\n            return 1;\n        }\n\n        // This will push * and / to the bottom of the list\n        if ([\"*\", \"/\"].includes(pathB)) {\n            return -1;\n        }\n\n        return 0;\n    });\n\n    console.log(\"Call to setRoutes\");\n    setRoutes(routes);\n\n    return <RouteContent />;\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,SAAS;AAElB,SAASC,YAAY;AAMrB,OAAO,MAAMC,MAAM,GAAIC,KAAkB,IAAK;EAC1C,MAAM;IAAEC;EAAU,CAAC,GAAGJ,SAAS,CAAC,CAAC;EAEjC,MAAMK,MAAM,GAAGF,KAAK,CAACE,MAAM,CAACC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;IACvC,MAAMC,KAAa,GAAGF,CAAC,CAACG,KAAK,CAACC,IAAI,IAAI,GAAG;IACzC,MAAMC,KAAa,GAAGJ,CAAC,CAACE,KAAK,CAACC,IAAI,IAAI,GAAG;;IAEzC;IACA,IAAIF,KAAK,KAAK,GAAG,IAAIG,KAAK,KAAK,GAAG,EAAE;MAChC,OAAO,CAAC,CAAC;IACb;;IAEA;IACA,IAAIH,KAAK,KAAK,GAAG,IAAIA,KAAK,KAAK,GAAG,EAAE;MAChC,OAAO,CAAC;IACZ;;IAEA;IACA,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAACI,QAAQ,CAACD,KAAK,CAAC,EAAE;MAC5B,OAAO,CAAC,CAAC;IACb;IAEA,OAAO,CAAC;EACZ,CAAC,CAAC;EAEFE,OAAO,CAACC,GAAG,CAAC,mBAAmB,CAAC;EAChCX,SAAS,CAACC,MAAM,CAAC;EAEjB,oBAAON,KAAA,CAAAiB,aAAA,CAACf,YAAY,MAAE,CAAC;AAC3B,CAAC","ignoreList":[]}

package/exports/admin/envConfig.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["EnvConfig"],"sources":["envConfig.ts"],"sourcesContent":["export { EnvConfig } from \"~/features/envConfig/index.js\";\n"],"mappings":"AAAA,SAASA,SAAS","ignoreList":[]}

package/exports/admin/graphqlClient.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["GraphQLClient"],"sources":["graphqlClient.ts"],"sourcesContent":["export { GraphQLClient } from \"~/features/graphqlClient/abstractions.js\";\n"],"mappings":"AAAA,SAASA,aAAa","ignoreList":[]}

package/exports/admin/localStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["LocalStorage","useLocalStorage","useLocalStorageValue","useLocalStorageValues"],"sources":["localStorage.ts"],"sourcesContent":["export { LocalStorage } from \"~/features/localStorage/abstractions.js\";\nexport {\n    useLocalStorage,\n    useLocalStorageValue,\n    useLocalStorageValues\n} from \"~/presentation/localStorage/index.js\";\n"],"mappings":"AAAA,SAASA,YAAY;AACrB,SACIC,eAAe,EACfC,oBAAoB,EACpBC,qBAAqB","ignoreList":[]}