From 97ad042170f4c71b518239723b733dd98e8e3e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0?= Date: Sat, 22 Aug 2026 15:36:54 +0900 Subject: [PATCH 1/2] chore: use oxfmt `sortImports` (#23319) --- .oxfmtrc.json | 5 + docs/.vitepress/buildEnd.config.ts | 2 +- docs/.vitepress/config.ts | 10 +- .../theme/components/AsideSponsors.vue | 2 +- .../.vitepress/theme/components/TopBanner.vue | 4 +- docs/.vitepress/theme/composables/sponsor.ts | 2 +- docs/.vitepress/theme/index.ts | 10 +- .../.vitepress/theme/landing/FeatureGrid1.vue | 2 +- .../.vitepress/theme/landing/FeatureGrid2.vue | 2 +- docs/.vitepress/theme/landing/Hero.vue | 2 +- docs/.vitepress/theme/landing/Layout.vue | 16 +- docs/.vitepress/theme/live/Layout.vue | 6 +- docs/.vitepress/theme/live/VideoIframe.vue | 2 +- eslint.config.js | 17 +-- packages/create-vite/src/index.ts | 6 +- .../template-lit-ts/src/my-element.ts | 2 +- .../template-lit/src/my-element.js | 2 +- .../template-preact-ts/src/app.tsx | 2 +- .../template-preact-ts/vite.config.ts | 2 +- .../create-vite/template-preact/src/app.jsx | 2 +- .../template-preact/vite.config.js | 2 +- .../create-vite/template-qwik-ts/src/app.tsx | 2 +- .../template-qwik-ts/vite.config.ts | 2 +- .../create-vite/template-qwik/src/app.jsx | 2 +- .../create-vite/template-qwik/vite.config.js | 2 +- .../create-vite/template-react-ts/src/App.tsx | 2 +- .../template-react-ts/vite.config.ts | 2 +- .../create-vite/template-react/src/App.jsx | 2 +- .../create-vite/template-react/vite.config.js | 2 +- .../create-vite/template-solid-ts/src/App.tsx | 2 +- .../create-vite/template-solid/src/App.jsx | 2 +- .../template-svelte-ts/vite.config.ts | 2 +- .../template-svelte/vite.config.js | 2 +- .../template-vanilla-ts/src/main.ts | 2 +- .../create-vite/template-vanilla/src/main.js | 2 +- .../src/components/HelloWorld.vue | 2 +- .../template-vue-ts/vite.config.ts | 2 +- .../src/components/HelloWorld.vue | 2 +- .../create-vite/template-vue/vite.config.js | 2 +- .../src/__tests__/snippets.spec.ts | 2 +- packages/plugin-legacy/src/index.ts | 18 +-- packages/vite/bin/vite.js | 2 +- packages/vite/rolldown.config.ts | 4 +- packages/vite/rolldown.dts.config.ts | 10 +- packages/vite/rollupLicensePlugin.ts | 4 +- packages/vite/src/client/client.ts | 6 +- .../src/module-runner/evaluatedModules.ts | 4 +- packages/vite/src/module-runner/hmrHandler.ts | 2 +- packages/vite/src/module-runner/runner.ts | 32 ++-- .../module-runner/sourcemap/interceptor.ts | 4 +- packages/vite/src/module-runner/types.ts | 10 +- .../src/node/__tests__/assetSource.spec.ts | 2 +- .../vite/src/node/__tests__/build.spec.ts | 6 +- .../vite/src/node/__tests__/config.spec.ts | 10 +- packages/vite/src/node/__tests__/dev.spec.ts | 2 +- .../src/node/__tests__/environment.spec.ts | 6 +- .../vite/src/node/__tests__/external.spec.ts | 2 +- .../fixtures/config/entry/vite.config.ts | 2 +- packages/vite/src/node/__tests__/html.spec.ts | 2 +- packages/vite/src/node/__tests__/http.spec.ts | 2 +- packages/vite/src/node/__tests__/oxc.spec.ts | 2 +- .../plugins/assetImportMetaUrl.spec.ts | 6 +- .../src/node/__tests__/plugins/css.spec.ts | 6 +- .../plugins/cssPreprocessorTeardown.spec.ts | 2 +- .../src/node/__tests__/plugins/define.spec.ts | 6 +- .../plugins/dynamicImportVar/parse.spec.ts | 2 +- .../src/node/__tests__/plugins/hooks.spec.ts | 8 +- .../plugins/importAnalysisBuild.spec.ts | 2 +- .../plugins/importGlob/fixture.spec.ts | 2 +- .../modulePreloadPolyfill.spec.ts | 2 +- .../__tests__/plugins/pluginFilter.spec.ts | 4 +- .../src/node/__tests__/plugins/terser.spec.ts | 4 +- .../src/node/__tests__/plugins/worker.spec.ts | 2 +- .../plugins/workerImportMetaUrl.spec.ts | 6 +- .../vite/src/node/__tests__/resolve.spec.ts | 4 +- .../src/node/__tests__/runnerImport.spec.ts | 4 +- packages/vite/src/node/__tests__/scan.spec.ts | 2 +- .../vite/src/node/__tests__/shortcuts.spec.ts | 2 +- .../vite/src/node/__tests__/utils.spec.ts | 10 +- .../vite/src/node/__tests_dts__/plugin.ts | 4 +- packages/vite/src/node/baseEnvironment.ts | 2 +- packages/vite/src/node/build.ts | 64 ++++---- packages/vite/src/node/cli.ts | 12 +- packages/vite/src/node/config.ts | 140 +++++++++--------- packages/vite/src/node/env.ts | 2 +- packages/vite/src/node/environment.ts | 4 +- packages/vite/src/node/external.ts | 4 +- packages/vite/src/node/http.ts | 8 +- packages/vite/src/node/idResolver.ts | 10 +- packages/vite/src/node/nativeConfigCompat.ts | 4 +- packages/vite/src/node/optimizer/index.ts | 22 +-- packages/vite/src/node/optimizer/optimizer.ts | 2 +- packages/vite/src/node/optimizer/resolve.ts | 6 +- .../src/node/optimizer/rolldownDepPlugin.ts | 16 +- packages/vite/src/node/optimizer/scan.ts | 24 +-- packages/vite/src/node/packages.ts | 6 +- packages/vite/src/node/plugin.ts | 18 +-- packages/vite/src/node/plugins/asset.ts | 36 ++--- .../src/node/plugins/assetImportMetaUrl.ts | 14 +- .../vite/src/node/plugins/clientInjections.ts | 8 +- packages/vite/src/node/plugins/css.ts | 56 +++---- packages/vite/src/node/plugins/define.ts | 2 +- .../src/node/plugins/dynamicImportVars.ts | 14 +- packages/vite/src/node/plugins/esbuild.ts | 12 +- .../esbuildBannerFooterCompatPlugin.ts | 4 +- .../vite/src/node/plugins/forwardConsole.ts | 2 +- packages/vite/src/node/plugins/html.ts | 36 ++--- .../vite/src/node/plugins/importAnalysis.ts | 48 +++--- .../src/node/plugins/importAnalysisBuild.ts | 16 +- .../vite/src/node/plugins/importMetaGlob.ts | 20 +-- packages/vite/src/node/plugins/index.ts | 32 ++-- packages/vite/src/node/plugins/license.ts | 4 +- packages/vite/src/node/plugins/manifest.ts | 4 +- .../src/node/plugins/modulePreloadPolyfill.ts | 2 +- .../vite/src/node/plugins/optimizedDeps.ts | 8 +- packages/vite/src/node/plugins/oxc.ts | 16 +- .../vite/src/node/plugins/pluginFilter.ts | 2 +- packages/vite/src/node/plugins/preAlias.ts | 6 +- .../vite/src/node/plugins/prepareOutDir.ts | 6 +- packages/vite/src/node/plugins/reporter.ts | 2 +- packages/vite/src/node/plugins/resolve.ts | 46 +++--- packages/vite/src/node/plugins/terser.ts | 4 +- packages/vite/src/node/plugins/wasm.ts | 2 +- packages/vite/src/node/plugins/worker.ts | 24 +-- .../src/node/plugins/workerImportMetaUrl.ts | 16 +- packages/vite/src/node/preview.ts | 44 +++--- .../node/server/__tests__/moduleGraph.spec.ts | 2 +- .../server/__tests__/pluginContainer.spec.ts | 2 +- .../node/server/__tests__/sourcemap.spec.ts | 2 +- packages/vite/src/node/server/bundledDev.ts | 8 +- packages/vite/src/node/server/environment.ts | 22 +-- .../environments/fetchableEnvironments.ts | 2 +- .../environments/runnableEnvironment.ts | 6 +- packages/vite/src/node/server/hmr.ts | 28 ++-- packages/vite/src/node/server/index.ts | 106 ++++++------- .../middlewares/__tests__/indexHtml.spec.ts | 2 +- .../vite/src/node/server/middlewares/base.ts | 2 +- .../vite/src/node/server/middlewares/error.ts | 2 +- .../node/server/middlewares/htmlFallback.ts | 4 +- .../src/node/server/middlewares/indexHtml.ts | 18 +-- .../node/server/middlewares/memoryFiles.ts | 2 +- .../vite/src/node/server/middlewares/proxy.ts | 4 +- .../src/node/server/middlewares/static.ts | 18 +-- .../src/node/server/middlewares/transform.ts | 34 ++--- .../vite/src/node/server/mixedModuleGraph.ts | 2 +- packages/vite/src/node/server/moduleGraph.ts | 4 +- packages/vite/src/node/server/openBrowser.ts | 6 +- .../vite/src/node/server/pluginContainer.ts | 40 ++--- packages/vite/src/node/server/send.ts | 2 +- packages/vite/src/node/server/sourcemap.ts | 6 +- .../vite/src/node/server/transformRequest.ts | 18 +-- packages/vite/src/node/server/warmup.ts | 2 +- packages/vite/src/node/server/ws.ts | 8 +- packages/vite/src/node/shortcuts.ts | 4 +- .../node/ssr/__tests__/ssrLoadModule.spec.ts | 4 +- .../node/ssr/__tests__/ssrTransform.spec.ts | 6 +- packages/vite/src/node/ssr/fetchModule.ts | 8 +- .../__tests__/fixtures/dynamic-import.js | 2 +- .../__tests__/fixtures/worker.invoke.mjs | 2 +- .../runtime/__tests__/server-runtime.spec.ts | 6 +- .../__tests__/server-source-maps.spec.ts | 2 +- .../server-worker-runner.invoke.spec.ts | 4 +- .../__tests__/server-worker-runner.spec.ts | 4 +- .../src/node/ssr/runtime/__tests__/utils.ts | 8 +- .../node/ssr/runtime/serverModuleRunner.ts | 2 +- .../vite/src/node/ssr/ssrManifestPlugin.ts | 2 +- packages/vite/src/node/ssr/ssrModuleLoader.ts | 6 +- packages/vite/src/node/ssr/ssrTransform.ts | 12 +- packages/vite/src/node/utils.ts | 36 ++--- packages/vite/src/node/watch.ts | 4 +- packages/vite/src/shared/hmr.ts | 2 +- .../vite/src/shared/moduleRunnerTransport.ts | 2 +- packages/vite/src/types/chokidar.d.ts | 2 +- .../internal/cssPreprocessorOptions.d.ts | 4 +- playground/alias/vite.config.js | 2 +- playground/backend-integration/vite.config.js | 2 +- .../__tests__/chunk-importmap.spec.ts | 2 +- .../cli-module/__tests__/cli-module.spec.ts | 2 +- playground/cli/__tests__/cli.spec.ts | 2 +- playground/csp/vite.config.js | 2 +- .../__tests__/css-lightningcss-proxy.spec.ts | 2 +- playground/css-sourcemap/vite.config.js | 2 +- playground/css/__tests__/tests.ts | 2 +- playground/css/async/async-3.js | 2 +- playground/css/lightningcss-plugins.js | 2 +- playground/css/postcss.config.js | 2 +- playground/css/vite.config-lightningcss.js | 4 +- playground/data-uri/main.js | 4 +- playground/define/__tests__/define.spec.ts | 2 +- .../src/entry-client.tsx | 2 +- playground/external/dep-that-imports/index.js | 4 +- playground/external/src/require-polyfill.js | 2 +- playground/fs-serve/__tests__/commonTests.ts | 10 +- .../fs-serve/root/matrixTestResultPlugin.ts | 2 +- playground/fs-serve/root/vite.config-base.js | 2 +- playground/fs-serve/root/vite.config.js | 2 +- .../glob-import/__tests__/glob-import.spec.ts | 2 +- playground/hmr-ssr/__tests__/hmr-ssr.spec.ts | 18 +-- .../main-accepted/main-accepted.ts | 2 +- .../main-non-accepted/main-non-accepted.ts | 2 +- .../hmr-ssr/file-delete-restore/index.js | 2 +- playground/hmr-ssr/hmr.ts | 2 +- playground/hmr/__tests__/hmr.spec.ts | 2 +- .../main-accepted/main-accepted.ts | 2 +- .../main-non-accepted/main-non-accepted.ts | 2 +- playground/hmr/file-delete-restore/index.js | 2 +- playground/hmr/hmr.ts | 2 +- .../__tests__/js-sourcemap.spec.ts | 8 +- .../json/__tests__/csr/json-csr.spec.ts | 4 +- ...lient-legacy-ssr-sequential-builds.spec.ts | 2 +- .../legacy/__tests__/ssr/legacy-ssr.spec.ts | 2 +- .../legacy/vite.config-custom-filename.js | 2 +- .../legacy/vite.config-multiple-output.js | 2 +- playground/lib/__tests__/serve.ts | 2 +- playground/optimize-deps/cjs.js | 12 +- .../__test__/optimize-missing-deps.spec.ts | 2 +- playground/resolve/browser-field/relative.js | 9 +- playground/resolve/ts-extension/index-js.js | 4 +- playground/resolve/ts-extension/index.ts | 4 +- playground/ssr-alias/src/main.js | 2 +- .../__tests__/ssr-conditions.spec.ts | 2 +- playground/ssr-conditions/src/app.js | 2 +- .../ssr-deps/__tests__/ssr-deps.spec.ts | 2 +- playground/ssr-deps/src/app.js | 26 ++-- .../ssr-html/__tests__/ssr-html.spec.ts | 6 +- .../ssr-html/test-stacktrace-runtime.js | 2 +- .../__tests__/ssr-noexternal.spec.ts | 2 +- playground/ssr-pug/__tests__/ssr-pug.spec.ts | 2 +- playground/ssr-pug/server.js | 2 +- playground/ssr-resolve/main.js | 6 +- .../ssr-wasm/__tests__/ssr-wasm.spec.ts | 2 +- playground/ssr-wasm/src/direct-light.js | 2 +- .../__tests__/ssr-webworker.spec.ts | 2 +- playground/ssr-webworker/src/entry-worker.jsx | 2 +- playground/ssr/__tests__/ssr.spec.ts | 2 +- .../ssr/src/forked-deadlock/common-module.js | 2 +- playground/tailwind/vite.config.ts | 2 +- playground/test-utils.ts | 12 +- .../__tests__/transform-plugin.spec.ts | 2 +- .../tsconfig-json-load-error.spec.ts | 2 +- .../__tests__/tsconfig-json.spec.ts | 2 +- playground/vitestGlobalSetup.ts | 4 +- playground/vitestSetup.ts | 14 +- .../worker/__tests__/iife/worker-iife.spec.ts | 4 +- playground/worker/my-worker.ts | 2 +- playground/worker/worker/main-module.js | 10 +- 246 files changed, 957 insertions(+), 964 deletions(-) diff --git a/.oxfmtrc.json b/.oxfmtrc.json index dd090bf31a7deb..58260ed5c2daa7 100644 --- a/.oxfmtrc.json +++ b/.oxfmtrc.json @@ -3,6 +3,11 @@ "singleQuote": true, "printWidth": 80, "sortPackageJson": false, + "sortImports": { + "groups": ["builtin", "external", "internal", "parent", "sibling", "index"], + "partitionByNewline": true, + "newlinesBetween": false + }, "overrides": [ { "files": ["**/*.json5"], diff --git a/docs/.vitepress/buildEnd.config.ts b/docs/.vitepress/buildEnd.config.ts index 4f64445971f4ab..ddbae5751d6880 100644 --- a/docs/.vitepress/buildEnd.config.ts +++ b/docs/.vitepress/buildEnd.config.ts @@ -1,5 +1,5 @@ -import path from 'node:path' import { writeFileSync } from 'node:fs' +import path from 'node:path' import { Feed } from 'feed' import type { SiteConfig } from 'vitepress' import { createContentLoader } from 'vitepress' diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index df6405e2532e91..45f0f6806db195 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -1,16 +1,16 @@ import path from 'node:path' +import { transformerTwoslash } from '@shikijs/vitepress-twoslash' +import type { FooterLink } from '@voidzero-dev/vitepress-theme' +import { extendConfig } from '@voidzero-dev/vitepress-theme/config' +import { markdownItImageSize } from 'markdown-it-image-size' import type { HeadConfig } from 'vitepress' import { defineConfig } from 'vitepress' -import { transformerTwoslash } from '@shikijs/vitepress-twoslash' +import { graphvizMarkdownPlugin } from 'vitepress-plugin-graphviz' import { groupIconMdPlugin, groupIconVitePlugin, } from 'vitepress-plugin-group-icons' -import { graphvizMarkdownPlugin } from 'vitepress-plugin-graphviz' import llmstxt from 'vitepress-plugin-llms' -import { markdownItImageSize } from 'markdown-it-image-size' -import { extendConfig } from '@voidzero-dev/vitepress-theme/config' -import type { FooterLink } from '@voidzero-dev/vitepress-theme' import packageJson from '../../packages/vite/package.json' with { type: 'json' } import { buildEnd } from './buildEnd.config.ts' diff --git a/docs/.vitepress/theme/components/AsideSponsors.vue b/docs/.vitepress/theme/components/AsideSponsors.vue index 093cf3ce635faa..3fc282205ced6b 100644 --- a/docs/.vitepress/theme/components/AsideSponsors.vue +++ b/docs/.vitepress/theme/components/AsideSponsors.vue @@ -1,9 +1,9 @@