diff --git a/packages/astro/test/error-bad-js.test.js b/packages/astro/test/error-bad-js.test.ts similarity index 86% rename from packages/astro/test/error-bad-js.test.js rename to packages/astro/test/error-bad-js.test.ts index 3ef37208be58..2ec458c1fa06 100644 --- a/packages/astro/test/error-bad-js.test.js +++ b/packages/astro/test/error-bad-js.test.ts @@ -1,11 +1,10 @@ import assert from 'node:assert/strict'; import { after, before, describe, it } from 'node:test'; import testAdapter from './test-adapter.js'; -import { loadFixture } from './test-utils.js'; +import { loadFixture, type Fixture, type DevServer } from './test-utils.js'; describe('Errors in JavaScript', () => { - /** @type {import('./test-utils').Fixture} */ - let fixture; + let fixture: Fixture; before(async () => { fixture = await loadFixture({ @@ -19,8 +18,7 @@ describe('Errors in JavaScript', () => { }); describe('dev', () => { - /** @type {import('./test-utils').DevServer} */ - let devServer; + let devServer: DevServer; before(async () => { devServer = await fixture.startDevServer(); @@ -45,7 +43,7 @@ describe('Errors in JavaScript', () => { describe('build', () => { before(async () => { - await fixture.build(); + await fixture.build({}); }); it('in nested components, does not crash server', async () => { diff --git a/packages/astro/test/error-build-location.test.js b/packages/astro/test/error-build-location.test.ts similarity index 66% rename from packages/astro/test/error-build-location.test.js rename to packages/astro/test/error-build-location.test.ts index ed94c678f62c..f969f3dfffaf 100644 --- a/packages/astro/test/error-build-location.test.js +++ b/packages/astro/test/error-build-location.test.ts @@ -1,23 +1,23 @@ import assert from 'node:assert/strict'; import { describe, it } from 'node:test'; -import { loadFixture } from './test-utils.js'; +import { loadFixture, type Fixture } from './test-utils.js'; describe('Errors information in build', () => { - /** @type {import('./test-utils').Fixture} */ - let fixture; + let fixture: Fixture; it('includes the file where the error happened', async () => { fixture = await loadFixture({ root: './fixtures/error-build-location', }); - let errorContent; + let errorContent: any; try { - await fixture.build(); + await fixture.build({}); } catch (e) { errorContent = e; } assert.equal(errorContent.id, 'src/pages/index.astro'); + assert.equal(errorContent.message, `I'm happening in build!`); }); }); diff --git a/packages/astro/test/error-map.test.js b/packages/astro/test/error-map.test.ts similarity index 93% rename from packages/astro/test/error-map.test.js rename to packages/astro/test/error-map.test.ts index dd467266ed10..b5600cd29ca0 100644 --- a/packages/astro/test/error-map.test.js +++ b/packages/astro/test/error-map.test.ts @@ -73,15 +73,11 @@ describe('Content Collections - error map', () => { }); }); -/** - * @param {z.ZodError} error - * @returns string[] - */ -function messages(error) { +function messages(error: z.ZodError): string[] { return error.issues.map((e) => e.message); } -function getParseError(schema, entry, parseOpts = { error: errorMap }) { +function getParseError(schema: z.Schema, entry: unknown, parseOpts = { error: errorMap }) { const res = schema.safeParse(entry, parseOpts); assert.equal(res.success, false, 'Schema should raise error'); return res.error; diff --git a/packages/astro/test/error-non-error.test.js b/packages/astro/test/error-non-error.test.ts similarity index 78% rename from packages/astro/test/error-non-error.test.js rename to packages/astro/test/error-non-error.test.ts index c7b7e8ed040c..85dcbcd49121 100644 --- a/packages/astro/test/error-non-error.test.js +++ b/packages/astro/test/error-non-error.test.ts @@ -1,13 +1,11 @@ import assert from 'node:assert/strict'; import { after, before, describe, it } from 'node:test'; -import { loadFixture } from './test-utils.js'; +import { loadFixture, type Fixture, type DevServer } from './test-utils.js'; describe('Can handle errors that are not instanceof Error', () => { - /** @type {import('./test-utils').Fixture} */ - let fixture; + let fixture: Fixture; - /** @type {import('./test-utils').DevServer} */ - let devServer; + let devServer: DevServer; before(async () => { fixture = await loadFixture({