From 963956b0e8a6fa35cf9f5b64cbff28b86dc78b9a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 10 Dec 2023 16:53:28 +0000 Subject: [PATCH 1/8] fix: upgrade prettier from 3.0.3 to 3.1.0 Snyk has created this PR to upgrade prettier from 3.0.3 to 3.1.0. See this package in npm: https://www.npmjs.com/package/prettier See this project in Snyk: https://app.snyk.io/org/dash0-zmw/project/4ca001f2-f267-42d6-ba80-d82e1d19f207?utm_source=github&utm_medium=referral&page=upgrade-pr --- packages/otelbin/package-lock.json | 8 ++++---- packages/otelbin/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/otelbin/package-lock.json b/packages/otelbin/package-lock.json index f17dd027..38e50dc7 100644 --- a/packages/otelbin/package-lock.json +++ b/packages/otelbin/package-lock.json @@ -70,7 +70,7 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "postcss": "^8.4.30", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "prettier-plugin-tailwindcss": "^0.5.7", "tailwindcss": "^3.3.5", "ts-node": "^10.9.1", @@ -10941,9 +10941,9 @@ } }, "node_modules/prettier": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", + "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/packages/otelbin/package.json b/packages/otelbin/package.json index 1f9743e4..2846f66c 100644 --- a/packages/otelbin/package.json +++ b/packages/otelbin/package.json @@ -76,7 +76,7 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "postcss": "^8.4.30", - "prettier": "^3.0.3", + "prettier": "^3.1.0", "prettier-plugin-tailwindcss": "^0.5.7", "tailwindcss": "^3.3.5", "ts-node": "^10.9.1", From fd922b91eac3cc9961ab1d30371342d2438a9528 Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 11:06:15 +0100 Subject: [PATCH 2/8] Fix linting rule and use next/image instead of --- packages/otelbin/src/components/share/ShareContent.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/otelbin/src/components/share/ShareContent.tsx b/packages/otelbin/src/components/share/ShareContent.tsx index 34986b83..40d8d6b8 100644 --- a/packages/otelbin/src/components/share/ShareContent.tsx +++ b/packages/otelbin/src/components/share/ShareContent.tsx @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: 2023 Dash0 Inc. // SPDX-License-Identifier: Apache-2.0 +import Image from "next/image"; import { SignInButton, useAuth } from "@clerk/nextjs"; import { Button } from "~/components/button"; import { ArrowDownToLine, Copy, LogIn } from "lucide-react"; @@ -52,7 +53,7 @@ export function ShareContent() {

Link to this configuration with a badge.

- OpenTelemetry collector configuration on OTelBin Date: Mon, 18 Dec 2023 11:10:42 +0100 Subject: [PATCH 3/8] Fix Warning: Forbidden non-null assertion. --- packages/otelbin/src/components/legal/LegalContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/otelbin/src/components/legal/LegalContent.tsx b/packages/otelbin/src/components/legal/LegalContent.tsx index 5729e564..c555e86a 100644 --- a/packages/otelbin/src/components/legal/LegalContent.tsx +++ b/packages/otelbin/src/components/legal/LegalContent.tsx @@ -11,7 +11,7 @@ export function LegalContent() { .filter((doc) => Boolean(doc.url)) .map((doc) => (
  • - + {doc.label}
    • From 2244ab4bd0a3aa20f953c435d89d4be64f137113 Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 11:15:11 +0100 Subject: [PATCH 4/8] disable typescript-eslint/no-explicit-any --- packages/otelbin/.eslintrc.cjs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/otelbin/.eslintrc.cjs b/packages/otelbin/.eslintrc.cjs index 05746a38..48d40aeb 100644 --- a/packages/otelbin/.eslintrc.cjs +++ b/packages/otelbin/.eslintrc.cjs @@ -21,6 +21,7 @@ const config = { plugins: ["@typescript-eslint", "header"], extends: ["next/core-web-vitals", "plugin:@typescript-eslint/recommended"], rules: { + "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/consistent-type-imports": [ "warn", { From eeaaecb97c8486366e0b98efdac1b1314b3235c6 Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 13:52:29 +0100 Subject: [PATCH 5/8] Ran prettier --- packages/otelbin/package-lock.json | 8 ++++---- packages/otelbin/package.json | 2 +- .../otelbin/src/components/react-flow/node-types/Node.tsx | 4 ++-- packages/otelbin/src/components/share/ShareContent.tsx | 2 +- packages/otelbin/src/components/use-toast.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/otelbin/package-lock.json b/packages/otelbin/package-lock.json index a5e382e5..6ed877f0 100644 --- a/packages/otelbin/package-lock.json +++ b/packages/otelbin/package-lock.json @@ -71,7 +71,7 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "postcss": "^8.4.30", - "prettier": "^3.1.0", + "prettier": "3.1.1", "prettier-plugin-tailwindcss": "^0.5.7", "tailwindcss": "^3.3.5", "ts-node": "^10.9.1", @@ -10958,9 +10958,9 @@ } }, "node_modules/prettier": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz", - "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" diff --git a/packages/otelbin/package.json b/packages/otelbin/package.json index 8cd02a28..4fe9752a 100644 --- a/packages/otelbin/package.json +++ b/packages/otelbin/package.json @@ -77,7 +77,7 @@ "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "postcss": "^8.4.30", - "prettier": "^3.1.0", + "prettier": "3.1.1", "prettier-plugin-tailwindcss": "^0.5.7", "tailwindcss": "^3.3.5", "ts-node": "^10.9.1", diff --git a/packages/otelbin/src/components/react-flow/node-types/Node.tsx b/packages/otelbin/src/components/react-flow/node-types/Node.tsx index 1ed70f3c..99fd34a5 100644 --- a/packages/otelbin/src/components/react-flow/node-types/Node.tsx +++ b/packages/otelbin/src/components/react-flow/node-types/Node.tsx @@ -75,8 +75,8 @@ const Node = ({ isConnector && (type === "exporter" || type === "receiver") ? "bg-green-500 text-green-950" : type === "processor" - ? "bg-blue-500" - : "bg-violet-500" + ? "bg-blue-500" + : "bg-violet-500" } text-xs font-medium h-[35%] overflow-hidden whitespace-nowrap overflow-ellipsis w-full flex items-center justify-center`} > diff --git a/packages/otelbin/src/components/share/ShareContent.tsx b/packages/otelbin/src/components/share/ShareContent.tsx index 40d8d6b8..cee4c6d5 100644 --- a/packages/otelbin/src/components/share/ShareContent.tsx +++ b/packages/otelbin/src/components/share/ShareContent.tsx @@ -28,7 +28,7 @@ export function ShareContent() { url: `/s/new`, method: "POST", body: fullURL, - } + } : undefined, fetcher ); diff --git a/packages/otelbin/src/components/use-toast.ts b/packages/otelbin/src/components/use-toast.ts index 1fd6c9ec..eda99f65 100644 --- a/packages/otelbin/src/components/use-toast.ts +++ b/packages/otelbin/src/components/use-toast.ts @@ -105,7 +105,7 @@ export const reducer = (state: State, action: Action): State => { ? { ...t, open: false, - } + } : t ), }; From 616695a20b352f04e56e32b385ba551cd7b3e72a Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 13:59:07 +0100 Subject: [PATCH 6/8] Prefer using nullish coalescing operator (??) instead of a logical or (||), as it is a safer operator --- packages/otelbin/src/components/legal/LegalContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/otelbin/src/components/legal/LegalContent.tsx b/packages/otelbin/src/components/legal/LegalContent.tsx index c555e86a..4249ae66 100644 --- a/packages/otelbin/src/components/legal/LegalContent.tsx +++ b/packages/otelbin/src/components/legal/LegalContent.tsx @@ -11,7 +11,7 @@ export function LegalContent() { .filter((doc) => Boolean(doc.url)) .map((doc) => (
  • - + {doc.label}
    • From 6679c077189c8da4c5a4bd8435a41d2187ada784 Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 15:44:42 +0100 Subject: [PATCH 7/8] Update .eslintrc.cjs --- packages/otelbin/.eslintrc.cjs | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/otelbin/.eslintrc.cjs b/packages/otelbin/.eslintrc.cjs index 48d40aeb..05746a38 100644 --- a/packages/otelbin/.eslintrc.cjs +++ b/packages/otelbin/.eslintrc.cjs @@ -21,7 +21,6 @@ const config = { plugins: ["@typescript-eslint", "header"], extends: ["next/core-web-vitals", "plugin:@typescript-eslint/recommended"], rules: { - "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/consistent-type-imports": [ "warn", { From c705f5393dc70add3f2e20d3cee709d92b07d44c Mon Sep 17 00:00:00 2001 From: Marcel Birkner Date: Mon, 18 Dec 2023 15:47:55 +0100 Subject: [PATCH 8/8] Update ShareContent.tsx --- packages/otelbin/src/components/share/ShareContent.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/otelbin/src/components/share/ShareContent.tsx b/packages/otelbin/src/components/share/ShareContent.tsx index cee4c6d5..03204a6e 100644 --- a/packages/otelbin/src/components/share/ShareContent.tsx +++ b/packages/otelbin/src/components/share/ShareContent.tsx @@ -1,7 +1,6 @@ // SPDX-FileCopyrightText: 2023 Dash0 Inc. // SPDX-License-Identifier: Apache-2.0 -import Image from "next/image"; import { SignInButton, useAuth } from "@clerk/nextjs"; import { Button } from "~/components/button"; import { ArrowDownToLine, Copy, LogIn } from "lucide-react"; @@ -53,7 +52,7 @@ export function ShareContent() {

    Link to this configuration with a badge.

    -