Skip to content

refactor(plugin-svgr): use import.meta.dirname for loaders #7483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenjiahan merged 1 commit into from
Apr 12, 2026
+3 −6
Merged

refactor(plugin-svgr): use import.meta.dirname for loaders #7483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions packages/plugin-svgr/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import type { RsbuildPlugin, Rspack } from '@rsbuild/core';
import { PLUGIN_REACT_NAME } from '@rsbuild/plugin-react';
import type { Config as BaseSvgrOptions } from '@svgr/core';
Expand All @@ -12,8 +11,6 @@ type SvgrOptions = Omit<BaseSvgrOptions, 'svgoConfig'> & {
svgoConfig?: SvgoConfig;
};

const __dirname = path.dirname(fileURLToPath(import.meta.url));

type SvgoPluginConfig = NonNullable<SvgoConfig['plugins']>[0];

export type SvgDefaultExport = 'component' | 'url';
Expand Down Expand Up @@ -211,7 +208,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({
.type('javascript/auto')
.resourceQuery(options.query || /react/)
.use(CHAIN_ID.USE.SVGR)
.loader(path.resolve(__dirname, './loader.mjs'))
.loader(path.join(import.meta.dirname, 'loader.mjs'))
Comment thread
chenjiahan marked this conversation as resolved.
.options({
...svgrOptions,
exportType: 'default',
Expand Down Expand Up @@ -242,7 +239,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({
// The issuer option ensures that SVGR will only apply if the SVG is imported from a JS file.
.set('issuer', issuer)
.use(CHAIN_ID.USE.SVGR)
.loader(path.resolve(__dirname, './loader.mjs'))
.loader(path.join(import.meta.dirname, 'loader.mjs'))
.options({
...svgrOptions,
exportType,
Expand All @@ -256,7 +253,7 @@ export const pluginSvgr = (options: PluginSvgrOptions = {}): RsbuildPlugin => ({
if (mixedImport && exportType === 'named') {
svgRule
.use(CHAIN_ID.USE.URL)
.loader(path.resolve(__dirname, './assetLoader.mjs'))
.loader(path.join(import.meta.dirname, 'assetLoader.mjs'))
.options({
limit: maxSize,
name: generatorOptions?.filename,
Expand Down
Loading