fix types

facebook · Nov 14, 2024 · 992ea81 · 992ea81
1 parent 61b4bdb
commit 992ea81
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/packages/docusaurus-plugin-svgr/src/index.ts b/packages/docusaurus-plugin-svgr/src/index.ts
@@ -9,27 +9,14 @@ import {createLoader} from './svgrLoader';
 import type {LoadContext, Plugin} from '@docusaurus/types';
 import type {PluginOptions, Options} from './options';
 
-export type {SVGRConfig, SVGOConfig} from './types';
-
 export default function pluginSVGR(
-  context: LoadContext,
+  _context: LoadContext,
   options: PluginOptions,
 ): Plugin {
   return {
     name: 'docusaurus-plugin-svgr',
     configureWebpack: (config, isServer) => {
       return {
-        mergeStrategy: {
-          module: {
-            rules: {
-              test: 'match',
-              use: {
-                loader: 'match',
-                options: 'replace',
-              },
-            },
-          },
-        },
         module: {
           rules: [createLoader({isServer, svgrConfig: options.svgrConfig})],
         },

diff --git a/packages/docusaurus-plugin-svgr/src/options.ts b/packages/docusaurus-plugin-svgr/src/options.ts
@@ -6,7 +6,13 @@
  */
 import {Joi} from '@docusaurus/utils-validation';
 import type {OptionValidationContext} from '@docusaurus/types';
-import type {Config as SVGRConfig} from '@svgr/core';
+
+// TODO unfortunately there's a SVGR TS error when skipLibCheck=false
+//  related to prettier, see https://github.com/gregberge/svgr/issues/904
+// import type {Config as SVGRConfig} from '@svgr/core';
+// export type {SVGRConfig};
+export type SVGRConfig = any;
+export type SVGOConfig = NonNullable<SVGRConfig['svgoConfig']>;
 
 export type PluginOptions = {
   svgrConfig: SVGRConfig;

diff --git a/packages/docusaurus-plugin-svgr/src/svgrLoader.ts b/packages/docusaurus-plugin-svgr/src/svgrLoader.ts
@@ -7,7 +7,7 @@
 
 import {getFileLoaderUtils} from '@docusaurus/utils';
 
-import type {SVGRConfig, SVGOConfig} from './types';
+import type {SVGRConfig, SVGOConfig} from './options';
 import type {RuleSetRule} from 'webpack';
 
 // TODO Docusaurus v4: change these defaults?

diff --git a/packages/docusaurus-plugin-svgr/src/types.d.ts b/packages/docusaurus-plugin-svgr/src/types.d.ts
@@ -6,7 +6,3 @@
  */
 
 /// <reference types="@docusaurus/module-type-aliases" />
-
-export type {Config as SVGRConfig} from '@svgr/core';
-
-export type SVGOConfig = NonNullable<SVGRConfig['svgoConfig']>;