Skip to content

Commit 5fb3e88

Browse files
authored
fix: inline source maps for TS + split source w/ and w/o into groups (#626)
1 parent 9f71a69 commit 5fb3e88

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

packages/haul-core/src/preset/__tests__/__snapshots__/makeConfigFactory.test.ts.snap

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Object {
128128
"filename": "[file].map",
129129
"module": true,
130130
"moduleFilenameTemplate": "[absolute-resource-path]",
131-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
131+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
132132
},
133133
"sourceMapFilename": "[file].map",
134134
"sourceMappingURLComment": "
@@ -198,7 +198,7 @@ Object {
198198
"filename": "[file].map",
199199
"module": true,
200200
"moduleFilenameTemplate": "[absolute-resource-path]",
201-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
201+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
202202
},
203203
"sourceMapFilename": "[file].map",
204204
"sourceMappingURLComment": "
@@ -263,7 +263,7 @@ Object {
263263
"filename": "[file].map",
264264
"module": true,
265265
"moduleFilenameTemplate": "[absolute-resource-path]",
266-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
266+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
267267
},
268268
"sourceMapFilename": "[file].map",
269269
"sourceMappingURLComment": "
@@ -418,7 +418,7 @@ Object {
418418
"filename": "[file].map",
419419
"module": true,
420420
"moduleFilenameTemplate": "[absolute-resource-path]",
421-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
421+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
422422
},
423423
"sourceMapFilename": "[file].map",
424424
"sourceMappingURLComment": "
@@ -482,7 +482,7 @@ Object {
482482
"filename": "[file].map",
483483
"module": true,
484484
"moduleFilenameTemplate": "[absolute-resource-path]",
485-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
485+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
486486
},
487487
"sourceMapFilename": "[file].map",
488488
"sourceMappingURLComment": "
@@ -541,7 +541,7 @@ Object {
541541
"filename": "[file].map",
542542
"module": true,
543543
"moduleFilenameTemplate": "[absolute-resource-path]",
544-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
544+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
545545
},
546546
"sourceMapFilename": "[file].map",
547547
"sourceMappingURLComment": "
@@ -648,7 +648,7 @@ Object {
648648
"filename": "[file].map",
649649
"module": true,
650650
"moduleFilenameTemplate": "[absolute-resource-path]",
651-
"test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
651+
"test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
652652
},
653653
"sourceMapFilename": "[file].map",
654654
"sourceMappingURLComment": "

packages/haul-core/src/preset/utils/getSourceMapPlugin.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ export default function getSourceMapPlugin(
99
serverConfig: NormalizedServerConfig
1010
) {
1111
const baseOptions = {
12-
test: /\.(js|css|(js)?bundle)($|\?)/i,
13-
filename: '[file].map',
14-
moduleFilenameTemplate: '[absolute-resource-path]',
12+
test: /\.(js|jsx|css|ts|tsx|(js)?bundle)($|\?)/i,
1513
module: true,
1614
};
1715

@@ -21,7 +19,11 @@ export default function getSourceMapPlugin(
2119
publicPath: `http://${serverConfig.host}:${serverConfig.port}/`,
2220
} as webpack.EvalSourceMapDevToolPluginOptions);
2321
} else if (bundleConfig.sourceMap) {
24-
return new webpack.SourceMapDevToolPlugin(baseOptions);
22+
return new webpack.SourceMapDevToolPlugin({
23+
...baseOptions,
24+
filename: '[file].map',
25+
moduleFilenameTemplate: '[absolute-resource-path]',
26+
});
2527
}
2628

2729
return undefined;

0 commit comments

Comments
 (0)