diff --git a/packages/active-element/test/index.test.ts b/packages/active-element/test/index.test.ts index de3e574ac..25d67e2eb 100644 --- a/packages/active-element/test/index.test.ts +++ b/packages/active-element/test/index.test.ts @@ -30,7 +30,7 @@ describe("makeActiveElementListener", () => { dispatchFocusEvent(); expect(events).toBe(1); - const clear = makeActiveElementListener(e => events++); + const clear = makeActiveElementListener(_e => events++); dispatchFocusEvent(); expect(events).toBe(2); diff --git a/packages/bounds/src/index.ts b/packages/bounds/src/index.ts index 726ea5add..5b35d900c 100644 --- a/packages/bounds/src/index.ts +++ b/packages/bounds/src/index.ts @@ -120,16 +120,16 @@ export function createElementBounds( ); if (isFn) { createEffect( - () => (target as Accessor)() || null, + () => target() || null, el => { - if (el) ro.observe(el as Element); + if (el) ro.observe(el); return () => { - if (el) ro.unobserve(el as Element); + if (el) ro.unobserve(el); }; }, ); } else { - ro.observe(target as Element); + ro.observe(target); } onCleanup(() => ro.disconnect()); } diff --git a/packages/bounds/test/index.test.ts b/packages/bounds/test/index.test.ts index 268da349e..df2fd3bec 100644 --- a/packages/bounds/test/index.test.ts +++ b/packages/bounds/test/index.test.ts @@ -4,8 +4,8 @@ import { createElementBounds, getElementBounds } from "../src/index.js"; class TestResizeObserver { constructor() {} - observe(target: Element, options?: ResizeObserverOptions): void {} - unobserve(target: Element): void {} + observe(_target: Element, _options?: ResizeObserverOptions): void {} + unobserve(_target: Element): void {} disconnect() {} } global.ResizeObserver = TestResizeObserver; diff --git a/packages/broadcast-channel/test/index.test.ts b/packages/broadcast-channel/test/index.test.ts index 0dbab2b4d..9f0aa2403 100644 --- a/packages/broadcast-channel/test/index.test.ts +++ b/packages/broadcast-channel/test/index.test.ts @@ -21,7 +21,7 @@ class BroadcastChannel { if (!_all_listeners[channel_name]) { _all_listeners[channel_name] = [this.listeners]; } else { - _all_listeners[channel_name]!.push(this.listeners); + _all_listeners[channel_name].push(this.listeners); } } @@ -167,7 +167,7 @@ describe("makeBroadcastChannel", () => { data.dispose(); }); - test("sending messages", async t => { + test("sending messages", async _t => { const channelName = "channel-1"; const data = createRoot(dispose => { diff --git a/packages/controlled-props/test/testProps.test.tsx b/packages/controlled-props/test/testProps.test.tsx index f6af4d39b..8377fdd40 100644 --- a/packages/controlled-props/test/testProps.test.tsx +++ b/packages/controlled-props/test/testProps.test.tsx @@ -94,7 +94,7 @@ describe("createControlledProp", () => { expect(label).instanceOf(HTMLLabelElement); const select = label.querySelector("select")!; expect(select).instanceOf(HTMLSelectElement); - expect(select.selectedOptions[0].innerHTML).toBe("One"); + expect(select.selectedOptions[0]?.innerHTML).toBe("One"); select.selectedIndex = 0; select.dispatchEvent(new Event("change")); expect(value()).toBe(Test.Zero); @@ -159,5 +159,6 @@ describe("createControlledProp", () => { enumSelect.selectedIndex = 1; enumSelect.dispatchEvent(new Event("change")); expect(props.enum()).toBe(Test.One); + dispose(); })); }); diff --git a/packages/date/test/date-difference.test.ts b/packages/date/test/date-difference.test.ts index 32bd7d2fc..35e3ab3b9 100644 --- a/packages/date/test/date-difference.test.ts +++ b/packages/date/test/date-difference.test.ts @@ -2,7 +2,7 @@ import { describe, it, expect } from "vitest"; import { createRoot, createSignal } from "solid-js"; import { createTimeAgo, - RelativeFormatMessages, + type RelativeFormatMessages, DAY, HOUR, MINUTE, @@ -110,8 +110,8 @@ describe("createTimeAgo", () => { const messages: Partial = { justNow: "NOW", future: n => `in the next ${n}`, - day: (n, past) => `${n} DAY${n > 1 ? "S" : ""}`, - week: (n, past) => (n === 1 ? "week" : `${n} weeks`), + day: (n, _past) => `${n} DAY${n > 1 ? "S" : ""}`, + week: (n, _past) => (n === 1 ? "week" : `${n} weeks`), }; const [timeago] = createTimeAgo(date, { diff --git a/packages/deep/test/track.bench.ts b/packages/deep/test/track.bench.ts index bc5298061..6128d487e 100644 --- a/packages/deep/test/track.bench.ts +++ b/packages/deep/test/track.bench.ts @@ -1,6 +1,6 @@ import { describe, bench } from "vitest"; import { batch, createEffect, createRoot } from "solid-js"; -import { captureStoreUpdates, trackDeep, trackStore } from "../src/index.js"; +import { trackDeep, trackStore } from "../src/index.js"; import { createStore } from "solid-js/store"; const fns = { diff --git a/packages/event-listener/src/eventListener.ts b/packages/event-listener/src/eventListener.ts index 7c19fc933..2864d4cf7 100644 --- a/packages/event-listener/src/eventListener.ts +++ b/packages/event-listener/src/eventListener.ts @@ -113,8 +113,8 @@ export function createEventListener( type State = { els: EventTarget[]; types: string[] }; const compute = (): State => ({ - els: asArray(access(targets)).filter(Boolean) as EventTarget[], - types: asArray(access(type)) as string[], + els: asArray(access(targets)).filter(x => !!x), + types: asArray(access(type)), }); const apply = ({ els, types }: State) => { diff --git a/packages/event-listener/src/types.ts b/packages/event-listener/src/types.ts index 3394558df..46794c15d 100644 --- a/packages/event-listener/src/types.ts +++ b/packages/event-listener/src/types.ts @@ -1,4 +1,4 @@ -import type { JSX } from "solid-js"; +import type { JSX } from "@solidjs/web"; export type EventListenerOptions = boolean | AddEventListenerOptions; diff --git a/packages/event-listener/test/setup.ts b/packages/event-listener/test/setup.ts index c7526aeb8..da226cb16 100644 --- a/packages/event-listener/test/setup.ts +++ b/packages/event-listener/test/setup.ts @@ -3,13 +3,13 @@ export const event_target = new EventTarget(); const globalListeners: Record void>> = {}; // @ts-ignore -event_target.addEventListener = (name: string, callback: (e: Event) => void, o: any) => { +event_target.addEventListener = (name: string, callback: (e: Event) => void, _o: any) => { if (!globalListeners[name]) globalListeners[name] = new Set(); // @ts-ignore globalListeners[name].add(callback); }; // @ts-ignore -event_target.removeEventListener = (name: string, callback: (e: Event) => void, o: any) => { +event_target.removeEventListener = (name: string, callback: (e: Event) => void, _o: any) => { if (!globalListeners[name]) return; // @ts-ignore globalListeners[name].delete(callback); diff --git a/packages/fetch/test/setup.ts b/packages/fetch/test/setup.ts index 5e8d0558b..90ef91161 100644 --- a/packages/fetch/test/setup.ts +++ b/packages/fetch/test/setup.ts @@ -1,7 +1,7 @@ class ResponseMock { constructor( public body: BodyInit | null, - private init: ResponseInit & { redirected: boolean; type: "cors" | "basic"; url: string }, + private init: Partial & { redirected?: boolean; type?: "cors" | "basic"; url?: string }, ) {} get status() { return this.init.status || -1; @@ -12,7 +12,7 @@ class ResponseMock { get headers() { return this.init.headers instanceof Headers ? this.init.headers - : new Headers(this.init.headers) || new Headers(); + : new Headers(this.init.headers || {}); } get ok() { return this.status >= 200 && this.status < 300; @@ -67,7 +67,7 @@ class ResponseMock { class HeadersMock { private headers: Record = {}; constructor(headers: Record) { - Object.entries(headers || {}).forEach(([key, value]) => { + Object.entries(headers).forEach(([key, value]) => { this.headers[key.toLowerCase()] = value; }); } diff --git a/packages/geolocation/test/setup.ts b/packages/geolocation/test/setup.ts index 41e1448c0..61706fee6 100644 --- a/packages/geolocation/test/setup.ts +++ b/packages/geolocation/test/setup.ts @@ -8,15 +8,15 @@ Object.defineProperty(global.navigator, "geolocation", { clearWatch: () => {}, getCurrentPosition( successCallback: PositionCallback, - errorCallback?: PositionErrorCallback | null, - options?: PositionOptions, + _errorCallback?: PositionErrorCallback | null, + _options?: PositionOptions, ) { successCallback({ coords: mockCoordinates } as GeolocationPosition); }, watchPosition( successCallback: PositionCallback, - errorCallback?: PositionErrorCallback | null, - options?: PositionOptions, + _errorCallback?: PositionErrorCallback | null, + _options?: PositionOptions, ) { successCallback({ coords: mockCoordinates } as GeolocationPosition); }, diff --git a/packages/keyboard/test/index.test.ts b/packages/keyboard/test/index.test.ts index 7c8a6d645..2b45fdac9 100644 --- a/packages/keyboard/test/index.test.ts +++ b/packages/keyboard/test/index.test.ts @@ -8,7 +8,7 @@ import { } from "../src/index.js"; const dispatchKeyEvent = (key: string, type: "keydown" | "keyup") => { - let ev = new Event(type) as any; + const ev = new Event(type) as any; ev.key = key; window.dispatchEvent(ev); }; diff --git a/packages/pagination/test/index.test.ts b/packages/pagination/test/index.test.ts index add2693c3..8d168f47d 100644 --- a/packages/pagination/test/index.test.ts +++ b/packages/pagination/test/index.test.ts @@ -4,9 +4,8 @@ import { createInfiniteScroll, createPagination, createSegment, - PaginationOptions, + type PaginationOptions, } from "../src/index.js"; -import { testEffect } from "../../resource/test/index.test.js"; describe("createPagination", () => { test("createPagination returns page getter and setter", () => @@ -89,7 +88,7 @@ describe("createPagination", () => { test("createPagination next back", () => { createRoot(dispose => { - const [paginationProps, page, setPage] = createPagination({ + const [paginationProps, _page, _setPage] = createPagination({ pages: 100, maxPages: 1, showFirst: false, @@ -107,7 +106,7 @@ describe("createPagination", () => { test("setting page below one will yield the first page", () => { createRoot(dispose => { - const [paginationProps, page, setPage] = createPagination({ + const [_paginationProps, page, setPage] = createPagination({ pages: 10, maxPages: 5, }); @@ -124,7 +123,7 @@ describe("createPagination", () => { test("setting page beyond the number pages will yield the last page", () => { createRoot(dispose => { - const [paginationProps, page, setPage] = createPagination({ + const [_paginationProps, page, setPage] = createPagination({ pages: 10, maxPages: 5, initialPage: 10, @@ -147,7 +146,7 @@ describe("createPagination", () => { maxPages: 5, initialPage: 10, }); - const [paginationProps, page, setPage] = createPagination(options); + const [_paginationProps, page, _setPage] = createPagination(options); expect(page()).toBe(10); setOptions({ pages: 8, maxPages: 5 }); @@ -200,7 +199,7 @@ describe("createSegment", () => { createRoot(dispose => { const [length, setLength] = createSignal(55); const items = createMemo(() => Array.from({ length: length() }, (_, i) => i + 1)); - const [page, setPage] = createSignal(6); + const [page, _setPage] = createSignal(6); const segment = createSegment(items, 10, page); const seg1 = segment(); diff --git a/packages/presence/src/index.ts b/packages/presence/src/index.ts index 4cadcf3d4..076629db2 100644 --- a/packages/presence/src/index.ts +++ b/packages/presence/src/index.ts @@ -144,8 +144,7 @@ export function createPresence( options: Options, ): PresenceResult { const initial = untrack(item); - // eslint-disable-next-line @typescript-eslint/no-explicit-any - const [mountedItem, setMountedItem] = createSignal(initial as any, INTERNAL_OPTIONS); + const [mountedItem, setMountedItem] = createSignal(initial as Exclude, INTERNAL_OPTIONS); const [shouldBeMounted, setShouldBeMounted] = createSignal(itemShouldBeMounted(initial), INTERNAL_OPTIONS); const { isMounted, ...rest } = createPresenceBase(shouldBeMounted, options); @@ -160,8 +159,7 @@ export function createPresence( if (isM) { setShouldBeMounted(false); } else if (itemShouldBeMounted(currentItem)) { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - setMountedItem(currentItem as any); + setMountedItem(currentItem as Exclude); setShouldBeMounted(true); } } else if (!itemShouldBeMounted(currentItem)) { diff --git a/packages/props/test/combineProps.test.ts b/packages/props/test/combineProps.test.ts index 0935ca1e3..f0183ecb2 100644 --- a/packages/props/test/combineProps.test.ts +++ b/packages/props/test/combineProps.test.ts @@ -1,6 +1,5 @@ import { describe, it, expect, vi } from "vitest"; -import { createComputed, createRoot, createSignal, mergeProps, ValidComponent } from "solid-js"; -import { DynamicProps, Dynamic } from "solid-js/web"; +import { createComputed, createRoot, createSignal, mergeProps } from "solid-js"; import { combineProps } from "../src/index.js"; describe("combineProps", () => { diff --git a/packages/range/test/indexRange.test.ts b/packages/range/test/indexRange.test.ts index 217cf5e5c..396d51031 100644 --- a/packages/range/test/indexRange.test.ts +++ b/packages/range/test/indexRange.test.ts @@ -64,16 +64,16 @@ describe("indexRange", () => { const a = mapped(); expect(a.length).toBe(3); - expect(a[0]()).toBe(-3.5); - expect(a[1]()).toBe(-2); - expect(a[2]()).toBe(-0.5); + expect(a[0]?.()).toBe(-3.5); + expect(a[1]?.()).toBe(-2); + expect(a[2]?.()).toBe(-0.5); setStart(0); setTo(2); setStep(0.2); const b = mapped(); for (let n = 0, i = 0; i < 10; n += 0.2, i++) { - expect(b[i]()).toBe(n); + expect(b[i]?.()).toBe(n); } setStart(5); @@ -81,11 +81,11 @@ describe("indexRange", () => { setStep(2); const c = mapped(); expect(c.length).toBe(5); - expect(c[0]()).toBe(5); - expect(c[1]()).toBe(3); - expect(c[2]()).toBe(1); - expect(c[3]()).toBe(-1); - expect(c[4]()).toBe(-3); + expect(c[0]?.()).toBe(5); + expect(c[1]?.()).toBe(3); + expect(c[2]?.()).toBe(1); + expect(c[3]?.()).toBe(-1); + expect(c[4]?.()).toBe(-3); dispose(); })); @@ -94,9 +94,9 @@ describe("indexRange", () => { createRoot(dispose => { const [start, setStart] = createSignal(4); const [to, setTo] = createSignal(8); - const [step, setStep] = createSignal(1); + const [step, _setStep] = createSignal(1); - let captured: (string | number)[] = []; + const captured: (string | number)[] = []; const mapped = indexRange(start, to, step, n => { captured.push(n()); }); @@ -123,7 +123,7 @@ describe("indexRange", () => { const [to, setTo] = createSignal(8); const [step, setStep] = createSignal(1); - let captured: (string | number)[] = []; + const captured: (string | number)[] = []; const mapped = indexRange(start, to, step, n => { onCleanup(() => captured.push(n())); }); @@ -152,7 +152,7 @@ describe("indexRange", () => { createRoot(dispose => { const [start, setStart] = createSignal(4); const [to, setTo] = createSignal(8); - const [step, setStep] = createSignal(1); + const [step, _setStep] = createSignal(1); const mapped = indexRange(start, to, step, n => n(), { fallback: () => "fb", diff --git a/packages/range/test/mapRange.test.ts b/packages/range/test/mapRange.test.ts index a33d0f583..eaed3c933 100644 --- a/packages/range/test/mapRange.test.ts +++ b/packages/range/test/mapRange.test.ts @@ -86,7 +86,7 @@ describe("mapRange", () => { const [to, setTo] = createSignal(8); const [step, setStep] = createSignal(1); - let captured: (string | number)[] = []; + const captured: (string | number)[] = []; const mapped = mapRange(start, to, step, n => { captured.push(n); }); @@ -118,7 +118,7 @@ describe("mapRange", () => { const [to, setTo] = createSignal(8); const [step, setStep] = createSignal(1); - let captured: (string | number)[] = []; + const captured: (string | number)[] = []; const mapped = mapRange(start, to, step, n => { onCleanup(() => captured.push(n)); }); @@ -148,7 +148,7 @@ describe("mapRange", () => { createRoot(dispose => { const [start, setStart] = createSignal(4); const [to, setTo] = createSignal(8); - const [step, setStep] = createSignal(1); + const [step, _setStep] = createSignal(1); const mapped = mapRange(start, to, step, n => n, { fallback: () => "fb" }); diff --git a/packages/range/test/repeat.test.ts b/packages/range/test/repeat.test.ts index e98ab5807..1fc3438b9 100644 --- a/packages/range/test/repeat.test.ts +++ b/packages/range/test/repeat.test.ts @@ -6,7 +6,7 @@ describe("repeat", () => { it("maps only added items", () => createRoot(dispose => { const [length, setLength] = createSignal(5); - let captured: number[] = []; + const captured: number[] = []; const mapped = repeat(length, i => { captured.push(i); return i; @@ -28,7 +28,7 @@ describe("repeat", () => { it("uses fallback if length is 0", () => createRoot(dispose => { const [length, setLength] = createSignal(4); - let captured: (string | number)[] = []; + const captured: (string | number)[] = []; const mapped = repeat( length, i => { @@ -56,7 +56,7 @@ describe("repeat", () => { it("disposing on remove and cleanup", () => createRoot(dispose => { const [length, setLength] = createSignal(2); - let cleanups: (string | number)[] = []; + const cleanups: (string | number)[] = []; const mapped = repeat( length, i => { diff --git a/packages/refs/test/index.test.ts b/packages/refs/test/index.test.ts index 78355cdf4..9b0cb231f 100644 --- a/packages/refs/test/index.test.ts +++ b/packages/refs/test/index.test.ts @@ -29,7 +29,7 @@ describe("resolveElements", () => { el1, () => undefined, () => () => el2, - // eslint-disable-next-line @typescript-eslint/no-unused-vars + [el3, () => el4, () => 123, ((_: number) => el5) as any], el6, ], diff --git a/packages/resource/test/index.test.ts b/packages/resource/test/index.test.ts index 4974ee009..ef5051a75 100644 --- a/packages/resource/test/index.test.ts +++ b/packages/resource/test/index.test.ts @@ -9,12 +9,12 @@ import { createDeepSignal, } from "../src/index.js"; -export function testEffect( +export function testEffect( fn: (done: (result: T) => void) => void, ): Promise { let done: (result: T) => void; let fail: (error: any) => void; - let promise = new Promise((resolve, reject) => { + const promise = new Promise((resolve, reject) => { done = resolve; fail = reject; }); diff --git a/packages/signal-builders/test/index.test.ts b/packages/signal-builders/test/index.test.ts index 410a2f874..dc293e6d8 100644 --- a/packages/signal-builders/test/index.test.ts +++ b/packages/signal-builders/test/index.test.ts @@ -29,13 +29,13 @@ describe("signal builders", () => { expect(a()).toEqual([num, el, svg]); const b = filterOutInstance(() => list, Element, Number); expect(b()).toEqual([string, string]); - expect(list).toEqual(copy, "nonmutable"); + expect(list, "nonmutable").toEqual(copy); dispose(); })); it("template", () => createRoot(dispose => { - const [a, setA] = createSignal("Hello"); + const [a, _setA] = createSignal("Hello"); const [b, setB] = createSignal("World"); const result = template`${a} ${b}!!!`; expect(result()).toBe("Hello World!!!"); diff --git a/packages/spring/test/index.test.ts b/packages/spring/test/index.test.ts index ecdd74def..22bf18f99 100644 --- a/packages/spring/test/index.test.ts +++ b/packages/spring/test/index.test.ts @@ -15,7 +15,7 @@ function _progress_time(by: number) { _raf_callbacks_old.clear(); } -let _now = performance.now; +const _now = performance.now; performance.now = () => _time; afterAll(() => { performance.now = _now; @@ -32,7 +32,7 @@ vi.stubGlobal("cancelAnimationFrame", function (id: number): void { describe("createSpring", () => { it("returns values", () => { - const [[spring, setSpring], dispose] = createRoot(d => [createSpring({ progress: 0 }), d]); + const [[spring, _setSpring], dispose] = createRoot(d => [createSpring({ progress: 0 }), d]); expect(spring().progress).toBe(0); dispose(); }); diff --git a/packages/spring/test/server.test.ts b/packages/spring/test/server.test.ts index 2637cca72..58e12a332 100644 --- a/packages/spring/test/server.test.ts +++ b/packages/spring/test/server.test.ts @@ -4,14 +4,14 @@ import { createSignal } from "solid-js"; describe("createSpring", () => { test("doesn't break in SSR", () => { - const [value, setValue] = createSpring({ progress: 0 }); + const [value, _setValue] = createSpring({ progress: 0 }); expect(value().progress, "initial value should be { progress: 0 }").toBe(0); }); }); describe("createDerivedSpring", () => { test("doesn't break in SSR", () => { - const [signal, setSignal] = createSignal({ progress: 0 }); + const [signal, _setSignal] = createSignal({ progress: 0 }); const value = createDerivedSpring(signal); expect(value().progress, "initial value should be { progress: 0 }").toBe(0); }); diff --git a/packages/stream/test/setup.ts b/packages/stream/test/setup.ts index 2c96b1e7f..8e1c90f80 100644 --- a/packages/stream/test/setup.ts +++ b/packages/stream/test/setup.ts @@ -1,41 +1,41 @@ -if (!window.AudioContext) { - class AudioContextMock { - public state: AudioContextState = "running"; - constructor(private options: AudioContextOptions) {} +class AudioContextMock { + public state: AudioContextState = "running"; + + constructor(_options: AudioContextOptions) {} - createAnalyser() { - return Object.assign( - { - frequencyBinCount: 128, - getByteFrequencyData: array => { - array.set([...array].map(() => (Math.random() * 255) | 0)); - }, - } as AnalyserNode, - { - connect: () => null, - disconnect: () => null, + createAnalyser() { + return Object.assign( + { + frequencyBinCount: 128, + getByteFrequencyData: array => { + array.set([...array].map(() => (Math.random() * 255) | 0)); }, - ); - } - createMediaStreamSource(mediaStream) { - return Object.assign( - { - mediaStream, - } as MediaStreamAudioSourceNode, - { connect: () => null, disconnect: () => null }, - ); - } - close() { - if (this.state === "closed") { - return Promise.reject(new Error("Closing an already closed AudioContext")); - } - this.state = "closed"; - return Promise.resolve(); + } as AnalyserNode, + { + connect: () => null, + disconnect: () => null, + }, + ); + } + createMediaStreamSource(mediaStream: MediaStream) { + return Object.assign( + { + mediaStream, + } as MediaStreamAudioSourceNode, + { connect: () => null, disconnect: () => null }, + ); + } + close() { + if (this.state === "closed") { + return Promise.reject(new Error("Closing an already closed AudioContext")); } + this.state = "closed"; + return Promise.resolve(); } - (window as any).AudioContext = AudioContextMock; - (globalThis as any).AudioContext = AudioContextMock; } +(window as any).AudioContext ??= AudioContextMock; +(globalThis as any).AudioContext ??= AudioContextMock; + (window as any).__mockstream__ = Object.assign(new EventTarget(), { getTracks: () => [], diff --git a/packages/trigger/test/server.test.ts b/packages/trigger/test/server.test.ts index 020f0277e..30c7b505a 100644 --- a/packages/trigger/test/server.test.ts +++ b/packages/trigger/test/server.test.ts @@ -1,4 +1,4 @@ -import { describe, test, expect, vi } from "vitest"; +import { describe, test, expect } from "vitest"; import { createTrigger, createTriggerCache } from "../src/index.js"; describe("createTrigger", () => { diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 7c5e33cb1..51f6df1c6 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -169,11 +169,11 @@ export function defer( const isArray = Array.isArray(deps); let prevInput: S; let shouldDefer = true; - return prevValue => { + return ((prevValue: Prev | undefined) => { let input: S; if (isArray) { input = Array(deps.length) as S; - for (let i = 0; i < deps.length; i++) (input as any[])[i] = deps[i](); + for (let i = 0; i < deps.length; i++) (input as any[])[i] = deps[i]?.(); } else input = deps(); if (shouldDefer) { shouldDefer = false; @@ -183,7 +183,7 @@ export function defer( const result = untrack(() => fn(input, prevInput, prevValue)); prevInput = input; return result; - }; + }) as unknown as EffectFunction | undefined>; } /** @@ -253,14 +253,14 @@ export function createHydratableSignal( options?: SignalOptions, ): ReturnType> { if (isServer) { - return createSignal(serverValue, options); + return createSignal(serverValue as Exclude, options); } if (sharedConfig.hydrating) { - const [state, setState] = createSignal(serverValue, options); - onSettled(() => setState(() => update())); + const [state, setState] = createSignal(serverValue as Exclude, options); + onSettled(() => setState(() => update() as any)); return [state, setState]; } - return createSignal(update(), options); + return createSignal(update() as Exclude, options); } /** @deprecated use {@link createHydratableSignal} instead */ diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts index e91bfa027..8569f6540 100644 --- a/packages/utils/src/types.ts +++ b/packages/utils/src/types.ts @@ -1,10 +1,5 @@ import type { Accessor, Setter } from "solid-js"; -export type { EffectOptions, OnOptions } from "solid-js"; - -// TODO delete in next major version -export type { ResolvedJSXElement, ResolvedChildren } from "solid-js/types/reactive/signal.js"; - /** * Can be single or in an array */ diff --git a/packages/websocket/test/setup.ts b/packages/websocket/test/setup.ts index f24347065..a7b9a15c1 100644 --- a/packages/websocket/test/setup.ts +++ b/packages/websocket/test/setup.ts @@ -14,7 +14,7 @@ declare global { (global as any).WSMessages = new Map(); -const readyStates = new Map(); +export const readyStates = new Map(); class MockWebSocket extends EventTarget { public CONNECTING = 0;