chore: clean dead code

.changeset/icy-stars-begin.md

@@ -0,0 +1,22 @@
+---
+'@astrojs/cloudflare': patch
+'@astrojs/web-vitals': patch
+'@astrojs/alpinejs': patch
+'@astrojs/markdoc': patch
+'@astrojs/netlify': patch
+'@astrojs/sitemap': patch
+'@astrojs/underscore-redirects': patch
+'@astrojs/preact': patch
+'@astrojs/vercel': patch
+'@astrojs/solid-js': patch
+'@astrojs/node': patch
+'@astrojs/mdx': patch
+'create-astro': patch
+'@astrojs/telemetry': patch
+'@astrojs/upgrade': patch
+'@astrojs/studio': patch
+'astro': patch
+'@astrojs/db': patch
+---
+
+Removes unused code

.github/workflows/ci.yml

@@ -92,7 +92,8 @@ jobs:
         run: pnpm install
 
       - name: Build Packages
-        run: pnpm run build
+        # The cache doesn't contain prebuild files and causes knip to fail
+        run: pnpm run build --force
 
       - name: Lint source code
         run: pnpm run lint:ci

benchmark/make-project/_template.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * Create a new project in the `projectDir` directory. Make sure to clean up the
  * previous artifacts here before generating files.

biome.jsonc

@@ -32,9 +32,9 @@
         "noConsoleLog": "warn"
       },
       "correctness": {
-        "noUnusedVariables": "info",
-        "noUnusedFunctionParameters": "info",
-        "noUnusedImports": "warn"
+        "noUnusedVariables": "error",
+        "noUnusedFunctionParameters": "error",
+        "noUnusedImports": "error"
       }
     }
   },

eslint.config.js

@@ -23,6 +23,7 @@ export default [
 			'packages/**/*.min.js',
 			'packages/**/dist/',
 			'packages/**/fixtures/',
+			'packages/**/_temp-fixtures/',
 			'packages/astro/vendor/vite/',
 			'benchmark/**/dist/',
 			'examples/',
@@ -54,7 +55,18 @@ export default [
 			'no-console': 'off',
 
 			// Todo: do we want these?
-			'@typescript-eslint/no-unused-vars': 'off',
+			'@typescript-eslint/no-unused-vars': [
+				'error',
+				{
+					args: 'all',
+					argsIgnorePattern: '^_',
+					caughtErrors: 'all',
+					caughtErrorsIgnorePattern: '^_',
+					destructuredArrayIgnorePattern: '^_',
+					varsIgnorePattern: '^_',
+					ignoreRestSiblings: true,
+				},
+			],
 			'@typescript-eslint/array-type': 'off',
 			'@typescript-eslint/ban-ts-comment': 'off',
 			'@typescript-eslint/class-literal-property-style': 'off',

knip.js

@@ -0,0 +1,77 @@
+// @ts-check
+const testEntry = 'test/**/*.test.js';
+
+/** @type {import('knip').KnipConfig} */
+export default {
+	ignore: ['**/test/**/{fixtures,_temp-fixtures}/**', '.github/scripts/**'],
+	tags: ['-lintignore'],
+	ignoreWorkspaces: [
+		'examples/**',
+		'**/{test,e2e}/**/{fixtures,_temp-fixtures}/**',
+		'benchmark/**',
+	],
+	workspaces: {
+		'.': {
+			ignoreDependencies: [
+				'@astrojs/check', // Used by the build script but not as a standard module import
+			],
+			// In smoke tests, we checkout to the docs repo so those binaries are not present in this project
+			ignoreBinaries: ['docgen', 'docgen:errors', 'playwright'],
+		},
+		'packages/*': {
+			entry: [testEntry],
+		},
+		'packages/astro': {
+			entry: [
+				// Can't be detected automatically since it's only in package.json#files
+				'templates/**/*',
+				testEntry,
+				'test/types/**/*',
+				'e2e/**/*.test.js',
+				'test/units/teardown.js',
+			],
+			ignore: ['**/e2e/**/{fixtures,_temp-fixtures}/**', 'performance/**/*'],
+			// Those deps are used in tests but only referenced as strings
+			ignoreDependencies: [
+				'rehype-autolink-headings',
+				'rehype-slug',
+				'rehype-toc',
+				'remark-code-titles',
+			],
+		},
+		'packages/integrations/*': {
+			entry: [testEntry],
+		},
+		'packages/integrations/cloudflare': {
+			entry: [testEntry],
+			// False positive because of cloudflare:workers
+			ignoreDependencies: ['cloudflare'],
+		},
+		'packages/integrations/mdx': {
+			entry: [testEntry],
+			// Required but not imported directly
+			ignoreDependencies: ['@types/*'],
+		},
+		'packages/integrations/netlify': {
+			entry: [testEntry],
+			ignore: ['test/hosted/**'],
+		},
+		'packages/integrations/solid': {
+			entry: [testEntry],
+			// It's an optional peer dep (triggers a warning) but it's fine in this case
+			ignoreDependencies: ['solid-devtools'],
+		},
+		'packages/integrations/vercel': {
+			entry: [testEntry, 'test/test-image-service.js'],
+			ignore: ['test/hosted/**'],
+		},
+		'packages/markdown/remark': {
+			entry: [testEntry],
+			// package.json#imports are not resolved at the moment
+			ignore: ['src/import-plugin-browser.ts'],
+		},
+		'packages/upgrade': {
+			entry: ['src/index.ts', testEntry],
+		},
+	},
+};

package.json

@@ -34,12 +34,13 @@
     "test:e2e:match": "cd packages/astro && pnpm playwright install chromium firefox && pnpm run test:e2e:match",
     "test:e2e:hosts": "turbo run test:hosted",
     "benchmark": "astro-benchmark",
-    "lint": "biome lint && eslint . --report-unused-disable-directives-severity=warn",
-    "lint:ci": "biome ci --formatter-enabled=false --organize-imports-enabled=false --reporter=github && eslint . --report-unused-disable-directives-severity=warn",
+    "lint": "biome lint && eslint . --report-unused-disable-directives-severity=warn && knip",
+    "lint:ci": "biome ci --formatter-enabled=false --organize-imports-enabled=false --reporter=github && eslint . --report-unused-disable-directives-severity=warn && knip",
     "lint:fix": "biome lint --write --unsafe",
     "publint": "pnpm -r --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --no-bail exec publint",
     "version": "changeset version && node ./scripts/deps/update-example-versions.js && pnpm install --no-frozen-lockfile && pnpm run format",
-    "preinstall": "npx only-allow pnpm"
+    "preinstall": "npx only-allow pnpm",
+    "knip": "knip"
   },
   "workspaces": [
     "packages/markdown/*",
@@ -58,10 +59,11 @@
     "@biomejs/biome": "1.9.4",
     "@changesets/changelog-github": "^0.5.1",
     "@changesets/cli": "^2.28.1",
-    "@types/node": "^18.17.8",
+    "@types/node": "^18.19.50",
     "esbuild": "^0.25.0",
     "eslint": "^9.24.0",
     "eslint-plugin-regexp": "^2.7.0",
+    "knip": "5.50.5",
     "only-allow": "^1.2.1",
     "prettier": "^3.5.3",
     "prettier-plugin-astro": "^0.14.1",

packages/astro/e2e/test-utils.js

@@ -4,10 +4,6 @@ import { fileURLToPath } from 'node:url';
 import { expect, test as testBase } from '@playwright/test';
 import { loadFixture as baseLoadFixture } from '../test/test-utils.js';
 
-export const isWindows = process.platform === 'win32';
-
-export { silentLogging } from '../test/test-utils.js';
-
 // Get all test files in directory, assign unique port for each of them so they don't conflict
 const testFiles = await fs.readdir(new URL('.', import.meta.url));
 const testFileToPort = new Map();

packages/astro/package.json

@@ -47,10 +47,7 @@
     "./compiler-runtime": "./dist/runtime/compiler/index.js",
     "./runtime/*": "./dist/runtime/*",
     "./config": "./dist/config/entrypoint.js",
-    "./container": {
-      "types": "./dist/container/index.d.ts",
-      "default": "./dist/container/index.js"
-    },
+    "./container": "./dist/container/index.js",
     "./app": "./dist/core/app/index.js",
     "./app/node": "./dist/core/app/node.js",
     "./client/*": "./dist/runtime/client/*",
@@ -76,10 +73,7 @@
       "default": "./zod.mjs"
     },
     "./errors": "./dist/core/errors/userError.js",
-    "./middleware": {
-      "types": "./dist/core/middleware/index.d.ts",
-      "default": "./dist/core/middleware/index.js"
-    },
+    "./middleware": "./dist/core/middleware/index.js",
     "./virtual-modules/*": "./dist/virtual-modules/*"
   },
   "bin": {

packages/astro/src/assets/fonts/config.ts

@@ -69,7 +69,7 @@ const fallbacksSchema = z.object({
 	optimizedFallbacks: z.boolean().optional(),
 });
 
-export const requiredFamilyAttributesSchema = z.object({
+const requiredFamilyAttributesSchema = z.object({
 	/**
 	 * The font family name, as identified by your font provider.
 	 */

packages/astro/src/assets/fonts/utils.ts

@@ -26,7 +26,7 @@ export function renderFontFace(properties: Record<string, string | undefined>) {
 	return `@font-face {\n\t${toCSS(properties)}\n}\n`;
 }
 
-export function unifontFontFaceDataToProperties(
+function unifontFontFaceDataToProperties(
 	font: Partial<unifont.FontFaceData>,
 ): Record<string, string | undefined> {
 	return {

packages/astro/src/assets/services/service.ts

@@ -81,7 +81,7 @@ interface SharedServiceProps<T extends Record<string, any> = Record<string, any>
 export type ExternalImageService<T extends Record<string, any> = Record<string, any>> =
 	SharedServiceProps<T>;
 
-export type LocalImageTransform = {
+type LocalImageTransform = {
 	src: string;
 	[key: string]: any;
 };

packages/astro/src/assets/utils/etag.ts

@@ -8,7 +8,7 @@
  * Simplified, optimized and add modified for 52 bit, which provides a larger hash space
  * and still making use of Javascript's 53-bit integer space.
  */
-export const fnv1a52 = (str: string) => {
+const fnv1a52 = (str: string) => {
 	const len = str.length;
 	let i = 0,
 		t0 = 0,

packages/astro/src/assets/utils/vendor/image-size/lookup.ts

@@ -1,16 +1,7 @@
-import type { imageType } from './types/index.js'
 import { typeHandlers } from './types/index.js'
 import { detector } from './detector.js'
 import type { ISizeCalculationResult } from './types/interface.ts'
 
-type Options = {
-  disabledTypes: imageType[]
-}
-
-const globalOptions: Options = {
-  disabledTypes: [],
-}
-
 /**
  * Return size information based on an Uint8Array
  *
@@ -22,10 +13,6 @@ export function lookup(input: Uint8Array): ISizeCalculationResult {
   const type = detector(input)
 
   if (typeof type !== 'undefined') {
-    if (globalOptions.disabledTypes.includes(type)) {
-      throw new TypeError('disabled file type: ' + type)
-    }
-
     // find an appropriate handler for this file type
     const size = typeHandlers.get(type)!.calculate(input)
     if (size !== undefined) {
@@ -37,7 +24,3 @@ export function lookup(input: Uint8Array): ISizeCalculationResult {
   // throw up, if we don't understand the file
   throw new TypeError('unsupported file type: ' + type)
 }
-
-export const disableTypes = (types: imageType[]): void => {
-  globalOptions.disabledTypes = types
-}

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

@@ -503,11 +503,7 @@ function addVitePlugin(mod: ProxifiedModule<any>, pluginId: string, packageName:
 	}
 }
 
-export function setAdapter(
-	mod: ProxifiedModule<any>,
-	adapter: IntegrationInfo,
-	exportName: string,
-) {
+function setAdapter(mod: ProxifiedModule<any>, adapter: IntegrationInfo, exportName: string) {
 	const config = getDefaultExportOptions(mod);
 	const adapterId = toIdent(adapter.id);
 

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

@@ -52,7 +52,7 @@ export async function printInfo({ flags }: InfoOptions) {
 	await copyToClipboard(output, flags.copy);
 }
 
-export async function copyToClipboard(text: string, force?: boolean) {
+async function copyToClipboard(text: string, force?: boolean) {
 	text = text.trim();
 	const system = platform();
 	let command = '';

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

@@ -26,7 +26,7 @@ const PREFERENCES_SUBCOMMANDS = [
 	'reset',
 	'list',
 ] as const;
-export type Subcommand = (typeof PREFERENCES_SUBCOMMANDS)[number];
+type Subcommand = (typeof PREFERENCES_SUBCOMMANDS)[number];
 
 type AnnotatedValue = { annotation: string; value: string | number | boolean };
 type AnnotatedValues = Record<string, AnnotatedValue>;

packages/astro/src/container/index.ts

@@ -124,10 +124,6 @@ export type AddClientRenderer = {
 	entrypoint: string;
 };
 
-type ContainerImportRendererFn = (
-	containerRenderer: ContainerRenderer,
-) => Promise<SSRLoadedRenderer>;
-
 function createManifest(
 	manifest?: AstroContainerManifest,
 	renderers?: SSRLoadedRenderer[],
@@ -269,12 +265,6 @@ export class experimental_AstroContainer {
 	 */
 	#withManifest = false;
 
-	/**
-	 * Internal function responsible for importing a renderer
-	 * @private
-	 */
-	#getRenderer: ContainerImportRendererFn | undefined;
-
 	private constructor({
 		streaming = false,
 		manifest,
@@ -414,7 +404,7 @@ export class experimental_AstroContainer {
 	}
 
 	// NOTE: we keep this private via TS instead via `#` so it's still available on the surface, so we can play with it.
-	// @ematipico: I plan to use it for a possible integration that could help people
+	// @ts-expect-error @ematipico: I plan to use it for a possible integration that could help people
 	private static async createFromManifest(
 		manifest: SSRManifest,
 	): Promise<experimental_AstroContainer> {

packages/astro/src/content/content-layer.ts

@@ -26,7 +26,7 @@ import {
 } from './utils.js';
 import { type WrappedWatcher, createWatcherWrapper } from './watcher.js';
 
-export interface ContentLayerOptions {
+interface ContentLayerOptions {
 	store: MutableDataStore;
 	settings: AstroSettings;
 	logger: Logger;
@@ -39,7 +39,7 @@ type CollectionLoader<TData> = () =>
 	| Record<string, Record<string, unknown>>
 	| Promise<Record<string, Record<string, unknown>>>;
 
-export class ContentLayer {
+class ContentLayer {
 	#logger: Logger;
 	#store: MutableDataStore;
 	#settings: AstroSettings;
@@ -342,7 +342,7 @@ export class ContentLayer {
 	}
 }
 
-export async function simpleLoader<TData extends { id: string }>(
+async function simpleLoader<TData extends { id: string }>(
 	handler: CollectionLoader<TData>,
 	context: LoaderContext,
 ) {

packages/astro/src/content/index.ts

@@ -1,7 +1,6 @@
-export { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from './consts.js';
 export { attachContentServerListeners } from './server-listeners.js';
 export { createContentTypesGenerator } from './types-generator.js';
-export { contentObservable, getContentPaths, hasAssetPropagationFlag } from './utils.js';
+export { getContentPaths, hasAssetPropagationFlag } from './utils.js';
 export { astroContentAssetPropagationPlugin } from './vite-plugin-content-assets.js';
 export { astroContentImportPlugin } from './vite-plugin-content-imports.js';
 export { astroContentVirtualModPlugin } from './vite-plugin-content-virtual-mod.js';