@zengenti/contensis-react-base 3.0.2-beta.22 → 3.0.2-beta.23

package/models/client/client.d.ts

@@ -1,7 +1,7 @@
 import 'isomorphic-fetch';
 import React from 'react';
-import { AppConfig } from "../config";
-declare type ReactAppProps = {
+import { AppConfig } from '~/config';
+type ReactAppProps = {
     routes: any;
     withEvents: any;
 };

package/models/client/index.d.ts

@@ -1,3 +1,3 @@
 import ClientApp from './client';
-export { default as ReactApp } from "../app/App";
+export { default as ReactApp } from '~/app/App';
 export default ClientApp;

package/models/config.d.ts

@@ -1,7 +1,7 @@
 import { AppRoutes, WithEvents } from './routing/routes';
 import handleResponse from './server/features/response-handler';
-export declare type StateType = 'immutable' | 'js';
-export declare type AppConfig = {
+export type StateType = 'immutable' | 'js';
+export type AppConfig = {
     stateType?: StateType;
     routes: AppRoutes;
     withReducers: {
@@ -10,7 +10,7 @@ export declare type AppConfig = {
     withSagas: any[];
     withEvents: WithEvents;
 };
-export declare type ServerConfig = AppConfig & {
+export type ServerConfig = AppConfig & {
     appRootPath?: string;
     disableSsrRedux?: boolean;
     handleResponses?: typeof handleResponse;

package/models/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./config";
-export * from "./routing/routes";
-export { default as linkDepthApi } from "./server/features/linkdepth-api/api";
-import internalServer from "./server/internalServer";
-export { default as ReactApp } from "./app/App";
+export * from '~/config';
+export * from '~/routing/routes';
+export { default as linkDepthApi } from '~/server/features/linkdepth-api/api';
+import internalServer from '~/server/internalServer';
+export { default as ReactApp } from '~/app/App';
 export default internalServer;

package/models/redux/actions/index.d.ts

@@ -5,5 +5,5 @@ declare namespace _default {
 }
 export default _default;
 import * as navigation from "./navigation";
-import * as routing from "../../routing/redux/actions";
+import * as routing from "~/routing/redux/actions";
 import * as version from "./version";

package/models/redux/appstate.d.ts

@@ -2,8 +2,8 @@ import { VersionStatus } from 'contensis-core-api';
 import { Entry, Node } from 'contensis-delivery-api/lib/models';
 import { Group, User } from 'contensis-management-api/lib/models';
 import { MatchedRoute } from 'react-router-config';
-import { StaticRoute } from "../routing/routes";
-export declare type AppState = {
+import { StaticRoute } from '~/routing/routes';
+export type AppState = {
     navigation: {
         root: Node | null;
         isError: boolean;

package/models/redux/selectors/index.d.ts

@@ -5,5 +5,5 @@ declare namespace _default {
 }
 export default _default;
 import * as navigation from "./navigation";
-import * as routing from "../../routing/redux/selectors";
+import * as routing from "~/routing/redux/selectors";
 import * as version from "./version";

package/models/redux/store/store.d.ts

@@ -1,6 +1,6 @@
 import { AppState } from '../appstate';
 import { History, MemoryHistory } from 'history';
-import { StateType } from "../../config";
+import { StateType } from '~/config';
 export declare let reduxStore: any;
 declare const _default: (featureReducers: any, initialState: AppState, history: History | MemoryHistory, stateType: StateType) => Promise<any>;
 export default _default;

package/models/redux/types/index.d.ts

@@ -5,5 +5,5 @@ declare namespace _default {
 }
 export default _default;
 import * as navigation from "./navigation";
-import * as routing from "../../routing/redux/types";
+import * as routing from "~/routing/redux/types";
 import * as version from "./version";

package/models/routing/redux/selectors.d.ts

@@ -1,7 +1,7 @@
-import { StateType } from "../../config";
-import { AppState } from "../../redux/appstate";
-export declare const selectRouteEntry: (state: AppState, returnType?: StateType | undefined) => any;
-export declare const selectMappedEntry: (state: AppState, returnType?: StateType | undefined) => any;
+import { StateType } from '~/config';
+import { AppState } from '~/redux/appstate';
+export declare const selectRouteEntry: (state: AppState, returnType?: StateType) => any;
+export declare const selectMappedEntry: (state: AppState, returnType?: StateType) => any;
 export declare const selectSurrogateKeys: (state: AppState) => any;
 export declare const selectCurrentHostname: (state: AppState) => any;
 export declare const selectCurrentTreeID: (state: AppState) => any;
@@ -20,7 +20,7 @@ export declare const selectCurrentProject: (state: AppState) => any;
 export declare const selectIsNotFound: (state: AppState) => any;
 export declare const selectCurrentAncestors: (state: AppState) => any;
 export declare const selectCurrentSiblings: (state: AppState) => any;
-export declare const selectCurrentNode: (state: AppState, returnType?: StateType | undefined) => any;
+export declare const selectCurrentNode: (state: AppState, returnType?: StateType) => any;
 export declare const selectCurrentChildren: (state: any) => any;
 export declare const selectBreadcrumb: (state: AppState) => any[];
 export declare const selectRouteErrorMessage: (state: AppState) => any;

package/models/routing/routes.d.ts

@@ -1,21 +1,21 @@
 import { MatchedRoute, RouteConfig } from 'react-router-config';
 import { Entry, Node } from 'contensis-delivery-api/lib/models';
 import React from 'react';
-import { AppState } from "../redux/appstate";
-declare type RouteComponent<Props> = React.ComponentType<Props>;
-export declare type RouteNode = Node & {
+import { AppState } from '~/redux/appstate';
+type RouteComponent<Props> = React.ComponentType<Props>;
+export type RouteNode = Node & {
     ancestors: Node[];
     children: Node[];
 };
-export declare type AppRoutes = {
+export type AppRoutes = {
     ContentTypeMappings: ContentTypeMapping[];
     StaticRoutes: StaticRoute[];
 };
-export declare type AppRootProps = {
+export type AppRootProps = {
     routes: AppRoutes;
     withEvents: WithEvents;
 };
-export declare type RouteComponentProps<P = any> = {
+export type RouteComponentProps<P = any> = {
     [key: string]: any;
     projectId?: string;
     contentTypeId?: string;
@@ -23,23 +23,23 @@ export declare type RouteComponentProps<P = any> = {
     mappedEntry?: P;
     isLoggedIn?: boolean;
 };
-export declare type RouteLoaderProps = {
+export type RouteLoaderProps = {
     loadingComponent?: React.ComponentType;
     notFoundComponent?: React.ComponentType;
     trailingSlashRedirectCode?: 301 | 302;
 };
-export declare type EntryMapper = (<MappedProps>(node: RouteNode, state?: AppState) => MappedProps | unknown) | (<MappedProps>(node: RouteNode, state?: AppState) => Promise<MappedProps | unknown>);
-export declare type ReduxInjector = () => Promise<{
+export type EntryMapper = (<MappedProps>(node: RouteNode, state?: AppState) => MappedProps | unknown) | (<MappedProps>(node: RouteNode, state?: AppState) => Promise<MappedProps | unknown>);
+export type ReduxInjector = () => Promise<{
     key: string;
     reducer: any;
     saga: any;
 }>;
-declare type UserGroupRequisite = {
+type UserGroupRequisite = {
     id?: string;
     name?: string;
 };
-export declare type RequireLogin = boolean | UserGroupRequisite[];
-export declare type ContentTypeMapping = {
+export type RequireLogin = boolean | UserGroupRequisite[];
+export type ContentTypeMapping = {
     contentTypeID: string;
     component: RouteComponent<RouteComponentProps>;
     entryMapper?: EntryMapper;
@@ -59,7 +59,7 @@ export declare type ContentTypeMapping = {
     };
     requireLogin?: RequireLogin;
 };
-export declare type StaticRoute = Omit<RouteConfig, 'component'> & {
+export type StaticRoute = Omit<RouteConfig, 'component'> & {
     component: RouteComponent<RouteComponentProps>;
     fetchNode?: boolean | {
         /**
@@ -79,7 +79,7 @@ export declare type StaticRoute = Omit<RouteConfig, 'component'> & {
     ssr?: boolean;
     ssrOnly?: boolean;
 };
-export declare type OnRouteLoadArgs = {
+export type OnRouteLoadArgs = {
     location: {
         pathname: string;
         search: string;
@@ -90,7 +90,7 @@ export declare type OnRouteLoadArgs = {
     staticRoute: MatchedRoute<any, StaticRoute>;
     statePath: string;
 };
-export declare type OnRouteLoadedArgs = {
+export type OnRouteLoadedArgs = {
     entry: Entry | any;
     location: {
         pathname: string;
@@ -101,7 +101,7 @@ export declare type OnRouteLoadedArgs = {
     path: string;
     staticRoute: MatchedRoute<any, StaticRoute>;
 };
-export declare type RouteLoadOptions = {
+export type RouteLoadOptions = {
     customNavigation?: boolean | {
         ancestors: boolean | number;
         children: boolean | number;
@@ -114,10 +114,10 @@ export declare type RouteLoadOptions = {
     preventScrollTop?: boolean;
     refetchNode?: true;
 };
-export declare type RouteLoadedOptions = {
+export type RouteLoadedOptions = {
     requireLogin?: RequireLogin;
 };
-export declare type WithEvents = {
+export type WithEvents = {
     onRouteLoad: (args: OnRouteLoadArgs) => Generator<void | RouteLoadOptions>;
     onRouteLoaded: (args: OnRouteLoadedArgs) => Generator<void | RouteLoadedOptions>;
 };

package/models/routing/util/queries.d.ts

@@ -1,2 +1,2 @@
-import { Query } from "../../util/ContensisDeliveryApi";
+import { Query } from '~/util/ContensisDeliveryApi';
 export declare const routeEntryByFieldsQuery: (id: string, language?: string, fields?: string[], versionStatus?: 'published' | 'latest') => Query;

package/models/server/features/linkdepth-api/LinkDepthSearchService.d.ts

@@ -1,6 +1,6 @@
 import { LinkDepthApiConfig, LinkDepthApiFilters, LinkFields } from './api.d';
 import QueryLevelResults from './QueryLevelResults';
-export declare type LinkDepthSearchServiceConstuctorArgs = Partial<LinkDepthApiConfig> & {
+export type LinkDepthSearchServiceConstuctorArgs = Partial<LinkDepthApiConfig> & {
     params: {
         [key: string]: string | undefined;
     };

package/models/server/features/linkdepth-api/search.d.ts

@@ -1,9 +1,9 @@
-import { FilterExpression, SearchQueryOptions } from "../../../search";
+import { FilterExpression, SearchQueryOptions } from '~/search';
 import { Query } from 'contensis-core-api';
 import { Entry } from 'contensis-delivery-api/lib/models';
 import { LinkDepthApiFilters } from './api.d';
-declare type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-declare type SearchQueryArgs = WithOptional<SearchQueryOptions & {
+type WithOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+type SearchQueryArgs = WithOptional<SearchQueryOptions & {
     idFilters?: SearchQueryOptions['filters'];
     sharedFilters?: SearchQueryOptions['filters'];
 }, 'assetTypes' | 'customWhere' | 'dynamicOrderBy' | 'excludeIds' | 'featuredResults' | 'fields' | 'includeInSearchFields' | 'languages' | 'omitDefaultSearchFields' | 'orderBy' | 'pageIndex' | 'searchTerm' | 'webpageTemplates' | 'weightedSearchFields'>;

package/models/server/internalServer.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="node" />
 import 'isomorphic-fetch';
-import express from 'express';
+import { Express } from 'express';
 import http from 'http';
 import React from 'react';
-import { ServerConfig } from "../config";
-declare const _default: {
-    app: import("express-serve-static-core").Express;
-    apiProxy: any;
+import { deliveryProxy } from './features/reverse-proxy';
+import { ServerConfig } from '~/config';
+type Exporting = {
+    app: Express;
+    apiProxy: typeof deliveryProxy;
     server: http.Server;
-    start: (ReactApp: React.ComponentType<any>, config: ServerConfig, ServerFeatures: (app: express.Express) => void) => void;
+    start: (ReactApp: React.ComponentType<any>, config: ServerConfig, ServerFeatures: (app: Express) => void) => void;
 };
+declare const _default: Exporting;
 export default _default;

package/models/server/util/bundles.d.ts

@@ -1,6 +1,6 @@
 import { ChunkExtractor } from '@loadable/server';
-import { ServerConfig } from "../../config";
-export declare const loadableBundleData: ({ stats, templates }: ServerConfig, staticRoutePath: string, build?: string | undefined) => {
+import { ServerConfig } from '~/config';
+export declare const loadableBundleData: ({ stats, templates }: ServerConfig, staticRoutePath: string, build?: string) => {
     stats?: string | null | undefined;
     templates?: {
         templateHTML: string;
@@ -8,7 +8,7 @@ export declare const loadableBundleData: ({ stats, templates }: ServerConfig, st
         templateHTMLFragment: string;
     } | null | undefined;
 };
-declare type LoadableChunkExtractors = {
+type LoadableChunkExtractors = {
     legacy?: ChunkExtractor;
     modern?: ChunkExtractor;
     commonLoadableExtractor: ChunkExtractor;

package/models/server/util/headers.d.ts

@@ -1,5 +1,5 @@
 import { Response } from 'express';
-import { AppState } from "../../redux/appstate";
+import { AppState } from '~/redux/appstate';
 export declare const addStandardHeaders: (state: AppState, response: Response, packagejson: any, groups: {
     globalGroups?: any[];
     allowedGroups?: any[];

package/models/server/webApp.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Express } from 'express';
-import { ServerConfig } from "../config";
+import { ServerConfig } from '~/config';
 declare const webApp: (app: Express, ReactApp: React.ComponentType<any>, config: ServerConfig & {
     allowedGroups?: string[];
     globalGroups?: string[];

package/models/testImmer/redux/reducer.d.ts

@@ -1,2 +1,2 @@
-declare var _default: any;
+declare const _default: any;
 export default _default;

package/models/user/components/Login.d.ts

@@ -1,10 +1,9 @@
-declare var _default: React.ComponentType<{
+declare const _default: (wrappedComponentProps: {
     errorMessage: any;
     isAuthenticated: any;
     isLoading: any;
     user: any;
     loginUser: any;
     logoutUser: any;
-}>;
+}) => JSX.Element;
 export default _default;
-import React from "react";

package/models/user/containers/ChangePassword.container.d.ts

@@ -1,5 +1,5 @@
-declare var _default: import("react").ComponentType<{
+declare const _default: (wrappedComponentProps: {
     [x: string]: any;
     children: any;
-}>;
+}) => JSX.Element;
 export default _default;

package/models/user/containers/ForgotPassword.container.d.ts

@@ -1,5 +1,5 @@
-declare var _default: import("react").ComponentType<{
+declare const _default: (wrappedComponentProps: {
     [x: string]: any;
     children: any;
-}>;
+}) => JSX.Element;
 export default _default;

package/models/user/containers/Login.container.d.ts

@@ -1,5 +1,5 @@
-declare var _default: import("react").ComponentType<{
+declare const _default: (wrappedComponentProps: {
     [x: string]: any;
     children: any;
-}>;
+}) => JSX.Element;
 export default _default;

package/models/user/containers/Registration.container.d.ts

@@ -1,5 +1,5 @@
-declare var _default: import("react").ComponentType<{
+declare const _default: (wrappedComponentProps: {
     [x: string]: any;
     children: any;
-}>;
+}) => JSX.Element;
 export default _default;

package/models/user/hocs/withLogin.d.ts

@@ -1,12 +1,6 @@
 export default withLogin;
-declare function withLogin(WrappedComponent: any): import("react-redux").ConnectedComponent<import("react").ComponentType<{
+declare function withLogin(WrappedComponent: any): import("react-redux").ConnectedComponent<(wrappedComponentProps: {
     [key: string]: any;
-}>, import("react-redux").Omit<{
-    [key: string]: any;
-} & {
-    children?: import("react").ReactNode;
-}, "error" | "isError" | "isLoading" | "user" | "isAuthenticated" | "isAuthenticationError" | "loginUser" | "logoutUser" | "authenticationError"> | import("react-redux").Omit<import("react").ClassAttributes<import("react").Component<{
-    [key: string]: any;
-}, any, any>> & {
+}) => JSX.Element, import("react-redux").Omit<{
     [key: string]: any;
 }, "error" | "isError" | "isLoading" | "user" | "isAuthenticated" | "isAuthenticationError" | "loginUser" | "logoutUser" | "authenticationError">>;

package/models/user/hocs/withRegistration.d.ts

@@ -1,12 +1,6 @@
 export default withRegistration;
-declare function withRegistration(WrappedComponent: any): import("react-redux").ConnectedComponent<import("react").ComponentType<{
+declare function withRegistration(WrappedComponent: any): import("react-redux").ConnectedComponent<(wrappedComponentProps: {
     [key: string]: any;
-}>, import("react-redux").Omit<{
-    [key: string]: any;
-} & {
-    children?: import("react").ReactNode;
-}, "error" | "isLoading" | "user" | "registerUser" | "isSuccess"> | import("react-redux").Omit<import("react").ClassAttributes<import("react").Component<{
-    [key: string]: any;
-}, any, any>> & {
+}) => JSX.Element, import("react-redux").Omit<{
     [key: string]: any;
 }, "error" | "isLoading" | "user" | "registerUser" | "isSuccess">>;

package/models/user/redux/selectors.d.ts

@@ -1,5 +1,5 @@
-import { StateType } from "../../config";
-import { AppState } from "../../redux/appstate";
+import { StateType } from '~/config';
+import { AppState } from '~/redux/appstate';
 export declare const selectUserIsLoading: (state: AppState) => any;
 export declare const selectUserIsAuthenticated: (state: AppState) => any;
 export declare const selectUserIsAuthenticationError: (state: AppState) => any;
@@ -11,15 +11,15 @@ export declare const selectUserIsError: (state: AppState) => any;
  */
 export declare const selectUserAuthenticationErrorMessage: (state: AppState) => any;
 export declare const selectUserErrorMessage: (state: AppState) => any;
-export declare const selectClientCredentials: (state: AppState, returnType?: StateType | undefined) => any;
-export declare const selectUser: (state: AppState, returnType?: StateType | undefined) => any;
+export declare const selectClientCredentials: (state: AppState, returnType?: StateType) => any;
+export declare const selectUser: (state: AppState, returnType?: StateType) => any;
 export declare const selectUserIsZengentiStaff: (state: AppState) => any;
 export declare const selectUserGuid: (state: AppState) => any;
 export declare const selectUsername: (state: AppState) => any;
 export declare const selectUserEmail: (state: AppState) => any;
-export declare const selectUserGroups: (state: AppState, returnType?: StateType | undefined) => any;
+export declare const selectUserGroups: (state: AppState, returnType?: StateType) => any;
 export declare const selectUserSecurityToken: (state: AppState) => any;
-export declare const selectUserRegistration: (state: AppState, returnType?: StateType | undefined) => any;
+export declare const selectUserRegistration: (state: AppState, returnType?: StateType) => any;
 export declare const selectUserRegistrationError: (state: AppState) => any;
 export declare const selectUserRegistrationIsLoading: (state: AppState) => any;
 export declare const selectUserRegistrationIsSuccess: (state: AppState) => any;

package/models/user/util/matchGroups.d.ts

@@ -1,3 +1,3 @@
 import { Group } from 'contensis-management-api/lib/models';
-import { RequireLogin } from "../../routing/routes";
+import { RequireLogin } from '~/routing/routes';
 export declare const matchUserGroup: (userGroups?: Group[], requiredGroups?: RequireLogin) => boolean;

package/models/util/ToJs.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const toJS: <Props extends {
     [key: string]: any;
-}>(WrappedComponent: React.ComponentType<Props>) => React.ComponentType<Props>;
+}>(WrappedComponent: React.ComponentType<Props>) => (wrappedComponentProps: Props) => JSX.Element;

package/models/util/index.d.ts

@@ -1,6 +1,6 @@
-export { default as setCachingHeaders } from "../server/features/caching/setCachingHeaders";
+export { default as setCachingHeaders } from '~/server/features/caching/setCachingHeaders';
 export { cachedSearch, deliveryApi, getClientConfig, } from './ContensisDeliveryApi';
 export { default as stringifyStrings } from './stringifyStrings';
 export { default as urls } from './urls';
 export * from './json-mapper';
-export { default as VersionInfo } from "../app/pages/VersionInfo";
+export { default as VersionInfo } from '~/app/pages/VersionInfo';

package/models/util/json-mapper.d.ts

@@ -1,10 +1,10 @@
 import { Entry } from 'contensis-delivery-api/lib/models';
 import mapJson from 'jsonpath-mapper';
 import MappingTemplate, { PureJsFunction } from 'jsonpath-mapper/dist/models/Template';
-import { AppState } from "../redux/appstate";
-import { EntryMapper, RouteNode } from "../routing/routes";
+import { AppState } from '~/redux/appstate';
+import { EntryMapper, RouteNode } from '~/routing/routes';
 export { default as mapJson, jpath } from 'jsonpath-mapper';
-declare type Mappers<S> = {
+type Mappers<S> = {
     [contentTypeId: string]: MappingTemplate<S>;
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zengenti/contensis-react-base",
-  "version": "3.0.2-beta.22",
+  "version": "3.0.2-beta.23",
   "repository": "https://github.com/zengenti/contensis-react-base",
   "license": "None",
   "description": "Turbocharge your React web apps with Contensis. This package handles all dependencies for creating full featured web apps in React with Contensis and Site View. Routing is driven by Site View, Redux is used for global state management and server-side rendering (SSR) is handled for you. Also taking care of intricate hosting issues such as cache invalidation and supporting authenticated content where required.",
@@ -46,6 +46,7 @@
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^13.2.1",
     "@types/babel__core": "^7.1.19",
     "@types/babel__template": "^7.4.1",
@@ -87,9 +88,9 @@
     "rimraf": "^3.0.2",
     "rollup": "^2.70.2",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "ts-patch": "^1.4.5",
-    "typescript": "^4.6.3",
-    "typescript-transform-paths": "^3.3.1",
+    "ts-patch": "^3.0.2",
+    "typescript": "^4.9.5",
+    "typescript-transform-paths": "^3.4.6",
     "zengenti-forms-package": "git+https://gitlab+deploy-token-11:DRbTWzdaRzkjDWc_VixQ@gitlab.zengenti.com/zengenti-packages/forms.git#next",
     "zengenti-search-package": "git+https://gitlab+deploy-token-5:XKRGRE1p2PrFAxnWwLNz@gitlab.zengenti.com/zengenti-packages/search.git#immer"
   },