refactor: upgrade typescript to 4.9.5 (#4229)

webiny · Aug 27, 2024 · dbcf756 · dbcf756
1 parent f7da215
commit dbcf756
Show file tree

Hide file tree

Showing 185 changed files with 716 additions and 623 deletions.
diff --git a/.yarn/patches/@material-base-npm-14.0.0-36e0a55c42.patch b/.yarn/patches/@material-base-npm-14.0.0-36e0a55c42.patch
@@ -0,0 +1,13 @@
+diff --git a/observer-foundation.d.ts b/observer-foundation.d.ts
+index d546598c6444aae71b00efdba33c20a884058e6f..ea99264896922327a4e5e40e6037edabdd9557c6 100644
+--- a/observer-foundation.d.ts
++++ b/observer-foundation.d.ts
+@@ -22,7 +22,7 @@
+  */
+ import { MDCFoundation } from './foundation';
+ import { Observer, ObserverRecord } from './observer';
+-export declare class MDCObserverFoundation<Adapter> extends MDCFoundation<Adapter> {
++export declare class MDCObserverFoundation<Adapter extends {} = {}> extends MDCFoundation<Adapter> {
+     /** A set of cleanup functions to unobserve changes. */
+     protected unobserves: Set<Function>;
+     constructor(adapter: Adapter);
diff --git a/.yarn/patches/apollo-link-npm-1.2.14-74f0ba01f9.patch b/.yarn/patches/apollo-link-npm-1.2.14-74f0ba01f9.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/types.d.ts b/lib/types.d.ts
+index 723ae9715022e8ea5d678e9a984b1b5511b230f6..60e30928350db6d718881c45042955aa072a862e 100644
+--- a/lib/types.d.ts
++++ b/lib/types.d.ts
+@@ -4,7 +4,7 @@ import { ExecutionResult as GraphQLExecutionResult } from 'graphql';
+ export { DocumentNode };
+ export interface ExecutionResult<TData = {
+     [key: string]: any;
+-}> extends GraphQLExecutionResult {
++}> extends GraphQLExecutionResult<TData> {
+     data?: TData | null;
+ }
+ export interface GraphQLRequest {
diff --git a/cypress-tests/cypress/support/utils.ts b/cypress-tests/cypress/support/utils.ts
@@ -87,7 +87,9 @@ type GqlQueryFunction<TReturn, TVariables> = (
     options?: GqlQueryOptions
 ) => Promise<TReturn>;
 
-export const createGqlQuery = <TReturn, TVariables = Record<string, never>>(
+export type GqlVariables = Record<string, any>;
+
+export const createGqlQuery = <TReturn, TVariables extends GqlVariables = GqlVariables>(
     query: string
 ): GqlQueryFunction<TReturn, TVariables> => {
     return async (variables: TVariables, options?: GqlQueryOptions) => {

diff --git a/cypress-tests/package.json b/cypress-tests/package.json
@@ -19,7 +19,7 @@
     "lodash": "^4.17.21",
     "nanoid": "^3.3.7",
     "node-fetch": "^2.6.1",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "uniqid": "^5.2.0"
   },
   "scripts": {

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "glob": "^7.1.3",
     "graphql": "^15.7.2",
     "husky": "^4.2.5",
-    "inquirer": "^7.0.0",
+    "inquirer": "8.2.6",
     "inquirer-autocomplete-prompt": "^1.0.1",
     "inquirer-checkbox-plus-prompt": "^1.0.1",
     "inquirer-maxlength-input-prompt": "^1.0.0",
@@ -94,7 +94,7 @@
     "semver": "^7.5.4",
     "ts-expect": "^1.3.0",
     "ts-jest": "^29.1.2",
-    "typescript": "4.7.4",
+    "typescript": "4.9.5",
     "typescript-transform-paths": "^3.4.6",
     "verdaccio": "^5.29.1",
     "write-json-file": "^4.2.0",
@@ -223,13 +223,15 @@
     "@grpc/grpc-js": "^1.11.1",
     "postcss": "^8.4.35",
     "semver": "7.5.4",
-    "typescript": "4.7.4",
     "@types/eslint": "8.2.1",
     "xml2js": "0.6.2",
     "yargs": "^17.3.1",
     "lerna@8.1.2": "patch:lerna@npm%3A8.1.2#./.yarn/patches/lerna-npm-8.1.2-be48ad2329.patch",
     "react-dnd": "^16.0.0",
-    "react-dnd-html5-backend": "^16.0.0"
+    "react-dnd-html5-backend": "^16.0.0",
+    "apollo-link@^1.2.14": "patch:apollo-link@npm%3A1.2.14#./.yarn/patches/apollo-link-npm-1.2.14-74f0ba01f9.patch",
+    "apollo-link@^1.0.0": "patch:apollo-link@npm%3A1.2.14#./.yarn/patches/apollo-link-npm-1.2.14-74f0ba01f9.patch",
+    "@material/base@^14.0.0": "patch:@material/base@npm%3A14.0.0#./.yarn/patches/@material-base-npm-14.0.0-36e0a55c42.patch"
   },
   "packageManager": "yarn@3.6.4",
   "dependencies": {

diff --git a/packages/api-aco/package.json b/packages/api-aco/package.json
@@ -57,6 +57,6 @@
     "prettier": "^2.8.3",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.13",
-    "typescript": "^4.7.4"
+    "typescript": "4.9.5"
   }
 }
diff --git a/packages/api-aco/src/apps/AcoApp.ts b/packages/api-aco/src/apps/AcoApp.ts
@@ -4,6 +4,7 @@ import {
     AcoRequestAction,
     AcoSearchRecordCrudBase,
     CreateSearchRecordParams,
+    GenericSearchData,
     IAcoApp,
     IAcoAppModifyFieldCallableCallback,
     IAcoAppOnAnyRequest,
@@ -12,7 +13,8 @@ import {
     IAcoAppParams,
     ListSearchRecordsParams,
     ListSearchRecordTagsParams,
-    SearchRecord
+    SearchRecord,
+    UpdateSearchRecordParams
 } from "~/types";
 import { CmsModel, CmsModelField } from "@webiny/api-headless-cms/types";
 import lodashUpperFirst from "lodash/upperFirst";
@@ -34,15 +36,20 @@ export class AcoApp implements IAcoApp {
 
     public get search(): AcoSearchRecordCrudBase {
         return {
-            create: async <TData>(data: CreateSearchRecordParams<TData>) => {
+            create: async <TData extends GenericSearchData = GenericSearchData>(
+                data: CreateSearchRecordParams<TData>
+            ) => {
                 await this.execOnAnyRequest("create");
                 const result = await this.context.aco.search.create<TData>(this.getModel(), data);
                 if (!this.onEntry) {
                     return result;
                 }
-                return this.onEntry(result);
+                return (await this.onEntry(result)) as SearchRecord<TData>;
             },
-            update: async <TData>(id: string, data: SearchRecord<TData>) => {
+            update: async <TData extends GenericSearchData = GenericSearchData>(
+                id: string,
+                data: UpdateSearchRecordParams<TData>
+            ) => {
                 await this.execOnAnyRequest("update");
                 const result = await this.context.aco.search.update<TData>(
                     this.getModel(),
@@ -52,29 +59,31 @@ export class AcoApp implements IAcoApp {
                 if (!this.onEntry) {
                     return result;
                 }
-                return this.onEntry(result);
+                return (await this.onEntry(result)) as SearchRecord<TData>;
             },
             move: async (id: string, folderId?: string) => {
                 await this.execOnAnyRequest("move");
                 return this.context.aco.search.move(this.getModel(), id, folderId);
             },
-            get: async <TData>(id: string) => {
+            get: async <TData extends GenericSearchData = GenericSearchData>(id: string) => {
                 await this.execOnAnyRequest("fetch");
                 const result = await this.context.aco.search.get<TData>(this.getModel(), id);
                 if (!result || !this.onEntry) {
                     return result;
                 }
-                return this.onEntry(result);
+                return (await this.onEntry(result)) as SearchRecord<TData>;
             },
-            list: async <TData>(params: ListSearchRecordsParams) => {
+            list: async <TData extends GenericSearchData = GenericSearchData>(
+                params: ListSearchRecordsParams
+            ) => {
                 await this.execOnAnyRequest("fetch");
                 const result = await this.context.aco.search.list<TData>(this.getModel(), params);
                 const onEntryList = this.onEntryList;
                 if (!onEntryList) {
                     return result;
                 }
                 const [entries, meta] = result;
-                const items = await onEntryList(entries);
+                const items = (await onEntryList(entries)) as SearchRecord<TData>[];
                 return [items, meta];
             },
             delete: async (id: string): Promise<boolean> => {

diff --git a/packages/api-aco/src/record/record.types.ts b/packages/api-aco/src/record/record.types.ts
@@ -44,7 +44,7 @@ export interface ListSearchRecordsParams {
     after?: string | null;
 }
 
-export type CreateSearchRecordParams<TData> = Pick<
+export type CreateSearchRecordParams<TData extends GenericSearchData = GenericSearchData> = Pick<
     SearchRecord<TData>,
     "id" | "title" | "content" | "type" | "location" | "data" | "tags"
 >;
@@ -181,20 +181,23 @@ export interface AcoSearchRecordCrud
         AcoSearchRecordCrudBase,
         "get" | "list" | "create" | "update" | "delete" | "listTags" | "move"
     > {
-    get<TData>(model: CmsModel, id: string): Promise<SearchRecord<TData>>;
-    list<TData>(
+    get<TData extends GenericSearchData = GenericSearchData>(
+        model: CmsModel,
+        id: string
+    ): Promise<SearchRecord<TData>>;
+    list<TData extends GenericSearchData = GenericSearchData>(
         model: CmsModel,
         params: ListSearchRecordsParams
     ): Promise<[SearchRecord<TData>[], ListMeta]>;
     listTags(
         model: CmsModel,
         params: ListSearchRecordTagsParams
     ): Promise<[SearchRecordTag[], ListMeta]>;
-    create<TData>(
+    create<TData extends GenericSearchData = GenericSearchData>(
         model: CmsModel,
         data: CreateSearchRecordParams<TData>
     ): Promise<SearchRecord<TData>>;
-    update<TData>(
+    update<TData extends GenericSearchData = GenericSearchData>(
         model: CmsModel,
         id: string,
         data: UpdateSearchRecordParams<TData>

diff --git a/packages/api-aco/src/types.ts b/packages/api-aco/src/types.ts
@@ -9,6 +9,7 @@ import {
     AcoSearchRecordCrud,
     AcoSearchRecordCrudBase,
     AcoSearchRecordStorageOperations,
+    GenericSearchData,
     SearchRecord
 } from "~/record/record.types";
 import { AcoFolderCrud, AcoFolderStorageOperations } from "~/folder/folder.types";
@@ -118,8 +119,12 @@ export interface IAcoApp {
     modifyField: IAcoAppModifyFieldCallable;
 }
 // TODO: determine correct type
-export type IAcoAppOnEntry<T = any> = (entry: SearchRecord<T>) => Promise<SearchRecord<T>>;
-export type IAcoAppOnEntryList<T = any> = (entry: SearchRecord<T>[]) => Promise<SearchRecord<T>[]>;
+export type IAcoAppOnEntry<T extends GenericSearchData = GenericSearchData> = (
+    entry: SearchRecord<T>
+) => Promise<SearchRecord<T>>;
+export type IAcoAppOnEntryList<T extends GenericSearchData = GenericSearchData> = (
+    entry: SearchRecord<T>[]
+) => Promise<SearchRecord<T>[]>;
 export type AcoRequestAction = "create" | "update" | "delete" | "move" | "fetch";
 export type IAcoAppOnAnyRequest = (context: AcoContext, action: AcoRequestAction) => Promise<void>;
 

diff --git a/packages/api-admin-settings/package.json b/packages/api-admin-settings/package.json
@@ -41,7 +41,7 @@
     "rimraf": "^5.0.5",
     "sinon": "^9.0.2",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-admin-users-so-ddb/package.json b/packages/api-admin-users-so-ddb/package.json
@@ -31,7 +31,7 @@
     "jest-dynalite": "^3.2.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-admin-users/package.json b/packages/api-admin-users/package.json
@@ -36,7 +36,7 @@
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-apw-scheduler-so-ddb/package.json b/packages/api-apw-scheduler-so-ddb/package.json
@@ -41,7 +41,7 @@
     "jest-dynalite": "^3.2.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-apw/package.json b/packages/api-apw/package.json
@@ -55,7 +55,7 @@
     "rimraf": "^5.0.5",
     "sinon": "^9.0.2",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-audit-logs/package.json b/packages/api-audit-logs/package.json
@@ -38,7 +38,7 @@
     "@webiny/project-utils": "0.0.0",
     "graphql": "^15.8.0",
     "ttypescript": "^1.5.13",
-    "typescript": "^4.7.4"
+    "typescript": "4.9.5"
   },
   "dependencies": {
     "@webiny/api": "0.0.0",

diff --git a/packages/api-authentication-cognito/package.json b/packages/api-authentication-cognito/package.json
@@ -22,7 +22,7 @@
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-authentication/package.json b/packages/api-authentication/package.json
@@ -27,7 +27,7 @@
     "jest-dynalite": "^3.2.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-background-tasks-ddb/package.json b/packages/api-background-tasks-ddb/package.json
@@ -20,7 +20,7 @@
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-background-tasks-es/package.json b/packages/api-background-tasks-es/package.json
@@ -22,7 +22,7 @@
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-background-tasks-os/package.json b/packages/api-background-tasks-os/package.json
@@ -22,7 +22,7 @@
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-cognito-authenticator/package.json b/packages/api-cognito-authenticator/package.json
@@ -25,7 +25,7 @@
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-dynamodb-to-elasticsearch/package.json b/packages/api-dynamodb-to-elasticsearch/package.json
@@ -29,7 +29,7 @@
     "@webiny/cli": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "@webiny/project-utils": "0.0.0",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-elasticsearch-tasks/package.json b/packages/api-elasticsearch-tasks/package.json
@@ -42,7 +42,7 @@
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.13",
     "type-fest": "^2.19.0",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-elasticsearch/package.json b/packages/api-elasticsearch/package.json
@@ -27,7 +27,7 @@
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-file-manager-ddb/package.json b/packages/api-file-manager-ddb/package.json
@@ -41,7 +41,7 @@
     "jsonpack": "^1.1.5",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-file-manager-s3/package.json b/packages/api-file-manager-s3/package.json
@@ -37,7 +37,7 @@
     "@webiny/cli": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^5.0.5",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-file-manager/package.json b/packages/api-file-manager/package.json
@@ -52,7 +52,7 @@
     "jest": "^29.7.0",
     "rimraf": "^5.0.5",
     "ttypescript": "^1.5.12",
-    "typescript": "4.7.4"
+    "typescript": "4.9.5"
   },
   "publishConfig": {
     "access": "public",