Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/compat/webpack/tests/dist",
Expand Down Expand Up @@ -677,7 +677,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when produ
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].[contenthash:8].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].[contenthash:8].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/compat/webpack/tests/dist",
Expand Down Expand Up @@ -1067,7 +1067,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "[name].js",
"hashFunction": "xxhash64",
"library": {
Expand Down Expand Up @@ -1431,7 +1431,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].[contenthash:8].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].[contenthash:8].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/compat/webpack/tests/dist",
Expand Down
10 changes: 3 additions & 7 deletions packages/core/src/plugins/sourceMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ export const pluginSourceMap = (): RsbuildPlugin => ({
name: 'rsbuild:source-map',

setup(api) {
const sourceMapFilenameTemplate = ({
absoluteResourcePath,
}: {
absoluteResourcePath: string;
}) => absoluteResourcePath;
const DEFAULT_SOURCE_MAP_TEMPLATE = '[absolute-resource-path]';

const enableCssSourceMap = (config: NormalizedEnvironmentConfig) => {
const { sourceMap } = config.output;
Expand All @@ -43,7 +39,7 @@ export const pluginSourceMap = (): RsbuildPlugin => ({

chain
.devtool(devtool)
.output.devtoolModuleFilenameTemplate(sourceMapFilenameTemplate);
.output.devtoolModuleFilenameTemplate(DEFAULT_SOURCE_MAP_TEMPLATE);

// When JS source map is disabled, but CSS source map is enabled,
// add `SourceMapDevToolPlugin` to let Rspack generate CSS source map.
Expand Down Expand Up @@ -77,7 +73,7 @@ export const pluginSourceMap = (): RsbuildPlugin => ({
// which means users want to customize it, skip the default processing.
if (
compilation.outputOptions.devtoolModuleFilenameTemplate !==
sourceMapFilenameTemplate
DEFAULT_SOURCE_MAP_TEMPLATE
) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/tests/__snapshots__/builder.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ exports[`should use Rspack as the default bundler > apply Rspack correctly 1`] =
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/dist",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/tests/__snapshots__/default.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/core/tests/dist",
Expand Down Expand Up @@ -962,7 +962,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].[contenthash:8].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].[contenthash:8].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/core/tests/dist",
Expand Down Expand Up @@ -1444,7 +1444,7 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "[name].js",
"hashFunction": "xxhash64",
"library": {
Expand Down Expand Up @@ -1927,7 +1927,7 @@ exports[`tools.rspack > should match snapshot 1`] = `
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/packages/core/tests/dist",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/tests/__snapshots__/environments.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ exports[`environment config > tools.rspack / bundlerChain can be configured in e
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "static/js/async/[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "static/js/[name].js",
"hashFunction": "xxhash64",
"path": "<ROOT>/dist",
Expand Down Expand Up @@ -2267,7 +2267,7 @@ exports[`environment config > tools.rspack / bundlerChain can be configured in e
"output": {
"assetModuleFilename": "static/assets/[name].[contenthash:8][ext]",
"chunkFilename": "[name].js",
"devtoolModuleFilenameTemplate": [Function],
"devtoolModuleFilenameTemplate": "[absolute-resource-path]",
"filename": "bundle.js",
"hashFunction": "xxhash64",
"library": {
Expand Down
Loading