From b68f6eb6d3786c174f9b643e26ee7e437b4864fb Mon Sep 17 00:00:00 2001 From: William Candillon Date: Sat, 11 Nov 2023 07:27:55 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20fix=20build=20script=20(#1972)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/src/renderer/__tests__/setup.tsx | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/package/src/renderer/__tests__/setup.tsx b/package/src/renderer/__tests__/setup.tsx index 39b5f944eb..5416f75eb3 100644 --- a/package/src/renderer/__tests__/setup.tsx +++ b/package/src/renderer/__tests__/setup.tsx @@ -8,12 +8,7 @@ import type { Server, WebSocket } from "ws"; import { DependencyManager } from "../DependencyManager"; import { ValueApi } from "../../values/web"; -import type * as SkiaExports from "../../skia"; -import type * as AnimationExports from "../../animation"; -import type * as ValuesExports from "../../values"; -import type * as RendererExports from "../index"; -import type * as OffscreenExports from "../Offscreen"; -import type * as TouchHandlerExports from "../../views/useTouchHandler"; +import type * as SkiaExports from "../../index"; import { JsiSkApi } from "../../skia/web/JsiSkia"; import type { Node } from "../../dom/nodes"; import { JsiSkDOM } from "../../dom/nodes"; @@ -162,15 +157,15 @@ export const loadFont = (uri: string, ftSize?: number) => { return Skia.Font(tf!, ftSize ?? fontSize); }; -export const importSkia = () => { +export const importSkia = (): typeof SkiaExports => { //const core = require("../../skia/core"); - const skia: typeof SkiaExports = require("../../skia"); - const renderer: typeof RendererExports = require("../../renderer"); - const offscreen: typeof OffscreenExports = require("../Offscreen"); + const skia = require("../../skia"); + const renderer = require("../../renderer"); + const offscreen = require("../Offscreen"); // TODO: to remove - const animation: typeof AnimationExports = require("../../animation"); - const values: typeof ValuesExports = require("../../values"); - const useTouchHandler: typeof TouchHandlerExports = require("../../views/useTouchHandler"); + const animation = require("../../animation"); + const values = require("../../values"); + const useTouchHandler = require("../../views/useTouchHandler"); return { ...skia, ...renderer,