diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts index 5937c3cdfa..fdaae94ff6 100644 --- a/packages/astro/src/cli/add/index.ts +++ b/packages/astro/src/cli/add/index.ts @@ -6,11 +6,11 @@ import { diffWords } from 'diff'; import { bold, cyan, dim, green, magenta, red, yellow } from 'kleur/colors'; import { type ASTNode, type ProxifiedModule, builders, generateCode, loadFile } from 'magicast'; import { getDefaultExportOptions } from 'magicast/helpers'; -import yoctoSpinner from 'yocto-spinner'; import preferredPM from 'preferred-pm'; import prompts from 'prompts'; import maxSatisfying from 'semver/ranges/max-satisfying.js'; import { exec } from 'tinyexec'; +import yoctoSpinner from 'yocto-spinner'; import { loadTSConfig, resolveConfig, diff --git a/packages/astro/src/cli/install-package.ts b/packages/astro/src/cli/install-package.ts index 049c40b7ef..f13650486c 100644 --- a/packages/astro/src/cli/install-package.ts +++ b/packages/astro/src/cli/install-package.ts @@ -2,11 +2,11 @@ import { createRequire } from 'node:module'; import boxen from 'boxen'; import ci from 'ci-info'; import { bold, cyan, dim, magenta } from 'kleur/colors'; -import yoctoSpinner from 'yocto-spinner'; import preferredPM from 'preferred-pm'; import prompts from 'prompts'; import { exec } from 'tinyexec'; import whichPm from 'which-pm'; +import yoctoSpinner from 'yocto-spinner'; import type { Logger } from '../core/logger/core.js'; const require = createRequire(import.meta.url); diff --git a/packages/astro/src/content/consts.ts b/packages/astro/src/content/consts.ts index 51eb6b78ed..76218d7e8a 100644 --- a/packages/astro/src/content/consts.ts +++ b/packages/astro/src/content/consts.ts @@ -38,6 +38,6 @@ export const DATA_STORE_FILE = 'data-store.json'; export const ASSET_IMPORTS_FILE = 'content-assets.mjs'; export const MODULES_IMPORTS_FILE = 'content-modules.mjs'; export const COLLECTIONS_MANIFEST_FILE = 'collections/collections.json'; -export const COLLECTIONS_DIR = 'collections/' +export const COLLECTIONS_DIR = 'collections/'; export const CONTENT_LAYER_TYPE = 'content_layer'; diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts index cc9486715f..4fec03d7cf 100644 --- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts +++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts @@ -1,8 +1,8 @@ -import { dataToEsm } from '@rollup/pluginutils'; -import glob from 'fast-glob'; import nodeFs from 'node:fs'; import { extname } from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; +import { dataToEsm } from '@rollup/pluginutils'; +import glob from 'fast-glob'; import pLimit from 'p-limit'; import type { Plugin } from 'vite'; import { AstroError, AstroErrorData } from '../core/errors/index.js'; diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts index 8b34b11c73..b85b728f48 100644 --- a/packages/astro/src/core/build/generate.ts +++ b/packages/astro/src/core/build/generate.ts @@ -540,7 +540,8 @@ function createBuildManifest( onRequest: middleware, }; }, - checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false, + checkOrigin: + (settings.config.security?.checkOrigin && settings.buildOutput === 'server') ?? false, key, envGetSecretEnabled: false, }; diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts index d9f0d3f2bd..12fdf65b17 100644 --- a/packages/astro/src/core/build/plugins/plugin-manifest.ts +++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts @@ -270,7 +270,8 @@ function buildManifest( assets: staticFiles.map(prefixAssetPath), i18n: i18nManifest, buildFormat: settings.config.build.format, - checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false, + checkOrigin: + (settings.config.security?.checkOrigin && settings.buildOutput === 'server') ?? false, serverIslandNameMap: Array.from(settings.serverIslandNameMap), key: encodedKey, envGetSecretEnabled: diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 24b16af984..06cd4bb275 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -1,9 +1,9 @@ -import { teardown } from '@astrojs/compiler'; -import glob from 'fast-glob'; -import { bgGreen, black, green } from 'kleur/colors'; import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; +import { teardown } from '@astrojs/compiler'; +import glob from 'fast-glob'; +import { bgGreen, black, green } from 'kleur/colors'; import * as vite from 'vite'; import { type BuildInternals, createBuildInternals } from '../../core/build/internal.js'; import { emptyDir, removeEmptyDirs } from '../../core/fs/index.js'; diff --git a/packages/astro/src/core/dev/restart.ts b/packages/astro/src/core/dev/restart.ts index 92dcc28ae0..532863dfad 100644 --- a/packages/astro/src/core/dev/restart.ts +++ b/packages/astro/src/core/dev/restart.ts @@ -3,6 +3,7 @@ import { fileURLToPath } from 'node:url'; import * as vite from 'vite'; import { globalContentLayer } from '../../content/content-layer.js'; import { eventCliSession, telemetry } from '../../events/index.js'; +import { SETTINGS_FILE } from '../../preferences/constants.js'; import type { AstroSettings } from '../../types/astro.js'; import type { AstroInlineConfig } from '../../types/public/config.js'; import { createNodeLogger, createSettings, resolveConfig } from '../config/index.js'; @@ -12,7 +13,6 @@ import { createSafeError } from '../errors/index.js'; import { formatErrorMessage } from '../messages.js'; import type { Container } from './container.js'; import { createContainer, startContainer } from './container.js'; -import { SETTINGS_FILE } from '../../preferences/constants.js'; async function createRestartedContainer( container: Container, diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts index 9d5d697245..a0ad87595f 100644 --- a/packages/astro/src/vite-plugin-astro-server/plugin.ts +++ b/packages/astro/src/vite-plugin-astro-server/plugin.ts @@ -60,7 +60,8 @@ export default function createVitePluginAstroServer({ await createRouteManifest({ settings, fsMod }, logger), // TODO: Handle partial updates to the manifest ); warnMissingAdapter(logger, settings); - pipeline.manifest.checkOrigin = settings.config.security.checkOrigin && settings.buildOutput === "server"; + pipeline.manifest.checkOrigin = + settings.config.security.checkOrigin && settings.buildOutput === 'server'; pipeline.setManifestData(routeManifest); } } @@ -161,7 +162,8 @@ export function createDevelopmentManifest(settings: AstroSettings): SSRManifest componentMetadata: new Map(), inlinedScripts: new Map(), i18n: i18nManifest, - checkOrigin: (settings.config.security?.checkOrigin && settings.buildOutput === "server") ?? false, + checkOrigin: + (settings.config.security?.checkOrigin && settings.buildOutput === 'server') ?? false, envGetSecretEnabled: false, key: createKey(), middleware() { diff --git a/packages/db/src/core/cli/commands/link/index.ts b/packages/db/src/core/cli/commands/link/index.ts index 539212964f..bd07b78243 100644 --- a/packages/db/src/core/cli/commands/link/index.ts +++ b/packages/db/src/core/cli/commands/link/index.ts @@ -9,8 +9,8 @@ import { } from '@astrojs/studio'; import { slug } from 'github-slugger'; import { bgRed, cyan } from 'kleur/colors'; -import yoctoSpinner from 'yocto-spinner'; import prompts from 'prompts'; +import yoctoSpinner from 'yocto-spinner'; import { safeFetch } from '../../../../runtime/utils.js'; import type { Result } from '../../../utils.js'; @@ -33,7 +33,7 @@ export async function cmd() { const workspaceId = await promptWorkspace(sessionToken); const newProjectName = await promptNewProjectName(); const newProjectRegion = await promptNewProjectRegion(); - const spinner = yoctoSpinner({text:'Creating new project...'}).start(); + const spinner = yoctoSpinner({ text: 'Creating new project...' }).start(); const newProjectData = await createNewProject({ workspaceId, name: newProjectName, diff --git a/packages/db/src/core/cli/commands/login/index.ts b/packages/db/src/core/cli/commands/login/index.ts index b1d191abbb..0b0979384e 100644 --- a/packages/db/src/core/cli/commands/login/index.ts +++ b/packages/db/src/core/cli/commands/login/index.ts @@ -5,9 +5,9 @@ import type { AstroConfig } from 'astro'; import { listen } from 'async-listen'; import { cyan } from 'kleur/colors'; import open from 'open'; -import yoctoSpinner from 'yocto-spinner'; import prompt from 'prompts'; import type { Arguments } from 'yargs-parser'; +import yoctoSpinner from 'yocto-spinner'; import type { DBConfig } from '../../../types.js'; const isWebContainer =