Skip to content

Commit dfd146f

Browse files
ematipicoematipico
authored
Revert "[ci] format" (#10417)
* Revert "[ci] format" This reverts commit 1863727. * pin dependency * update lock
1 parent 8dceb5e commit dfd146f

File tree

128 files changed

+251
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+251
-205
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
},
4848
"packageManager": "[email protected]",
4949
"dependencies": {
50-
"@biomejs/biome": "^1.5.3",
5150
"astro-benchmark": "workspace:*"
5251
},
5352
"devDependencies": {
53+
"@biomejs/biome": "1.5.3",
5454
"@astrojs/check": "^0.5.8",
5555
"@changesets/changelog-github": "^0.4.8",
5656
"@changesets/cli": "^2.26.2",

‎packages/astro/components/Image.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
2+
import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
33
import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';
44
import type { HTMLAttributes } from '../types';
55

‎packages/astro/components/Picture.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
import { type LocalImageProps, type RemoteImageProps, getImage } from 'astro:assets';
2+
import { getImage, type LocalImageProps, type RemoteImageProps } from 'astro:assets';
33
import type { GetImageResult, ImageOutputFormat } from '../dist/@types/astro';
44
import { isESMImportedImage } from '../dist/assets/utils/imageKind';
55
import { AstroError, AstroErrorData } from '../dist/core/errors/index.js';

‎packages/astro/e2e/fixtures/astro-component/src/pages/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2+
import Hero from '../components/Hero.astro';
23
import LinkedLib from '@e2e/astro-linked-lib'
34
import HoistedScript from '@e2e/astro-linked-lib/HoistedScript'
4-
import Hero from '../components/Hero.astro';
55
---
66

77
<html>

‎packages/astro/e2e/fixtures/client-only/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.jsx';
32
import * as react from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.jsx';
44
import SolidCounter from '../components/solid/SolidCounter.jsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/hydration-race/src/components/Wrapper.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Deeper from './Deeper.astro';
32
import One from './One.jsx';
3+
import Deeper from './Deeper.astro';
44
---
55

66

‎packages/astro/e2e/fixtures/lit-component/src/pages/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
import ClientOnlyComponent from '../components/ClientOnlyComponent.js';
32
import MyCounter from '../components/Counter.js';
43
import NonDeferredCounter from '../components/NonDeferredCounter.js';
4+
import ClientOnlyComponent from '../components/ClientOnlyComponent.js';
55
66
const someProps = {
77
count: 10,

‎packages/astro/e2e/fixtures/multiple-frameworks/src/pages/index.astro

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2+
// Style Imports
3+
import '../styles/global.css';
24
// Component Imports
35
import { A, B as Renamed } from '../components';
4-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
56
import * as react from '../components/react/ReactCounter.jsx';
7+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
68
import SolidCounter from '../components/solid/SolidCounter.tsx';
7-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
89
import VueCounter from '../components/vue/VueCounter.vue';
9-
// Style Imports
10-
import '../styles/global.css';
10+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
1111
1212
// Full Astro Component Syntax:
1313
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-in-preact/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
32
import ReactCounter from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-in-react/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
32
import ReactCounter from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-in-solid/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
32
import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-in-svelte/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
32
import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-in-vue/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
32
import { Counter as ReactCounter } from '../components/react/ReactCounter.jsx';
3+
import { PreactCounter } from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
88
// Full Astro Component Syntax:
99
// https://docs.astro.build/basics/astro-components/

‎packages/astro/e2e/fixtures/nested-recursive/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
2-
import PreactCounter from '../components/preact/PreactCounter.tsx';
32
import ReactCounter from '../components/react/ReactCounter.jsx';
3+
import PreactCounter from '../components/preact/PreactCounter.tsx';
44
import SolidCounter from '../components/solid/SolidCounter.tsx';
5-
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
65
import VueCounter from '../components/vue/VueCounter.vue';
6+
import SvelteCounter from '../components/svelte/SvelteCounter.svelte';
77
---
88

99
<html lang="en">

‎packages/astro/e2e/fixtures/pass-js/src/pages/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Component from '../components/React';
32
import type { BigNestedObject } from '../types';
3+
import Component from '../components/React';
44
55
const object: BigNestedObject = {
66
nested: {

‎packages/astro/e2e/fixtures/solid-recurse/src/pages/index.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import WrapperA from "../components/WrapperA.jsx";
32
import WrapperB from "../components/WrapperB.jsx";
3+
import WrapperA from "../components/WrapperA.jsx";
44
---
55

66
<html>

‎packages/astro/e2e/fixtures/tailwindcss/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
import Button from '../components/Button.astro';
3-
import Complex from '../components/Complex.astro';
42
// Component Imports
53
import Layout from '../components/Layout.astro';
4+
import Button from '../components/Button.astro';
5+
import Complex from '../components/Complex.astro';
66
---
77

88
<Layout>

‎packages/astro/e2e/fixtures/view-transitions/src/components/ClickToNavigate.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { navigate } from "astro:transitions/client";
21
import React from 'react';
2+
import { navigate } from "astro:transitions/client";
33
export default function ClickToNavigate({ to, id }) {
44
return <button id={id} onClick={() => navigate(to)}>Navigate to `{to}`</button>;
55
}

‎packages/astro/e2e/fixtures/view-transitions/src/pages/client-load.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import { ViewTransitions } from "astro:transitions";
32
import ClickToNavigate from "../components/ClickToNavigate.jsx"
3+
import { ViewTransitions } from "astro:transitions";
44
---
55
<html>
66
<head>

‎packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-four.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
import Island from '../components/Island';
32
import Layout from '../components/Layout.astro';
4-
import SvelteCounter from '../components/SvelteCounter.svelte';
3+
import Island from '../components/Island';
54
import VueCounter from '../components/VueCounter.vue';
5+
import SvelteCounter from '../components/SvelteCounter.svelte';
66
---
77
<Layout>
88
<p id="page-four">Page 4</p>

‎packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-one.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Island from '../components/Island';
32
import Layout from '../components/Layout.astro';
3+
import Island from '../components/Island';
44
---
55
<Layout>
66
<a id="click-two" href="/client-only-two">go to page 2</a>

‎packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-three.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
import Island from '../components/Island';
32
import Layout from '../components/Layout.astro';
4-
import SvelteCounter from '../components/SvelteCounter.svelte';
3+
import Island from '../components/Island';
54
import VueCounter from '../components/VueCounter.vue';
5+
import SvelteCounter from '../components/SvelteCounter.svelte';
66
---
77
<Layout>
88
<a id="click-four" href="/client-only-four">go to page 4</a>

‎packages/astro/e2e/fixtures/view-transitions/src/pages/client-only-two.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Island from '../components/Island';
32
import Layout from '../components/Layout.astro';
3+
import Island from '../components/Island';
44
---
55
<Layout>
66
<p id="page-two">Page 2</p>

‎packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-one.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import InlineScript from '../components/InlineScript.astro';
32
import Layout from '../components/Layout.astro';
3+
import InlineScript from '../components/InlineScript.astro';
44
---
55
<Layout>
66
<InlineScript />

‎packages/astro/e2e/fixtures/view-transitions/src/pages/inline-script-two.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import InlineScript from '../components/InlineScript.astro';
32
import Layout from '../components/Layout.astro';
3+
import InlineScript from '../components/InlineScript.astro';
44
---
55
<Layout>
66
<InlineScript />

‎packages/astro/e2e/fixtures/view-transitions/src/pages/island-one.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Island from '../components/Island.jsx';
32
import Layout from '../components/Layout.astro';
3+
import Island from '../components/Island.jsx';
44
export const prerender = false;
55
66
const persistProps = Astro.url.searchParams.has('persist');

‎packages/astro/e2e/fixtures/view-transitions/src/pages/island-two.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import Island from '../components/Island.jsx';
32
import Layout from '../components/Layout.astro';
3+
import Island from '../components/Island.jsx';
44
---
55
<Layout>
66
<p id="island-two">Page 2</p>

‎packages/astro/e2e/fixtures/vue-component/src/pages/index.astro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
import Counter from '../components/Counter.vue';
3-
import State from '../components/State.vue'
4-
import AsyncTest from '../components/Test.vue'
53
import VueComponent from '../components/VueComponent.vue';
4+
import AsyncTest from '../components/Test.vue'
5+
import State from '../components/State.vue'
66
77
const someProps = {
88
count: 0,

‎packages/astro/e2e/nested-recursive.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { test as base, expect } from '@playwright/test';
1+
import { expect, test as base } from '@playwright/test';
22
import { loadFixture, waitForHydrate } from './test-utils.js';
33

44
const test = base.extend({

‎packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2+
import { Heading, Aside, LikeButton, HydratedLikeButton } from '@performance/utils';
23
import type { CollectionEntry } from 'astro:content';
3-
import { Aside, Heading, HydratedLikeButton, LikeButton } from '@performance/utils';
44
55
type Props = {
66
entry: CollectionEntry<'generated'>;

‎packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
import type { CollectionEntry } from 'astro:content';
32
import Title from './Title.astro';
3+
import type { CollectionEntry } from 'astro:content';
44
55
type Props = {
66
entry: CollectionEntry<'generated'>;

‎packages/astro/src/assets/endpoint/generic.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// @ts-expect-error
2-
import { imageConfig } from 'astro:assets';
31
import { isRemotePath } from '@astrojs/internal-helpers/path';
42
import mime from 'mime/lite.js';
53
import type { APIRoute } from '../../@types/astro.js';
64
import { getConfiguredImageService } from '../internal.js';
75
import { etag } from '../utils/etag.js';
86
import { isRemoteAllowed } from '../utils/remotePattern.js';
7+
// @ts-expect-error
8+
import { imageConfig } from 'astro:assets';
99

1010
async function loadRemoteImage(src: URL) {
1111
try {

‎packages/astro/src/assets/endpoint/node.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
import os from 'node:os';
33
import { isAbsolute } from 'node:path';
44
import { fileURLToPath, pathToFileURL } from 'node:url';
5-
// @ts-expect-error
6-
import { assetsDir, imageConfig, outDir } from 'astro:assets';
75
import { isRemotePath, removeQueryString } from '@astrojs/internal-helpers/path';
86
import { readFile } from 'fs/promises';
97
import mime from 'mime/lite.js';
108
import type { APIRoute } from '../../@types/astro.js';
119
import { getConfiguredImageService } from '../internal.js';
1210
import { etag } from '../utils/etag.js';
1311
import { isRemoteAllowed } from '../utils/remotePattern.js';
12+
// @ts-expect-error
13+
import { assetsDir, imageConfig, outDir } from 'astro:assets';
1414

1515
function replaceFileSystemReferences(src: string) {
1616
return os.platform().includes('win32') ? src.replace(/^\/@fs\//, '') : src.replace(/^\/@fs/, '');

‎packages/astro/src/core/build/plugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Rollup, Plugin as VitePlugin } from 'vite';
1+
import type { Plugin as VitePlugin, Rollup } from 'vite';
22
import type { BuildInternals } from './internal.js';
33
import type { StaticBuildOptions, ViteBuildReturn } from './types.js';
44

‎packages/astro/src/core/build/plugins/plugin-css.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { GetModuleInfo } from 'rollup';
2-
import type { BuildOptions, ResolvedConfig, Rollup, Plugin as VitePlugin } from 'vite';
2+
import type { BuildOptions, Plugin as VitePlugin, ResolvedConfig, Rollup } from 'vite';
33
import { isBuildableCSSRequest } from '../../../vite-plugin-astro-server/util.js';
44
import type { BuildInternals } from '../internal.js';
55
import type { AstroBuildPlugin, BuildTarget } from '../plugin.js';

‎packages/astro/src/core/build/plugins/util.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { extname } from 'node:path';
2-
import type { BuildOptions, Rollup, Plugin as VitePlugin } from 'vite';
2+
import type { BuildOptions, Plugin as VitePlugin, Rollup } from 'vite';
33

44
// eslint-disable-next-line @typescript-eslint/ban-types
55
type OutputOptionsHook = Extract<VitePlugin['outputOptions'], Function>;

‎packages/astro/src/core/config/schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type {
2-
ShikiConfig,
32
RehypePlugin as _RehypePlugin,
43
RemarkPlugin as _RemarkPlugin,
54
RemarkRehype as _RemarkRehype,
5+
ShikiConfig,
66
} from '@astrojs/markdown-remark';
77
import { markdownConfigDefaults } from '@astrojs/markdown-remark';
88
import { type BuiltinTheme, bundledThemes } from 'shiki';

‎packages/astro/src/core/logger/vite.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fileURLToPath } from 'url';
22
import stripAnsi from 'strip-ansi';
3-
import type { LogLevel, Rollup, Logger as ViteLogger } from 'vite';
3+
import type { LogLevel, Logger as ViteLogger, Rollup } from 'vite';
44
import { isAstroError } from '../errors/errors.js';
55
import { serverShortcuts as formatServerShortcuts } from '../messages.js';
66
import { type Logger as AstroLogger, isLogLevelEnabled } from './core.js';

‎packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// @ts-expect-error
2-
import { loadDevToolbarApps } from 'astro:dev-toolbar';
31
import type { DevToolbarApp as DevToolbarAppDefinition } from '../../../@types/astro.js';
42
import { settings } from './settings.js';
53
import type { AstroDevToolbar, DevToolbarApp } from './toolbar.js';
4+
// @ts-expect-error
5+
import { loadDevToolbarApps } from 'astro:dev-toolbar';
66

77
let overlay: AstroDevToolbar;
88

‎packages/astro/src/transitions/router.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ async function prepareForClientOnlyComponents(newDocument: Document, toLocation:
716716

717717
// return a promise that resolves when all astro-islands are hydrated
718718
async function hydrationDone(loadingPage: HTMLIFrameElement) {
719-
await new Promise((r) =>
720-
loadingPage.contentWindow?.addEventListener('load', r, { once: true })
719+
await new Promise(
720+
(r) => loadingPage.contentWindow?.addEventListener('load', r, { once: true })
721721
);
722722

723723
return new Promise<void>(async (r) => {

0 commit comments

Comments
 (0)