chore: rebase

benchmark/bench/render.js

@@ -5,8 +5,8 @@ import { fileURLToPath } from 'node:url';
 import { execaCommand } from 'execa';
 import { markdownTable } from 'markdown-table';
 import { waitUntilBusy } from 'port-authority';
-import { calculateStat, astroBin } from './_util.js';
 import { renderFiles } from '../make-project/render-default.js';
+import { astroBin, calculateStat } from './_util.js';
 
 const port = 4322;
 

package.json

@@ -88,7 +88,6 @@
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "only-allow": "^1.1.1",
-    "organize-imports-cli": "^0.10.0",
     "prettier": "^3.0.2",
     "prettier-plugin-astro": "^0.12.0",
     "tiny-glob": "^0.2.9",

packages/astro/src/cli/info/index.ts

@@ -1,7 +1,7 @@
-/* eslint-disable no-console */
-import * as colors from 'kleur/colors';
 import { execSync } from 'node:child_process';
 import { arch, platform } from 'node:os';
+/* eslint-disable no-console */
+import * as colors from 'kleur/colors';
 import prompts from 'prompts';
 import type yargs from 'yargs-parser';
 import { resolveConfig } from '../../core/config/index.js';

packages/astro/test/units/routing/route-sanitization.test.js

@@ -1,14 +1,14 @@
+import { fileURLToPath } from 'node:url';
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { createContainer } from '../../../dist/core/dev/container.js';
+import testAdapter from '../../test-adapter.js';
 import {
 	createBasicSettings,
 	createFs,
 	createRequestAndResponse,
 	defaultLogger,
 } from '../test-utils.js';
-import { fileURLToPath } from 'node:url';
-import { expect } from 'chai';
-import { createContainer } from '../../../dist/core/dev/container.js';
-import * as cheerio from 'cheerio';
-import testAdapter from '../../test-adapter.js';
 
 const root = new URL('../../fixtures/alias/', import.meta.url);
 const fileSystem = {

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(

packages/integrations/vercel/src/serverless/adapter.ts

@@ -1,3 +1,5 @@
+import { basename } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import type {
 	AstroAdapter,
 	AstroConfig,
@@ -7,9 +9,7 @@ import type {
 } from 'astro';
 import { AstroError } from 'astro/errors';
 import glob from 'fast-glob';
-import { basename } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { defaultImageConfig, getImageConfig, type VercelImageConfig } from '../image/shared.js';
+import { type VercelImageConfig, defaultImageConfig, getImageConfig } from '../image/shared.js';
 import { exposeEnv } from '../lib/env.js';
 import { getVercelOutput, removeDir, writeJson } from '../lib/fs.js';
 import { copyDependenciesToFunction } from '../lib/nft.js';