From 623950621eea1d98d3122ad73b0c2a0bb6a3e28c Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Thu, 31 Oct 2024 09:38:52 +0100 Subject: [PATCH 1/3] removed unnecessary console logs --- biome.json | 6 +- package-lock.json | 85 ++++++++++++++------------ package.json | 2 +- scripts/icons.ts | 2 + scripts/setup.ts | 2 + src/client/components/jsonRenderer.tsx | 1 - src/server/logger.ts | 3 +- src/vite/plugin.tsx | 1 + 8 files changed, 60 insertions(+), 42 deletions(-) diff --git a/biome.json b/biome.json index 5262369..f2f749d 100644 --- a/biome.json +++ b/biome.json @@ -25,7 +25,11 @@ "recommended": true, "suspicious": { "recommended": true, - "noExplicitAny": "off" + "noExplicitAny": "off", + "noConsole": { + "level": "error", + "options": { "allow": ["assert", "error", "info", "warn"] } + } }, "style": { "recommended": true diff --git a/package-lock.json b/package-lock.json index 54f0dc9..41b047e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "remix-development-tools", - "version": "4.7.2", + "version": "4.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "remix-development-tools", - "version": "4.7.2", + "version": "4.7.3", "license": "MIT", "workspaces": [ ".", @@ -28,7 +28,7 @@ "tailwind-merge": "^1.14.0" }, "devDependencies": { - "@biomejs/biome": "1.8.3", + "@biomejs/biome": "^1.9.4", "@remix-run/dev": "^2.9.1", "@remix-run/node": "^2.9.1", "@remix-run/react": "^2.9.1", @@ -3308,11 +3308,12 @@ "dev": true }, "node_modules/@biomejs/biome": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.8.3.tgz", - "integrity": "sha512-/uUV3MV+vyAczO+vKrPdOW0Iaet7UnJMU4bNMinggGJTAnBPjCoLEYcyYtYHNnUNYlv4xZMH6hVIQCAozq8d5w==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.9.4.tgz", + "integrity": "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==", "dev": true, "hasInstallScript": true, + "license": "MIT OR Apache-2.0", "bin": { "biome": "bin/biome" }, @@ -3324,24 +3325,25 @@ "url": "https://opencollective.com/biome" }, "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "1.8.3", - "@biomejs/cli-darwin-x64": "1.8.3", - "@biomejs/cli-linux-arm64": "1.8.3", - "@biomejs/cli-linux-arm64-musl": "1.8.3", - "@biomejs/cli-linux-x64": "1.8.3", - "@biomejs/cli-linux-x64-musl": "1.8.3", - "@biomejs/cli-win32-arm64": "1.8.3", - "@biomejs/cli-win32-x64": "1.8.3" + "@biomejs/cli-darwin-arm64": "1.9.4", + "@biomejs/cli-darwin-x64": "1.9.4", + "@biomejs/cli-linux-arm64": "1.9.4", + "@biomejs/cli-linux-arm64-musl": "1.9.4", + "@biomejs/cli-linux-x64": "1.9.4", + "@biomejs/cli-linux-x64-musl": "1.9.4", + "@biomejs/cli-win32-arm64": "1.9.4", + "@biomejs/cli-win32-x64": "1.9.4" } }, "node_modules/@biomejs/cli-darwin-arm64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.8.3.tgz", - "integrity": "sha512-9DYOjclFpKrH/m1Oz75SSExR8VKvNSSsLnVIqdnKexj6NwmiMlKk94Wa1kZEdv6MCOHGHgyyoV57Cw8WzL5n3A==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.9.4.tgz", + "integrity": "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "darwin" @@ -3351,13 +3353,14 @@ } }, "node_modules/@biomejs/cli-darwin-x64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.8.3.tgz", - "integrity": "sha512-UeW44L/AtbmOF7KXLCoM+9PSgPo0IDcyEUfIoOXYeANaNXXf9mLUwV1GeF2OWjyic5zj6CnAJ9uzk2LT3v/wAw==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.9.4.tgz", + "integrity": "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "darwin" @@ -3367,13 +3370,14 @@ } }, "node_modules/@biomejs/cli-linux-arm64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.8.3.tgz", - "integrity": "sha512-fed2ji8s+I/m8upWpTJGanqiJ0rnlHOK3DdxsyVLZQ8ClY6qLuPc9uehCREBifRJLl/iJyQpHIRufLDeotsPtw==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.9.4.tgz", + "integrity": "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "linux" @@ -3383,13 +3387,14 @@ } }, "node_modules/@biomejs/cli-linux-arm64-musl": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.8.3.tgz", - "integrity": "sha512-9yjUfOFN7wrYsXt/T/gEWfvVxKlnh3yBpnScw98IF+oOeCYb5/b/+K7YNqKROV2i1DlMjg9g/EcN9wvj+NkMuQ==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.9.4.tgz", + "integrity": "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "linux" @@ -3399,13 +3404,14 @@ } }, "node_modules/@biomejs/cli-linux-x64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.8.3.tgz", - "integrity": "sha512-I8G2QmuE1teISyT8ie1HXsjFRz9L1m5n83U1O6m30Kw+kPMPSKjag6QGUn+sXT8V+XWIZxFFBoTDEDZW2KPDDw==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.9.4.tgz", + "integrity": "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "linux" @@ -3415,13 +3421,14 @@ } }, "node_modules/@biomejs/cli-linux-x64-musl": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.8.3.tgz", - "integrity": "sha512-UHrGJX7PrKMKzPGoEsooKC9jXJMa28TUSMjcIlbDnIO4EAavCoVmNQaIuUSH0Ls2mpGMwUIf+aZJv657zfWWjA==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.9.4.tgz", + "integrity": "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "linux" @@ -3431,13 +3438,14 @@ } }, "node_modules/@biomejs/cli-win32-arm64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.8.3.tgz", - "integrity": "sha512-J+Hu9WvrBevfy06eU1Na0lpc7uR9tibm9maHynLIoAjLZpQU3IW+OKHUtyL8p6/3pT2Ju5t5emReeIS2SAxhkQ==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.9.4.tgz", + "integrity": "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "win32" @@ -3447,13 +3455,14 @@ } }, "node_modules/@biomejs/cli-win32-x64": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.8.3.tgz", - "integrity": "sha512-/PJ59vA1pnQeKahemaQf4Nyj7IKUvGQSc3Ze1uIGi+Wvr1xF7rGobSrAAG01T/gUDG21vkDsZYM03NAmPiVkqg==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.9.4.tgz", + "integrity": "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT OR Apache-2.0", "optional": true, "os": [ "win32" diff --git a/package.json b/package.json index d6cbe15..c58b6e1 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "vite": ">=5.0.0" }, "devDependencies": { - "@biomejs/biome": "1.8.3", + "@biomejs/biome": "^1.9.4", "@remix-run/dev": "^2.9.1", "@remix-run/node": "^2.9.1", "@remix-run/react": "^2.9.1", diff --git a/scripts/icons.ts b/scripts/icons.ts index 05ef83a..ac6b3c7 100644 --- a/scripts/icons.ts +++ b/scripts/icons.ts @@ -12,10 +12,12 @@ const files = glob.sync("**/*.svg", { cwd: inputDir, }) if (files.length === 0) { + // biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log(`No SVG files found in ${inputDirRelative}`) process.exit(0) } // The relative paths are just for cleaner logs +// biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log(`Generating sprite for ${inputDirRelative}`) generateSvgSprite({ diff --git a/scripts/setup.ts b/scripts/setup.ts index b69d745..4d34962 100644 --- a/scripts/setup.ts +++ b/scripts/setup.ts @@ -3,6 +3,7 @@ import chalk from "chalk" import prompt from "prompt" // Helper method used to verify the run const verifyRun = async () => { + // biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log("About to execute the command") const { sure } = await prompt.get([ @@ -10,6 +11,7 @@ const verifyRun = async () => { ]) if (sure !== "y") { + // biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log(chalk.bold.red("Command aborted!\n")) process.exit(1) } diff --git a/src/client/components/jsonRenderer.tsx b/src/client/components/jsonRenderer.tsx index 0ecf297..8763124 100644 --- a/src/client/components/jsonRenderer.tsx +++ b/src/client/components/jsonRenderer.tsx @@ -30,7 +30,6 @@ const JsonRenderer = ({ data }: JsonRendererProps) => { value .then((res) => { if (!ref.current) return - console.log(res) setJson((json: any) => ({ ...json, [key]: res, diff --git a/src/server/logger.ts b/src/server/logger.ts index 45f9788..d63c1ac 100644 --- a/src/server/logger.ts +++ b/src/server/logger.ts @@ -6,7 +6,8 @@ const log = (message: string) => { if (config.silent) { return } - // eslint-disable-next-line no-console + + // biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log(message) } diff --git a/src/vite/plugin.tsx b/src/vite/plugin.tsx index 77cc8a8..61d8f07 100644 --- a/src/vite/plugin.tsx +++ b/src/vite/plugin.tsx @@ -175,6 +175,7 @@ export const remixDevTools: (args?: RemixViteConfig) => Plugin[] = (args) => { async configResolved(resolvedViteConfig) { if (!args?.suppressDeprecationWarning && resolvedViteConfig.appType === "custom") { // Log a warning message + // biome-ignore lint/suspicious/noConsole: disable noConsole rule for this line console.log( `\n\n⚠️ ${chalk.yellowBright("remix-development-tools")} are going to be deprecated and will be renamed to ${chalk.greenBright("react-router-devtools ")} when React Router v7 is released ⚠️`, `\n⚠️ Set suppressDeprecationWarning to true in your ${chalk.greenBright("vite.config.ts")} file to silence this warning ⚠️` From e59d174751b0898119c6a252c22fd6efbb53dd80 Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Thu, 31 Oct 2024 10:01:45 +0100 Subject: [PATCH 2/3] format fix --- src/client/hooks/useDevServerConnection.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/hooks/useDevServerConnection.ts b/src/client/hooks/useDevServerConnection.ts index fd67200..73bfa72 100644 --- a/src/client/hooks/useDevServerConnection.ts +++ b/src/client/hooks/useDevServerConnection.ts @@ -14,7 +14,7 @@ const updateRouteInfo = ( const { data, type } = event const { id, ...rest } = data // Get existing route - const existingRouteInfo = !includeServerInfo ? routes?.[id] : routes?.[id] ?? server?.routes?.[id] + const existingRouteInfo = !includeServerInfo ? routes?.[id] : (routes?.[id] ?? server?.routes?.[id]) let newRouteData = [...(existingRouteInfo?.[type === "loader" ? "loaders" : "actions"] || []), rest] // Makes sure there are no more than 20 entries per loader/action newRouteData = cutArrayToLastN(newRouteData, 20) @@ -40,10 +40,10 @@ const updateRouteInfo = ( highestExecutionTime: max, averageExecutionTime: Number(Number(total / newRouteData.length).toFixed(2)), loaderTriggerCount: type === "loader" ? loaderTriggerCount + 1 : loaderTriggerCount, - loaders: type === "loader" ? newRouteData : existingRouteInfo?.loaders ?? [], - actions: type === "action" ? newRouteData : existingRouteInfo?.actions ?? [], - lastLoader: type === "loader" ? rest : existingRouteInfo?.lastLoader ?? {}, - lastAction: type === "action" ? rest : existingRouteInfo?.lastAction ?? {}, + loaders: type === "loader" ? newRouteData : (existingRouteInfo?.loaders ?? []), + actions: type === "action" ? newRouteData : (existingRouteInfo?.actions ?? []), + lastLoader: type === "loader" ? rest : (existingRouteInfo?.lastLoader ?? {}), + lastAction: type === "action" ? rest : (existingRouteInfo?.lastAction ?? {}), actionTriggerCount: type === "action" ? actionTriggerCount + 1 : actionTriggerCount, } } From 53b962da1d4e03e0e323f54d1955e82af566e7ba Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Thu, 31 Oct 2024 10:23:16 +0100 Subject: [PATCH 3/3] updated version in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c58b6e1..bb712af 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "remix-development-tools", "description": "Remix development tools - a set of tools for developing/debugging Remix.run apps", "author": "Alem Tuzlak", - "version": "4.7.3", + "version": "4.7.4", "license": "MIT", "keywords": [ "remix",