diff options
128 files changed, 251 insertions, 205 deletions
diff --git a/package.json b/package.json index b4a94962c..b68cdf1b4 100644 --- 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 index 4e55f5608..aee198a60 100644 --- 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 index f9b535530..b37b2d545 100644 --- 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 index 04cb1c110..3ada093e7 100644 --- 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 index a80bddc0e..d8b30b9cf 100644 --- 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 index 9a914d8fb..a3de9b8ec 100644 --- 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 index 1d9511057..43eb17a4e 100644 --- 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 index 55b2108cb..ded58d8aa 100644 --- 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 index 962f8f038..19ab50427 100644 --- 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 index 9fb5b4862..1ab459f74 100644 --- 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 index c4af890a0..91552a836 100644 --- 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 index b1b8187d5..5648a2581 100644 --- 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 index f8e74ff78..ea0a88f84 100644 --- 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 index 4b180602d..a17337c89 100644 --- 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 index 24794367f..181f2bfba 100644 --- 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 index b67eb81ce..7aeca1aef 100644 --- 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 index 65bff4d4a..948fa51df 100644 --- 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 index 2d14d42a6..db8cc25f3 100644 --- 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 index 0eaff1165..f24d216be 100644 --- 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 index 569a24b1a..9ebfa65f0 100644 --- 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 index 1a9b731bf..a51ccc299 100644 --- 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 index 83fcd4e18..34fa69926 100644 --- 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 index 2175ffd0b..4190d86ef 100644 --- 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 index bd59d22cf..e887fe6a5 100644 --- 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 index 2becd8d1c..430ad9465 100644 --- 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 index 533ac4088..883d567a1 100644 --- 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 index c76ee1452..37912591c 100644 --- 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 index fd2e8f9b5..fb10e6038 100644 --- 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 index 262cd6772..8271c6557 100644 --- 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 index fbe086bc2..3008f6119 100644 --- 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 index 6c40fe40e..42c2da57a 100644 --- 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 index 4554dd6d9..22b15446d 100644 --- 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 index 1d9ac9df6..4d29a7fad 100644 --- a/packages/astro/src/assets/endpoint/node.ts +++ b/packages/astro/src/assets/endpoint/node.ts @@ -2,8 +2,6 @@ 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'; @@ -11,6 +9,8 @@ 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 index f16b5a1d9..68474b057 100644 --- 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 index df1223873..a84ce37d8 100644 --- 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 index d1bd266cd..0c9636b30 100644 --- 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 index 3e8349d4c..ef1a6ec85 100644 --- 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 index 317a03782..9ddfd92eb 100644 --- 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 index c7d6c7cea..f115decf0 100644 --- 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 index 69f4e717c..9efb3a457 100644 --- 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) => { diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts index 2f4e256b7..bc9dbd5aa 100644 --- a/packages/astro/src/vite-plugin-astro/index.ts +++ b/packages/astro/src/vite-plugin-astro/index.ts @@ -3,9 +3,9 @@ import type * as vite from 'vite'; import type { AstroConfig, AstroSettings } from '../@types/astro.js'; import type { Logger } from '../core/logger/core.js'; import type { + CompileMetadata, PluginCssMetadata as AstroPluginCssMetadata, PluginMetadata as AstroPluginMetadata, - CompileMetadata, } from './types.js'; import { normalizePath } from 'vite'; diff --git a/packages/astro/src/vite-plugin-config-alias/index.ts b/packages/astro/src/vite-plugin-config-alias/index.ts index a5f4ae53c..7a7949e51 100644 --- a/packages/astro/src/vite-plugin-config-alias/index.ts +++ b/packages/astro/src/vite-plugin-config-alias/index.ts @@ -1,6 +1,6 @@ import path from 'node:path'; import type { CompilerOptions } from 'typescript'; -import { type ResolvedConfig, type Plugin as VitePlugin, normalizePath } from 'vite'; +import { type Plugin as VitePlugin, type ResolvedConfig, normalizePath } from 'vite'; import type { AstroSettings } from '../@types/astro.js'; type Alias = { diff --git a/packages/astro/test/fixtures/0-css/src/pages/index.astro b/packages/astro/test/fixtures/0-css/src/pages/index.astro index c21f98025..c11fe1166 100644 --- a/packages/astro/test/fixtures/0-css/src/pages/index.astro +++ b/packages/astro/test/fixtures/0-css/src/pages/index.astro @@ -5,16 +5,13 @@ import AstroComponent from '../components/Astro.astro'; import AstroComponentNone from '../components/AstroNone.astro'; import AstroSass from '../components/AstroSass.astro'; import AstroScss from '../components/AstroScss.astro'; -import ModuleOrdering from '../components/ModuleOrdering.jsx'; import ReactCSS from '../components/ReactCSS.jsx'; -import ReactDynamic from '../components/ReactDynamic.jsx'; import ReactModules from '../components/ReactModules.jsx'; import ReactModulesSass from '../components/ReactModulesSass.jsx'; import ReactModulesScss from '../components/ReactModulesScss.jsx'; import ReactSass from '../components/ReactSass.jsx'; import ReactScss from '../components/ReactScss.jsx'; import SvelteCSS from '../components/SvelteCSS.svelte'; -import SvelteDynamic from '../components/SvelteDynamic.svelte'; import SvelteSass from '../components/SvelteSass.svelte'; import SvelteScss from '../components/SvelteScss.svelte'; import VueCSS from '../components/VueCSS.vue'; @@ -22,6 +19,9 @@ import VueModules from '../components/VueModules.vue'; import VueSass from '../components/VueSass.vue'; import VueScoped from '../components/VueScoped.vue'; import VueScss from '../components/VueScss.vue'; +import ReactDynamic from '../components/ReactDynamic.jsx'; +import SvelteDynamic from '../components/SvelteDynamic.svelte'; +import ModuleOrdering from '../components/ModuleOrdering.jsx'; import '../styles/imported-url.css'; import '../styles/imported.sass'; diff --git a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/src/pages/index.astro b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/src/pages/index.astro index a654eeb12..e200a9567 100644 --- a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/src/pages/index.astro +++ b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/src/pages/index.astro @@ -1,10 +1,10 @@ --- -import Alias from 'components/Alias.svelte'; import Client from 'components/Client.svelte' import Foo from 'components/Foo.astro'; import StyleComp from 'components/Style.astro'; -import 'styles/main.css'; +import Alias from 'components/Alias.svelte'; import { foo, index } from 'utils/constants'; +import 'styles/main.css'; --- <html lang="en"> <head> diff --git a/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro b/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro index e880d4844..25faad0ea 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro +++ b/packages/astro/test/fixtures/alias-tsconfig/src/pages/index.astro @@ -1,11 +1,11 @@ --- -import Alias from '@components/Alias.svelte'; import Client from '@components/Client.svelte' -import '@styles/main.css'; -import { namespace } from '@test/namespace-package' import Foo from 'src/components/Foo.astro'; import StyleComp from 'src/components/Style.astro'; +import Alias from '@components/Alias.svelte'; +import { namespace } from '@test/namespace-package' import { foo, index } from 'src/utils/constants'; +import '@styles/main.css'; const globResult = Object.keys(import.meta.glob('@components/glob/*.js')).join(', ') --- diff --git a/packages/astro/test/fixtures/astro-check-errors/src/pages/index.astro b/packages/astro/test/fixtures/astro-check-errors/src/pages/index.astro index 4521e6f25..c161df438 100644 --- a/packages/astro/test/fixtures/astro-check-errors/src/pages/index.astro +++ b/packages/astro/test/fixtures/astro-check-errors/src/pages/index.astro @@ -1,5 +1,5 @@ --- -console.log(doesntExist) + console.log(doesntExist) --- <html lang="en"> diff --git a/packages/astro/test/fixtures/astro-children/src/pages/markup.astro b/packages/astro/test/fixtures/astro-children/src/pages/markup.astro index 2cc198bb0..b771c2433 100644 --- a/packages/astro/test/fixtures/astro-children/src/pages/markup.astro +++ b/packages/astro/test/fixtures/astro-children/src/pages/markup.astro @@ -1,7 +1,7 @@ --- import PreactComponent from '../components/Component.jsx'; -import SvelteComponent from '../components/Component.svelte'; import VueComponent from '../components/Component.vue'; +import SvelteComponent from '../components/Component.svelte'; --- <html> <head><title>Children</title></head> diff --git a/packages/astro/test/fixtures/astro-children/src/pages/multiple.astro b/packages/astro/test/fixtures/astro-children/src/pages/multiple.astro index 41061c0b9..8c2f73a91 100644 --- a/packages/astro/test/fixtures/astro-children/src/pages/multiple.astro +++ b/packages/astro/test/fixtures/astro-children/src/pages/multiple.astro @@ -1,7 +1,7 @@ --- import PreactComponent from '../components/Component.jsx'; -import SvelteComponent from '../components/Component.svelte'; import VueComponent from '../components/Component.vue'; +import SvelteComponent from '../components/Component.svelte'; --- <html> <head><title>Children</title></head> diff --git a/packages/astro/test/fixtures/astro-children/src/pages/strings.astro b/packages/astro/test/fixtures/astro-children/src/pages/strings.astro index f67f29c64..10b1a887f 100644 --- a/packages/astro/test/fixtures/astro-children/src/pages/strings.astro +++ b/packages/astro/test/fixtures/astro-children/src/pages/strings.astro @@ -1,7 +1,7 @@ --- import PreactComponent from '../components/Component.jsx'; -import SvelteComponent from '../components/Component.svelte'; import VueComponent from '../components/Component.vue'; +import SvelteComponent from '../components/Component.svelte'; --- <html> <head><title>Children</title></head> diff --git a/packages/astro/test/fixtures/astro-client-only/src/pages/index.astro b/packages/astro/test/fixtures/astro-client-only/src/pages/index.astro index 7a7d59b79..bf239197f 100644 --- a/packages/astro/test/fixtures/astro-client-only/src/pages/index.astro +++ b/packages/astro/test/fixtures/astro-client-only/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import ReactComponent from '../components/JSXComponent.jsx'; import PersistentCounter from '../components/PersistentCounter.svelte'; +import ReactComponent from '../components/JSXComponent.jsx'; --- <html> <head><title>Client only pages</title></head> diff --git a/packages/astro/test/fixtures/astro-jsx/src/pages/index.astro b/packages/astro/test/fixtures/astro-jsx/src/pages/index.astro index b4d078567..ccfb2b5a0 100644 --- a/packages/astro/test/fixtures/astro-jsx/src/pages/index.astro +++ b/packages/astro/test/fixtures/astro-jsx/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import PreactCounter from '../components/PreactCounter.tsx'; import ReactCounter from '../components/ReactCounter.jsx'; +import PreactCounter from '../components/PreactCounter.tsx'; import SolidCounter from '../components/SolidCounter.jsx'; --- diff --git a/packages/astro/test/fixtures/astro-partial-html/src/pages/head.astro b/packages/astro/test/fixtures/astro-partial-html/src/pages/head.astro index 608394142..635b09699 100644 --- a/packages/astro/test/fixtures/astro-partial-html/src/pages/head.astro +++ b/packages/astro/test/fixtures/astro-partial-html/src/pages/head.astro @@ -1,6 +1,6 @@ --- -import Component from '../components/Component.jsx'; import Head from '../components/Head.astro'; +import Component from '../components/Component.jsx'; --- <html> diff --git a/packages/astro/test/fixtures/astro-partial-html/src/pages/jsx.astro b/packages/astro/test/fixtures/astro-partial-html/src/pages/jsx.astro index 09c0e8eb5..b5a34f4ce 100644 --- a/packages/astro/test/fixtures/astro-partial-html/src/pages/jsx.astro +++ b/packages/astro/test/fixtures/astro-partial-html/src/pages/jsx.astro @@ -1,6 +1,6 @@ --- -import Component from '../components/Component.jsx'; import Layout from '../components/Layout.astro'; +import Component from '../components/Component.jsx'; // note: this test requires <Layout> to be the very first element --- diff --git a/packages/astro/test/fixtures/astro-slots-nested/src/pages/hidden-nested.astro b/packages/astro/test/fixtures/astro-slots-nested/src/pages/hidden-nested.astro index d3f041756..dcb3ebcba 100644 --- a/packages/astro/test/fixtures/astro-slots-nested/src/pages/hidden-nested.astro +++ b/packages/astro/test/fixtures/astro-slots-nested/src/pages/hidden-nested.astro @@ -1,6 +1,6 @@ --- -import Inner from '../components/react/Inner' import Parent from '../components/react/Parent' +import Inner from '../components/react/Inner' --- <html lang="en"> diff --git a/packages/astro/test/fixtures/astro-slots-nested/src/pages/server-component-nested.astro b/packages/astro/test/fixtures/astro-slots-nested/src/pages/server-component-nested.astro index 8c256864f..ec4ae3158 100644 --- a/packages/astro/test/fixtures/astro-slots-nested/src/pages/server-component-nested.astro +++ b/packages/astro/test/fixtures/astro-slots-nested/src/pages/server-component-nested.astro @@ -1,9 +1,9 @@ --- -import PassesChildrenSv from '../components/PassesChildrenSv.svelte'; -import PassesChildrenV from '../components/PassesChildrenV.vue'; -import PassesChildrenP from '../components/preact/PassesChildrenP.jsx'; import PassesChildren from '../components/react/PassesChildren.jsx'; +import PassesChildrenP from '../components/preact/PassesChildrenP.jsx'; import PassesChildrenS from '../components/solid/PassesChildrenS.jsx'; +import PassesChildrenSv from '../components/PassesChildrenSv.svelte'; +import PassesChildrenV from '../components/PassesChildrenV.vue'; --- <html lang="en"> diff --git a/packages/astro/test/fixtures/astro-slots/src/pages/slottedapi-render.astro b/packages/astro/test/fixtures/astro-slots/src/pages/slottedapi-render.astro index f383d9e89..8cd31fdd3 100644 --- a/packages/astro/test/fixtures/astro-slots/src/pages/slottedapi-render.astro +++ b/packages/astro/test/fixtures/astro-slots/src/pages/slottedapi-render.astro @@ -1,7 +1,7 @@ --- import Render from '../components/Render.astro'; -import RenderArgs from '../components/RenderArgs.astro'; import RenderFn from '../components/RenderFn.astro'; +import RenderArgs from '../components/RenderArgs.astro'; --- <html> diff --git a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro index e372f5a64..3645d37bb 100644 --- a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro +++ b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro @@ -1,6 +1,6 @@ --- import { Image } from 'astro:assets'; -import { getEntries, getEntry } from 'astro:content'; +import { getEntry, getEntries } from 'astro:content'; const welcomePost = await getEntry('blog', 'welcome'); diff --git a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js index b7b7d8472..638bbea4d 100644 --- a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js +++ b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js @@ -1,6 +1,6 @@ -import { getCollection } from 'astro:content'; import * as devalue from 'devalue'; import { stripAllRenderFn } from '../utils.js'; +import { getCollection } from 'astro:content'; export async function GET() { const withoutConfig = stripAllRenderFn(await getCollection('without-config')); diff --git a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js index a05a9138b..e0f123076 100644 --- a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js +++ b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js @@ -1,6 +1,6 @@ -import { getEntryBySlug } from 'astro:content'; import * as devalue from 'devalue'; import { stripRenderFn } from '../utils.js'; +import { getEntryBySlug } from 'astro:content'; export async function GET() { const columbiaWithoutConfig = stripRenderFn(await getEntryBySlug('without-config', 'columbia')); diff --git a/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro b/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro index 63b6eb70e..418d449bb 100644 --- a/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro +++ b/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro @@ -1,6 +1,6 @@ --- -import { getCollection } from "astro:content"; import type { GetStaticPaths } from "astro"; +import { getCollection } from "astro:content"; export const getStaticPaths = (async () => { const blog = await getCollection("blog"); diff --git a/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro index dcf329ec4..33f96a70d 100644 --- a/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro +++ b/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro @@ -1,5 +1,5 @@ --- -import { Image, getImage} from 'astro:assets'; +import { getImage,Image } from 'astro:assets'; import { getCollection } from 'astro:content'; export async function getStaticPaths() { diff --git a/packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro b/packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro index 90838f002..89a7288ae 100644 --- a/packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro +++ b/packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import inline from '../inline.css?inline'; import Layout from '../layouts/Layout.astro'; +import inline from '../inline.css?inline'; import raw from '../raw.css?raw'; --- <Layout title="Welcome to Astro."> diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro index 2aecfb0f2..bfdbeb5f8 100644 --- a/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro +++ b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import { getEntryBySlug } from 'astro:content'; import Button from '../components/Button.astro'; +import { getEntryBySlug } from 'astro:content'; const entry = await getEntryBySlug('en', 'endeavour'); const { Content } = await entry.render(); diff --git a/packages/astro/test/fixtures/css-order-import/src/pages/component.astro b/packages/astro/test/fixtures/css-order-import/src/pages/component.astro index 3d5f26339..1b779d18d 100644 --- a/packages/astro/test/fixtures/css-order-import/src/pages/component.astro +++ b/packages/astro/test/fixtures/css-order-import/src/pages/component.astro @@ -1,7 +1,7 @@ --- -import Client2 from '../components/Client2.jsx'; import One from '../components/One.astro'; import Two from '../components/Two.astro'; +import Client2 from '../components/Client2.jsx'; --- <html> <head> diff --git a/packages/astro/test/fixtures/css-order-import/src/pages/dedupe.astro b/packages/astro/test/fixtures/css-order-import/src/pages/dedupe.astro index bbd26ad6b..ea3a01670 100644 --- a/packages/astro/test/fixtures/css-order-import/src/pages/dedupe.astro +++ b/packages/astro/test/fixtures/css-order-import/src/pages/dedupe.astro @@ -1,6 +1,6 @@ --- -import Dedupe from '../components/Dedupe.jsx'; import '../styles/AstroJsx.css'; +import Dedupe from '../components/Dedupe.jsx'; --- <html> <head> diff --git a/packages/astro/test/fixtures/css-order-import/src/pages/index.astro b/packages/astro/test/fixtures/css-order-import/src/pages/index.astro index 6cc9ac708..0a6baab59 100644 --- a/packages/astro/test/fixtures/css-order-import/src/pages/index.astro +++ b/packages/astro/test/fixtures/css-order-import/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import Client1 from '../components/Client1.jsx'; import '../styles/base.css'; +import Client1 from '../components/Client1.jsx'; --- <html> <head> diff --git a/packages/astro/test/fixtures/css-order-layout/src/layouts/Main.astro b/packages/astro/test/fixtures/css-order-layout/src/layouts/Main.astro index 225b8c103..49f378bc6 100644 --- a/packages/astro/test/fixtures/css-order-layout/src/layouts/Main.astro +++ b/packages/astro/test/fixtures/css-order-layout/src/layouts/Main.astro @@ -1,6 +1,6 @@ --- -import BlueButton from "../components/BlueButton.astro"; import MainHead from "../components/MainHead.astro"; +import BlueButton from "../components/BlueButton.astro"; --- <html lang="en"> diff --git a/packages/astro/test/fixtures/css-order-layout/src/layouts/Second.astro b/packages/astro/test/fixtures/css-order-layout/src/layouts/Second.astro index 225b8c103..49f378bc6 100644 --- a/packages/astro/test/fixtures/css-order-layout/src/layouts/Second.astro +++ b/packages/astro/test/fixtures/css-order-layout/src/layouts/Second.astro @@ -1,6 +1,6 @@ --- -import BlueButton from "../components/BlueButton.astro"; import MainHead from "../components/MainHead.astro"; +import BlueButton from "../components/BlueButton.astro"; --- <html lang="en"> diff --git a/packages/astro/test/fixtures/fetch/src/pages/index.astro b/packages/astro/test/fixtures/fetch/src/pages/index.astro index 944873d0c..06a5bd2b3 100644 --- a/packages/astro/test/fixtures/fetch/src/pages/index.astro +++ b/packages/astro/test/fixtures/fetch/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import AlreadyImported from '../components/AlreadyImported.astro'; import Test from '../components/AstroComponent.astro'; +import AlreadyImported from '../components/AlreadyImported.astro'; import CustomDeclaration from '../components/CustomDeclaration.astro'; import JsxComponent from '../components/JsxComponent.jsx'; import SvelteComponent from '../components/SvelteComponent.svelte'; diff --git a/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro b/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro index c6aba4c40..454d7dfba 100644 --- a/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro +++ b/packages/astro/test/fixtures/fontsource-package/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import "@fontsource/monofett"; import "@fontsource/montserrat"; +import "@fontsource/monofett"; --- <html lang="en"> <head> diff --git a/packages/astro/test/fixtures/head-injection/src/pages/with-slot-in-slot.astro b/packages/astro/test/fixtures/head-injection/src/pages/with-slot-in-slot.astro index 1bd33e577..85b228c43 100644 --- a/packages/astro/test/fixtures/head-injection/src/pages/with-slot-in-slot.astro +++ b/packages/astro/test/fixtures/head-injection/src/pages/with-slot-in-slot.astro @@ -1,6 +1,6 @@ --- -import RegularSlot from "../components/RegularSlot.astro" import Layout from "../components/SlotRenderLayout.astro"; +import RegularSlot from "../components/RegularSlot.astro" --- <Layout> <RegularSlot> diff --git a/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render.astro b/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render.astro index b9cbfae96..337b4a95c 100644 --- a/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render.astro +++ b/packages/astro/test/fixtures/head-injection/src/pages/with-slot-render.astro @@ -1,6 +1,6 @@ --- -import Component from "../components/SlotRenderComponent.astro" import Layout from "../components/SlotRenderLayout.astro"; +import Component from "../components/SlotRenderComponent.astro" --- <Layout> <Component> diff --git a/packages/astro/test/fixtures/html-slots/src/pages/index.astro b/packages/astro/test/fixtures/html-slots/src/pages/index.astro index 6ccfffe41..aa4a3bd25 100644 --- a/packages/astro/test/fixtures/html-slots/src/pages/index.astro +++ b/packages/astro/test/fixtures/html-slots/src/pages/index.astro @@ -1,7 +1,7 @@ --- import Default from '../components/Default.html'; -import Inline from '../components/Inline.html'; import Named from '../components/Named.html'; +import Inline from '../components/Inline.html'; --- <Default>Default</Default> diff --git a/packages/astro/test/fixtures/hydration-race/src/components/Wrapper.astro b/packages/astro/test/fixtures/hydration-race/src/components/Wrapper.astro index d3e1e31e8..c751b2f77 100644 --- a/packages/astro/test/fixtures/hydration-race/src/components/Wrapper.astro +++ b/packages/astro/test/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'; --- <div> diff --git a/packages/astro/test/fixtures/hydration-race/src/pages/index.astro b/packages/astro/test/fixtures/hydration-race/src/pages/index.astro index 6b196b36d..d5272cc75 100644 --- a/packages/astro/test/fixtures/hydration-race/src/pages/index.astro +++ b/packages/astro/test/fixtures/hydration-race/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import One from '../components/One.jsx'; import Wrapper from '../components/Wrapper.astro'; +import One from '../components/One.jsx'; --- <html> <head> diff --git a/packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/index.astro b/packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/index.astro index c6186a7b7..d138455a3 100644 --- a/packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/index.astro +++ b/packages/astro/test/fixtures/i18n-routing-subdomain/src/pages/index.astro @@ -1,5 +1,5 @@ --- -import { getAbsoluteLocaleUrl, getLocaleByPath, getPathByLocale, getRelativeLocaleUrl } from "astro:i18n"; +import { getRelativeLocaleUrl, getAbsoluteLocaleUrl, getPathByLocale, getLocaleByPath } from "astro:i18n"; let absoluteLocaleUrl_pt = getAbsoluteLocaleUrl("pt", "about"); let absoluteLocaleUrl_it = getAbsoluteLocaleUrl("it"); diff --git a/packages/astro/test/fixtures/i18n-routing/src/pages/virtual-module.astro b/packages/astro/test/fixtures/i18n-routing/src/pages/virtual-module.astro index 4ec7e5ae5..f65356e8f 100644 --- a/packages/astro/test/fixtures/i18n-routing/src/pages/virtual-module.astro +++ b/packages/astro/test/fixtures/i18n-routing/src/pages/virtual-module.astro @@ -1,5 +1,5 @@ --- -import { getAbsoluteLocaleUrl, getLocaleByPath, getPathByLocale, getRelativeLocaleUrl } from "astro:i18n"; +import { getRelativeLocaleUrl, getAbsoluteLocaleUrl, getPathByLocale, getLocaleByPath } from "astro:i18n"; let about = getRelativeLocaleUrl("pt", "about"); let spanish = getRelativeLocaleUrl("es", "about"); diff --git a/packages/astro/test/fixtures/jsx/src/pages/frameworks.astro b/packages/astro/test/fixtures/jsx/src/pages/frameworks.astro index 91c1b5eba..cfd28a3d4 100644 --- a/packages/astro/test/fixtures/jsx/src/pages/frameworks.astro +++ b/packages/astro/test/fixtures/jsx/src/pages/frameworks.astro @@ -1,10 +1,10 @@ --- -import FrameworkMDX from '../components/Content.mdx' -import FrameworkSvelte from '../components/SvelteCounter.svelte' -import FrameworkVue from '../components/VueCounter.vue' +import FrameworkSolid from '../components/solid/SolidCounter.jsx' import FrameworkPreact from '../components/preact/PreactCounter.jsx' import FrameworkReact from '../components/react/ReactCounter.jsx' -import FrameworkSolid from '../components/solid/SolidCounter.jsx' +import FrameworkSvelte from '../components/SvelteCounter.svelte' +import FrameworkVue from '../components/VueCounter.vue' +import FrameworkMDX from '../components/Content.mdx' --- <div id="preact-wrapper"> diff --git a/packages/astro/test/fixtures/multiple-renderers/src/pages/index.astro b/packages/astro/test/fixtures/multiple-renderers/src/pages/index.astro index c5f4756c3..1708d1cc9 100644 --- a/packages/astro/test/fixtures/multiple-renderers/src/pages/index.astro +++ b/packages/astro/test/fixtures/multiple-renderers/src/pages/index.astro @@ -1,5 +1,5 @@ --- -function Component() { + function Component() { return `<div id="component">works</div>`; } --- diff --git a/packages/astro/test/fixtures/preact-component/src/pages/fn.astro b/packages/astro/test/fixtures/preact-component/src/pages/fn.astro index 6d8f6f7ed..ced75e301 100644 --- a/packages/astro/test/fixtures/preact-component/src/pages/fn.astro +++ b/packages/astro/test/fixtures/preact-component/src/pages/fn.astro @@ -1,6 +1,6 @@ --- -import ArrowFunctionComponent from '../components/ArrowFunction.jsx'; import FunctionComponent from '../components/Function.jsx'; +import ArrowFunctionComponent from '../components/ArrowFunction.jsx'; --- <html> diff --git a/packages/astro/test/fixtures/preact-component/src/pages/signals.astro b/packages/astro/test/fixtures/preact-component/src/pages/signals.astro index b68fde36d..bfe4a1020 100644 --- a/packages/astro/test/fixtures/preact-component/src/pages/signals.astro +++ b/packages/astro/test/fixtures/preact-component/src/pages/signals.astro @@ -1,6 +1,6 @@ --- -import { signal } from '@preact/signals'; import Signals from '../components/Signals'; +import { signal } from '@preact/signals'; const count = signal(1); --- <html> diff --git a/packages/astro/test/fixtures/react-jsx-export/src/pages/index.astro b/packages/astro/test/fixtures/react-jsx-export/src/pages/index.astro index 0d774e80b..945f965f5 100644 --- a/packages/astro/test/fixtures/react-jsx-export/src/pages/index.astro +++ b/packages/astro/test/fixtures/react-jsx-export/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import {ConstDeclarationExport, FunctionDeclarationExport,LetDeclarationExport } from '../components/DeclarationExportTest' import ListAsDefaultExport, {ListExport, RenamedListExport, ListExportTestComponent} from '../components/ListExportTest' +import {ConstDeclarationExport, LetDeclarationExport, FunctionDeclarationExport} from '../components/DeclarationExportTest' import AnonymousArrowDefaultExport from '../components/defaultExport/AnonymousArrowDefaultExport' import AnonymousFunctionDefaultExport from '../components/defaultExport/AnonymousFunctionDefaultExport' import HocDefaultExport from '../components/defaultExport/HocDefaultExport' diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/[...catchall].astro b/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/[...catchall].astro index f212b6e53..622638e70 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/[...catchall].astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/[...catchall].astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { lang: 'de', catchall: '1/2' } }, { params: { lang: 'en', catchall: '1/2' } } diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/index.astro b/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/index.astro index 4af288f0b..a0bf17881 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/index.astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/[lang]/index.astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { lang: 'de' } }, // always shadowed by /de/index.astro { params: { lang: 'en' } } diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/[page].astro b/packages/astro/test/fixtures/routing-priority/src/pages/[page].astro index 74f5d463f..7543bce3a 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/[page].astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/[page].astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { page: "page-1" } diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/[slug].astro b/packages/astro/test/fixtures/routing-priority/src/pages/[slug].astro index 55e8161bb..409942844 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/[slug].astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/[slug].astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { slug: "slug-1" }, diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/posts/[...slug].astro b/packages/astro/test/fixtures/routing-priority/src/pages/posts/[...slug].astro index a3a57b006..839a46f9b 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/posts/[...slug].astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/posts/[...slug].astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { slug: "1/2" }, diff --git a/packages/astro/test/fixtures/routing-priority/src/pages/posts/[pid].astro b/packages/astro/test/fixtures/routing-priority/src/pages/posts/[pid].astro index a9245b5ba..47b332a32 100644 --- a/packages/astro/test/fixtures/routing-priority/src/pages/posts/[pid].astro +++ b/packages/astro/test/fixtures/routing-priority/src/pages/posts/[pid].astro @@ -1,5 +1,5 @@ --- -export async function getStaticPaths() { + export async function getStaticPaths() { return [ { params: { pid: 'post-1' } }, { params: { pid: 'post-2' } } diff --git a/packages/astro/test/fixtures/solid-component/src/pages/index.astro b/packages/astro/test/fixtures/solid-component/src/pages/index.astro index e4931ded1..06a35b287 100644 --- a/packages/astro/test/fixtures/solid-component/src/pages/index.astro +++ b/packages/astro/test/fixtures/solid-component/src/pages/index.astro @@ -1,9 +1,9 @@ --- -import { Router } from "@solidjs/router"; -import { Counter as DepCounter } from '@test/solid-jsx-component'; import Hello from '../components/Hello.jsx'; -import ProxyComponent from '../components/ProxyComponent.jsx'; import WithNewlines from '../components/WithNewlines.jsx'; +import { Router } from "@solidjs/router"; +import ProxyComponent from '../components/ProxyComponent.jsx'; +import { Counter as DepCounter } from '@test/solid-jsx-component'; --- <html> <head><title>Solid</title></head> diff --git a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro index bf968b5ac..60f0b429b 100644 --- a/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro +++ b/packages/astro/test/fixtures/solid-component/src/pages/ssr-client-none.astro @@ -1,6 +1,6 @@ --- -import { LazyCounter } from '../components/LazyCounter.jsx'; import { AsyncComponent } from '../components/async-components.jsx'; +import { LazyCounter } from '../components/LazyCounter.jsx'; --- <html> diff --git a/packages/astro/test/fixtures/special-chars-in-component-imports/src/pages/index.astro b/packages/astro/test/fixtures/special-chars-in-component-imports/src/pages/index.astro index 62d5e4afd..9f44b97c5 100644 --- a/packages/astro/test/fixtures/special-chars-in-component-imports/src/pages/index.astro +++ b/packages/astro/test/fixtures/special-chars-in-component-imports/src/pages/index.astro @@ -1,11 +1,11 @@ --- import CaretCounter from '../components/^--with-carets/Counter'; import RocketCounter from '../components/and-rockets-🚀/Counter'; -import RoundBracketCounter from '../components/with-(round-brackets)/Counter'; -import SquareBracketCounter from '../components/with-[square-brackets]/Counter'; // Not supported in Vite // import PercentCounter from '../components/now-100%-better/Counter'; import SpaceCounter from '../components/with some spaces/Counter'; +import RoundBracketCounter from '../components/with-(round-brackets)/Counter'; +import SquareBracketCounter from '../components/with-[square-brackets]/Counter'; --- <html> <head> diff --git a/packages/astro/test/fixtures/static-build/src/pages/hoisted.astro b/packages/astro/test/fixtures/static-build/src/pages/hoisted.astro index 6d66d9896..9677a6c52 100644 --- a/packages/astro/test/fixtures/static-build/src/pages/hoisted.astro +++ b/packages/astro/test/fixtures/static-build/src/pages/hoisted.astro @@ -1,6 +1,6 @@ --- -import ExternalHoisted from '../components/ExternalHoisted.astro'; import InlineHoisted from '../components/InlineHoisted.astro'; +import ExternalHoisted from '../components/ExternalHoisted.astro'; --- <html> diff --git a/packages/astro/test/fixtures/static-build/src/pages/index.astro b/packages/astro/test/fixtures/static-build/src/pages/index.astro index 054b82a01..5bd2410ac 100644 --- a/packages/astro/test/fixtures/static-build/src/pages/index.astro +++ b/packages/astro/test/fixtures/static-build/src/pages/index.astro @@ -1,7 +1,7 @@ --- -import { test as ssrConfigTest } from '@test/static-build-pkg'; import MainHead from '../components/MainHead.astro'; import Nav from '../components/Nav/index.jsx'; +import { test as ssrConfigTest } from '@test/static-build-pkg'; let allPosts = await Astro.glob('./posts/*.md'); // Note that this just tests a warning diff --git a/packages/astro/test/fixtures/streaming/src/pages/index.astro b/packages/astro/test/fixtures/streaming/src/pages/index.astro index dd680eba7..ef0e8eb49 100644 --- a/packages/astro/test/fixtures/streaming/src/pages/index.astro +++ b/packages/astro/test/fixtures/streaming/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import AsyncEach from '../components/AsyncEach.astro'; import Header from '../components/Header.astro'; +import AsyncEach from '../components/AsyncEach.astro'; import { wait } from '../wait'; async function * list() { diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts index eeeba5a50..0109835c6 100644 --- a/packages/create-astro/src/messages.ts +++ b/packages/create-astro/src/messages.ts @@ -1,6 +1,6 @@ import { exec } from 'node:child_process'; /* eslint no-console: 'off' */ -import { color, say as houston, label, spinner as load } from '@astrojs/cli-kit'; +import { color, label, say as houston, spinner as load } from '@astrojs/cli-kit'; import { align, sleep } from '@astrojs/cli-kit/utils'; import stripAnsi from 'strip-ansi'; import { shell } from './shell.js'; diff --git a/packages/db/test/fixtures/basics/db/config.ts b/packages/db/test/fixtures/basics/db/config.ts index eb4d94be4..137fd2650 100644 --- a/packages/db/test/fixtures/basics/db/config.ts +++ b/packages/db/test/fixtures/basics/db/config.ts @@ -1,5 +1,5 @@ -import { column, defineDb, defineTable } from 'astro:db'; import { Themes } from './theme'; +import { column, defineDb, defineTable } from 'astro:db'; const Author = defineTable({ columns: { diff --git a/packages/db/test/fixtures/basics/db/seed.ts b/packages/db/test/fixtures/basics/db/seed.ts index 256be9359..a1502dc2b 100644 --- a/packages/db/test/fixtures/basics/db/seed.ts +++ b/packages/db/test/fixtures/basics/db/seed.ts @@ -1,6 +1,6 @@ -import { Author, db } from 'astro:db'; import { asDrizzleTable } from '@astrojs/db/utils'; import { Themes as ThemesConfig } from './theme'; +import { Author, db } from 'astro:db'; const Themes = asDrizzleTable('Themes', ThemesConfig); export default async function () { diff --git a/packages/db/test/fixtures/basics/src/pages/index.astro b/packages/db/test/fixtures/basics/src/pages/index.astro index 2be0c4b23..2d21f8110 100644 --- a/packages/db/test/fixtures/basics/src/pages/index.astro +++ b/packages/db/test/fixtures/basics/src/pages/index.astro @@ -1,6 +1,6 @@ --- /// <reference path="../../.astro/db-types.d.ts" /> -import { Author, Themes, db } from 'astro:db'; +import { Author, db, Themes } from 'astro:db'; const authors = await db.select().from(Author); const themes = await db.select().from(Themes); diff --git a/packages/db/test/fixtures/integration-only/integration/config.ts b/packages/db/test/fixtures/integration-only/integration/config.ts index 71490be95..d1f1aac26 100644 --- a/packages/db/test/fixtures/integration-only/integration/config.ts +++ b/packages/db/test/fixtures/integration-only/integration/config.ts @@ -1,5 +1,5 @@ -import { defineDb } from 'astro:db'; import { menu } from './shared'; +import { defineDb } from 'astro:db'; export default defineDb({ tables: { diff --git a/packages/db/test/fixtures/integration-only/integration/seed.ts b/packages/db/test/fixtures/integration-only/integration/seed.ts index ed2b2e2eb..d46b05e1c 100644 --- a/packages/db/test/fixtures/integration-only/integration/seed.ts +++ b/packages/db/test/fixtures/integration-only/integration/seed.ts @@ -1,6 +1,6 @@ -import { db } from 'astro:db'; import { asDrizzleTable } from '@astrojs/db/utils'; import { menu } from './shared'; +import { db } from 'astro:db'; export default async function () { const table = asDrizzleTable('menu', menu); diff --git a/packages/db/test/fixtures/integrations/integration/config.ts b/packages/db/test/fixtures/integrations/integration/config.ts index 71490be95..d1f1aac26 100644 --- a/packages/db/test/fixtures/integrations/integration/config.ts +++ b/packages/db/test/fixtures/integrations/integration/config.ts @@ -1,5 +1,5 @@ -import { defineDb } from 'astro:db'; import { menu } from './shared'; +import { defineDb } from 'astro:db'; export default defineDb({ tables: { diff --git a/packages/db/test/fixtures/integrations/integration/seed.ts b/packages/db/test/fixtures/integrations/integration/seed.ts index ed2b2e2eb..d46b05e1c 100644 --- a/packages/db/test/fixtures/integrations/integration/seed.ts +++ b/packages/db/test/fixtures/integrations/integration/seed.ts @@ -1,6 +1,6 @@ -import { db } from 'astro:db'; import { asDrizzleTable } from '@astrojs/db/utils'; import { menu } from './shared'; +import { db } from 'astro:db'; export default async function () { const table = asDrizzleTable('menu', menu); diff --git a/packages/db/test/fixtures/recipes/src/pages/index.astro b/packages/db/test/fixtures/recipes/src/pages/index.astro index 9fd2dac41..f1856c12e 100644 --- a/packages/db/test/fixtures/recipes/src/pages/index.astro +++ b/packages/db/test/fixtures/recipes/src/pages/index.astro @@ -1,6 +1,6 @@ --- /// <reference path="../../.astro/db-types.d.ts" /> -import { Ingredient, Recipe, db, eq } from 'astro:db'; +import { Recipe, Ingredient, db, eq } from 'astro:db'; const ingredientsByRecipe = await db .select({ diff --git a/packages/db/test/fixtures/ticketing-example/src/components/Form.tsx b/packages/db/test/fixtures/ticketing-example/src/components/Form.tsx index f393d8281..a4f69c558 100644 --- a/packages/db/test/fixtures/ticketing-example/src/components/Form.tsx +++ b/packages/db/test/fixtures/ticketing-example/src/components/Form.tsx @@ -1,5 +1,6 @@ // Generated by simple:form +import { type ComponentProps, createContext, useContext, useState } from 'react'; import { navigate } from 'astro:transitions/client'; import { type FieldErrors, @@ -12,7 +13,6 @@ import { toValidateField, validateForm, } from 'simple:form'; -import { type ComponentProps, createContext, useContext, useState } from 'react'; export function useCreateFormContext(validator: FormValidator, fieldErrors?: FieldErrors) { const initial = getInitialFormState({ validator, fieldErrors }); diff --git a/packages/db/test/fixtures/ticketing-example/src/pages/[event]/_Ticket.tsx b/packages/db/test/fixtures/ticketing-example/src/pages/[event]/_Ticket.tsx index 5e488d69d..bb244122b 100644 --- a/packages/db/test/fixtures/ticketing-example/src/pages/[event]/_Ticket.tsx +++ b/packages/db/test/fixtures/ticketing-example/src/pages/[event]/_Ticket.tsx @@ -1,7 +1,7 @@ -import { createForm } from 'simple:form'; import { useState } from 'react'; import { z } from 'zod'; import { Form, Input } from '../../components/Form'; +import { createForm } from 'simple:form'; export const ticketForm = createForm({ email: z.string().email(), diff --git a/packages/integrations/lit/server-shim.js b/packages/integrations/lit/server-shim.js index ed371f89a..7cbee09f4 100644 --- a/packages/integrations/lit/server-shim.js +++ b/packages/integrations/lit/server-shim.js @@ -1,4 +1,4 @@ -import { customElements as litCE, HTMLElement as litShimHTMLElement } from '@lit-labs/ssr-dom-shim'; +import { HTMLElement as litShimHTMLElement, customElements as litCE } from '@lit-labs/ssr-dom-shim'; // Something at build time injects document.currentScript = undefined instead of // document.currentScript = null. This causes Sass build to fail because it diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts index 1af9214af..89f9f9e86 100644 --- a/packages/integrations/markdoc/src/content-entry-type.ts +++ b/packages/integrations/markdoc/src/content-entry-type.ts @@ -6,7 +6,7 @@ import Markdoc from '@markdoc/markdoc'; import type { AstroConfig, ContentEntryType } from 'astro'; import { emitESMImage } from 'astro/assets/utils'; import matter from 'gray-matter'; -import type { Rollup, ErrorPayload as ViteErrorPayload } from 'vite'; +import type { ErrorPayload as ViteErrorPayload, Rollup } from 'vite'; import type { ComponentConfig } from './config.js'; import { htmlTokenTransform } from './html/transform/html-token-transform.js'; import type { MarkdocConfigResult } from './load-config.js'; diff --git a/packages/integrations/markdoc/src/runtime-assets-config.ts b/packages/integrations/markdoc/src/runtime-assets-config.ts index 0211c1381..d93605f6c 100644 --- a/packages/integrations/markdoc/src/runtime-assets-config.ts +++ b/packages/integrations/markdoc/src/runtime-assets-config.ts @@ -1,7 +1,7 @@ -//@ts-expect-error Cannot find module 'astro:assets' or its corresponding type declarations. -import { Image } from 'astro:assets'; import type { Config as MarkdocConfig } from '@markdoc/markdoc'; import Markdoc from '@markdoc/markdoc'; +//@ts-expect-error Cannot find module 'astro:assets' or its corresponding type declarations. +import { Image } from 'astro:assets'; export const assetsConfig: MarkdocConfig = { nodes: { diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js index cb3c84652..75dd29d8e 100644 --- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js +++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js @@ -1,6 +1,6 @@ -import { getCollection } from 'astro:content'; import { stringify } from 'devalue'; import { stripAllRenderFn } from '../../utils.js'; +import { getCollection } from 'astro:content'; export async function GET() { const posts = await getCollection('blog'); diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js index 53dd17013..1399aa3aa 100644 --- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js +++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js @@ -1,6 +1,6 @@ -import { getEntryBySlug } from 'astro:content'; import { stringify } from 'devalue'; import { stripRenderFn } from '../../utils.js'; +import { getEntryBySlug } from 'astro:content'; export async function GET() { const post = await getEntryBySlug('blog', 'post-1'); diff --git a/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro index 90b021e95..2baef9d69 100644 --- a/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro +++ b/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro @@ -1,5 +1,5 @@ --- -import { CollectionEntry, getCollection } from "astro:content"; +import { getCollection, CollectionEntry } from "astro:content"; export async function getStaticPaths() { const docs = await getCollection('docs'); diff --git a/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro index 90b021e95..2baef9d69 100644 --- a/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro +++ b/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro @@ -1,5 +1,5 @@ --- -import { CollectionEntry, getCollection } from "astro:content"; +import { getCollection, CollectionEntry } from "astro:content"; export async function getStaticPaths() { const docs = await getCollection('docs'); diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/src/components/Image.astro b/packages/integrations/markdoc/test/fixtures/image-assets/src/components/Image.astro index e572c04d7..aac129452 100644 --- a/packages/integrations/markdoc/test/fixtures/image-assets/src/components/Image.astro +++ b/packages/integrations/markdoc/test/fixtures/image-assets/src/components/Image.astro @@ -1,7 +1,7 @@ --- -import { Image } from 'astro:assets'; // src/components/MyImage.astro import type { ImageMetadata } from 'astro'; +import { Image } from 'astro:assets'; type Props = { src: string | ImageMetadata; alt: string; diff --git a/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro index bea51d3b5..1f60f6589 100644 --- a/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro +++ b/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro @@ -1,5 +1,5 @@ --- -import { getCollection, getEntryBySlug } from "astro:content"; +import { getEntryBySlug, getCollection } from "astro:content"; const { slug } = Astro.params; diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro index 5afb5be92..7d6ca0ca4 100644 --- a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro +++ b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/posts/[post].astro @@ -1,7 +1,7 @@ --- import { getCollection } from 'astro:content'; -import SmallCaps from '../../components/SmallCaps.astro'; import Layout from '../../layouts/ContentLayout.astro'; +import SmallCaps from '../../components/SmallCaps.astro'; export async function getStaticPaths() { const entries = await getCollection('posts'); diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/remote.astro b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/remote.astro index 7c8000642..9a7b76a10 100644 --- a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/remote.astro +++ b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/pages/remote.astro @@ -1,8 +1,8 @@ --- -import { Markdown } from 'astro-remote' -import Paragraph from '../components/P.astro'; -import Layout from '../layouts/One.astro'; import '../styles/global.css' +import Layout from '../layouts/One.astro'; +import Paragraph from '../components/P.astro'; +import { Markdown } from 'astro-remote' --- <Layout title="Welcome to Astro."> diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/components/MyImage.astro b/packages/integrations/mdx/test/fixtures/mdx-images/src/components/MyImage.astro index 3cb699e3a..e3541867c 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/src/components/MyImage.astro +++ b/packages/integrations/mdx/test/fixtures/mdx-images/src/components/MyImage.astro @@ -1,6 +1,6 @@ --- -import { Image } from 'astro:assets'; import type { ImageMetadata } from 'astro'; +import { Image } from 'astro:assets'; type Props = { src: string | ImageMetadata; diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro index 4e4db66a4..e5f7a61d9 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro +++ b/packages/integrations/mdx/test/fixtures/mdx-images/src/pages/esm-import.astro @@ -1,6 +1,6 @@ --- -import MyImage from 'src/components/MyImage.astro'; import MDX from '../components/Component.mdx'; +import MyImage from 'src/components/MyImage.astro'; --- <!DOCTYPE html> diff --git a/packages/integrations/mdx/test/fixtures/mdx-optimize/src/pages/import.astro b/packages/integrations/mdx/test/fixtures/mdx-optimize/src/pages/import.astro index 9bfa7cebf..b522a3028 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-optimize/src/pages/import.astro +++ b/packages/integrations/mdx/test/fixtures/mdx-optimize/src/pages/import.astro @@ -1,6 +1,6 @@ --- -import Strong from '../components/Strong.astro' import { Content, components } from './index.mdx' +import Strong from '../components/Strong.astro' --- <!DOCTYPE html> diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js index b2e94fbf0..f7de2ff2e 100644 --- a/packages/integrations/react/server.js +++ b/packages/integrations/react/server.js @@ -1,8 +1,8 @@ -import opts from 'astro:react:opts'; import React from 'react'; import ReactDOM from 'react-dom/server'; import { incrementId } from './context.js'; import StaticHtml from './static-html.js'; +import opts from 'astro:react:opts'; const slotName = (str) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase()); const reactTypeof = Symbol.for('react.element'); diff --git a/packages/integrations/react/test/fixtures/react-component/src/pages/index.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/index.astro index b3b95c4b3..3afd8233f 100644 --- a/packages/integrations/react/test/fixtures/react-component/src/pages/index.astro +++ b/packages/integrations/react/test/fixtures/react-component/src/pages/index.astro @@ -1,12 +1,12 @@ --- -import ArrowFunction from '../components/ArrowFunction.jsx'; -import CloneElement from '../components/CloneElement'; -import Later from '../components/Goodbye.vue'; import Hello from '../components/Hello.jsx'; +import Later from '../components/Goodbye.vue'; +import ArrowFunction from '../components/ArrowFunction.jsx'; import PropsSpread from '../components/PropsSpread.jsx'; -import Pure from '../components/Pure.jsx'; import {Research2} from '../components/Research.jsx'; +import Pure from '../components/Pure.jsx'; import TypeScriptComponent from '../components/TypeScriptComponent'; +import CloneElement from '../components/CloneElement'; import WithChildren from '../components/WithChildren'; import WithId from '../components/WithId'; diff --git a/packages/integrations/vue/client.js b/packages/integrations/vue/client.js index 807f843fc..3fdf53dae 100644 --- a/packages/integrations/vue/client.js +++ b/packages/integrations/vue/client.js @@ -1,6 +1,6 @@ -import { setup } from 'virtual:@astrojs/vue/app'; import { Suspense, createApp, createSSRApp, h } from 'vue'; import StaticHtml from './static-html.js'; +import { setup } from 'virtual:@astrojs/vue/app'; export default (element) => async (Component, props, slotted, { client }) => { diff --git a/packages/integrations/vue/server.js b/packages/integrations/vue/server.js index be57dd43a..55d61871d 100644 --- a/packages/integrations/vue/server.js +++ b/packages/integrations/vue/server.js @@ -1,7 +1,7 @@ -import { setup } from 'virtual:@astrojs/vue/app'; import { createSSRApp, h } from 'vue'; import { renderToString } from 'vue/server-renderer'; import StaticHtml from './static-html.js'; +import { setup } from 'virtual:@astrojs/vue/app'; function check(Component) { return !!Component['ssrRender'] || !!Component['__ssrInlineRender']; diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint/src/pages/index.astro b/packages/integrations/vue/test/fixtures/app-entrypoint/src/pages/index.astro index 511b626ba..a517f8a97 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint/src/pages/index.astro +++ b/packages/integrations/vue/test/fixtures/app-entrypoint/src/pages/index.astro @@ -1,8 +1,8 @@ --- import Foo from '../components/Foo.vue'; +import MultipleScriptBlocks, { doubleNumber } from '../components/MultipleScriptBlocks.vue'; import GenericComponent from '../components/Generics.vue'; import GenericsAndBlocks, { customFormatter } from '../components/GenericsAndBlocks.vue'; -import MultipleScriptBlocks, { doubleNumber } from '../components/MultipleScriptBlocks.vue'; --- <html> diff --git a/packages/integrations/vue/test/fixtures/basics/src/pages/index.astro b/packages/integrations/vue/test/fixtures/basics/src/pages/index.astro index b2f292d10..e17de6edf 100644 --- a/packages/integrations/vue/test/fixtures/basics/src/pages/index.astro +++ b/packages/integrations/vue/test/fixtures/basics/src/pages/index.astro @@ -1,6 +1,6 @@ --- -import Bar from '../components/Foo.vue'; import Parent from '../components/Parent.astro'; +import Bar from '../components/Foo.vue'; --- <html> <head> diff --git a/packages/markdown/remark/src/frontmatter-injection.ts b/packages/markdown/remark/src/frontmatter-injection.ts index 91b98ebcb..cb53d2ab2 100644 --- a/packages/markdown/remark/src/frontmatter-injection.ts +++ b/packages/markdown/remark/src/frontmatter-injection.ts @@ -1,4 +1,4 @@ -import type { VFileData as Data, VFile } from 'vfile'; +import type { VFile, VFileData as Data } from 'vfile'; import type { MarkdownAstroData } from './types.js'; function isValidAstroData(obj: unknown): obj is MarkdownAstroData { diff --git a/packages/telemetry/src/system-info.ts b/packages/telemetry/src/system-info.ts index 2913b6941..1315c63c9 100644 --- a/packages/telemetry/src/system-info.ts +++ b/packages/telemetry/src/system-info.ts @@ -1,5 +1,5 @@ import os from 'node:os'; -import { name as ciName, isCI } from 'ci-info'; +import { isCI, name as ciName } from 'ci-info'; import isDocker from 'is-docker'; import isWSL from 'is-wsl'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 76bfe49ba..7a63eb123 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,9 +14,6 @@ importers: .: dependencies: - '@biomejs/biome': - specifier: ^1.5.3 - version: 1.6.0 astro-benchmark: specifier: workspace:* version: link:benchmark @@ -24,6 +21,9 @@ importers: '@astrojs/check': specifier: ^0.5.8 version: 0.5.8(prettier-plugin-astro@0.12.3)(prettier@3.2.5)(typescript@5.2.2) + '@biomejs/biome': + specifier: 1.5.3 + version: 1.5.3 '@changesets/changelog-github': specifier: ^0.4.8 version: 0.4.8 @@ -207,10 +207,10 @@ importers: version: link:../../packages/integrations/vue '@types/react': specifier: ^18.2.37 - version: 18.2.64 + version: 18.2.57 '@types/react-dom': specifier: ^18.2.15 - version: 18.2.21 + version: 18.2.19 astro: specifier: ^4.5.2 version: link:../../packages/astro @@ -5995,92 +5995,92 @@ packages: '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 - /@biomejs/biome@1.6.0: - resolution: {integrity: sha512-hvP8K1+CV8qc9eNdXtPwzScVxFSHB448CPKSqX6+8IW8G7bbhBVKGC80BowExJN5+vu+kzsj4xkWa780MAOlJw==} + /@biomejs/biome@1.5.3: + resolution: {integrity: sha512-yvZCa/g3akwTaAQ7PCwPWDCkZs3Qa5ONg/fgOUT9e6wAWsPftCjLQFPXBeGxPK30yZSSpgEmRCfpGTmVbUjGgg==} engines: {node: '>=14.*'} hasBin: true requiresBuild: true optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.6.0 - '@biomejs/cli-darwin-x64': 1.6.0 - '@biomejs/cli-linux-arm64': 1.6.0 - '@biomejs/cli-linux-arm64-musl': 1.6.0 - '@biomejs/cli-linux-x64': 1.6.0 - '@biomejs/cli-linux-x64-musl': 1.6.0 - '@biomejs/cli-win32-arm64': 1.6.0 - '@biomejs/cli-win32-x64': 1.6.0 - dev: false - - /@biomejs/cli-darwin-arm64@1.6.0: - resolution: {integrity: sha512-K1Fjqye5pt+Ua+seC7V/2bFjfnqOaEOcQbBQSiiefB/VPNOb6lA5NFIfJ1PskTA3JrMXE1k7iqKQn56qrKFS6A==} + '@biomejs/cli-darwin-arm64': 1.5.3 + '@biomejs/cli-darwin-x64': 1.5.3 + '@biomejs/cli-linux-arm64': 1.5.3 + '@biomejs/cli-linux-arm64-musl': 1.5.3 + '@biomejs/cli-linux-x64': 1.5.3 + '@biomejs/cli-linux-x64-musl': 1.5.3 + '@biomejs/cli-win32-arm64': 1.5.3 + '@biomejs/cli-win32-x64': 1.5.3 + dev: true + + /@biomejs/cli-darwin-arm64@1.5.3: + resolution: {integrity: sha512-ImU7mh1HghEDyqNmxEZBoMPr8SxekkZuYcs+gynKlNW+TALQs7swkERiBLkG9NR0K1B3/2uVzlvYowXrmlW8hw==} engines: {node: '>=14.*'} cpu: [arm64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-darwin-x64@1.6.0: - resolution: {integrity: sha512-CjEALu6vN9RbcfhaBDoj481mesUIsUjxgQn+/kiMCea+Paypqslhez1I7OwRBJnkzz+Pa+PXdABd7S30eyy6+Q==} + /@biomejs/cli-darwin-x64@1.5.3: + resolution: {integrity: sha512-vCdASqYnlpq/swErH7FD6nrFz0czFtK4k/iLgj0/+VmZVjineFPgevOb+Sr9vz0tk0GfdQO60bSpI74zU8M9Dw==} engines: {node: '>=14.*'} cpu: [x64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-linux-arm64-musl@1.6.0: - resolution: {integrity: sha512-prww6AUuJ+IO/GziN3WjtGM/DNOVuPFxqWrK97wKTZygEDdA+o1qHUN2HeCkSyk084xnzbMSbls5xscAKAn43A==} + /@biomejs/cli-linux-arm64-musl@1.5.3: + resolution: {integrity: sha512-DYuMizUYUBYfS0IHGjDrOP1RGipqWfMGEvNEJ398zdtmCKLXaUvTimiox5dvx4X15mBK5M2m8wgWUgOP1giUpQ==} engines: {node: '>=14.*'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-linux-arm64@1.6.0: - resolution: {integrity: sha512-32LVrC7dAgQT39YZ0ieO/VzzpAflozs9mW5K0oKNef7S4ocCdk89E98eXApxOdei0JTf3vfseDCl1AUIp6MwJw==} + /@biomejs/cli-linux-arm64@1.5.3: + resolution: {integrity: sha512-cupBQv0sNF1OKqBfx7EDWMSsKwRrBUZfjXawT4s6hKV6ALq7p0QzWlxr/sDmbKMLOaLQtw2Qgu/77N9rm+f9Rg==} engines: {node: '>=14.*'} cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-linux-x64-musl@1.6.0: - resolution: {integrity: sha512-NwitWeUKCy8G/rr+rgHPYirnrsOjJEJBWODdaRzweeFNcJjvO6de6AmNdSJzsewzLEaxjOWyoXU03MdzbGz/6Q==} + /@biomejs/cli-linux-x64-musl@1.5.3: + resolution: {integrity: sha512-UUHiAnlDqr2Y/LpvshBFhUYMWkl2/Jn+bi3U6jKuav0qWbbBKU/ByHgR4+NBxpKBYoCtWxhnmatfH1bpPIuZMw==} engines: {node: '>=14.*'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-linux-x64@1.6.0: - resolution: {integrity: sha512-b6mWu9Cu4w5B3K46wq9SlxKEZEEL6II/6HFNAuZ4YL8mOeQ0FTMU+wNMJFKkmkSE2zvim3xwW3PknmbLKbe3Mg==} + /@biomejs/cli-linux-x64@1.5.3: + resolution: {integrity: sha512-YQrSArQvcv4FYsk7Q91Yv4uuu5F8hJyORVcv3zsjCLGkjIjx2RhjYLpTL733SNL7v33GmOlZY0eFR1ko38tuUw==} engines: {node: '>=14.*'} cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-win32-arm64@1.6.0: - resolution: {integrity: sha512-DlNOL6mG+76iZS1gL/UiuMme7jnt+auzo2+u0aUq6UXYsb75juchwlnVLy2UV5CQjVBRB8+RM+KVoXRZ8NlBjQ==} + /@biomejs/cli-win32-arm64@1.5.3: + resolution: {integrity: sha512-HxatYH7vf/kX9nrD+pDYuV2GI9GV8EFo6cfKkahAecTuZLPxryHx1WEfJthp5eNsE0+09STGkKIKjirP0ufaZA==} engines: {node: '>=14.*'} cpu: [arm64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true - /@biomejs/cli-win32-x64@1.6.0: - resolution: {integrity: sha512-sXBcXIOGuG8/XcHqmnkhLIs0oy6Dp+TkH4Alr4WH/P8mNsp5GcStI/ZwbEiEoxA0P3Fi+oUppQ6srxaY2rSCHg==} + /@biomejs/cli-win32-x64@1.5.3: + resolution: {integrity: sha512-fMvbSouZEASU7mZH8SIJSANDm5OqsjgtVXlbUqxwed6BP7uuHRSs396Aqwh2+VoW8fwTpp6ybIUoC9FrzB0kyA==} engines: {node: '>=14.*'} cpu: [x64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true /@builder.io/partytown@0.8.2: @@ -7997,11 +7997,25 @@ packages: resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} dev: true + /@types/react-dom@18.2.19: + resolution: {integrity: sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==} + dependencies: + '@types/react': 18.2.57 + dev: false + /@types/react-dom@18.2.21: resolution: {integrity: sha512-gnvBA/21SA4xxqNXEwNiVcP0xSGHh/gi1VhWv9Bl46a0ItbTT5nFY+G9VSQpaG/8N/qdJpJ+vftQ4zflTtnjLw==} dependencies: '@types/react': 18.2.64 + /@types/react@18.2.57: + resolution: {integrity: sha512-ZvQsktJgSYrQiMirAN60y4O/LRevIV8hUzSOSNB6gfR3/o3wCBFQx3sPwIYtuDMeiVgsSS3UzCV26tEzgnfvQw==} + dependencies: + '@types/prop-types': 15.7.11 + '@types/scheduler': 0.16.8 + csstype: 3.1.3 + dev: false + /@types/react@18.2.64: resolution: {integrity: sha512-MlmPvHgjj2p3vZaxbQgFUQFvD8QiZwACfGqEdDSWou5yISWxDQ4/74nCAwsUiX7UFLKZz3BbVSPj+YxeoGGCfg==} dependencies: @@ -8992,6 +9006,7 @@ packages: /b4a@1.6.6: resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==} + requiresBuild: true dev: false /babel-plugin-jsx-dom-expressions@0.37.17(@babel/core@7.24.0): @@ -9103,6 +9118,7 @@ packages: /bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} + requiresBuild: true dependencies: buffer: 5.7.1 inherits: 2.0.4 @@ -9394,6 +9410,7 @@ packages: /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} + requiresBuild: true dev: false /chownr@2.0.0: @@ -9518,9 +9535,11 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + requiresBuild: true /color-string@1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} + requiresBuild: true dependencies: color-name: 1.1.4 simple-swizzle: 0.2.2 @@ -9534,6 +9553,7 @@ packages: /color@4.2.3: resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==} engines: {node: '>=12.5.0'} + requiresBuild: true dependencies: color-convert: 2.0.1 color-string: 1.9.1 @@ -9848,6 +9868,7 @@ packages: /decompress-response@6.0.0: resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==} engines: {node: '>=10'} + requiresBuild: true dependencies: mimic-response: 3.1.0 dev: false @@ -9869,6 +9890,7 @@ packages: /deep-extend@0.6.0: resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} engines: {node: '>=4.0.0'} + requiresBuild: true dev: false /deep-is@0.1.4: @@ -10190,6 +10212,7 @@ packages: /end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} + requiresBuild: true dependencies: once: 1.4.0 dev: false @@ -10594,6 +10617,7 @@ packages: /expand-template@2.0.3: resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==} engines: {node: '>=6'} + requiresBuild: true dev: false /express@4.18.3: @@ -10668,6 +10692,7 @@ packages: /fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} + requiresBuild: true dev: false /fast-glob@3.3.2: @@ -10830,6 +10855,7 @@ packages: /fs-constants@1.0.0: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} + requiresBuild: true dev: false /fs-extra@10.1.0: @@ -10983,6 +11009,7 @@ packages: /github-from-package@0.0.0: resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==} + requiresBuild: true dev: false /github-slugger@2.0.0: @@ -11568,6 +11595,7 @@ packages: /ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} + requiresBuild: true dev: false /inline-style-parser@0.1.1: @@ -11615,6 +11643,7 @@ packages: /is-arrayish@0.3.2: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} + requiresBuild: true dev: false /is-bigint@1.0.4: @@ -12957,6 +12986,7 @@ packages: /mimic-response@3.1.0: resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==} engines: {node: '>=10'} + requiresBuild: true dev: false /min-indent@1.0.1: @@ -13037,6 +13067,7 @@ packages: /mkdirp-classic@0.5.3: resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==} + requiresBuild: true dev: false /mkdirp@1.0.4: @@ -13134,6 +13165,7 @@ packages: /napi-build-utils@1.0.2: resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} + requiresBuild: true dev: false /natural-compare@1.4.0: @@ -13171,12 +13203,14 @@ packages: /node-abi@3.56.0: resolution: {integrity: sha512-fZjdhDOeRcaS+rcpve7XuwHBmktS1nS1gzgghwKUQQ8nTy2FdSDr6ZT8k6YhvlJeHmmQMYiT/IH9hfco5zeW2Q==} engines: {node: '>=10'} + requiresBuild: true dependencies: semver: 7.6.0 dev: false /node-addon-api@6.1.0: resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==} + requiresBuild: true dev: false /node-domexception@1.0.0: @@ -14150,6 +14184,7 @@ packages: resolution: {integrity: sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==} engines: {node: '>=10'} hasBin: true + requiresBuild: true dependencies: detect-libc: 2.0.2 expand-template: 2.0.3 @@ -14267,6 +14302,7 @@ packages: /pump@3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} + requiresBuild: true dependencies: end-of-stream: 1.4.4 once: 1.4.0 @@ -14324,6 +14360,7 @@ packages: /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true + requiresBuild: true dependencies: deep-extend: 0.6.0 ini: 1.3.8 @@ -15065,10 +15102,12 @@ packages: /simple-concat@1.0.1: resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} + requiresBuild: true dev: false /simple-get@4.0.1: resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==} + requiresBuild: true dependencies: decompress-response: 6.0.0 once: 1.4.0 @@ -15092,6 +15131,7 @@ packages: /simple-swizzle@0.2.2: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} + requiresBuild: true dependencies: is-arrayish: 0.3.2 dev: false @@ -15252,6 +15292,7 @@ packages: /streamx@2.16.1: resolution: {integrity: sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==} + requiresBuild: true dependencies: fast-fifo: 1.3.2 queue-tick: 1.0.1 @@ -15573,6 +15614,7 @@ packages: /tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} + requiresBuild: true dependencies: chownr: 1.1.4 mkdirp-classic: 0.5.3 @@ -15582,6 +15624,7 @@ packages: /tar-fs@3.0.5: resolution: {integrity: sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==} + requiresBuild: true dependencies: pump: 3.0.0 tar-stream: 3.1.7 @@ -15593,6 +15636,7 @@ packages: /tar-stream@2.2.0: resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} engines: {node: '>=6'} + requiresBuild: true dependencies: bl: 4.1.0 end-of-stream: 1.4.4 @@ -15603,6 +15647,7 @@ packages: /tar-stream@3.1.7: resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==} + requiresBuild: true dependencies: b4a: 1.6.6 fast-fifo: 1.3.2 @@ -15802,6 +15847,7 @@ packages: /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} + requiresBuild: true dependencies: safe-buffer: 5.2.1 dev: false |