From 1b45e472c9c8b72062a654fc2de9415d1cc59fdb Mon Sep 17 00:00:00 2001 From: Michael Nelson Date: Thu, 2 Mar 2023 11:00:32 +1100 Subject: [PATCH] Add import extension to es plugin also Signed-off-by: Michael Nelson --- cmd/kubeapps-apis/buf.gen.yaml | 4 +++- .../gen/kubeappsapis/core/packages/v1alpha1/packages_pb.ts | 4 ++-- .../kubeappsapis/core/packages/v1alpha1/repositories_pb.ts | 6 +++--- .../gen/kubeappsapis/core/plugins/v1alpha1/plugins_pb.ts | 2 +- .../plugins/fluxv2/packages/v1alpha1/fluxv2_pb.ts | 2 +- .../kubeappsapis/plugins/helm/packages/v1alpha1/helm_pb.ts | 6 +++--- .../kapp_controller/packages/v1alpha1/kapp_controller_pb.ts | 2 +- .../kubeappsapis/plugins/resources/v1alpha1/resources_pb.ts | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/cmd/kubeapps-apis/buf.gen.yaml b/cmd/kubeapps-apis/buf.gen.yaml index 3cf7ef633c3..2965d52e2af 100644 --- a/cmd/kubeapps-apis/buf.gen.yaml +++ b/cmd/kubeapps-apis/buf.gen.yaml @@ -52,7 +52,9 @@ plugins: - esModuleInterop=true # use imports as required in modern ts setups - useOptionals=messages # use optional TypeScript properties instead of undefined - name: es - opt: target=ts + opt: + - target=ts + - import_extension=none out: ../../dashboard/src/gen path: ../../dashboard/node_modules/.bin/protoc-gen-es - name: connect-es diff --git a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages_pb.ts b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages_pb.ts index a655c4207c7..dde03ab66ac 100644 --- a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages_pb.ts +++ b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/packages_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/core/packages/v1alpha1/packages.proto (package kubeappsapis.core.packages.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -15,7 +15,7 @@ import type { PlainMessage, } from "@bufbuild/protobuf"; import { Any, Message, proto3 } from "@bufbuild/protobuf"; -import { Plugin } from "../../plugins/v1alpha1/plugins_pb.js"; +import { Plugin } from "../../plugins/v1alpha1/plugins_pb"; /** * GetAvailablePackageSummariesRequest diff --git a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories_pb.ts b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories_pb.ts index 6a4fa60b35a..1b2585295c1 100644 --- a/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories_pb.ts +++ b/dashboard/src/gen/kubeappsapis/core/packages/v1alpha1/repositories_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/core/packages/v1alpha1/repositories.proto (package kubeappsapis.core.packages.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -15,8 +15,8 @@ import type { PlainMessage, } from "@bufbuild/protobuf"; import { Any, Message, proto3 } from "@bufbuild/protobuf"; -import { Context } from "./packages_pb.js"; -import { Plugin } from "../../plugins/v1alpha1/plugins_pb.js"; +import { Context } from "./packages_pb"; +import { Plugin } from "../../plugins/v1alpha1/plugins_pb"; /** * AddPackageRepositoryRequest diff --git a/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins_pb.ts b/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins_pb.ts index 58256e2818d..16329e6ecde 100644 --- a/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins_pb.ts +++ b/dashboard/src/gen/kubeappsapis/core/plugins/v1alpha1/plugins_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/core/plugins/v1alpha1/plugins.proto (package kubeappsapis.core.plugins.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2_pb.ts b/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2_pb.ts index 99c2f9ee653..5b0f53483c1 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2_pb.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/plugins/fluxv2/packages/v1alpha1/fluxv2.proto (package kubeappsapis.plugins.fluxv2.packages.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm_pb.ts b/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm_pb.ts index 10602c874cd..3bd29841a96 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm_pb.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/helm/packages/v1alpha1/helm_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/plugins/helm/packages/v1alpha1/helm.proto (package kubeappsapis.plugins.helm.packages.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -15,8 +15,8 @@ import type { PlainMessage, } from "@bufbuild/protobuf"; import { Message, proto3 } from "@bufbuild/protobuf"; -import { InstalledPackageReference } from "../../../../core/packages/v1alpha1/packages_pb.js"; -import { DockerCredentials } from "../../../../core/packages/v1alpha1/repositories_pb.js"; +import { InstalledPackageReference } from "../../../../core/packages/v1alpha1/packages_pb"; +import { DockerCredentials } from "../../../../core/packages/v1alpha1/repositories_pb"; /** * InstalledPackageDetailCustomDataHelm diff --git a/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller_pb.ts b/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller_pb.ts index 7df78b60614..e34ab66e83a 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller_pb.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/plugins/kapp_controller/packages/v1alpha1/kapp_controller.proto (package kubeappsapis.plugins.kapp_controller.packages.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources_pb.ts b/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources_pb.ts index aaea8526649..ab027930cb0 100644 --- a/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources_pb.ts +++ b/dashboard/src/gen/kubeappsapis/plugins/resources/v1alpha1/resources_pb.ts @@ -1,7 +1,7 @@ // Copyright 2021-2022 the Kubeapps contributors. // SPDX-License-Identifier: Apache-2.0 -// @generated by protoc-gen-es v1.0.0 with parameter "target=ts" +// @generated by protoc-gen-es v1.0.0 with parameter "target=ts,import_extension=none" // @generated from file kubeappsapis/plugins/resources/v1alpha1/resources.proto (package kubeappsapis.plugins.resources.v1alpha1, syntax proto3) /* eslint-disable */ // @ts-nocheck @@ -19,7 +19,7 @@ import { Context, InstalledPackageReference, ResourceRef, -} from "../../../core/packages/v1alpha1/packages_pb.js"; +} from "../../../core/packages/v1alpha1/packages_pb"; /** * SecretType