From c9dca0222c8f36da30ecc1471d1e46fbefe0ebc1 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sun, 29 Dec 2024 15:26:21 -0600 Subject: [PATCH] fix: Add support for WXT v0.20.0 --- packages/module-react/entrypoints/content/index.tsx | 7 +++++-- packages/module-react/modules/react.ts | 3 ++- packages/module-solid/entrypoints/content/index.tsx | 7 +++++-- packages/module-solid/modules/solid.ts | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/module-react/entrypoints/content/index.tsx b/packages/module-react/entrypoints/content/index.tsx index 34f4ae19..87ac4e91 100644 --- a/packages/module-react/entrypoints/content/index.tsx +++ b/packages/module-react/entrypoints/content/index.tsx @@ -1,5 +1,8 @@ -import { defineContentScript } from 'wxt/sandbox'; -import { ContentScriptContext, createShadowRootUi } from 'wxt/client'; +import { + defineContentScript, + ContentScriptContext, + createShadowRootUi, +} from '#imports'; import React from 'react'; import ReactDOM from 'react-dom/client'; diff --git a/packages/module-react/modules/react.ts b/packages/module-react/modules/react.ts index 09ceaa94..0d2b5951 100644 --- a/packages/module-react/modules/react.ts +++ b/packages/module-react/modules/react.ts @@ -16,7 +16,8 @@ export default defineWxtModule({ // Enable auto-imports for JSX files wxt.hook('config:resolved', (wxt) => { - if (wxt.config.imports === false) return; + // In older versions of WXT, `wxt.config.imports` could be false + if (!wxt.config.imports) return; wxt.config.imports.dirsScanOptions ??= {}; wxt.config.imports.dirsScanOptions.filePatterns = [ diff --git a/packages/module-solid/entrypoints/content/index.tsx b/packages/module-solid/entrypoints/content/index.tsx index 7c2f0e7c..ef12a949 100644 --- a/packages/module-solid/entrypoints/content/index.tsx +++ b/packages/module-solid/entrypoints/content/index.tsx @@ -1,5 +1,8 @@ -import { defineContentScript } from 'wxt/sandbox'; -import { ContentScriptContext, createShadowRootUi } from 'wxt/client'; +import { + defineContentScript, + ContentScriptContext, + createShadowRootUi, +} from '#imports'; import { render } from 'solid-js/web'; export default defineContentScript({ diff --git a/packages/module-solid/modules/solid.ts b/packages/module-solid/modules/solid.ts index 8b9d53bd..1940d8e7 100644 --- a/packages/module-solid/modules/solid.ts +++ b/packages/module-solid/modules/solid.ts @@ -19,7 +19,8 @@ export default defineWxtModule({ // Enable auto-imports for JSX files wxt.hook('config:resolved', (wxt) => { - if (wxt.config.imports === false) return; + // In older versions of WXT, `wxt.config.imports` could be false + if (!wxt.config.imports) return; wxt.config.imports.dirsScanOptions ??= {}; wxt.config.imports.dirsScanOptions.filePatterns = [