diff --git a/.changeset/smart-nails-work.md b/.changeset/smart-nails-work.md new file mode 100644 index 000000000000..524cea9d123d --- /dev/null +++ b/.changeset/smart-nails-work.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +import generated types from `__types/index.d.ts` file diff --git a/.changeset/soft-months-fail.md b/.changeset/soft-months-fail.md new file mode 100644 index 000000000000..418e71ce3ed1 --- /dev/null +++ b/.changeset/soft-months-fail.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +[breaking] write generated types to `__types` directories diff --git a/documentation/docs/15-types.md b/documentation/docs/15-types.md index fc5744348719..c47866de9bb0 100644 --- a/documentation/docs/15-types.md +++ b/documentation/docs/15-types.md @@ -26,7 +26,7 @@ Needless to say, this is cumbersome to write out, and less portable (if you were To solve this problem, SvelteKit generates `.d.ts` files for each of your endpoints and pages: ```ts -/// file: .svelte-kit/types/src/routes/[foo]/[bar]/[baz].d.ts +/// file: .svelte-kit/types/src/routes/[foo]/[bar]/__types/[baz].d.ts /// link: false import type { RequestHandler as GenericRequestHandler, Load as GenericLoad } from '@sveltejs/kit'; @@ -45,7 +45,7 @@ These files can be imported into your endpoints and pages as siblings, thanks to ```js /// file: src/routes/[foo]/[bar]/[baz].js -// @filename: [baz].d.ts +// @filename: __types/[baz].d.ts import type { RequestHandler as GenericRequestHandler, Load as GenericLoad } from '@sveltejs/kit'; export type RequestHandler = GenericRequestHandler< @@ -56,7 +56,7 @@ export type RequestHandler = GenericRequestHandler< // @filename: index.js // @errors: 2355 // ---cut--- -/** @type {import('./[baz]').RequestHandler} */ +/** @type {import('./__types/[baz]').RequestHandler} */ export async function get({ params }) { // ... } @@ -64,7 +64,7 @@ export async function get({ params }) { ```svelte diff --git a/packages/kit/src/packaging/test/fixtures/emitTypes-false/src/lib/Test2.svelte b/packages/kit/src/packaging/test/fixtures/emitTypes-false/src/lib/Test2.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/emitTypes-false/src/lib/Test2.svelte +++ b/packages/kit/src/packaging/test/fixtures/emitTypes-false/src/lib/Test2.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/exports-merge/expected/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/exports-merge/expected/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/exports-merge/expected/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/exports-merge/expected/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/exports-merge/src/lib/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/exports-merge/src/lib/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/exports-merge/src/lib/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/exports-merge/src/lib/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/exports-replace/expected/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/exports-replace/expected/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/exports-replace/expected/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/exports-replace/expected/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/exports-replace/src/lib/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/exports-replace/src/lib/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/exports-replace/src/lib/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/exports-replace/src/lib/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/javascript/expected/Test2.svelte b/packages/kit/src/packaging/test/fixtures/javascript/expected/Test2.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/javascript/expected/Test2.svelte +++ b/packages/kit/src/packaging/test/fixtures/javascript/expected/Test2.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/javascript/expected/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/javascript/expected/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/javascript/expected/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/javascript/expected/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/javascript/src/lib/Test2.svelte b/packages/kit/src/packaging/test/fixtures/javascript/src/lib/Test2.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/javascript/src/lib/Test2.svelte +++ b/packages/kit/src/packaging/test/fixtures/javascript/src/lib/Test2.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/src/packaging/test/fixtures/javascript/src/lib/internal/Test.svelte b/packages/kit/src/packaging/test/fixtures/javascript/src/lib/internal/Test.svelte index 06a5a3408e95..852fe8cd5dbc 100644 --- a/packages/kit/src/packaging/test/fixtures/javascript/src/lib/internal/Test.svelte +++ b/packages/kit/src/packaging/test/fixtures/javascript/src/lib/internal/Test.svelte @@ -1,6 +1,6 @@ diff --git a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte index a0acf4eb07bd..03089c2e7a21 100644 --- a/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte +++ b/packages/kit/test/apps/basics/src/routes/encoded/[slug].svelte @@ -1,5 +1,5 @@