From 68d6990fce855f8212f9d98cf911386542e6ec90 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Mon, 26 Jan 2026 01:13:42 +0800 Subject: [PATCH] Minor refactor to browser prettier setup (#18749) --- eslint.config.js | 2 +- knip.config.js | 2 +- .../browser-prettier.js | 15 ++++++--------- .../{browser => browser-prettier}/browser.js | 0 .../{browser => browser-prettier}/index.html | 0 .../config/{browser => browser-prettier}/main.js | 0 .../{browser => browser-prettier}/server.js | 0 .../config/{browser => browser-prettier}/start.js | 0 .../{browser => browser-prettier}/utilities.js | 0 tests/config/get-prettier.js | 4 +--- tests/config/install-browser.js | 2 +- 11 files changed, 10 insertions(+), 15 deletions(-) rename tests/config/{browser => browser-prettier}/browser-prettier.js (85%) rename tests/config/{browser => browser-prettier}/browser.js (100%) rename tests/config/{browser => browser-prettier}/index.html (100%) rename tests/config/{browser => browser-prettier}/main.js (100%) rename tests/config/{browser => browser-prettier}/server.js (100%) rename tests/config/{browser => browser-prettier}/start.js (100%) rename tests/config/{browser => browser-prettier}/utilities.js (100%) diff --git a/eslint.config.js b/eslint.config.js index c0ae61ce4..b8f4720e4 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -320,7 +320,7 @@ const configs = [ "scripts/**/*", "benchmarks/**", "tests/config/install-prettier.js", - "tests/config/browser/**/*", + "tests/config/browser-prettier/**/*", ], rules: { "no-console": "off", diff --git a/knip.config.js b/knip.config.js index 3f639525f..0532462d4 100644 --- a/knip.config.js +++ b/knip.config.js @@ -20,7 +20,7 @@ const config = { "src/experimental-cli/index.js", // Tests - "tests/config/browser/**", + "tests/config/browser-prettier/**", ], project: ["src/**", "scripts/**"], ignore: [ diff --git a/tests/config/browser/browser-prettier.js b/tests/config/browser-prettier/browser-prettier.js similarity index 85% rename from tests/config/browser/browser-prettier.js rename to tests/config/browser-prettier/browser-prettier.js index 2ae4d4cfa..9940eb4be 100644 --- a/tests/config/browser/browser-prettier.js +++ b/tests/config/browser-prettier/browser-prettier.js @@ -52,12 +52,9 @@ const proxyFunction = (accessPath, optionsIndex = 1) => }, ); -const prettier = { - formatWithCursor: proxyFunction("formatWithCursor"), - getSupportInfo: proxyFunction("getSupportInfo", /* optionsIndex */ 0), - __debug: { - parse: proxyFunction("__debug.parse"), - }, -}; - -export { prettier }; +export const formatWithCursor = proxyFunction("formatWithCursor"); +export const getSupportInfo = proxyFunction( + "getSupportInfo", + /* optionsIndex */ 0, +); +export const __debug = { parse: proxyFunction("__debug.parse") }; diff --git a/tests/config/browser/browser.js b/tests/config/browser-prettier/browser.js similarity index 100% rename from tests/config/browser/browser.js rename to tests/config/browser-prettier/browser.js diff --git a/tests/config/browser/index.html b/tests/config/browser-prettier/index.html similarity index 100% rename from tests/config/browser/index.html rename to tests/config/browser-prettier/index.html diff --git a/tests/config/browser/main.js b/tests/config/browser-prettier/main.js similarity index 100% rename from tests/config/browser/main.js rename to tests/config/browser-prettier/main.js diff --git a/tests/config/browser/server.js b/tests/config/browser-prettier/server.js similarity index 100% rename from tests/config/browser/server.js rename to tests/config/browser-prettier/server.js diff --git a/tests/config/browser/start.js b/tests/config/browser-prettier/start.js similarity index 100% rename from tests/config/browser/start.js rename to tests/config/browser-prettier/start.js diff --git a/tests/config/browser/utilities.js b/tests/config/browser-prettier/utilities.js similarity index 100% rename from tests/config/browser/utilities.js rename to tests/config/browser-prettier/utilities.js diff --git a/tests/config/get-prettier.js b/tests/config/get-prettier.js index 28f8bc271..df5e0e083 100644 --- a/tests/config/get-prettier.js +++ b/tests/config/get-prettier.js @@ -3,9 +3,7 @@ import { pathToFileURL } from "node:url"; function getPrettierInternal() { if (process.env.TEST_RUNTIME === "browser") { - return import("./browser/browser-prettier.js").then( - ({ prettier }) => prettier, - ); + return import("./browser-prettier/browser-prettier.js"); } if (process.env.TEST_STANDALONE) { diff --git a/tests/config/install-browser.js b/tests/config/install-browser.js index 2c7d9153d..0608bd123 100644 --- a/tests/config/install-browser.js +++ b/tests/config/install-browser.js @@ -5,7 +5,7 @@ function installBrowserSync() { "make-synchronized", ); const { installBrowser } = makeSynchronized( - new URL("./browser/browser.js", import.meta.url), + new URL("./browser-prettier/browser.js", import.meta.url), ); const browser = process.env.TEST_RUNTIME_BROWSER || "chrome";