Revert "[ci] format" (#10417)

* Revert "[ci] format" This reverts commit 1863727. * pin dependency * update lock
withastro · Mar 13, 2024 · dfd146f · dfd146f
1 parent 8dceb5e
commit dfd146f
Show file tree

Hide file tree

Showing 128 changed files with 251 additions and 205 deletions.
diff --git a/package.json b/package.json
@@ -47,10 +47,10 @@
   },
   "packageManager": "pnpm@8.6.12",
   "dependencies": {
-    "@biomejs/biome": "^1.5.3",
     "astro-benchmark": "workspace:*"
   },
   "devDependencies": {
+    "@biomejs/biome": "1.5.3",
     "@astrojs/check": "^0.5.8",
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",

diff --git a/packages/astro/components/Image.astro b/packages/astro/components/Image.astro
@@ -1,5 +1,5 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
+import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
 import type { HTMLAttributes } from '../types';
 

diff --git a/packages/astro/components/Picture.astro b/packages/astro/components/Picture.astro
@@ -1,5 +1,5 @@
 ---
-import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
+import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
 import type { GetImageResult, ImageOutputFormat } from '../dist/@types/astro';
 import { isESMImportedImage } from '../dist/assets/utils/imageKind';
 import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';

diff --git a/packages/astro/e2e/fixtures/astro-component/src/pages/index.astro b/packages/astro/e2e/fixtures/astro-component/src/pages/index.astro
@@ -1,7 +1,7 @@
 ---
+import Hero from '../components/Hero.astro';
 import LinkedLib from '@e2e/astro-linked-lib'
 import HoistedScript from '@e2e/astro-linked-lib/HoistedScript'
-import Hero from '../components/Hero.astro';
 ---
 
 <html>

diff --git a/packages/astro/e2e/fixtures/client-only/src/pages/index.astro b/packages/astro/e2e/fixtures/client-only/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.jsx';
 import * as react from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.jsx';
 import SolidCounter from '../components/solid/SolidCounter.jsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/hydration-race/src/components/Wrapper.astro b/packages/astro/e2e/fixtures/hydration-race/src/components/Wrapper.astro
@@ -1,6 +1,6 @@
 ---
-import Deeper from './Deeper.astro';
 import One from './One.jsx';
+import Deeper from './Deeper.astro';
 ---
 
 

diff --git a/packages/astro/e2e/fixtures/lit-component/src/pages/index.astro b/packages/astro/e2e/fixtures/lit-component/src/pages/index.astro
@@ -1,7 +1,7 @@
 ---
-import ClientOnlyComponent from '../components/ClientOnlyComponent.js';
 import MyCounter from '../components/Counter.js';
 import NonDeferredCounter from '../components/NonDeferredCounter.js';
+import ClientOnlyComponent from '../components/ClientOnlyComponent.js';
 
 const someProps = {
 	count: 10,

diff --git a/packages/astro/e2e/fixtures/multiple-frameworks/src/pages/index.astro b/packages/astro/e2e/fixtures/multiple-frameworks/src/pages/index.astro
@@ -1,13 +1,13 @@
 ---
+// Style Imports
+import '../styles/global.css';
 // Component Imports
 import { A, B as Renamed } from '../components';
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import * as react from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
-// Style Imports
-import '../styles/global.css';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-in-preact/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-in-preact/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import ReactCounter from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-in-react/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-in-react/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import ReactCounter from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-in-solid/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-in-solid/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-in-svelte/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-in-svelte/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-in-vue/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-in-vue/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
+import { PreactCounter } from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 
 // Full Astro Component Syntax:
 // https://docs.astro.build/basics/astro-components/

diff --git a/packages/astro/e2e/fixtures/nested-recursive/src/pages/index.astro b/packages/astro/e2e/fixtures/nested-recursive/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import PreactCounter from '../components/preact/PreactCounter.tsx';
 import ReactCounter from '../components/react/ReactCounter.jsx';
+import PreactCounter from '../components/preact/PreactCounter.tsx';
 import SolidCounter from '../components/solid/SolidCounter.tsx';
-import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 import VueCounter from '../components/vue/VueCounter.vue';
+import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
 ---
 
 <html lang="en">

diff --git a/packages/astro/e2e/fixtures/pass-js/src/pages/index.astro b/packages/astro/e2e/fixtures/pass-js/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
-import Component from '../components/React';
 import type { BigNestedObject } from '../types';
+import Component from '../components/React';
 
 const object: BigNestedObject = {
 	nested: {

diff --git a/packages/astro/e2e/fixtures/solid-recurse/src/pages/index.astro b/packages/astro/e2e/fixtures/solid-recurse/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
-import WrapperA from "../components/WrapperA.jsx";
 import WrapperB from "../components/WrapperB.jsx";
+import WrapperA from "../components/WrapperA.jsx";
 ---
 
 <html>

diff --git a/packages/astro/e2e/fixtures/tailwindcss/src/pages/index.astro b/packages/astro/e2e/fixtures/tailwindcss/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import Button from '../components/Button.astro';
-import Complex from '../components/Complex.astro';
 // Component Imports
 import Layout from '../components/Layout.astro';
+import Button from '../components/Button.astro';
+import Complex from '../components/Complex.astro';
 ---
 
 <Layout>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/components/ClickToNavigate.jsx b/packages/astro/e2e/fixtures/view-transitions/src/components/ClickToNavigate.jsx
@@ -1,5 +1,5 @@
-import { navigate } from "astro:transitions/client";
 import React from 'react';
+import { navigate } from "astro:transitions/client";
 export default function ClickToNavigate({ to, id }) {
     return <button id={id} onClick={() => navigate(to)}>Navigate to `{to}`</button>;
 }
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/client-load.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/client-load.astro
@@ -1,6 +1,6 @@
 ---
-import { ViewTransitions } from "astro:transitions";
 import ClickToNavigate from "../components/ClickToNavigate.jsx"
+import { ViewTransitions } from "astro:transitions";
 ---
 <html>
 	<head>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-four.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-four.astro
@@ -1,8 +1,8 @@
 ---
-import Island from '../components/Island';
 import Layout from '../components/Layout.astro';
-import SvelteCounter from '../components/SvelteCounter.svelte';
+import Island from '../components/Island';
 import VueCounter from '../components/VueCounter.vue';
+import SvelteCounter from '../components/SvelteCounter.svelte';
 ---
 <Layout>
 	<p id="page-four">Page 4</p>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-one.astro
@@ -1,6 +1,6 @@
 ---
-import Island from '../components/Island';
 import Layout from '../components/Layout.astro';
+import Island from '../components/Island';
 ---
 <Layout>
 	<a id="click-two" href="/client-only-two">go to page 2</a>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-three.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-three.astro
@@ -1,8 +1,8 @@
 ---
-import Island from '../components/Island';
 import Layout from '../components/Layout.astro';
-import SvelteCounter from '../components/SvelteCounter.svelte';
+import Island from '../components/Island';
 import VueCounter from '../components/VueCounter.vue';
+import SvelteCounter from '../components/SvelteCounter.svelte';
 ---
 <Layout>
 	<a id="click-four" href="/client-only-four">go to page 4</a>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-two.astro
@@ -1,6 +1,6 @@
 ---
-import Island from '../components/Island';
 import Layout from '../components/Layout.astro';
+import Island from '../components/Island';
 ---
 <Layout>
 	<p id="page-two">Page 2</p>

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-one.astro
@@ -1,6 +1,6 @@
 ---
-import InlineScript from '../components/InlineScript.astro';
 import Layout from '../components/Layout.astro';
+import InlineScript from '../components/InlineScript.astro';
 ---
 <Layout>
 	<InlineScript />

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-two.astro
@@ -1,6 +1,6 @@
 ---
-import InlineScript from '../components/InlineScript.astro';
 import Layout from '../components/Layout.astro';
+import InlineScript from '../components/InlineScript.astro';
 ---
 <Layout>
 	<InlineScript />

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-one.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-one.astro
@@ -1,6 +1,6 @@
 ---
-import Island from '../components/Island.jsx';
 import Layout from '../components/Layout.astro';
+import Island from '../components/Island.jsx';
 export const prerender = false;
 
 const persistProps = Astro.url.searchParams.has('persist');

diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/island-two.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/island-two.astro
@@ -1,6 +1,6 @@
 ---
-import Island from '../components/Island.jsx';
 import Layout from '../components/Layout.astro';
+import Island from '../components/Island.jsx';
 ---
 <Layout>
 	<p id="island-two">Page 2</p>

diff --git a/packages/astro/e2e/fixtures/vue-component/src/pages/index.astro b/packages/astro/e2e/fixtures/vue-component/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
 import Counter from '../components/Counter.vue';
-import State from '../components/State.vue'
-import AsyncTest from '../components/Test.vue'
 import VueComponent from '../components/VueComponent.vue';
+import AsyncTest from '../components/Test.vue'
+import State from '../components/State.vue'
 
 const someProps = {
 	count: 0,

diff --git a/packages/astro/e2e/nested-recursive.test.js b/packages/astro/e2e/nested-recursive.test.js
@@ -1,4 +1,4 @@
-import { test as base, expect } from '@playwright/test';
+import { expect, test as base } from '@playwright/test';
 import { loadFixture, waitForHydrate } from './test-utils.js';
 
 const test = base.extend({

diff --git a/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro b/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro
@@ -1,6 +1,6 @@
 ---
+import { Heading, Aside, LikeButton, HydratedLikeButton } from '@performance/utils';
 import type { CollectionEntry } from 'astro:content';
-import { Aside, Heading, HydratedLikeButton, LikeButton } from '@performance/utils';
 
 type Props = {
 	entry: CollectionEntry<'generated'>;

diff --git a/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro b/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro
@@ -1,6 +1,6 @@
 ---
-import type { CollectionEntry } from 'astro:content';
 import Title from './Title.astro';
+import type { CollectionEntry } from 'astro:content';
 
 type Props = {
 	entry: CollectionEntry<'generated'>;

diff --git a/packages/astro/src/assets/endpoint/generic.ts b/packages/astro/src/assets/endpoint/generic.ts
@@ -1,11 +1,11 @@
-// @ts-expect-error
-import { imageConfig } from 'astro:assets';
 import { isRemotePath } from '@astrojs/internal-helpers/path';
 import mime from 'mime/lite.js';
 import type { APIRoute } from '../../@types/astro.js';
 import { getConfiguredImageService } from '../internal.js';
 import { etag } from '../utils/etag.js';
 import { isRemoteAllowed } from '../utils/remotePattern.js';
+// @ts-expect-error
+import { imageConfig } from 'astro:assets';
 
 async function loadRemoteImage(src: URL) {
 	try {

diff --git a/packages/astro/src/assets/endpoint/node.ts b/packages/astro/src/assets/endpoint/node.ts
@@ -2,15 +2,15 @@
 import os from 'node:os';
 import { isAbsolute } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-// @ts-expect-error
-import { assetsDir, imageConfig, outDir } from 'astro:assets';
 import { isRemotePath, removeQueryString } from '@astrojs/internal-helpers/path';
 import { readFile } from 'fs/promises';
 import mime from 'mime/lite.js';
 import type { APIRoute } from '../../@types/astro.js';
 import { getConfiguredImageService } from '../internal.js';
 import { etag } from '../utils/etag.js';
 import { isRemoteAllowed } from '../utils/remotePattern.js';
+// @ts-expect-error
+import { assetsDir, imageConfig, outDir } from 'astro:assets';
 
 function replaceFileSystemReferences(src: string) {
 	return os.platform().includes('win32') ? src.replace(/^\/@fs\//, '') : src.replace(/^\/@fs/, '');

diff --git a/packages/astro/src/core/build/plugin.ts b/packages/astro/src/core/build/plugin.ts
@@ -1,4 +1,4 @@
-import type { Rollup, Plugin as VitePlugin } from 'vite';
+import type { Plugin as VitePlugin, Rollup } from 'vite';
 import type { BuildInternals } from './internal.js';
 import type { StaticBuildOptions, ViteBuildReturn } from './types.js';
 

diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -1,5 +1,5 @@
 import type { GetModuleInfo } from 'rollup';
-import type { BuildOptions, ResolvedConfig, Rollup, Plugin as VitePlugin } from 'vite';
+import type { BuildOptions, Plugin as VitePlugin, ResolvedConfig, Rollup } from 'vite';
 import { isBuildableCSSRequest } from '../../../vite-plugin-astro-server/util.js';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin, BuildTarget } from '../plugin.js';

diff --git a/packages/astro/src/core/build/plugins/util.ts b/packages/astro/src/core/build/plugins/util.ts
@@ -1,5 +1,5 @@
 import { extname } from 'node:path';
-import type { BuildOptions, Rollup, Plugin as VitePlugin } from 'vite';
+import type { BuildOptions, Plugin as VitePlugin, Rollup } from 'vite';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type OutputOptionsHook = Extract<VitePlugin['outputOptions'], Function>;

diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
@@ -1,8 +1,8 @@
 import type {
-	ShikiConfig,
 	RehypePlugin as _RehypePlugin,
 	RemarkPlugin as _RemarkPlugin,
 	RemarkRehype as _RemarkRehype,
+	ShikiConfig,
 } from '@astrojs/markdown-remark';
 import { markdownConfigDefaults } from '@astrojs/markdown-remark';
 import { type BuiltinTheme, bundledThemes } from 'shiki';

diff --git a/packages/astro/src/core/logger/vite.ts b/packages/astro/src/core/logger/vite.ts
@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'url';
 import stripAnsi from 'strip-ansi';
-import type { LogLevel, Rollup, Logger as ViteLogger } from 'vite';
+import type { LogLevel, Logger as ViteLogger, Rollup } from 'vite';
 import { isAstroError } from '../errors/errors.js';
 import { serverShortcuts as formatServerShortcuts } from '../messages.js';
 import { type Logger as AstroLogger, isLogLevelEnabled } from './core.js';

diff --git a/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts b/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts
@@ -1,8 +1,8 @@
-// @ts-expect-error
-import { loadDevToolbarApps } from 'astro:dev-toolbar';
 import type { DevToolbarApp as DevToolbarAppDefinition } from '../../../@types/astro.js';
 import { settings } from './settings.js';
 import type { AstroDevToolbar, DevToolbarApp } from './toolbar.js';
+// @ts-expect-error
+import { loadDevToolbarApps } from 'astro:dev-toolbar';
 
 let overlay: AstroDevToolbar;
 

diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
@@ -716,8 +716,8 @@ async function prepareForClientOnlyComponents(newDocument: Document, toLocation:
 
 		// return a promise that resolves when all astro-islands are hydrated
 		async function hydrationDone(loadingPage: HTMLIFrameElement) {
-			await new Promise((r) =>
-				loadingPage.contentWindow?.addEventListener('load', r, { once: true })
+			await new Promise(
+				(r) => loadingPage.contentWindow?.addEventListener('load', r, { once: true })
 			);
 
 			return new Promise<void>(async (r) => {