From d6cd621b2c488f22e21a6d6558c20b909ab58c1a Mon Sep 17 00:00:00 2001 From: Augustin Husson Date: Thu, 18 Jun 2026 15:04:59 +0200 Subject: [PATCH] bump perses/spec Signed-off-by: Augustin Husson --- client/package.json | 2 +- client/src/model/http.ts | 6 ------ components/package.json | 2 +- cue/common/proxy/proxy.cue | 6 +++--- cue/cue.mod/module.cue | 2 +- dashboards/package.json | 2 +- package-lock.json | 14 +++++++------- plugin-system/package.json | 2 +- .../HTTPSettingsEditor/HTTPSettingsEditor.test.tsx | 2 +- .../HTTPSettingsEditor/HTTPSettingsEditor.tsx | 5 +++-- 10 files changed, 19 insertions(+), 24 deletions(-) diff --git a/client/package.json b/client/package.json index 7f91c0e9..bdd6c42c 100644 --- a/client/package.json +++ b/client/package.json @@ -15,7 +15,7 @@ "main": "dist/cjs/index.js", "types": "dist/index.d.ts", "dependencies": { - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "zod": "^3.21.4" }, "scripts": { diff --git a/client/src/model/http.ts b/client/src/model/http.ts index ac91d3e2..ef0bca5e 100644 --- a/client/src/model/http.ts +++ b/client/src/model/http.ts @@ -11,10 +11,4 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { HTTPProxy } from '@perses-dev/spec'; - export type RequestHeaders = Record; -export interface HTTPDatasourceSpec { - directUrl?: string; - proxy?: HTTPProxy; -} diff --git a/components/package.json b/components/package.json index b3e51fe1..6e2f1142 100644 --- a/components/package.json +++ b/components/package.json @@ -34,7 +34,7 @@ "@date-fns/tz": "^1.4.1", "@fontsource/inter": "^5.0.0", "@mui/x-date-pickers": "^7.23.1", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "@perses-dev/client": "0.54.0-beta.7", "numbro": "^2.3.6", "@tanstack/match-sorter-utils": "^8.19.4", diff --git a/cue/common/proxy/proxy.cue b/cue/common/proxy/proxy.cue index a7e5a5c5..3fd909fa 100644 --- a/cue/common/proxy/proxy.cue +++ b/cue/common/proxy/proxy.cue @@ -22,7 +22,7 @@ package proxy import ( - specCommon "github.com/perses/spec/cue/common" + "github.com/perses/spec/cue/datasource" httpProxy "github.com/perses/spec/cue/datasource/proxy/http" sqlProxy "github.com/perses/spec/cue/datasource/proxy/sql" ) @@ -31,7 +31,7 @@ import ( #HTTPProxy: httpProxy.#Proxy -#baseHTTPDatasourceSpec: { directUrl: specCommon.#URL } | { proxy: #HTTPProxy } +#baseHTTPDatasourceSpec: datasource.#HTTPDatasourceSpec #MySQL: sqlProxy.#MySQLConfig @@ -39,4 +39,4 @@ import ( #SQLProxy: sqlProxy.#Proxy -#baseSQLDatasourceSpec: { driver: "mysql" | "mariadb" | "postgres", host: string, database: string } | { proxy: #SQLProxy } +#baseSQLDatasourceSpec: datasource.#SQLDatasourceSpec diff --git a/cue/cue.mod/module.cue b/cue/cue.mod/module.cue index f3a82095..1fc7fb85 100644 --- a/cue/cue.mod/module.cue +++ b/cue/cue.mod/module.cue @@ -7,7 +7,7 @@ source: { } deps: { "github.com/perses/spec/cue@v0": { - v: "v0.2.0-beta.3" + v: "v0.2.0-beta.6" default: true } } diff --git a/dashboards/package.json b/dashboards/package.json index 3b767a5a..4e6b6a8f 100644 --- a/dashboards/package.json +++ b/dashboards/package.json @@ -31,7 +31,7 @@ "dependencies": { "@perses-dev/components": "0.54.0-beta.7", "@perses-dev/plugin-system": "0.54.0-beta.7", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "@perses-dev/client": "0.54.0-beta.7", "@tanstack/hotkeys": "^0.8.0", "@tanstack/react-hotkeys": "^0.9.1", diff --git a/package-lock.json b/package-lock.json index 80f59fa6..dc3fbb28 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "version": "0.54.0-beta.7", "license": "Apache-2.0", "dependencies": { - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "zod": "^3.21.4" } }, @@ -74,7 +74,7 @@ "@fontsource/inter": "^5.0.0", "@mui/x-date-pickers": "^7.23.1", "@perses-dev/client": "0.54.0-beta.7", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "@tanstack/match-sorter-utils": "^8.19.4", "@tanstack/react-table": "^8.20.5", "@uiw/react-codemirror": "^4.19.1", @@ -111,7 +111,7 @@ "@perses-dev/client": "0.54.0-beta.7", "@perses-dev/components": "0.54.0-beta.7", "@perses-dev/plugin-system": "0.54.0-beta.7", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "@tanstack/hotkeys": "^0.8.0", "@tanstack/react-hotkeys": "^0.9.1", "immer": "^10.1.1", @@ -3354,9 +3354,9 @@ "link": true }, "node_modules/@perses-dev/spec": { - "version": "0.2.0-beta.3", - "resolved": "https://registry.npmjs.org/@perses-dev/spec/-/spec-0.2.0-beta.3.tgz", - "integrity": "sha512-04xxEAWt6n2lndYAdDz2lXOZozXKwBCq3Sw8uEwEKXtZNp6mxAKltofM5yJKFgfrWFav55lX1kYSwYG8nDk/+A==", + "version": "0.2.0-beta.6", + "resolved": "https://registry.npmjs.org/@perses-dev/spec/-/spec-0.2.0-beta.6.tgz", + "integrity": "sha512-J8oWuZgc/0nlT8PDlEIahA7XZ/tKITC9C0FG7e+FFhYGRzZ5oyMz2keuPkAzl3KPYB9yeczit9TFQWsoY/ot5Q==", "license": "Apache-2.0", "dependencies": { "date-fns": "^4.1.0", @@ -15692,7 +15692,7 @@ "@perses-dev/client": "0.54.0-beta.7", "@perses-dev/components": "0.54.0-beta.7", "@perses-dev/core": "0.53.0", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "date-fns": "^4.1.0", "date-fns-tz": "^3.2.0", "immer": "^10.1.1", diff --git a/plugin-system/package.json b/plugin-system/package.json index ec47ee08..8c67806a 100644 --- a/plugin-system/package.json +++ b/plugin-system/package.json @@ -31,7 +31,7 @@ "@module-federation/enhanced": "^2.3.3", "@perses-dev/components": "0.54.0-beta.7", "@perses-dev/core": "0.53.0", - "@perses-dev/spec": "0.2.0-beta.3", + "@perses-dev/spec": "0.2.0-beta.6", "@perses-dev/client": "0.54.0-beta.7", "date-fns": "^4.1.0", "date-fns-tz": "^3.2.0", diff --git a/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.test.tsx b/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.test.tsx index 105b957c..60b850af 100644 --- a/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.test.tsx +++ b/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.test.tsx @@ -15,7 +15,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { FormProvider, useForm } from 'react-hook-form'; import { ReactElement } from 'react'; -import { HTTPDatasourceSpec } from '@perses-dev/client'; +import { HTTPDatasourceSpec } from '@perses-dev/spec'; import { HTTPSettingsEditor } from './HTTPSettingsEditor'; describe('HTTPSettingsEditor - Request Headers', () => { diff --git a/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.tsx b/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.tsx index 7b2438a4..7fc1012f 100644 --- a/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.tsx +++ b/plugin-system/src/components/HTTPSettingsEditor/HTTPSettingsEditor.tsx @@ -14,10 +14,11 @@ import { Grid, IconButton, MenuItem, TextField, Typography } from '@mui/material'; import React, { Fragment, ReactElement, useState } from 'react'; import { produce } from 'immer'; -import { Controller, useForm, useFieldArray } from 'react-hook-form'; +import { Controller, useFieldArray, useForm } from 'react-hook-form'; import MinusIcon from 'mdi-material-ui/Minus'; import PlusIcon from 'mdi-material-ui/Plus'; -import { HTTPDatasourceSpec, RequestHeaders } from '@perses-dev/client'; +import { HTTPDatasourceSpec } from '@perses-dev/spec'; +import { RequestHeaders } from '@perses-dev/client'; import { OptionsEditorRadios } from '../OptionsEditorRadios'; type HeaderEntry = {