Merge pull request #7541 from telamonian/typescript-srcmap-for-extens…

…ions Enable typescript sourcemaps for debugging locally installed labextensions
jupyterlab · Nov 21, 2019 · 908ec55 · 908ec55
2 parents 3755447 + d0a75c1
commit 908ec55
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/dev_mode/webpack.config.js b/dev_mode/webpack.config.js
@@ -60,6 +60,12 @@ Object.keys(jlab.linkedPackages).forEach(function(name) {
   watched[name] = plib.dirname(localPkgPath);
 });
 
+// Set up source-map-loader to look in watched lib dirs
+let sourceMapRes = Object.values(watched).reduce((res, name) => {
+  res.push(new RegExp(name + '/lib'));
+  return res;
+}, []);
+
 /**
  * Sync a local path to a linked package path if they are files and differ.
  */
@@ -165,10 +171,9 @@ module.exports = [
         { test: /\.txt$/, use: 'raw-loader' },
         {
           test: /\.js$/,
+          include: sourceMapRes,
           use: ['source-map-loader'],
-          enforce: 'pre',
-          // eslint-disable-next-line no-undef
-          exclude: /node_modules/
+          enforce: 'pre'
         },
         { test: /\.(jpg|png|gif)$/, use: 'file-loader' },
         { test: /\.js.map$/, use: 'file-loader' },

diff --git a/jupyterlab/staging/webpack.config.js b/jupyterlab/staging/webpack.config.js
@@ -60,6 +60,12 @@ Object.keys(jlab.linkedPackages).forEach(function(name) {
   watched[name] = plib.dirname(localPkgPath);
 });
 
+// Set up source-map-loader to look in watched lib dirs
+let sourceMapRes = Object.values(watched).reduce((res, name) => {
+  res.push(new RegExp(name + '/lib'));
+  return res;
+}, []);
+
 /**
  * Sync a local path to a linked package path if they are files and differ.
  */
@@ -165,10 +171,9 @@ module.exports = [
         { test: /\.txt$/, use: 'raw-loader' },
         {
           test: /\.js$/,
+          include: sourceMapRes,
           use: ['source-map-loader'],
-          enforce: 'pre',
-          // eslint-disable-next-line no-undef
-          exclude: /node_modules/
+          enforce: 'pre'
         },
         { test: /\.(jpg|png|gif)$/, use: 'file-loader' },
         { test: /\.js.map$/, use: 'file-loader' },