fix: inline source maps for TS + split source w/ and w/o into groups (#…

…626)
callstack · Aug 13, 2019 · 5fb3e88 · 5fb3e88
1 parent 9f71a69
commit 5fb3e88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/packages/haul-core/src/preset/__tests__/__snapshots__/makeConfigFactory.test.ts.snap b/packages/haul-core/src/preset/__tests__/__snapshots__/makeConfigFactory.test.ts.snap
@@ -128,7 +128,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -198,7 +198,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -263,7 +263,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -418,7 +418,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -482,7 +482,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -541,7 +541,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "
@@ -648,7 +648,7 @@ Object {
             "filename": "[file].map",
             "module": true,
             "moduleFilenameTemplate": "[absolute-resource-path]",
-            "test": /\\\\\\.\\(js\\|css\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
+            "test": /\\\\\\.\\(js\\|jsx\\|css\\|ts\\|tsx\\|\\(js\\)\\?bundle\\)\\(\\$\\|\\\\\\?\\)/i,
           },
           "sourceMapFilename": "[file].map",
           "sourceMappingURLComment": "

diff --git a/packages/haul-core/src/preset/utils/getSourceMapPlugin.ts b/packages/haul-core/src/preset/utils/getSourceMapPlugin.ts
@@ -9,9 +9,7 @@ export default function getSourceMapPlugin(
   serverConfig: NormalizedServerConfig
 ) {
   const baseOptions = {
-    test: /\.(js|css|(js)?bundle)($|\?)/i,
-    filename: '[file].map',
-    moduleFilenameTemplate: '[absolute-resource-path]',
+    test: /\.(js|jsx|css|ts|tsx|(js)?bundle)($|\?)/i,
     module: true,
   };
 
@@ -21,7 +19,11 @@ export default function getSourceMapPlugin(
       publicPath: `http://${serverConfig.host}:${serverConfig.port}/`,
     } as webpack.EvalSourceMapDevToolPluginOptions);
   } else if (bundleConfig.sourceMap) {
-    return new webpack.SourceMapDevToolPlugin(baseOptions);
+    return new webpack.SourceMapDevToolPlugin({
+      ...baseOptions,
+      filename: '[file].map',
+      moduleFilenameTemplate: '[absolute-resource-path]',
+    });
   }
 
   return undefined;