@zengenti/contensis-react-base 3.2.2 → 3.2.3-beta.1

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

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

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

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

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

@@ -3,14 +3,14 @@ export function injectReducer({ key, reducer }: {
     key: any;
     reducer: any;
 }, store?: import("../../../node_modules/redux").Store<import("../..").AppState, import("../../../node_modules/redux").Action<any>> & {
-    runSaga: <S extends import("redux-saga").Saga<any[]>>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
+    runSaga: <S extends import("redux-saga").Saga>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
     close: () => void;
 }): void;
 export function injectSaga({ key, saga }: {
     key: any;
     saga: any;
 }, store?: import("../../../node_modules/redux").Store<import("../..").AppState, import("../../../node_modules/redux").Action<any>> & {
-    runSaga: <S extends import("redux-saga").Saga<any[]>>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
+    runSaga: <S extends import("redux-saga").Saga>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
     close: () => void;
 }): void;
 export function injectRedux({ key, reducer, saga }: {
@@ -18,7 +18,7 @@ export function injectRedux({ key, reducer, saga }: {
     reducer: any;
     saga: any;
 }, store?: import("../../../node_modules/redux").Store<import("../..").AppState, import("../../../node_modules/redux").Action<any>> & {
-    runSaga: <S extends import("redux-saga").Saga<any[]>>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
+    runSaga: <S extends import("redux-saga").Saga>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
     close: () => void;
 }): void;
 export function useInjectRedux({ key, reducer, saga }: {
@@ -26,6 +26,6 @@ export function useInjectRedux({ key, reducer, saga }: {
     reducer: any;
     saga: any;
 }, store?: import("../../../node_modules/redux").Store<import("../..").AppState, import("../../../node_modules/redux").Action<any>> & {
-    runSaga: <S extends import("redux-saga").Saga<any[]>>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
+    runSaga: <S extends import("redux-saga").Saga>(saga: S, ...args: Parameters<S>) => import("redux-saga").Task;
     close: () => void;
 }): void;

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

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

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

@@ -1,3 +1,3 @@
-export const GET_NODE_TREE: string;
-export const SET_NODE_TREE: string;
-export const GET_NODE_TREE_ERROR: string;
+export const GET_NODE_TREE: "@NAVIGATION/_GET_NODE_TREE";
+export const SET_NODE_TREE: "@NAVIGATION/_SET_NODE_TREE";
+export const GET_NODE_TREE_ERROR: "@NAVIGATION/_GET_NODE_TREE_ERROR";

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

@@ -1,2 +1,2 @@
-export const SET_VERSION: string;
-export const SET_VERSION_STATUS: string;
+export const SET_VERSION: "@VERSION/SET_VERSION";
+export const SET_VERSION_STATUS: "@VERSION/SET_VERSION_STATUS";

package/models/routing/components/Status.d.ts

@@ -1,4 +1,4 @@
-import React, { PropsWithChildren } from 'react';
-export declare const Status: ({ code, children, }: React.PropsWithChildren<{
+import { PropsWithChildren } from 'react';
+export declare const Status: ({ code, children, }: PropsWithChildren<{
     code: number;
 }>) => JSX.Element;

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

@@ -1,11 +1,11 @@
-export declare const GET_ENTRY: string;
-export declare const SET_ENTRY: string;
-export declare const SET_NODE: string;
-export declare const SET_ANCESTORS: string;
-export declare const SET_SIBLINGS: string;
-export declare const SET_ENTRY_ID: string;
-export declare const SET_SURROGATE_KEYS: string;
-export declare const SET_NAVIGATION_PATH: string;
-export declare const SET_TARGET_PROJECT: string;
-export declare const SET_ROUTE: string;
-export declare const UPDATE_LOADING_STATE: string;
+export declare const GET_ENTRY = "@ROUTING/_GET_ENTRY";
+export declare const SET_ENTRY = "@ROUTING/_SET_ENTRY";
+export declare const SET_NODE = "@ROUTING/_SET_NODE";
+export declare const SET_ANCESTORS = "@ROUTING/_SET_ANCESTORS";
+export declare const SET_SIBLINGS = "@ROUTING/_SET_SIBLINGS";
+export declare const SET_ENTRY_ID = "@ROUTING/_SET_ENTRY_ID";
+export declare const SET_SURROGATE_KEYS = "@ROUTING/_SET_SURROGATE_KEYS";
+export declare const SET_NAVIGATION_PATH = "@ROUTING/_SET_NAVIGATION_PATH";
+export declare const SET_TARGET_PROJECT = "@ROUTING/_SET_TARGET_PROJECT";
+export declare const SET_ROUTE = "@ROUTING/_SET_ROUTE";
+export declare const UPDATE_LOADING_STATE = "@ROUTING/_UPDATE_LOADING_STATE";

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

@@ -6,10 +6,10 @@ declare function LoginForm({ authenticationError, loading, loginUser }: {
 }): JSX.Element;
 declare namespace LoginForm {
     namespace propTypes {
-        const loginException: PropTypes.Requireable<boolean>;
-        const authenticationError: PropTypes.Requireable<boolean>;
-        const loading: PropTypes.Requireable<boolean>;
-        const loginUser: PropTypes.Requireable<(...args: any[]) => any>;
+        let loginException: PropTypes.Requireable<boolean>;
+        let authenticationError: PropTypes.Requireable<boolean>;
+        let loading: PropTypes.Requireable<boolean>;
+        let loginUser: PropTypes.Requireable<(...args: any[]) => any>;
     }
 }
-import PropTypes from "prop-types";
+import PropTypes from 'prop-types';

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

@@ -5,8 +5,8 @@ declare function LogoutForm({ logoutUser, user }: {
 }): JSX.Element;
 declare namespace LogoutForm {
     namespace propTypes {
-        const logoutUser: PropTypes.Requireable<(...args: any[]) => any>;
-        const user: PropTypes.Requireable<object>;
+        let logoutUser: PropTypes.Requireable<(...args: any[]) => any>;
+        let user: PropTypes.Requireable<object>;
     }
 }
-import PropTypes from "prop-types";
+import PropTypes from 'prop-types';

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

@@ -1,21 +1,21 @@
-export declare const VALIDATE_USER: string;
-export declare const SET_AUTHENTICATION_STATE: string;
-export declare const LOGIN_USER: string;
-export declare const LOGIN_SUCCESSFUL: string;
-export declare const LOGIN_FAILED: string;
-export declare const LOGOUT_USER: string;
-export declare const REGISTER_USER: string;
-export declare const REGISTER_USER_SUCCESS: string;
-export declare const REGISTER_USER_FAILED: string;
-export declare const REQUEST_USER_PASSWORD_RESET: string;
-export declare const RESET_USER_PASSWORD: string;
-export declare const REQUEST_USER_PASSWORD_RESET_SENDING: string;
-export declare const REQUEST_USER_PASSWORD_RESET_SUCCESS: string;
-export declare const REQUEST_USER_PASSWORD_RESET_ERROR: string;
-export declare const RESET_USER_PASSWORD_SENDING: string;
-export declare const RESET_USER_PASSWORD_SUCCESS: string;
-export declare const RESET_USER_PASSWORD_ERROR: string;
-export declare const CHANGE_USER_PASSWORD: string;
-export declare const CHANGE_USER_PASSWORD_SENDING: string;
-export declare const CHANGE_USER_PASSWORD_SUCCESS: string;
-export declare const CHANGE_USER_PASSWORD_ERROR: string;
+export declare const VALIDATE_USER = "@USER/VALIDATE_USER";
+export declare const SET_AUTHENTICATION_STATE = "@USER/SET_AUTHENTICATION_STATE";
+export declare const LOGIN_USER = "@USER/LOGIN_USER";
+export declare const LOGIN_SUCCESSFUL = "@USER/LOGIN_SUCCESSFUL";
+export declare const LOGIN_FAILED = "@USER/LOGIN_FAILED";
+export declare const LOGOUT_USER = "@USER/LOGOUT_USER";
+export declare const REGISTER_USER = "@USER/REGISTER_USER";
+export declare const REGISTER_USER_SUCCESS = "@USER/REGISTER_USER_SUCCESS";
+export declare const REGISTER_USER_FAILED = "@USER/REGISTER_USER_FAILED";
+export declare const REQUEST_USER_PASSWORD_RESET = "@USER/REQUEST_USER_PASSWORD_RESET";
+export declare const RESET_USER_PASSWORD = "@USER/RESET_USER_PASSWORD";
+export declare const REQUEST_USER_PASSWORD_RESET_SENDING = "@USER/REQUEST_USER_PASSWORD_RESET_SENDING";
+export declare const REQUEST_USER_PASSWORD_RESET_SUCCESS = "@USER/REQUEST_USER_PASSWORD_RESET_SUCCESS";
+export declare const REQUEST_USER_PASSWORD_RESET_ERROR = "@USER/REQUEST_USER_PASSWORD_RESET_ERROR";
+export declare const RESET_USER_PASSWORD_SENDING = "@USER/RESET_USER_PASSWORD_SENDING";
+export declare const RESET_USER_PASSWORD_SUCCESS = "@USER/RESET_USER_PASSWORD_SUCCESS";
+export declare const RESET_USER_PASSWORD_ERROR = "@USER/RESET_USER_PASSWORD_ERROR";
+export declare const CHANGE_USER_PASSWORD = "@USER/CHANGE_USER_PASSWORD";
+export declare const CHANGE_USER_PASSWORD_SENDING = "@USER/CHANGE_USER_PASSWORD_SENDING";
+export declare const CHANGE_USER_PASSWORD_SUCCESS = "@USER/CHANGE_USER_PASSWORD_SUCCESS";
+export declare const CHANGE_USER_PASSWORD_ERROR = "@USER/CHANGE_USER_PASSWORD_ERROR";

package/models/util/CachedDeliveryApi.d.ts

@@ -14,11 +14,11 @@ declare class CachedSearch {
     searchUsingPost(query: Query, linkDepth?: number, project?: string): any;
     get(id: string, linkDepth?: number, versionStatus?: VersionStatus, project?: string, fields?: string[]): Promise<import("contensis-delivery-api").Entry>;
     getContentType(id: string, project?: string): Promise<import("contensis-core-api").ContentType>;
-    getRootNode(options: NodeGetRootOptions, versionStatus?: VersionStatus, project?: string): Promise<import("contensis-delivery-api").Node>;
-    getNode(options: Parameters<INodeOperations['get']>[0], project?: string): Promise<import("contensis-delivery-api").Node>;
-    getAncestors(options: Parameters<INodeOperations['getAncestors']>[0], project?: string): Promise<import("contensis-delivery-api").Node[]>;
-    getChildren(options: Parameters<INodeOperations['getChildren']>[0], project?: string): Promise<import("contensis-delivery-api").Node[]>;
-    getSiblings(options: Parameters<INodeOperations['getSiblings']>[0], project?: string): Promise<import("contensis-delivery-api").Node[]>;
+    getRootNode(options: NodeGetRootOptions, versionStatus?: VersionStatus, project?: string): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>>;
+    getNode(options: Parameters<INodeOperations['get']>[0], project?: string): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>>;
+    getAncestors(options: Parameters<INodeOperations['getAncestors']>[0], project?: string): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
+    getChildren(options: Parameters<INodeOperations['getChildren']>[0], project?: string): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
+    getSiblings(options: Parameters<INodeOperations['getSiblings']>[0], project?: string): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
     request<T extends () => Promise<any>>(key: string, execute: T): ReturnType<T>;
 }
 export declare const cachedSearch: CachedSearch;

package/models/util/ContensisDeliveryApi.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="qs" />
+/// <reference types="node" />
 import { VersionStatus } from 'contensis-core-api';
 import { Client, Query } from 'contensis-delivery-api';
 import { Config } from 'contensis-delivery-api/lib/models';

package/models/util/SSRContext.d.ts

@@ -1,15 +1,14 @@
-/// <reference types="qs" />
 import { Request, Response } from 'express';
-import React, { PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import { SSRContext as SSRContextType } from "../models";
 /** SSRContextProvider allows us to hold and access request-scoped references
  *  throughout the component tree
  *
  *  adding this in client side allows consumers to write universal code and use
  *  the same helpers and refs as in SSR */
-export declare const SSRContextProvider: ({ children, request, response, }: React.PropsWithChildren<{
-    request?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>> | undefined;
-    response?: Response<any, Record<string, any>> | undefined;
+export declare const SSRContextProvider: ({ children, request, response, }: PropsWithChildren<{
+    request?: Request;
+    response?: Response;
 }>) => JSX.Element;
 export declare const useSSRContext: () => SSRContextType;
 export declare const useDeliveryApi: () => {
@@ -21,10 +20,10 @@ export declare const useDeliveryApi: () => {
     searchUsingPost(query: import("contensis-core-api").Query, linkDepth?: number, project?: string): any;
     get(id: string, linkDepth?: number, versionStatus?: import("contensis-core-api").VersionStatus, project?: string | undefined, fields?: string[] | undefined): Promise<import("contensis-delivery-api").Entry>;
     getContentType(id: string, project?: string | undefined): Promise<import("contensis-core-api").ContentType>;
-    getRootNode(options: import("contensis-delivery-api").NodeGetRootOptions, versionStatus?: import("contensis-core-api").VersionStatus, project?: string | undefined): Promise<import("contensis-delivery-api").Node>;
-    getNode(options: string | import("contensis-delivery-api").NodeGetByIdOptions | import("contensis-delivery-api").NodeGetByPathOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node>;
-    getAncestors(options: string | import("contensis-delivery-api").Node | import("contensis-delivery-api").NodeGetAncestorsOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node[]>;
-    getChildren(options: string | import("contensis-delivery-api").Node | import("contensis-delivery-api").NodeGetChildrenOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node[]>;
-    getSiblings(options: string | import("contensis-delivery-api").Node | import("contensis-delivery-api").NodeGetSiblingOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node[]>;
+    getRootNode(options: import("contensis-delivery-api").NodeGetRootOptions, versionStatus?: import("contensis-core-api").VersionStatus, project?: string | undefined): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>>;
+    getNode(options: string | import("contensis-delivery-api").NodeGetByIdOptions | import("contensis-delivery-api").NodeGetByPathOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>>;
+    getAncestors(options: string | import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry> | import("contensis-delivery-api").NodeGetAncestorsOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
+    getChildren(options: string | import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry> | import("contensis-delivery-api").NodeGetChildrenOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
+    getSiblings(options: string | import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry> | import("contensis-delivery-api").NodeGetSiblingOptions, project?: string | undefined): Promise<import("contensis-delivery-api").Node<import("contensis-delivery-api").Entry>[]>;
     request<T extends () => Promise<any>>(key: string, execute: T): ReturnType<T>;
 };

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

@@ -42,9 +42,9 @@ export declare const useEntryMapper: <S, T extends Mappers<S>>(entry: S, mappers
  * a default mapper template, returns an empty object if no mapper template
  * couild be applied.
  */
-export declare const mapEntries: <S, Mappers_1 extends {
+export declare const mapEntries: <S, Mappers extends {
     [contentTypeId: string]: MappingTemplate<S>;
-}>(entries: S[], mappers: Mappers_1, field?: string) => unknown[];
+}>(entries: S[], mappers: Mappers, field?: string) => unknown[];
 /**
  * mapComposer mapping function to take a composer field from Delivery API along
  * with mappers for each Composer Item "type" and return an array of mapped components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zengenti/contensis-react-base",
-  "version": "3.2.2",
+  "version": "3.2.3-beta.1",
   "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.",
@@ -10,17 +10,14 @@
   "scripts": {
     "start": "npm run roll:watch",
     "debug:server": "npm start",
-    "build": "npm run clean:lib && ttsc && npm run copymodels && npm run roll:lib",
+    "build": "npm run clean:lib && tspc && npm run copymodels && npm run roll:lib",
     "build:lib": "npm i zengenti-search-package zengenti-forms-package && npm run build",
     "roll:lib": "cross-env NODE_ENV=production rollup --bundleConfigAsCjs -c rollup/rollup.config.lib.js",
     "roll:watch": "cross-env NODE_ENV=production rollup --bundleConfigAsCjs -c rollup/rollup.config.lib.js --watch",
     "clean:lib": "rimraf ./models && rimraf ./esm && rimraf ./cjs",
     "copymodels": "copyfiles --up 3 --follow \"./node_modules/zengenti-search-package/models/**/*\" models/search --verbose",
-    "changelog": "generate-changelog -x ci,chore --tag v3.2.0...",
     "lint": "eslint ./src",
-    "lint:fix": "eslint --fix ./src",
-    "test": "jest  -c ./config/jest.config.js --detectOpenHandles --forceExit",
-    "publish:test": "npm pack && tar -xvzf *.tgz && rm -rf package *.tgz"
+    "lint:fix": "eslint --fix ./src"
   },
   "keywords": [],
   "author": "http://Zengenti.com",
@@ -34,6 +31,7 @@
     "@babel/preset-env": "^7.25.4",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
+    "@eslint/js": "^9.12.0",
     "@loadable/babel-plugin": "^5.16.1",
     "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-babel": "^6.0.4",
@@ -41,6 +39,7 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@types/babel__core": "^7.20.5",
+    "@types/eslint__js": "^8.42.3",
     "@types/events": "^3.0.0",
     "@types/express": "^4.17.13",
     "@types/isomorphic-fetch": "^0.0.36",
@@ -54,30 +53,26 @@
     "@types/react-router-config": "^5.0.6",
     "@types/react-router-dom": "^5.3.3",
     "@types/webpack-env": "^1.17.0",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-styled-components": "^2.1.4",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^2.7.1",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-react-hooks": "^4.4.0",
+    "eslint": "^9.12.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react-hooks": "^5.0.0",
     "fs-extra": "^10.1.0",
-    "generate-changelog": "^1.8.0",
-    "prettier": "^2.6.2",
+    "globals": "^15.11.0",
+    "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
     "rollup": "^4.21.3",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "ttypescript": "^1.5.15",
-    "typescript": "^4.9.5",
-    "typescript-transform-paths": "^3.4.6",
+    "ts-patch": "^3.2.1",
+    "typescript": "5.4",
+    "typescript-eslint": "^8.9.0",
+    "typescript-transform-paths": "^3.5.1",
     "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"
   },
@@ -88,8 +83,8 @@
     "app-root-path": "^3.0.0",
     "await-to-js": "^3.0.0",
     "chalk": "^4.1.2",
-    "contensis-delivery-api": "^1.4.1",
-    "contensis-management-api": "^2.1.9",
+    "contensis-delivery-api": "^1.5.0",
+    "contensis-management-api": "^2.2.0",
     "custom-env": "^2.0.1",
     "deep-equal": "^2.0.5",
     "deepmerge": "^4.2.2",