diff options
Diffstat (limited to 'packages/integrations')
39 files changed, 77 insertions, 75 deletions
diff --git a/packages/integrations/alpinejs/src/index.ts b/packages/integrations/alpinejs/src/index.ts index 77ea68c74..8bfdd95e5 100644 --- a/packages/integrations/alpinejs/src/index.ts +++ b/packages/integrations/alpinejs/src/index.ts @@ -1,6 +1,6 @@ +import { resolve } from 'node:path'; import type { AstroIntegration } from 'astro'; import type { Plugin } from 'vite'; -import { resolve } from 'node:path'; interface Options { /** 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/lit/server.js b/packages/integrations/lit/server.js index b5e56f3c2..e3f1c0340 100644 --- a/packages/integrations/lit/server.js +++ b/packages/integrations/lit/server.js @@ -1,4 +1,6 @@ +// Separate import from the rest so it doesn't get re-organized after other imports import './server-shim.js'; + import { LitElementRenderer } from '@lit-labs/ssr/lib/lit-element-renderer.js'; import * as parse5 from 'parse5'; diff --git a/packages/integrations/lit/src/index.ts b/packages/integrations/lit/src/index.ts index f8fbeccba..6c86bd740 100644 --- a/packages/integrations/lit/src/index.ts +++ b/packages/integrations/lit/src/index.ts @@ -1,5 +1,5 @@ -import type { AstroIntegration } from 'astro'; import { readFileSync } from 'node:fs'; +import type { AstroIntegration } from 'astro'; function getViteConfiguration() { return { diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts index eea580f72..fe15d03b0 100644 --- a/packages/integrations/markdoc/src/content-entry-type.ts +++ b/packages/integrations/markdoc/src/content-entry-type.ts @@ -1,12 +1,12 @@ +import fs from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import type { Config as MarkdocConfig, Node } from '@markdoc/markdoc'; import Markdoc from '@markdoc/markdoc'; import type { AstroConfig, ContentEntryType } from 'astro'; import { emitESMImage } from 'astro/assets/utils'; import matter from 'gray-matter'; -import fs from 'node:fs'; -import path from 'node:path'; -import { fileURLToPath } from 'node:url'; -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/extensions/prism.ts b/packages/integrations/markdoc/src/extensions/prism.ts index 5cfd628ca..54f98f928 100644 --- a/packages/integrations/markdoc/src/extensions/prism.ts +++ b/packages/integrations/markdoc/src/extensions/prism.ts @@ -1,6 +1,6 @@ import { runHighlighterWithAstro } from '@astrojs/prism/dist/highlighter'; import { unescapeHTML } from 'astro/runtime/server/index.js'; -import { Markdoc, type AstroMarkdocConfig } from '../config.js'; +import { type AstroMarkdocConfig, Markdoc } from '../config.js'; export default function prism(): AstroMarkdocConfig { return { diff --git a/packages/integrations/markdoc/src/index.ts b/packages/integrations/markdoc/src/index.ts index 15a0fa7af..1696b36e8 100644 --- a/packages/integrations/markdoc/src/index.ts +++ b/packages/integrations/markdoc/src/index.ts @@ -1,9 +1,9 @@ import type { AstroConfig, AstroIntegration, ContentEntryType, HookParameters } from 'astro'; import { getContentEntryType } from './content-entry-type.js'; import { + type MarkdocConfigResult, SUPPORTED_MARKDOC_CONFIG_FILES, loadMarkdocConfig, - type MarkdocConfigResult, } from './load-config.js'; import type { MarkdocIntegrationOptions } from './options.js'; diff --git a/packages/integrations/markdoc/src/load-config.ts b/packages/integrations/markdoc/src/load-config.ts index 723516ce7..6ae6f5a15 100644 --- a/packages/integrations/markdoc/src/load-config.ts +++ b/packages/integrations/markdoc/src/load-config.ts @@ -1,7 +1,7 @@ -import type { AstroConfig } from 'astro'; -import { build as esbuild } from 'esbuild'; import * as fs from 'node:fs'; import { fileURLToPath } from 'node:url'; +import type { AstroConfig } from 'astro'; +import { build as esbuild } from 'esbuild'; import type { AstroMarkdocConfig } from './config.js'; import { MarkdocError } from './utils.js'; diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts index 80d8c1b76..adbe49e48 100644 --- a/packages/integrations/mdx/src/index.ts +++ b/packages/integrations/mdx/src/index.ts @@ -1,9 +1,9 @@ +import fs from 'node:fs/promises'; +import { fileURLToPath } from 'node:url'; import { markdownConfigDefaults, setVfileFrontmatter } from '@astrojs/markdown-remark'; import type { AstroIntegration, ContentEntryType, HookParameters, SSRError } from 'astro'; import astroJSXRenderer from 'astro/jsx/renderer.js'; import { parse as parseESM } from 'es-module-lexer'; -import fs from 'node:fs/promises'; -import { fileURLToPath } from 'node:url'; import type { Options as RemarkRehypeOptions } from 'remark-rehype'; import type { PluggableList } from 'unified'; import { VFile } from 'vfile'; diff --git a/packages/integrations/mdx/src/remark-images-to-component.ts b/packages/integrations/mdx/src/remark-images-to-component.ts index 86f04aa47..4ab6a0422 100644 --- a/packages/integrations/mdx/src/remark-images-to-component.ts +++ b/packages/integrations/mdx/src/remark-images-to-component.ts @@ -1,6 +1,6 @@ import type { MarkdownVFile } from '@astrojs/markdown-remark'; import type { Image, Parent } from 'mdast'; -import type { MdxJsxFlowElement, MdxjsEsm, MdxJsxAttribute } from 'mdast-util-mdx'; +import type { MdxJsxAttribute, MdxJsxFlowElement, MdxjsEsm } from 'mdast-util-mdx'; import { visit } from 'unist-util-visit'; import { jsToTreeNode } from './utils.js'; diff --git a/packages/integrations/node/src/index.ts b/packages/integrations/node/src/index.ts index 61ea5ad74..2108ec5ca 100644 --- a/packages/integrations/node/src/index.ts +++ b/packages/integrations/node/src/index.ts @@ -1,5 +1,5 @@ -import { AstroError } from 'astro/errors'; import type { AstroAdapter, AstroIntegration } from 'astro'; +import { AstroError } from 'astro/errors'; import type { Options, UserOptions } from './types.js'; export function getAdapter(options: Options): AstroAdapter { diff --git a/packages/integrations/node/src/log-listening-on.ts b/packages/integrations/node/src/log-listening-on.ts index 5ce93bfd7..5986fc64e 100644 --- a/packages/integrations/node/src/log-listening-on.ts +++ b/packages/integrations/node/src/log-listening-on.ts @@ -1,9 +1,9 @@ -import os from 'node:os'; import type http from 'node:http'; import https from 'node:https'; +import type { AddressInfo } from 'node:net'; +import os from 'node:os'; import type { AstroIntegrationLogger } from 'astro'; import type { Options } from './types.js'; -import type { AddressInfo } from 'node:net'; export async function logListeningOn( logger: AstroIntegrationLogger, diff --git a/packages/integrations/node/src/middleware.ts b/packages/integrations/node/src/middleware.ts index 6b6c2afee..5cc4c4a46 100644 --- a/packages/integrations/node/src/middleware.ts +++ b/packages/integrations/node/src/middleware.ts @@ -1,6 +1,6 @@ +import type { NodeApp } from 'astro/app/node'; import { createAppHandler } from './serve-app.js'; import type { RequestHandler } from './types.js'; -import type { NodeApp } from 'astro/app/node'; /** * Creates a middleware that can be used with Express, Connect, etc. diff --git a/packages/integrations/node/src/preview.ts b/packages/integrations/node/src/preview.ts index 519b68082..0e3f55ae6 100644 --- a/packages/integrations/node/src/preview.ts +++ b/packages/integrations/node/src/preview.ts @@ -1,9 +1,9 @@ import { fileURLToPath } from 'node:url'; +import type { CreatePreviewServer } from 'astro'; import { AstroError } from 'astro/errors'; import { logListeningOn } from './log-listening-on.js'; -import { createServer } from './standalone.js'; -import type { CreatePreviewServer } from 'astro'; import type { createExports } from './server.js'; +import { createServer } from './standalone.js'; type ServerModule = ReturnType<typeof createExports>; type MaybeServerModule = Partial<ServerModule>; diff --git a/packages/integrations/node/src/serve-static.ts b/packages/integrations/node/src/serve-static.ts index b0b1e1766..a65e52e96 100644 --- a/packages/integrations/node/src/serve-static.ts +++ b/packages/integrations/node/src/serve-static.ts @@ -1,10 +1,10 @@ +import fs from 'node:fs'; +import type { IncomingMessage, ServerResponse } from 'node:http'; import path from 'node:path'; import url from 'node:url'; -import fs from 'node:fs'; +import type { NodeApp } from 'astro/app/node'; import send from 'send'; -import type { IncomingMessage, ServerResponse } from 'node:http'; import type { Options } from './types.js'; -import type { NodeApp } from 'astro/app/node'; /** * Creates a Node.js http listener for static files and prerendered pages. diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts index 73b59c53f..1fb9d93e5 100644 --- a/packages/integrations/node/src/server.ts +++ b/packages/integrations/node/src/server.ts @@ -1,8 +1,8 @@ +import type { SSRManifest } from 'astro'; import { NodeApp, applyPolyfills } from 'astro/app/node'; +import createMiddleware from './middleware.js'; import { createStandaloneHandler } from './standalone.js'; import startServer from './standalone.js'; -import createMiddleware from './middleware.js'; -import type { SSRManifest } from 'astro'; import type { Options } from './types.js'; applyPolyfills(); diff --git a/packages/integrations/node/src/standalone.ts b/packages/integrations/node/src/standalone.ts index 9fa8bd88c..35f1ee8d8 100644 --- a/packages/integrations/node/src/standalone.ts +++ b/packages/integrations/node/src/standalone.ts @@ -1,13 +1,13 @@ -import http from 'node:http'; import https from 'https'; import fs from 'node:fs'; +import http from 'node:http'; +import type { PreviewServer } from 'astro'; +import type { NodeApp } from 'astro/app/node'; import enableDestroy from 'server-destroy'; +import { logListeningOn } from './log-listening-on.js'; import { createAppHandler } from './serve-app.js'; import { createStaticHandler } from './serve-static.js'; -import { logListeningOn } from './log-listening-on.js'; -import type { NodeApp } from 'astro/app/node'; import type { Options } from './types.js'; -import type { PreviewServer } from 'astro'; export default function standalone(app: NodeApp, options: Options) { const port = process.env.PORT ? Number(process.env.PORT) : options.port ?? 8080; diff --git a/packages/integrations/node/src/types.ts b/packages/integrations/node/src/types.ts index 3c03dffac..010053de5 100644 --- a/packages/integrations/node/src/types.ts +++ b/packages/integrations/node/src/types.ts @@ -1,6 +1,6 @@ -import type { NodeApp } from 'astro/app/node'; import type { IncomingMessage, ServerResponse } from 'node:http'; import type { SSRManifest } from 'astro'; +import type { NodeApp } from 'astro/app/node'; export interface UserOptions { /** diff --git a/packages/integrations/partytown/src/index.ts b/packages/integrations/partytown/src/index.ts index 85b6af764..6930b1336 100644 --- a/packages/integrations/partytown/src/index.ts +++ b/packages/integrations/partytown/src/index.ts @@ -1,11 +1,11 @@ -import type { PartytownConfig } from '@builder.io/partytown/integration'; -import { partytownSnippet } from '@builder.io/partytown/integration'; -import { copyLibFiles, libDirPath } from '@builder.io/partytown/utils'; -import type { AstroIntegration } from 'astro'; import { createRequire } from 'module'; import * as fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; +import type { PartytownConfig } from '@builder.io/partytown/integration'; +import { partytownSnippet } from '@builder.io/partytown/integration'; +import { copyLibFiles, libDirPath } from '@builder.io/partytown/utils'; +import type { AstroIntegration } from 'astro'; import sirv from './sirv.js'; const resolve = createRequire(import.meta.url).resolve; diff --git a/packages/integrations/partytown/src/sirv.ts b/packages/integrations/partytown/src/sirv.ts index e6f7c6218..ce4136f2f 100644 --- a/packages/integrations/partytown/src/sirv.ts +++ b/packages/integrations/partytown/src/sirv.ts @@ -32,10 +32,10 @@ import * as fs from 'node:fs'; import { join, normalize, resolve } from 'node:path'; +import { URL } from 'node:url'; // import { totalist } from 'totalist/sync'; // import { parse } from '@polka/url'; import { lookup } from 'mrmime'; -import { URL } from 'node:url'; const noop = () => {}; diff --git a/packages/integrations/preact/src/index.ts b/packages/integrations/preact/src/index.ts index 85f9bed0f..a2264a990 100644 --- a/packages/integrations/preact/src/index.ts +++ b/packages/integrations/preact/src/index.ts @@ -1,6 +1,6 @@ -import { preact, type PreactPluginOptions as VitePreactPluginOptions } from '@preact/preset-vite'; -import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro'; import { fileURLToPath } from 'node:url'; +import { type PreactPluginOptions as VitePreactPluginOptions, preact } from '@preact/preset-vite'; +import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro'; const babelCwd = new URL('../', import.meta.url); diff --git a/packages/integrations/preact/src/server.ts b/packages/integrations/preact/src/server.ts index 01b2ba100..c502e68db 100644 --- a/packages/integrations/preact/src/server.ts +++ b/packages/integrations/preact/src/server.ts @@ -1,7 +1,7 @@ import type { AstroComponentMetadata } from 'astro'; -import { Component as BaseComponent, h, type VNode } from 'preact'; -import prepass from 'preact-ssr-prepass'; +import { Component as BaseComponent, type VNode, h } from 'preact'; import { render } from 'preact-render-to-string'; +import prepass from 'preact-ssr-prepass'; import { getContext } from './context.js'; import { restoreSignalsOnProps, serializeSignals } from './signals.js'; import StaticHtml from './static-html.js'; diff --git a/packages/integrations/react/client-v17.js b/packages/integrations/react/client-v17.js index 625dba6bf..565c688d4 100644 --- a/packages/integrations/react/client-v17.js +++ b/packages/integrations/react/client-v17.js @@ -1,5 +1,5 @@ import { createElement } from 'react'; -import { render, hydrate, unmountComponentAtNode } from 'react-dom'; +import { hydrate, render, unmountComponentAtNode } from 'react-dom'; import StaticHtml from './static-html.js'; export default (element) => diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js index b3ddeb6b1..f7de2ff2e 100644 --- a/packages/integrations/react/server.js +++ b/packages/integrations/react/server.js @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/server'; -import StaticHtml from './static-html.js'; 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()); diff --git a/packages/integrations/react/vnode-children.js b/packages/integrations/react/vnode-children.js index 0b26ef423..e0751c95a 100644 --- a/packages/integrations/react/vnode-children.js +++ b/packages/integrations/react/vnode-children.js @@ -1,5 +1,5 @@ -import { parse, DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE } from 'ultrahtml'; -import { createElement, Fragment } from 'react'; +import { Fragment, createElement } from 'react'; +import { DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE, parse } from 'ultrahtml'; let ids = 0; export default function convert(children) { diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts index 11f19f5de..9b1ea5ddb 100644 --- a/packages/integrations/sitemap/src/index.ts +++ b/packages/integrations/sitemap/src/index.ts @@ -1,6 +1,6 @@ -import type { AstroConfig, AstroIntegration } from 'astro'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; +import type { AstroConfig, AstroIntegration } from 'astro'; import type { EnumChangefreq, LinkItem as LinkItemBase, SitemapItemLoose } from 'sitemap'; import { simpleSitemapAndIndex } from 'sitemap'; import { ZodError } from 'zod'; diff --git a/packages/integrations/solid/src/server.ts b/packages/integrations/solid/src/server.ts index 81f150d93..a91658ea3 100644 --- a/packages/integrations/solid/src/server.ts +++ b/packages/integrations/solid/src/server.ts @@ -1,11 +1,11 @@ import { + NoHydration, + Suspense, createComponent, generateHydrationScript, - NoHydration, renderToString, renderToStringAsync, ssr, - Suspense, } from 'solid-js/web'; import { getContext, incrementId } from './context.js'; import type { RendererContext } from './types.js'; diff --git a/packages/integrations/svelte/server-v5.js b/packages/integrations/svelte/server-v5.js index e1d246ff4..b4ef33824 100644 --- a/packages/integrations/svelte/server-v5.js +++ b/packages/integrations/svelte/server-v5.js @@ -1,5 +1,5 @@ -import { render } from 'svelte/server'; import { add_snippet_symbol } from 'svelte/internal'; +import { render } from 'svelte/server'; // Allow a slot to be rendered as a snippet (dev validation only) const tagSlotAsSnippet = import.meta.env.DEV ? add_snippet_symbol : (s) => s; diff --git a/packages/integrations/svelte/src/index.ts b/packages/integrations/svelte/src/index.ts index 695214223..9c38b9d05 100644 --- a/packages/integrations/svelte/src/index.ts +++ b/packages/integrations/svelte/src/index.ts @@ -1,7 +1,7 @@ +import { fileURLToPath } from 'node:url'; import type { Options } from '@sveltejs/vite-plugin-svelte'; import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte'; import type { AstroIntegration, AstroRenderer } from 'astro'; -import { fileURLToPath } from 'node:url'; import { VERSION } from 'svelte/compiler'; import type { UserConfig } from 'vite'; diff --git a/packages/integrations/vercel/src/lib/nft.ts b/packages/integrations/vercel/src/lib/nft.ts index 585a45e99..6daf12558 100644 --- a/packages/integrations/vercel/src/lib/nft.ts +++ b/packages/integrations/vercel/src/lib/nft.ts @@ -1,6 +1,6 @@ -import type { AstroIntegrationLogger } from 'astro'; -import { relative, relative as relativePath } from 'node:path'; +import { relative as relativePath } from 'node:path'; import { fileURLToPath } from 'node:url'; +import type { AstroIntegrationLogger } from 'astro'; import { copyFilesToFunction } from './fs.js'; export async function copyDependenciesToFunction( @@ -21,7 +21,7 @@ export async function copyDependenciesToFunction( cache: object ): Promise<{ handler: string }> { const entryPath = fileURLToPath(entry); - logger.info(`Bundling function ${relative(fileURLToPath(outDir), entryPath)}`); + logger.info(`Bundling function ${relativePath(fileURLToPath(outDir), entryPath)}`); // Get root of folder of the system (like C:\ on Windows or / on Linux) let base = entry; diff --git a/packages/integrations/vercel/src/lib/redirects.ts b/packages/integrations/vercel/src/lib/redirects.ts index 20a5e502c..8f8db4dcf 100644 --- a/packages/integrations/vercel/src/lib/redirects.ts +++ b/packages/integrations/vercel/src/lib/redirects.ts @@ -1,6 +1,6 @@ +import nodePath from 'node:path'; import { appendForwardSlash } from '@astrojs/internal-helpers/path'; import type { AstroConfig, RouteData, RoutePart } from 'astro'; -import nodePath from 'node:path'; const pathJoin = nodePath.posix.join; diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts index 2f2e4f747..2cb35a517 100644 --- a/packages/integrations/vercel/src/serverless/adapter.ts +++ b/packages/integrations/vercel/src/serverless/adapter.ts @@ -1,3 +1,6 @@ +import { existsSync, readFileSync } from 'node:fs'; +import { basename } from 'node:path'; +import { pathToFileURL } from 'node:url'; import type { AstroAdapter, AstroConfig, @@ -7,25 +10,22 @@ import type { } from 'astro'; import { AstroError } from 'astro/errors'; import glob from 'fast-glob'; -import { basename } from 'node:path'; -import { pathToFileURL } from 'node:url'; -import { existsSync, readFileSync } from 'node:fs'; import { - getAstroImageConfig, - getDefaultImageConfig, type DevImageService, type VercelImageConfig, + getAstroImageConfig, + getDefaultImageConfig, } from '../image/shared.js'; import { removeDir, writeJson } from '../lib/fs.js'; import { copyDependenciesToFunction } from '../lib/nft.js'; import { escapeRegex, getRedirects } from '../lib/redirects.js'; import { - getSpeedInsightsViteConfig, type VercelSpeedInsightsConfig, + getSpeedInsightsViteConfig, } from '../lib/speed-insights.js'; import { - getInjectableWebAnalyticsContent, type VercelWebAnalyticsConfig, + getInjectableWebAnalyticsContent, } from '../lib/web-analytics.js'; import { generateEdgeMiddleware } from './middleware.js'; diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts index 661e75f1c..67047a7ed 100644 --- a/packages/integrations/vercel/src/serverless/entrypoint.ts +++ b/packages/integrations/vercel/src/serverless/entrypoint.ts @@ -1,11 +1,11 @@ -import type { SSRManifest } from 'astro'; -import { applyPolyfills, NodeApp } from 'astro/app/node'; import type { IncomingMessage, ServerResponse } from 'node:http'; +import type { SSRManifest } from 'astro'; +import { NodeApp, applyPolyfills } from 'astro/app/node'; import { - ASTRO_PATH_HEADER, - ASTRO_PATH_PARAM, ASTRO_LOCALS_HEADER, ASTRO_MIDDLEWARE_SECRET_HEADER, + ASTRO_PATH_HEADER, + ASTRO_PATH_PARAM, } from './adapter.js'; applyPolyfills(); diff --git a/packages/integrations/vercel/src/serverless/middleware.ts b/packages/integrations/vercel/src/serverless/middleware.ts index bf38a3a9f..1875cce00 100644 --- a/packages/integrations/vercel/src/serverless/middleware.ts +++ b/packages/integrations/vercel/src/serverless/middleware.ts @@ -1,9 +1,9 @@ import { existsSync } from 'node:fs'; -import { fileURLToPath, pathToFileURL } from 'node:url'; import { builtinModules } from 'node:module'; +import { fileURLToPath, pathToFileURL } from 'node:url'; import { - ASTRO_MIDDLEWARE_SECRET_HEADER, ASTRO_LOCALS_HEADER, + ASTRO_MIDDLEWARE_SECRET_HEADER, ASTRO_PATH_HEADER, NODE_PATH, } from './adapter.js'; diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts index 7bc793e40..d7fd57fd5 100644 --- a/packages/integrations/vercel/src/static/adapter.ts +++ b/packages/integrations/vercel/src/static/adapter.ts @@ -1,21 +1,21 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro'; import { - getAstroImageConfig, - getDefaultImageConfig, type DevImageService, type VercelImageConfig, + getAstroImageConfig, + getDefaultImageConfig, } from '../image/shared.js'; import { emptyDir, writeJson } from '../lib/fs.js'; import { isServerLikeOutput } from '../lib/prerender.js'; import { getRedirects } from '../lib/redirects.js'; import { - getSpeedInsightsViteConfig, type VercelSpeedInsightsConfig, + getSpeedInsightsViteConfig, } from '../lib/speed-insights.js'; import { - getInjectableWebAnalyticsContent, type VercelWebAnalyticsConfig, + getInjectableWebAnalyticsContent, } from '../lib/web-analytics.js'; const PACKAGE_NAME = '@astrojs/vercel/static'; diff --git a/packages/integrations/vue/client.js b/packages/integrations/vue/client.js index a6eed651a..3fdf53dae 100644 --- a/packages/integrations/vue/client.js +++ b/packages/integrations/vue/client.js @@ -1,6 +1,6 @@ -import { h, createSSRApp, createApp, Suspense } from 'vue'; -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 4bcf04903..55d61871d 100644 --- a/packages/integrations/vue/server.js +++ b/packages/integrations/vue/server.js @@ -1,7 +1,7 @@ -import { h, createSSRApp } from 'vue'; +import { createSSRApp, h } from 'vue'; import { renderToString } from 'vue/server-renderer'; -import { setup } from 'virtual:@astrojs/vue/app'; 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/src/index.ts b/packages/integrations/vue/src/index.ts index 8aa7cde0d..b65d27499 100644 --- a/packages/integrations/vue/src/index.ts +++ b/packages/integrations/vue/src/index.ts @@ -2,9 +2,9 @@ import path from 'node:path'; import type { Options as VueOptions } from '@vitejs/plugin-vue'; import vue from '@vitejs/plugin-vue'; import type { Options as VueJsxOptions } from '@vitejs/plugin-vue-jsx'; +import { MagicString } from '@vue/compiler-sfc'; import type { AstroIntegration, AstroRenderer } from 'astro'; import type { Plugin, UserConfig } from 'vite'; -import { MagicString } from '@vue/compiler-sfc'; interface Options extends VueOptions { jsx?: boolean | VueJsxOptions; diff --git a/packages/integrations/vue/static-html.js b/packages/integrations/vue/static-html.js index 885319026..689b56a70 100644 --- a/packages/integrations/vue/static-html.js +++ b/packages/integrations/vue/static-html.js @@ -1,4 +1,4 @@ -import { h, defineComponent } from 'vue'; +import { defineComponent, h } from 'vue'; /** * Astro passes `children` as a string of HTML, so we need |