From a3b2c3230d5fc362712c22e0838b21b48f3c6c1f Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Wed, 17 Jul 2024 15:39:31 +0000 Subject: [PATCH] [ci] format --- packages/astro/src/core/sync/index.ts | 16 ++++++++-------- packages/astro/src/core/sync/setup-env-ts.ts | 4 ++-- packages/astro/src/integrations/hooks.ts | 4 ++-- packages/astro/test/astro-sync.test.js | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/astro/src/core/sync/index.ts b/packages/astro/src/core/sync/index.ts index c952529536..7441aabc7e 100644 --- a/packages/astro/src/core/sync/index.ts +++ b/packages/astro/src/core/sync/index.ts @@ -1,15 +1,20 @@ -import { dim } from 'kleur/colors'; import fsMod from 'node:fs'; import { performance } from 'node:perf_hooks'; import { fileURLToPath } from 'node:url'; +import { dim } from 'kleur/colors'; import { type HMRPayload, createServer } from 'vite'; import type { AstroConfig, AstroInlineConfig, AstroSettings } from '../../@types/astro.js'; import { getPackage } from '../../cli/install-package.js'; import { createContentTypesGenerator } from '../../content/index.js'; import { globalContentConfigObserver } from '../../content/utils.js'; import { syncAstroEnv } from '../../env/sync.js'; -import { setUpEnvTs } from './setup-env-ts.js'; +import { telemetry } from '../../events/index.js'; +import { eventCliSession } from '../../events/session.js'; +import { runHookConfigSetup } from '../../integrations/hooks.js'; import { getTimeStat } from '../build/util.js'; +import { resolveConfig } from '../config/config.js'; +import { createNodeLogger } from '../config/logging.js'; +import { createSettings } from '../config/settings.js'; import { createVite } from '../create-vite.js'; import { collectErrorMetadata } from '../errors/dev/utils.js'; import { @@ -22,12 +27,7 @@ import { import type { Logger } from '../logger/core.js'; import { formatErrorMessage } from '../messages.js'; import { ensureProcessNodeEnv } from '../util.js'; -import { createNodeLogger } from '../config/logging.js'; -import { resolveConfig } from '../config/config.js'; -import { createSettings } from '../config/settings.js'; -import { telemetry } from '../../events/index.js'; -import { eventCliSession } from '../../events/session.js'; -import { runHookConfigSetup } from '../../integrations/hooks.js'; +import { setUpEnvTs } from './setup-env-ts.js'; export type SyncOptions = { /** diff --git a/packages/astro/src/core/sync/setup-env-ts.ts b/packages/astro/src/core/sync/setup-env-ts.ts index 1363b0da8f..5a380271a2 100644 --- a/packages/astro/src/core/sync/setup-env-ts.ts +++ b/packages/astro/src/core/sync/setup-env-ts.ts @@ -6,8 +6,8 @@ import { normalizePath } from 'vite'; import type { AstroSettings } from '../../@types/astro.js'; import { ACTIONS_TYPES_FILE } from '../../actions/consts.js'; import { CONTENT_TYPES_FILE } from '../../content/consts.js'; -import { type Logger } from '../logger/core.js'; import { ENV_TYPES_FILE } from '../../env/constants.js'; +import { type Logger } from '../logger/core.js'; function getDotAstroTypeReference({ settings, @@ -57,7 +57,7 @@ export async function setUpEnvTs({ if (fs.existsSync(envTsPath)) { const initialEnvContents = await fs.promises.readFile(envTsPath, 'utf-8'); - let typesEnvContents = initialEnvContents + let typesEnvContents = initialEnvContents; for (const injectedType of injectedTypes) { if (!injectedType.meetsCondition || (await injectedType.meetsCondition?.())) { diff --git a/packages/astro/src/integrations/hooks.ts b/packages/astro/src/integrations/hooks.ts index 0da9c88337..48a9777e8c 100644 --- a/packages/astro/src/integrations/hooks.ts +++ b/packages/astro/src/integrations/hooks.ts @@ -105,13 +105,13 @@ export async function runHookConfigSetup({ command, logger, isRestart = false, - fs = fsMod + fs = fsMod, }: { settings: AstroSettings; command: 'dev' | 'build' | 'preview'; logger: Logger; isRestart?: boolean; - fs?: typeof fsMod + fs?: typeof fsMod; }): Promise { // An adapter is an integration, so if one is provided push it. if (settings.config.adapter) { diff --git a/packages/astro/test/astro-sync.test.js b/packages/astro/test/astro-sync.test.js index 0e22a36c8d..f6faa67225 100644 --- a/packages/astro/test/astro-sync.test.js +++ b/packages/astro/test/astro-sync.test.js @@ -1,9 +1,9 @@ import assert from 'node:assert/strict'; import * as fs from 'node:fs'; import { before, describe, it } from 'node:test'; +import { fileURLToPath } from 'node:url'; import ts from 'typescript'; import { loadFixture } from './test-utils.js'; -import { fileURLToPath } from 'node:url'; const createFixture = () => { /** @type {Awaited>} */