webiny · brunozoric · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026 · Mar 9, 2026
diff --git a/cypress-tests/package.json b/cypress-tests/package.json
@@ -20,7 +20,7 @@
     "graphql-request": "^7.4.0",
     "lodash": "^4.17.23",
     "nanoid": "^5.1.6",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "uniqid": "^5.4.0"
   },
   "scripts": {

diff --git a/cypress-tests/tsconfig.json b/cypress-tests/tsconfig.json
@@ -5,7 +5,7 @@
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
     "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "module": "esnext",
     "lib": ["esnext", "dom", "dom.iterable"],
     "resolveJsonModule": true,
@@ -16,7 +16,7 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react",
     "emitDeclarationOnly": true,
-    "baseUrl": ".",
+
     "paths": {},
     "strict": true,
     "noUnusedParameters": false,

diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "ts-expect": "^1.3.0",
     "tsx": "^4.21.0",
     "type-fest": "^5.4.4",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "validator": "^13.15.26",
     "verdaccio": "^6.2.9",
     "vite-tsconfig-paths": "^6.1.1",
@@ -247,6 +247,7 @@
     "@emotion/react": "11.10.8",
     "@types/react": "18.2.79",
     "@types/react-dom": "18.2.25",
+    "typescript": "6.0.1-rc",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "lerna@8.1.2": "patch:lerna@npm%3A8.1.2#./.yarn/patches/lerna-npm-8.1.2-be48ad2329.patch",

diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
@@ -63,7 +63,7 @@
     "rimraf": "^6.1.3",
     "sass": "^1.97.3",
     "storybook": "^9.1.19",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   },
   "publishConfig": {

diff --git a/packages/admin-ui/tsconfig.build.json b/packages/admin-ui/tsconfig.build.json
@@ -19,7 +19,6 @@
       "@webiny/utils": ["../utils/src"],
       "@webiny/project/*": ["../project/src/*"],
       "@webiny/project": ["../project/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/admin-ui/tsconfig.json b/packages/admin-ui/tsconfig.json
@@ -19,7 +19,6 @@
       "@webiny/utils": ["../utils/src"],
       "@webiny/project/*": ["../project/src/*"],
       "@webiny/project": ["../project/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-aco/package.json b/packages/api-aco/package.json
@@ -59,7 +59,7 @@
     "graphql": "^16.13.0",
     "prettier": "3.6.2",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   }
 }
diff --git a/packages/api-aco/tsconfig.build.json b/packages/api-aco/tsconfig.build.json
@@ -184,7 +184,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/wcp/*": ["../wcp/src/*"],
       "@webiny/wcp": ["../wcp/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-aco/tsconfig.json b/packages/api-aco/tsconfig.json
@@ -184,7 +184,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/wcp/*": ["../wcp/src/*"],
       "@webiny/wcp": ["../wcp/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-audit-logs/package.json b/packages/api-audit-logs/package.json
@@ -24,7 +24,7 @@
     "@webiny/plugins": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "graphql": "^16.13.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   },
   "dependencies": {

diff --git a/packages/api-audit-logs/tsconfig.build.json b/packages/api-audit-logs/tsconfig.build.json
@@ -214,7 +214,6 @@
       "@webiny/handler-aws": ["../handler-aws/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-audit-logs/tsconfig.json b/packages/api-audit-logs/tsconfig.json
@@ -214,7 +214,6 @@
       "@webiny/handler-aws": ["../handler-aws/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-background-tasks-ddb/package.json b/packages/api-background-tasks-ddb/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@webiny/build-tools": "0.0.0",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3"
+    "typescript": "6.0.1-rc"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-background-tasks-ddb/tsconfig.build.json b/packages/api-background-tasks-ddb/tsconfig.build.json
@@ -16,7 +16,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/tasks/*": ["../tasks/src/*"],
       "@webiny/tasks": ["../tasks/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-background-tasks-ddb/tsconfig.json b/packages/api-background-tasks-ddb/tsconfig.json
@@ -13,7 +13,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/tasks/*": ["../tasks/src/*"],
       "@webiny/tasks": ["../tasks/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-background-tasks-os/package.json b/packages/api-background-tasks-os/package.json
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@webiny/build-tools": "0.0.0",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3"
+    "typescript": "6.0.1-rc"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-background-tasks-os/tsconfig.build.json b/packages/api-background-tasks-os/tsconfig.build.json
@@ -22,7 +22,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/tasks/*": ["../tasks/src/*"],
       "@webiny/tasks": ["../tasks/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-background-tasks-os/tsconfig.json b/packages/api-background-tasks-os/tsconfig.json
@@ -22,7 +22,6 @@
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/tasks/*": ["../tasks/src/*"],
       "@webiny/tasks": ["../tasks/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-core-ddb/package.json b/packages/api-core-ddb/package.json
@@ -30,7 +30,7 @@
     "@webiny/project-utils": "0.0.0",
     "jest-dynalite": "^3.6.1",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3"
+    "typescript": "6.0.1-rc"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-core-ddb/tsconfig.build.json b/packages/api-core-ddb/tsconfig.build.json
@@ -143,7 +143,6 @@
       "@webiny/db-dynamodb": ["../db-dynamodb/src"],
       "@webiny/error/*": ["../error/src/*"],
       "@webiny/error": ["../error/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-core-ddb/tsconfig.json b/packages/api-core-ddb/tsconfig.json
@@ -143,7 +143,6 @@
       "@webiny/db-dynamodb": ["../db-dynamodb/src"],
       "@webiny/error/*": ["../error/src/*"],
       "@webiny/error": ["../error/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-core/package.json b/packages/api-core/package.json
@@ -86,7 +86,7 @@
     "@webiny/project-utils": "0.0.0",
     "jest-dynalite": "^3.6.1",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   },
   "publishConfig": {

diff --git a/packages/api-core/tsconfig.build.json b/packages/api-core/tsconfig.build.json
@@ -48,7 +48,6 @@
       "@webiny/db-dynamodb": ["../db-dynamodb/src"],
       "@webiny/handler-aws/*": ["../handler-aws/src/*"],
       "@webiny/handler-aws": ["../handler-aws/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-core/tsconfig.json b/packages/api-core/tsconfig.json
@@ -48,7 +48,6 @@
       "@webiny/db-dynamodb": ["../db-dynamodb/src"],
       "@webiny/handler-aws/*": ["../handler-aws/src/*"],
       "@webiny/handler-aws": ["../handler-aws/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-dynamodb-to-elasticsearch/package.json b/packages/api-dynamodb-to-elasticsearch/package.json
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@webiny/build-tools": "0.0.0",
     "@webiny/plugins": "0.0.0",
-    "typescript": "5.9.3"
+    "typescript": "6.0.1-rc"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/api-dynamodb-to-elasticsearch/tsconfig.build.json b/packages/api-dynamodb-to-elasticsearch/tsconfig.build.json
@@ -31,7 +31,6 @@
       "@webiny/utils": ["../utils/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-dynamodb-to-elasticsearch/tsconfig.json b/packages/api-dynamodb-to-elasticsearch/tsconfig.json
@@ -31,7 +31,6 @@
       "@webiny/utils": ["../utils/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-elasticsearch-tasks/package.json b/packages/api-elasticsearch-tasks/package.json
@@ -37,7 +37,7 @@
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^6.1.3",
     "type-fest": "^5.4.4",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   },
   "publishConfig": {

diff --git a/packages/api-elasticsearch-tasks/tsconfig.build.json b/packages/api-elasticsearch-tasks/tsconfig.build.json
@@ -181,7 +181,6 @@
       "@webiny/handler-db": ["../handler-db/src"],
       "@webiny/handler-graphql/*": ["../handler-graphql/src/*"],
       "@webiny/handler-graphql": ["../handler-graphql/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-elasticsearch-tasks/tsconfig.json b/packages/api-elasticsearch-tasks/tsconfig.json
@@ -181,7 +181,6 @@
       "@webiny/handler-db": ["../handler-db/src"],
       "@webiny/handler-graphql/*": ["../handler-graphql/src/*"],
       "@webiny/handler-graphql": ["../handler-graphql/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-elasticsearch/__tests__/context.test.ts b/packages/api-elasticsearch/__tests__/context.test.ts
@@ -3,7 +3,7 @@ import elasticsearchContext from "~/index";
 import { ContextPlugin } from "@webiny/api";
 import { PluginsContainer } from "@webiny/plugins";
 import { ElasticsearchQueryBuilderOperatorPlugin } from "~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin";
-import { Client } from "@elastic/elasticsearch";
+import { Client } from "@elastic/elasticsearch/index.js";
 import { ElasticsearchContext } from "~/types";
 import { createElasticsearchClient } from "@webiny/project-utils/testing/elasticsearch/createClient";
 

diff --git a/packages/api-elasticsearch/package.json b/packages/api-elasticsearch/package.json
@@ -2,6 +2,7 @@
   "name": "@webiny/api-elasticsearch",
   "version": "0.0.0",
   "type": "module",
+  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/webiny/webiny-js.git",
@@ -26,7 +27,7 @@
     "@webiny/build-tools": "0.0.0",
     "@webiny/project-utils": "0.0.0",
     "rimraf": "^6.1.3",
-    "typescript": "5.9.3",
+    "typescript": "6.0.1-rc",
     "vitest": "^4.0.18"
   },
   "publishConfig": {

diff --git a/packages/api-elasticsearch/src/client.ts b/packages/api-elasticsearch/src/client.ts
@@ -1,7 +1,7 @@
 import createAwsElasticsearchConnector from "aws-elasticsearch-connector";
 import crypto from "crypto";
 import WebinyError from "@webiny/error";
-import { Client, type ClientOptions } from "@elastic/elasticsearch";
+import { Client, type ClientOptions } from "@elastic/elasticsearch/index.js";
 
 export interface ElasticsearchClientOptions extends ClientOptions {
     endpoint?: string;

diff --git a/packages/api-elasticsearch/src/index.ts b/packages/api-elasticsearch/src/index.ts
@@ -7,17 +7,17 @@ import { ContextPlugin } from "@webiny/api";
 import type { ElasticsearchClientOptions } from "~/client.js";
 import { createElasticsearchClient } from "~/client.js";
 import { getElasticsearchOperators } from "~/operators.js";
-import { Client } from "@elastic/elasticsearch";
+import { Client } from "@elastic/elasticsearch/index.js";
 
-export * from "./indexConfiguration/index.js";
+export { getBaseConfiguration, getCommonMappings } from "./indexConfiguration/index.js";
 export * from "./plugins/index.js";
 export * from "./sort.js";
 export * from "./indices.js";
 export * from "./where.js";
 export * from "./limit.js";
 export * from "./normalize.js";
 export * from "./compression.js";
-export * from "./operators.js";
+export { getElasticsearchOperators } from "./operators.js";
 export * from "./cursors.js";
 export * from "./client.js";
 export * from "./utils/index.js";
@@ -26,10 +26,7 @@ export * from "./sharedIndex.js";
 export * from "./indexPrefix.js";
 export * from "./db/index.js";
 
-/**
- * We must accept either Elasticsearch client or options that create the client.
- */
-export default (
+export const clientContextPlugin = (
     params: ElasticsearchClientOptions | Client
 ): ContextPlugin<ElasticsearchContext> => {
     return new ContextPlugin<ElasticsearchContext>(context => {
@@ -48,3 +45,4 @@ export default (
         context.plugins.register(getElasticsearchOperators());
     });
 };
+export default clientContextPlugin;
diff --git a/packages/api-elasticsearch/src/types.ts b/packages/api-elasticsearch/src/types.ts
@@ -1,5 +1,5 @@
-import type { Client } from "@elastic/elasticsearch";
-import { type ApiResponse } from "@elastic/elasticsearch";
+import type { Client } from "@elastic/elasticsearch/index.js";
+import { type ApiResponse } from "@elastic/elasticsearch/index.js";
 import type { BoolQueryConfig, PrimitiveValue, Query as esQuery } from "elastic-ts";
 import type { Context, GenericRecord } from "@webiny/api/types.js";
 /**

diff --git a/packages/api-elasticsearch/src/utils/createIndex.ts b/packages/api-elasticsearch/src/utils/createIndex.ts
@@ -1,4 +1,4 @@
-import type { Client } from "@elastic/elasticsearch";
+import type { Client } from "@elastic/elasticsearch/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
 import { getLastAddedIndexPlugin } from "~/indices.js";
 import type { ElasticsearchIndexPlugin } from "~/plugins/index.js";

diff --git a/packages/api-elasticsearch/tsconfig.build.json b/packages/api-elasticsearch/tsconfig.build.json
@@ -25,7 +25,6 @@
       "@webiny/error": ["../error/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }
diff --git a/packages/api-elasticsearch/tsconfig.json b/packages/api-elasticsearch/tsconfig.json
@@ -25,7 +25,6 @@
       "@webiny/error": ["../error/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"]
-    },
-    "baseUrl": "."
+    }
   }
 }