();
await renderPath({
prerenderer,
@@ -176,8 +176,8 @@ describe('renderPath()', () => {
pages: { 'public/index.html': 'public file' },
});
- const warnings = [];
- conflictOptions.logger.warn = (_label, msg) => warnings.push(msg);
+ const warnings: string[] = [];
+ (conflictOptions.logger as any).warn = (_label: string, msg: string) => warnings.push(msg);
const result = await renderPath({
prerenderer,
@@ -201,8 +201,8 @@ describe('renderPath()', () => {
};
const route = createRouteData({ route: '/boom' });
- const errors = [];
- options.logger.error = (_label, msg) => errors.push(msg);
+ const errors: string[] = [];
+ (options.logger as any).error = (_label: string, msg: string) => errors.push(msg);
await assert.rejects(
() => renderPath({ prerenderer, pathname: '/boom', route, options, logger: options.logger }),
@@ -219,10 +219,10 @@ describe('renderPath()', () => {
inlineConfig: { trailingSlash: 'always' },
});
- let capturedUrl;
+ let capturedUrl: URL | undefined;
const prerenderer = createMockPrerenderer({ '/demo': 'hello' });
const originalRender = prerenderer.render.bind(prerenderer);
- prerenderer.render = async (request, opts) => {
+ prerenderer.render = async (request: Request, opts: any) => {
capturedUrl = new URL(request.url);
return originalRender(request, opts);
};
@@ -275,14 +275,14 @@ describe('renderPath()', () => {
// ---------------------------------------------------------------------------
describe('createMockPrerenderer with ComponentInstance', () => {
- let options;
+ let options: StaticBuildOptions;
before(async () => {
options = await createStaticBuildOptions();
});
it('renders a bare ComponentInstance to HTML via RenderContext', async () => {
- const Page = createComponent((_result) => renderTemplate`Hello from component
`);
+ const Page = createComponent((_result: any) => renderTemplate`Hello from component
`);
const prerenderer = createMockPrerenderer({ '/': { default: Page } });
const route = createRouteData({ route: '/' });
@@ -308,7 +308,8 @@ describe('createMockPrerenderer with ComponentInstance', () => {
it('passes props to a ComponentInstance via the props key', async () => {
const Page = createComponent(
- (_result, { title }) => renderTemplate`${title}${title}
`,
+ (_result: any, { title }: { title: string }) =>
+ renderTemplate`${title}${title}
`,
);
const prerenderer = createMockPrerenderer({
'/blog/hello': { default: Page, props: { title: 'Hello World' } },
@@ -332,10 +333,11 @@ describe('createMockPrerenderer with ComponentInstance', () => {
it('renders nested components', async () => {
const Inner = createComponent(
- (_result, { label }) => renderTemplate`${label}`,
+ (_result: any, { label }: { label: string }) =>
+ renderTemplate`${label}`,
);
const Page = createComponent(
- (result) =>
+ (result: any) =>
renderTemplate`${renderComponent(result, 'Inner', Inner, { label: 'nested' })}
`,
);
const prerenderer = createMockPrerenderer({ '/nested': { default: Page } });
@@ -357,7 +359,7 @@ describe('createMockPrerenderer with ComponentInstance', () => {
});
it('falls back to string pages and ComponentInstance pages in the same prerenderer', async () => {
- const Component = createComponent((_result) => renderTemplate`component page
`);
+ const Component = createComponent((_result: any) => renderTemplate`component page
`);
const prerenderer = createMockPrerenderer({
'/string': 'string page
',
'/component': { default: Component },
@@ -394,7 +396,7 @@ describe('createMockPrerenderer with ComponentInstance', () => {
route,
options,
logger: options.logger,
- }).catch((e) => e);
+ }).catch((e: unknown) => e);
assert.ok(err instanceof Error, 'should throw an Error');
assert.ok(err.message.includes('/not-registered'), 'error should name the missing pathname');
diff --git a/packages/astro/test/units/build/preserve-build-client-dir.test.js b/packages/astro/test/units/build/preserve-build-client-dir.test.ts
similarity index 63%
rename from packages/astro/test/units/build/preserve-build-client-dir.test.js
rename to packages/astro/test/units/build/preserve-build-client-dir.test.ts
index b723a8335fc6..e178398f1134 100644
--- a/packages/astro/test/units/build/preserve-build-client-dir.test.js
+++ b/packages/astro/test/units/build/preserve-build-client-dir.test.ts
@@ -1,8 +1,10 @@
import * as assert from 'node:assert/strict';
import { describe, it } from 'node:test';
+import type { AstroSettings } from '../../../dist/types/astro.js';
+import type { RouteData } from '../../../dist/types/public/internal.js';
import { getOutFolder } from '../../../dist/core/build/common.js';
import { getClientOutputDirectory } from '../../../dist/prerender/utils.js';
-import { createSettings } from './test-helpers.js';
+import { createSettings } from './test-helpers.ts';
describe('preserveBuildClientDir', () => {
const outDir = new URL('file:///project/dist/');
@@ -10,48 +12,57 @@ describe('preserveBuildClientDir', () => {
describe('getClientOutputDirectory', () => {
it('returns outDir for static builds without preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'static' });
+ const settings = createSettings({ buildOutput: 'static' }) as unknown as AstroSettings;
const result = getClientOutputDirectory(settings);
assert.equal(result.href, outDir.href);
});
it('returns client dir for static builds with preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'static', preserveBuildClientDir: true });
+ const settings = createSettings({
+ buildOutput: 'static',
+ preserveBuildClientDir: true,
+ }) as unknown as AstroSettings;
const result = getClientOutputDirectory(settings);
assert.equal(result.href, clientDir.href);
});
it('returns client dir for server builds regardless of preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'server' });
+ const settings = createSettings({ buildOutput: 'server' }) as unknown as AstroSettings;
const result = getClientOutputDirectory(settings);
assert.equal(result.href, clientDir.href);
});
});
describe('getOutFolder', () => {
- const pageRoute = { type: 'page', isIndex: false };
+ const pageRoute = { type: 'page', isIndex: false } as unknown as RouteData;
it('outputs to outDir for static builds without preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'static' });
+ const settings = createSettings({ buildOutput: 'static' }) as unknown as AstroSettings;
const result = getOutFolder(settings, '/about', pageRoute);
assert.equal(result.href, new URL('about/', outDir).href);
});
it('outputs to client dir for static builds with preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'static', preserveBuildClientDir: true });
+ const settings = createSettings({
+ buildOutput: 'static',
+ preserveBuildClientDir: true,
+ }) as unknown as AstroSettings;
const result = getOutFolder(settings, '/about', pageRoute);
assert.equal(result.href, new URL('about/', clientDir).href);
});
it('outputs to client dir for server builds regardless of preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'server' });
+ const settings = createSettings({ buildOutput: 'server' }) as unknown as AstroSettings;
const result = getOutFolder(settings, '/about', pageRoute);
assert.equal(result.href, new URL('about/', clientDir).href);
});
it('outputs root index to client dir with preserveBuildClientDir', () => {
- const settings = createSettings({ buildOutput: 'static', preserveBuildClientDir: true });
- const indexRoute = { type: 'page', isIndex: true };
+ const settings = createSettings({
+ buildOutput: 'static',
+ preserveBuildClientDir: true,
+ }) as unknown as AstroSettings;
+ const indexRoute = { type: 'page', isIndex: true } as unknown as RouteData;
const result = getOutFolder(settings, '/', indexRoute);
assert.equal(result.href, new URL('./', clientDir).href);
});
diff --git a/packages/astro/test/units/build/server-islands.test.js b/packages/astro/test/units/build/server-islands.test.ts
similarity index 96%
rename from packages/astro/test/units/build/server-islands.test.js
rename to packages/astro/test/units/build/server-islands.test.ts
index 319ff88a0075..e5b5abb1b37f 100644
--- a/packages/astro/test/units/build/server-islands.test.js
+++ b/packages/astro/test/units/build/server-islands.test.ts
@@ -3,12 +3,13 @@ import { promises as fs } from 'node:fs';
import path from 'node:path';
import { describe, it } from 'node:test';
import { fileURLToPath, pathToFileURL } from 'node:url';
+import type { Plugin } from 'vite';
import { AstroBuilder } from '../../../dist/core/build/index.js';
import { parseRoute } from '../../../dist/core/routing/parse-route.js';
-import { createBasicSettings, defaultLogger } from '../test-utils.js';
-import { virtualAstroModules } from './test-helpers.js';
+import { createBasicSettings, defaultLogger } from '../test-utils.ts';
+import { virtualAstroModules } from './test-helpers.ts';
-async function readFilesRecursive(dir) {
+async function readFilesRecursive(dir: string): Promise {
const entries = await fs.readdir(dir, { withFileTypes: true });
const files = await Promise.all(
entries.map(async (entry) => {
@@ -22,11 +23,11 @@ async function readFilesRecursive(dir) {
return files.flat();
}
-function forceDoubleQuotedServerIslandPlaceholders() {
+function forceDoubleQuotedServerIslandPlaceholders(): Plugin {
return {
name: 'force-double-quoted-server-island-placeholders',
enforce: 'pre',
- renderChunk(code) {
+ renderChunk(code: string) {
if (!code.includes("'$$server-islands-map$$'")) {
return;
}
diff --git a/packages/astro/test/units/build/static-build.test.js b/packages/astro/test/units/build/static-build.test.ts
similarity index 93%
rename from packages/astro/test/units/build/static-build.test.js
rename to packages/astro/test/units/build/static-build.test.ts
index 487ebf10c6cd..50268232fdd3 100644
--- a/packages/astro/test/units/build/static-build.test.js
+++ b/packages/astro/test/units/build/static-build.test.ts
@@ -1,10 +1,11 @@
import * as assert from 'node:assert/strict';
import { describe, it } from 'node:test';
import { makeAstroPageEntryPointFileName } from '../../../dist/core/build/static-build.js';
+import type { RouteData } from '../../../dist/types/public/internal.js';
describe('astro/src/core/build', () => {
describe('makeAstroPageEntryPointFileName', () => {
- const routes = [
+ const routes: RouteData[] = [
{
route: '/',
component: 'src/pages/index.astro',
@@ -25,7 +26,7 @@ describe('astro/src/core/build', () => {
component: 'src/pages/blog/[year]/[...slug].astro',
pathname: undefined,
},
- ];
+ ] as RouteData[];
it('handles local pages', async () => {
const input = '@astro-page:src/pages/index@_@astro';
diff --git a/packages/astro/test/units/build/test-helpers.js b/packages/astro/test/units/build/test-helpers.ts
similarity index 76%
rename from packages/astro/test/units/build/test-helpers.js
rename to packages/astro/test/units/build/test-helpers.ts
index 52a67ba5962c..232a3d15cba0 100644
--- a/packages/astro/test/units/build/test-helpers.js
+++ b/packages/astro/test/units/build/test-helpers.ts
@@ -1,26 +1,29 @@
-// @ts-check
-import { mkdtempSync, mkdirSync, writeFileSync } from 'node:fs';
+import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { fileURLToPath, pathToFileURL } from 'node:url';
+import type { Plugin } from 'vite';
import { RenderContext } from '../../../dist/core/render-context.js';
import { createRoutesList as _createRoutesList } from '../../../dist/core/routing/create-manifest.js';
-import { createBasicPipeline, createBasicSettings, defaultLogger } from '../test-utils.js';
+import type { StaticBuildOptions } from '../../../dist/core/build/types.js';
+import type { Pipeline } from '../../../dist/core/base-pipeline.js';
+import type { RouteData } from '../../../dist/types/public/internal.js';
+import type { AstroInlineConfig } from '../../../dist/types/public/config.js';
+import type { ComponentInstance } from '../../../dist/types/astro.js';
+import { createBasicPipeline, createBasicSettings, defaultLogger } from '../test-utils.ts';
-/**
- * @param {object} options
- * @param {'static' | 'server'} options.buildOutput
- * @param {boolean} [options.preserveBuildClientDir]
- * @param {URL} [options.outDir]
- * @param {URL} [options.clientDir]
- * @param {'directory' | 'file' | 'preserve'} [options.buildFormat]
- */
export function createSettings({
buildOutput,
preserveBuildClientDir = false,
outDir = new URL('file:///project/dist/'),
clientDir = new URL('file:///project/dist/client/'),
buildFormat = 'directory',
+}: {
+ buildOutput: 'static' | 'server';
+ preserveBuildClientDir?: boolean;
+ outDir?: URL;
+ clientDir?: URL;
+ buildFormat?: 'directory' | 'file' | 'preserve';
}) {
return {
buildOutput,
@@ -37,12 +40,9 @@ export function createSettings({
/**
* A Vite plugin that provides in-memory .astro source files as virtual modules.
* This allows running a full Astro build without any files on disk.
- *
- * @param {URL} root - The project root URL
- * @param {Record} files - Map of relative paths (e.g. 'src/pages/index.astro') to source content
*/
-export function virtualAstroModules(root, files) {
- const virtualFiles = new Map();
+export function virtualAstroModules(root: URL, files: Record): Plugin {
+ const virtualFiles = new Map();
for (const [relativePath, source] of Object.entries(files)) {
const absolute = fileURLToPath(new URL(relativePath, root));
virtualFiles.set(absolute, source);
@@ -52,7 +52,7 @@ export function virtualAstroModules(root, files) {
name: 'virtual-astro-modules',
enforce: 'pre',
resolveId: {
- handler(id, importer) {
+ handler(id: string, importer: string | undefined) {
if (virtualFiles.has(id)) return id;
if (id.startsWith('/')) {
const absolute = fileURLToPath(new URL('.' + id, root));
@@ -65,8 +65,8 @@ export function virtualAstroModules(root, files) {
},
},
load: {
- handler(id) {
- if (virtualFiles.has(id)) return { code: virtualFiles.get(id) };
+ handler(id: string) {
+ if (virtualFiles.has(id)) return { code: virtualFiles.get(id)! };
},
},
};
@@ -78,11 +78,8 @@ export function virtualAstroModules(root, files) {
*
* All page paths are project-relative (e.g. `'src/pages/index.astro'`).
* Call `cleanup()` when done to remove the directory.
- *
- * @param {Record} [initialFiles]
- * @returns {URL}
*/
-function createTmpRootDir(initialFiles = {}) {
+function createTmpRootDir(initialFiles: Record = {}): URL {
const rootPath = mkdtempSync(join(tmpdir(), 'astro-test-'));
for (const [relativePath, content] of Object.entries(initialFiles)) {
const absPath = join(rootPath, relativePath);
@@ -100,23 +97,13 @@ function createTmpRootDir(initialFiles = {}) {
* directory, `createRoutesList` scans them, and `cleanup()` removes them when
* the test is done. Without `pages`, an empty options object is returned
* (no routes, no disk I/O).
- *
- * @param {object} [overrides]
- * @param {Record} [overrides.pages]
- * Map of project-relative paths (e.g. `'src/pages/index.astro'`) to source
- * content. Written to a temp directory and scanned to produce `routesList`.
- * @param {'static' | 'server'} [overrides.buildOutput]
- * @param {object | undefined} [overrides.adapter]
- * @param {any} [overrides.inlineConfig]
- * Astro inline config overrides (e.g. `i18n`, `base`, `trailingSlash`).
- * @returns {Promise}
*/
export async function createStaticBuildOptions({
pages = {},
- buildOutput = /** @type {'static'} */ ('static'),
- adapter = undefined,
- inlineConfig = {},
-} = {}) {
+ buildOutput = 'static' as 'static' | 'server',
+ adapter = undefined as object | undefined,
+ inlineConfig = {} as AstroInlineConfig,
+} = {}): Promise {
const hasPages = Object.keys(pages).length > 0;
// Write page sources to a real temp directory so createRoutesList can scan them.
@@ -125,7 +112,7 @@ export async function createStaticBuildOptions({
? createTmpRootDir(pages)
: pathToFileURL(mkdtempSync(join(tmpdir(), 'astro-test-')) + '/');
- const resolvedConfig = /** @type {any} */ ({
+ const resolvedConfig = {
root: rootUrl,
srcDir: new URL('src/', rootUrl),
outDir: new URL('dist/', rootUrl),
@@ -142,9 +129,9 @@ export async function createStaticBuildOptions({
server: new URL('dist/server/', rootUrl),
...(inlineConfig.build ?? {}),
},
- });
+ };
- let routesList = { routes: [] };
+ let routesList: { routes: RouteData[] } = { routes: [] };
if (hasPages) {
const settings = await createBasicSettings({
root: fileURLToPath(rootUrl),
@@ -154,7 +141,7 @@ export async function createStaticBuildOptions({
routesList = await _createRoutesList({ settings }, defaultLogger);
}
- const options = /** @type {any} */ ({
+ const options = {
origin: 'http://localhost:4321',
pageNames: [],
routesList,
@@ -164,11 +151,25 @@ export async function createStaticBuildOptions({
config: resolvedConfig,
},
logger: { info() {}, warn() {}, error() {}, debug() {} },
- });
+ } as unknown as StaticBuildOptions;
return options;
}
+/** Page value: raw HTML string, string factory, a Response, or a ComponentInstance with optional props. */
+type PageValue =
+ | string
+ | (() => string)
+ | Response
+ | (ComponentInstance & { props?: Record });
+
+/** Minimal shape matching `AstroPrerenderer` from the public integrations API. */
+interface MockPrerenderer {
+ name: string;
+ getStaticPaths: () => Promise<{ pathname: string; route: RouteData }[]>;
+ render: (request: Request, options: { routeData: RouteData }) => Promise;
+}
+
/**
* Creates a minimal `AstroPrerenderer` backed by an in-memory map of pathnames
* to page definitions.
@@ -194,25 +195,23 @@ export async function createStaticBuildOptions({
* pair — the same shape as `PathWithRoute` in the public integrations API.
*
* @example Basic usage
- * ```js
+ * ```ts
* const prerenderer = createMockPrerenderer({
* '/about': 'About',
* '/old': new Response(null, { status: 301, headers: { location: '/new' } }),
* });
* ```
- *
- * @param {Record string) | Response | (import('../../../dist/types/astro.js').ComponentInstance & { props?: Record })>} pages
- * @param {{ staticPaths?: import('../../..').PathWithRoute[] }} [options]
- * @returns {import('../../..').AstroPrerenderer}
*/
-export function createMockPrerenderer(pages, options = {}) {
+export function createMockPrerenderer(
+ pages: Record,
+ options: { staticPaths?: { pathname: string; route: RouteData }[] } = {},
+): MockPrerenderer {
const { staticPaths } = options;
/** Lazily-created shared pipeline — one per prerenderer instance. */
- let _pipeline = null;
+ let _pipeline: Pipeline | null = null;
- /** @returns {import('../../../dist/core/base-pipeline.js').Pipeline} */
- function getPipeline() {
+ function getPipeline(): Pipeline {
if (!_pipeline) _pipeline = createBasicPipeline();
return _pipeline;
}
@@ -224,7 +223,7 @@ export function createMockPrerenderer(pages, options = {}) {
return staticPaths ?? [];
},
- async render(request, { routeData }) {
+ async render(request: Request, { routeData }: { routeData: RouteData }) {
// For static routes routeData.pathname is the canonical key.
// For dynamic routes (pathname === undefined), derive it from the
// request URL by stripping build-format artifacts (trailing slash, .html).
@@ -257,7 +256,9 @@ export function createMockPrerenderer(pages, options = {}) {
// ── ComponentInstance: { default: Component, props? } ────────────
// Everything else is treated as a ComponentInstance and rendered via
// RenderContext, letting the pipeline handle it naturally.
- const { props = {}, ...componentInstance } = /** @type {any} */ (page);
+ const { props = {}, ...componentInstance } = page as ComponentInstance & {
+ props?: Record;
+ };
const ctx = await RenderContext.create({
pipeline: getPipeline(),
request,
diff --git a/packages/astro/test/units/cache/noop.test.js b/packages/astro/test/units/cache/noop.test.ts
similarity index 89%
rename from packages/astro/test/units/cache/noop.test.js
rename to packages/astro/test/units/cache/noop.test.ts
index 0156fc8ba6d5..1cccce2155b3 100644
--- a/packages/astro/test/units/cache/noop.test.js
+++ b/packages/astro/test/units/cache/noop.test.ts
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
import { describe, it } from 'node:test';
import { NoopAstroCache, DisabledAstroCache } from '../../../dist/core/cache/runtime/noop.js';
import { applyCacheHeaders, isCacheActive } from '../../../dist/core/cache/runtime/cache.js';
-import { defaultLogger } from '../test-utils.js';
+import { defaultLogger } from '../test-utils.ts';
describe('NoopAstroCache', () => {
it('enabled is false', () => {
@@ -12,8 +12,8 @@ describe('NoopAstroCache', () => {
it('set() is callable and does nothing', () => {
const cache = new NoopAstroCache();
- cache.set({ maxAge: 300, tags: ['a'] });
- cache.set(false);
+ cache.set();
+ cache.set();
// No error thrown
});
@@ -24,7 +24,7 @@ describe('NoopAstroCache', () => {
it('invalidate() is callable and resolves', async () => {
const cache = new NoopAstroCache();
- await cache.invalidate({ tags: 'x' });
+ await cache.invalidate();
// No error thrown
});
@@ -57,14 +57,14 @@ describe('DisabledAstroCache', () => {
it('set() does not throw', () => {
const cache = new DisabledAstroCache(defaultLogger);
- cache.set({ maxAge: 300 });
- cache.set(false);
+ cache.set();
+ cache.set();
// No error thrown
});
it('tags returns empty array', () => {
const cache = new DisabledAstroCache(defaultLogger);
- cache.set({ tags: ['x'] });
+ cache.set();
assert.deepEqual(cache.tags, []);
});
@@ -77,8 +77,8 @@ describe('DisabledAstroCache', () => {
it('invalidate() throws AstroError with CacheNotEnabled', async () => {
const cache = new DisabledAstroCache(defaultLogger);
await assert.rejects(
- () => cache.invalidate({ tags: 'x' }),
- (err) => err.name === 'CacheNotEnabled',
+ () => cache.invalidate(),
+ (err: Error) => err.name === 'CacheNotEnabled',
);
});
diff --git a/packages/astro/test/units/csp/rendering.test.js b/packages/astro/test/units/csp/rendering.test.ts
similarity index 83%
rename from packages/astro/test/units/csp/rendering.test.js
rename to packages/astro/test/units/csp/rendering.test.ts
index 6fe37b85da66..ae6d13c79034 100644
--- a/packages/astro/test/units/csp/rendering.test.js
+++ b/packages/astro/test/units/csp/rendering.test.ts
@@ -8,51 +8,65 @@ import {
render,
renderHead,
} from '../../../dist/runtime/server/index.js';
-import { createBasicPipeline } from '../test-utils.js';
+import type { SSRManifestCSP } from '../../../dist/types/public/internal.js';
+import type { Pipeline } from '../../../dist/core/render/index.js';
+import { createBasicPipeline } from '../test-utils.ts';
// #region Test Utilities
-/**
- * Creates a pipeline with CSP configuration
- * @param {Partial} cspConfig
- */
-function createCspPipeline(cspConfig = {}) {
+function createCspPipeline(cspConfig: Partial = {}): Pipeline {
const pipeline = createBasicPipeline();
- pipeline.manifest = {
- ...pipeline.manifest,
- shouldInjectCspMetaTags: true,
- csp: {
- cspDestination: cspConfig.cspDestination,
- algorithm: cspConfig.algorithm || 'SHA-256',
- scriptHashes: cspConfig.scriptHashes || [],
- scriptResources: cspConfig.scriptResources || [],
- styleHashes: cspConfig.styleHashes || [],
- styleResources: cspConfig.styleResources || [],
- directives: cspConfig.directives || [],
- isStrictDynamic: cspConfig.isStrictDynamic || false,
+ // manifest is readonly, so we use Object.defineProperty to override it for testing
+ Object.defineProperty(pipeline, 'manifest', {
+ value: {
+ ...pipeline.manifest,
+ shouldInjectCspMetaTags: true,
+ csp: {
+ cspDestination: cspConfig.cspDestination,
+ algorithm: cspConfig.algorithm || 'SHA-256',
+ scriptHashes: cspConfig.scriptHashes || [],
+ scriptResources: cspConfig.scriptResources || [],
+ styleHashes: cspConfig.styleHashes || [],
+ styleResources: cspConfig.styleResources || [],
+ directives: cspConfig.directives || [],
+ isStrictDynamic: cspConfig.isStrictDynamic || false,
+ },
},
- };
+ writable: false,
+ configurable: true,
+ });
return pipeline;
}
-/**
- * Renders a page component and returns HTML and headers
- * @param {any} PageComponent
- * @param {any} pipeline
- * @param {boolean} prerender
- */
-async function renderPage(PageComponent, pipeline, prerender = true) {
+async function renderPage(
+ PageComponent: ReturnType,
+ pipeline: Pipeline,
+ prerender = true,
+): Promise<{ html: string; response: Response }> {
const PageModule = { default: PageComponent };
const request = new Request('http://localhost/');
const routeData = {
- type: 'page',
+ type: 'page' as const,
+ route: '/index',
pathname: '/index',
component: 'src/pages/index.astro',
- params: {},
+ params: [] as string[],
+ segments: [] as any[],
+ pattern: /^\/$/ as RegExp,
+ distURL: [] as URL[],
prerender,
+ fallbackRoutes: [] as any[],
+ isIndex: true,
+ origin: 'project' as const,
};
- const renderContext = await RenderContext.create({ pipeline, request, routeData });
+ const renderContext = await RenderContext.create({
+ pipeline,
+ request,
+ routeData,
+ pathname: '/index',
+ clientAddress: '127.0.0.1',
+ });
const response = await renderContext.render(PageModule);
const html = await response.text();
@@ -64,10 +78,10 @@ async function renderPage(PageComponent, pipeline, prerender = true) {
// #region Reusable Components
/** Simple page component */
-const SimplePage = createComponent((result) => {
+const SimplePage = createComponent(() => {
return render`
- ${renderHead(result)}
- ${maybeRenderHead(result)}Test
+ ${renderHead()}
+ ${maybeRenderHead()}Test
`;
});
@@ -86,7 +100,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('sha256-abc123'), 'Should include first style hash');
assert.ok(content.includes('sha256-def456'), 'Should include second style hash');
@@ -107,7 +121,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('sha256-xyz789'), 'Should include first script hash');
assert.ok(content.includes('sha256-uvw456'), 'Should include second script hash');
@@ -126,7 +140,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('sha512-'), 'Should use sha512 prefix');
assert.ok(content.includes('sha512-longhash123abc'), 'Should include SHA-512 hash');
@@ -142,7 +156,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('sha384-'), 'Should use sha384 prefix');
assert.ok(content.includes('sha384-mediumhash456'), 'Should include SHA-384 hash');
@@ -160,7 +174,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('sha384-hash2'), 'Should include custom style hash 1');
assert.ok(content.includes('sha384-hash4'), 'Should include custom script hash 1');
@@ -179,7 +193,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(
content.includes("img-src 'self' 'https://example.com'"),
@@ -201,7 +215,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(content.includes('upgrade-insecure-requests'), 'Should include upgrade directive');
assert.ok(content.includes('sandbox'), 'Should include sandbox directive');
@@ -224,7 +238,7 @@ describe('CSP Rendering', () => {
const $ = cheerio.load(html);
const meta = $('meta[http-equiv="Content-Security-Policy"]');
- const content = meta.attr('content');
+ const content = meta.attr('content')!;
assert.ok(
content.includes('script-src https://cdn.example.com https://scripts.cdn.example.com'),
@@ -244,7 +258,7 @@ describe('CSP Rendering', () => {
scriptResources: ['https://global.cdn.example.com'],
});
- const PageWithCspApi = createComponent((result) => {
+ const PageWithCspApi = createComponent((result: any) => {
const Astro = result.createAstro({}, {});
// Use runtime CSP API
@@ -254,16 +268,16 @@ describe('CSP Rendering', () => {
Astro.csp.insertDirective('img-src https://images.cdn.example.com');
return render`
- ${renderHead(result)}
- ${maybeRenderHead(result)}Scripts
- `;
+ ${renderHead()}
+ ${maybeRenderHead()}Scripts
+