From f215ad81646382e0d67550ad11498e7e09cfc1bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:04:51 -0400 Subject: [PATCH 1/2] chore(deps-dev): bump svelte-check from 3.8.6 to 4.0.4 in the test group (#401) Bumps the test group with 1 update: [svelte-check](https://github.com/sveltejs/language-tools). Updates `svelte-check` from 3.8.6 to 4.0.4 - [Release notes](https://github.com/sveltejs/language-tools/releases) - [Commits](https://github.com/sveltejs/language-tools/compare/svelte-check-3.8.6...svelte-check-4.0.4) --- updated-dependencies: - dependency-name: svelte-check dependency-type: direct:development update-type: version-update:semver-major dependency-group: test ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e536ce0..3601cd8 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "prettier": "^3.3.3", "prettier-plugin-svelte": "^3.2.5", "svelte": "^3 || ^4 || ^5 || ^5.0.0-next.0", - "svelte-check": "^3.8.4", + "svelte-check": "^4.0.4", "svelte-jester": "^5.0.0", "typescript": "^5.5.3", "vite": "^5.3.3", From f4b1508eb58550b71802f59532025ff198cdb011 Mon Sep 17 00:00:00 2001 From: Michael Cousins Date: Tue, 1 Oct 2024 22:43:41 -0400 Subject: [PATCH 2/2] fix(svelte5): ensure typings are actually included in the module (#402) --- package.json | 2 +- src/component-types.d.ts | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 3601cd8..192560d 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "types": "svelte-check", "types:legacy": "svelte-check --tsconfig tsconfig.legacy.json", "validate": "npm-run-all test:vitest:* test:jest types build", - "build": "tsc -p tsconfig.build.json", + "build": "tsc -p tsconfig.build.json && cp src/component-types.d.ts types", "contributors:add": "all-contributors add", "contributors:generate": "all-contributors generate", "preview-release": "./scripts/preview-release" diff --git a/src/component-types.d.ts b/src/component-types.d.ts index a349597..9df84c2 100644 --- a/src/component-types.d.ts +++ b/src/component-types.d.ts @@ -1,11 +1,14 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import type * as Svelte from 'svelte' -// eslint-disable-next-line @typescript-eslint/no-explicit-any type IS_MODERN_SVELTE = any extends Svelte.Component ? false : true /** A compiled, imported Svelte component. */ -export type Component

= IS_MODERN_SVELTE extends true - ? Svelte.Component

| Svelte.SvelteComponent

+export type Component< + P extends Record, + E extends Record, +> = IS_MODERN_SVELTE extends true + ? Svelte.Component | Svelte.SvelteComponent

: Svelte.SvelteComponent

/** @@ -19,7 +22,7 @@ export type ComponentType = C extends Svelte.SvelteComponent : C /** The props of a component. */ -export type Props = Svelte.ComponentProps +export type Props> = Svelte.ComponentProps /** * The exported fields of a component. @@ -29,7 +32,7 @@ export type Props = Svelte.ComponentProps */ export type Exports = C extends Svelte.SvelteComponent ? C - : C extends Svelte.Component + : C extends Svelte.Component ? E : never @@ -38,6 +41,7 @@ export type Exports = C extends Svelte.SvelteComponent * * In Svelte 4, these are the options passed to the component constructor. */ -export type MountOptions = IS_MODERN_SVELTE extends true - ? Parameters, Exports>>[1] - : Svelte.ComponentConstructorOptions> +export type MountOptions> = + IS_MODERN_SVELTE extends true + ? Parameters, Exports>>[1] + : Svelte.ComponentConstructorOptions>