Skip to content

Commit f843428

Browse files
committed
fix: ts 6
1 parent c0e056e commit f843428

File tree

6 files changed

+11
-19
lines changed

6 files changed

+11
-19
lines changed

packages/api-elasticsearch/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "0.0.0",
44
"type": "module",
55
"main": "index.js",
6-
"types": "types.d.js",
76
"repository": {
87
"type": "git",
98
"url": "https://github.com/webiny/webiny-js.git",

packages/api-elasticsearch/src/index.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import { createElasticsearchClient } from "~/client.js";
99
import { getElasticsearchOperators } from "~/operators.js";
1010
import { Client } from "@elastic/elasticsearch/index.js";
1111

12-
export * from "./indexConfiguration/index.js";
12+
export { getBaseConfiguration, getCommonMappings } from "./indexConfiguration/index.js";
1313
export * from "./plugins/index.js";
1414
export * from "./sort.js";
1515
export * from "./indices.js";
1616
export * from "./where.js";
1717
export * from "./limit.js";
1818
export * from "./normalize.js";
1919
export * from "./compression.js";
20-
export * from "./operators.js";
20+
export { getElasticsearchOperators } from "./operators.js";
2121
export * from "./cursors.js";
2222
export * from "./client.js";
2323
export * from "./utils/index.js";
@@ -26,10 +26,8 @@ export * from "./sharedIndex.js";
2626
export * from "./indexPrefix.js";
2727
export * from "./db/index.js";
2828

29-
/**
30-
* We must accept either Elasticsearch client or options that create the client.
31-
*/
32-
export default (
29+
30+
const clientContextPlugin = (
3331
params: ElasticsearchClientOptions | Client
3432
): ContextPlugin<ElasticsearchContext> => {
3533
return new ContextPlugin<ElasticsearchContext>(context => {
@@ -48,3 +46,4 @@ export default (
4846
context.plugins.register(getElasticsearchOperators());
4947
});
5048
};
49+
export default clientContextPlugin;

packages/cli/files/duplicates.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"typescript","versions":[{"version":"6.0.1-rc","files":[{"file":"/package.json","types":["devDependencies","resolutions"]},{"file":"/packages/admin-ui/package.json","types":["devDependencies"]},{"file":"/packages/api/package.json","types":["devDependencies"]},{"file":"/packages/api-aco/package.json","types":["devDependencies"]},{"file":"/packages/api-audit-logs/package.json","types":["devDependencies"]},{"file":"/packages/api-background-tasks-ddb/package.json","types":["devDependencies"]},{"file":"/packages/api-background-tasks-os/package.json","types":["devDependencies"]},{"file":"/packages/api-core/package.json","types":["devDependencies"]},{"file":"/packages/api-core-ddb/package.json","types":["devDependencies"]},{"file":"/packages/api-dynamodb-to-elasticsearch/package.json","types":["devDependencies"]},{"file":"/packages/api-elasticsearch/package.json","types":["devDependencies"]},{"file":"/packages/api-elasticsearch-tasks/package.json","types":["devDependencies"]},{"file":"/packages/api-file-manager/package.json","types":["devDependencies"]},{"file":"/packages/api-file-manager-aco/package.json","types":["devDependencies"]},{"file":"/packages/api-file-manager-s3/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-aco/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-bulk-actions/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-ddb/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-ddb-es/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-es-tasks/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-import-export/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-scheduler/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-tasks/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-tasks-ddb-es/package.json","types":["devDependencies"]},{"file":"/packages/api-headless-cms-workflows/package.json","types":["devDependencies"]},{"file":"/packages/api-mailer/package.json","types":["devDependencies"]},{"file":"/packages/api-record-locking/package.json","types":["devDependencies"]},{"file":"/packages/api-scheduler/package.json","types":["devDependencies"]},{"file":"/packages/api-sync-system/package.json","types":["devDependencies"]},{"file":"/packages/api-website-builder/package.json","types":["devDependencies"]},{"file":"/packages/api-website-builder-workflows/package.json","types":["devDependencies"]},{"file":"/packages/api-websockets/package.json","types":["devDependencies"]},{"file":"/packages/api-workflows/package.json","types":["devDependencies"]},{"file":"/packages/app/package.json","types":["devDependencies"]},{"file":"/packages/app-aco/package.json","types":["devDependencies"]},{"file":"/packages/app-admin/package.json","types":["devDependencies"]},{"file":"/packages/app-admin-ui/package.json","types":["devDependencies"]},{"file":"/packages/app-audit-logs/package.json","types":["devDependencies"]},{"file":"/packages/app-file-manager/package.json","types":["devDependencies"]},{"file":"/packages/app-file-manager-s3/package.json","types":["devDependencies"]},{"file":"/packages/app-graphql-playground/package.json","types":["devDependencies"]},{"file":"/packages/app-headless-cms/package.json","types":["devDependencies"]},{"file":"/packages/app-headless-cms-common/package.json","types":["devDependencies"]},{"file":"/packages/app-headless-cms-scheduler/package.json","types":["devDependencies"]},{"file":"/packages/app-headless-cms-workflows/package.json","types":["devDependencies"]},{"file":"/packages/app-mailer/package.json","types":["devDependencies"]},{"file":"/packages/app-record-locking/package.json","types":["devDependencies"]},{"file":"/packages/app-sdk-playground/package.json","types":["devDependencies"]},{"file":"/packages/app-security-access-management/package.json","types":["devDependencies"]},{"file":"/packages/app-serverless-cms/package.json","types":["devDependencies"]},{"file":"/packages/app-trash-bin/package.json","types":["devDependencies"]},{"file":"/packages/app-utils/package.json","types":["devDependencies"]},{"file":"/packages/app-website-builder/package.json","types":["devDependencies"]},{"file":"/packages/app-website-builder-workflows/package.json","types":["devDependencies"]},{"file":"/packages/app-websockets/package.json","types":["devDependencies"]},{"file":"/packages/app-workflows/package.json","types":["devDependencies"]},{"file":"/packages/auth0/package.json","types":["devDependencies"]},{"file":"/packages/aws-sdk/package.json","types":["devDependencies"]},{"file":"/packages/build-tools/package.json","types":["dependencies"]},{"file":"/packages/cli-core/package.json","types":["devDependencies"]},{"file":"/packages/common-audit-logs/package.json","types":["devDependencies"]},{"file":"/packages/data-migration/package.json","types":["devDependencies"]},{"file":"/packages/db/package.json","types":["devDependencies"]},{"file":"/packages/db-dynamodb/package.json","types":["devDependencies"]},{"file":"/packages/error/package.json","types":["devDependencies"]},{"file":"/packages/feature/package.json","types":["devDependencies"]},{"file":"/packages/feature-flags/package.json","types":["devDependencies"]},{"file":"/packages/form/package.json","types":["devDependencies"]},{"file":"/packages/handler/package.json","types":["devDependencies"]},{"file":"/packages/handler-aws/package.json","types":["devDependencies"]},{"file":"/packages/handler-client/package.json","types":["devDependencies"]},{"file":"/packages/handler-db/package.json","types":["devDependencies"]},{"file":"/packages/handler-graphql/package.json","types":["devDependencies"]},{"file":"/packages/i18n/package.json","types":["devDependencies"]},{"file":"/packages/i18n-react/package.json","types":["devDependencies"]},{"file":"/packages/ioc/package.json","types":["devDependencies"]},{"file":"/packages/logger/package.json","types":["devDependencies"]},{"file":"/packages/mcp/package.json","types":["devDependencies"]},{"file":"/packages/migrations/package.json","types":["devDependencies"]},{"file":"/packages/okta/package.json","types":["devDependencies"]},{"file":"/packages/plugins/package.json","types":["devDependencies"]},{"file":"/packages/project/package.json","types":["devDependencies"]},{"file":"/packages/project-aws/package.json","types":["devDependencies"]},{"file":"/packages/pulumi/package.json","types":["devDependencies"]},{"file":"/packages/pulumi-sdk/package.json","types":["devDependencies"]},{"file":"/packages/react-composition/package.json","types":["devDependencies"]},{"file":"/packages/sdk/package.json","types":["devDependencies"]},{"file":"/packages/shared-aco/package.json","types":["devDependencies"]},{"file":"/packages/tasks/package.json","types":["devDependencies"]},{"file":"/packages/tenant-manager/package.json","types":["devDependencies"]},{"file":"/packages/testing/package.json","types":["devDependencies"]},{"file":"/packages/ui/package.json","types":["devDependencies"]},{"file":"/packages/utils/package.json","types":["devDependencies"]},{"file":"/packages/validation/package.json","types":["devDependencies"]},{"file":"/packages/wcp/package.json","types":["devDependencies"]},{"file":"/packages/webiny/package.json","types":["devDependencies"]},{"file":"/packages/website-builder-nextjs/package.json","types":["devDependencies"]},{"file":"/packages/website-builder-react/package.json","types":["devDependencies"]},{"file":"/packages/website-builder-sdk/package.json","types":["devDependencies"]},{"file":"/cypress-tests/package.json","types":["devDependencies"]},{"file":"/scripts/cli/package.json","types":["devDependencies"]}]},{"version":"5.9.3","files":[{"file":"/packages/create-webiny-project/_templates/base/template.package.json","types":["devDependencies"]}]}]}]
1+
[]

packages/cli/files/references.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

packages/project-utils/testing/elasticsearch/client.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import type { Client } from "@elastic/elasticsearch/index.js";
2-
import {
3-
createElasticsearchClient as createClient,
4-
ElasticsearchClientOptions
5-
} from "@webiny/api-elasticsearch/client";
2+
import { createElasticsearchClient as createClient } from "@webiny/api-elasticsearch/client.js";
3+
import type { ElasticsearchClientOptions } from "@webiny/api-elasticsearch/client.js";
64
import type { IndicesCreate, IndicesExists } from "@elastic/elasticsearch/api/requestParams.js";
75
import type { TransportRequestOptions } from "@elastic/elasticsearch/lib/Transport.js";
86

packages/project-utils/testing/elasticsearch/getElasticsearchClient.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { expect } from "vitest";
22
import path from "path";
33
import { ContextPlugin } from "@webiny/api";
4-
import elasticsearchClientContextPlugin, {
5-
getElasticsearchOperators
6-
} from "@webiny/api-elasticsearch";
4+
import { clientContextPlugin, getElasticsearchOperators } from "@webiny/api-elasticsearch";
75
import { logger } from "../logger";
86
import { createHandler } from "@webiny/handler-aws";
97
import { createEventHandler as createDynamoDBToElasticsearchEventHandler } from "@webiny/api-dynamodb-to-elasticsearch";
@@ -67,9 +65,7 @@ export class ElasticsearchClientConfig {
6765

6866
const documentClient = getDocumentClient();
6967
this.elasticsearchClient = createElasticsearchClient();
70-
const elasticsearchClientContext = elasticsearchClientContextPlugin(
71-
this.elasticsearchClient
72-
);
68+
const elasticsearchClientContext = clientContextPlugin(this.elasticsearchClient);
7369

7470
/**
7571
* Intercept DocumentClient operations and trigger dynamoToElastic function (almost like a DynamoDB Stream trigger)

0 commit comments

Comments
 (0)