diff --git a/.changeset/mean-plants-shave.md b/.changeset/mean-plants-shave.md new file mode 100644 index 0000000..5a15892 --- /dev/null +++ b/.changeset/mean-plants-shave.md @@ -0,0 +1,6 @@ +--- +"vite-plugin-istanbul-widget": patch +--- + +fix: remix support + \ No newline at end of file diff --git a/packages/vite-plugin-istanbul-widget/src/index.ts b/packages/vite-plugin-istanbul-widget/src/index.ts index 2736b9e..50e0a0a 100644 --- a/packages/vite-plugin-istanbul-widget/src/index.ts +++ b/packages/vite-plugin-istanbul-widget/src/index.ts @@ -33,6 +33,7 @@ export function istanbulWidget(opts: VitePluginIstanbulWidgetOptions): any { } }, transformIndexHtml: { + // pre for base url order: 'pre', handler(html) { if (istanbulWidgetConfig !== false) { diff --git a/packages/vite-plugin-istanbul-widget/src/remix/client.tsx b/packages/vite-plugin-istanbul-widget/src/remix/client.tsx index e3c1a7b..288e8e5 100644 --- a/packages/vite-plugin-istanbul-widget/src/remix/client.tsx +++ b/packages/vite-plugin-istanbul-widget/src/remix/client.tsx @@ -1,5 +1,6 @@ -import { IstanbulWidget, type IstanbulWidgetOptions } from 'istanbul-widget/lib' import { type ComponentType, useEffect, useState } from 'react' +// @ts-ignore +import { IstanbulWidget, type IstanbulWidgetOptions } from 'istanbul-widget/lib' let hydrating = true @@ -14,8 +15,8 @@ function useHydrated() { return hydrated } -export function withIstanbulWidget(Component: ComponentType, istanbulWidgetConfig: IstanbulWidgetOptions) { - function AppWithIstanbulWidget(props) { +export const withIstanbulWidget = (Component: ComponentType, istanbulWidgetConfig: IstanbulWidgetOptions) => () => { + function AppWithIstanbulWidget(props: any) { const hydrated = useHydrated() useEffect(() => { if (hydrated) { diff --git a/packages/vite-plugin-istanbul-widget/src/remix/index.tsx b/packages/vite-plugin-istanbul-widget/src/remix/index.ts similarity index 100% rename from packages/vite-plugin-istanbul-widget/src/remix/index.tsx rename to packages/vite-plugin-istanbul-widget/src/remix/index.ts diff --git a/packages/vite-plugin-istanbul-widget/src/types.d.ts b/packages/vite-plugin-istanbul-widget/src/types.d.ts index 98653af..d7c9485 100644 --- a/packages/vite-plugin-istanbul-widget/src/types.d.ts +++ b/packages/vite-plugin-istanbul-widget/src/types.d.ts @@ -26,7 +26,7 @@ export type VitePluginIstanbulWidgetOptions = { * istanbul-widget 配置 * @description false 则关闭 istanbul-widget 控件 */ - istanbulWidgetConfig: IstanbulWidgetOptions | false + istanbulWidgetConfig?: IstanbulWidgetOptions | false /** * 延迟istanbul-widget初始化(ms) * @default 0 diff --git a/packages/vite-plugin-istanbul-widget/tsup.config.ts b/packages/vite-plugin-istanbul-widget/tsup.config.ts index be2dbb4..8b1afeb 100644 --- a/packages/vite-plugin-istanbul-widget/tsup.config.ts +++ b/packages/vite-plugin-istanbul-widget/tsup.config.ts @@ -6,7 +6,7 @@ export const tsup = defineConfig((option) => { entry: { 'index': 'src/index.ts', 'astro': 'src/astro/index.ts', - 'remix': 'src/remix/index.tsx', + 'remix': 'src/remix/index.ts', 'remix/client': 'src/remix/client.tsx', }, dts: true,