From a58cc96091046edf1c5bc61732e0013a573cb4b1 Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 5 Sep 2023 10:28:45 +0100
Subject: [PATCH] chore: rebase

---
 benchmark/bench/render.js                              |  2 +-
 package.json                                           |  1 -
 packages/astro/src/cli/info/index.ts                   |  4 ++--
 .../test/units/routing/route-sanitization.test.js      | 10 +++++-----
 packages/integrations/vercel/src/lib/nft.ts            |  4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/benchmark/bench/render.js b/benchmark/bench/render.js
index 49f20f267..373d3c7b4 100644
--- a/benchmark/bench/render.js
+++ b/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;
 
diff --git a/package.json b/package.json
index 8bf7dc459..32beb8579 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,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.3",
     "prettier-plugin-astro": "^0.12.0",
     "tiny-glob": "^0.2.9",
diff --git a/packages/astro/src/cli/info/index.ts b/packages/astro/src/cli/info/index.ts
index 2ee9ffd0d..c902bd54d 100644
--- a/packages/astro/src/cli/info/index.ts
+++ b/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';
diff --git a/packages/astro/test/units/routing/route-sanitization.test.js b/packages/astro/test/units/routing/route-sanitization.test.js
index 14c9c3829..189885711 100644
--- a/packages/astro/test/units/routing/route-sanitization.test.js
+++ b/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 = {
diff --git a/packages/integrations/vercel/src/lib/nft.ts b/packages/integrations/vercel/src/lib/nft.ts
index 585a45e99..b6fe46999 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(