Amend aspnet-webpack for better node-inspector support

SteveSandersonMS · SteveSandersonMS · commit 79872c1bde12 · 2016-07-26T16:38:46.000+01:00
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aspnet-webpack",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/LoadViaWebpack.ts
@@ -35,6 +35,12 @@ export function loadViaWebpack<T>(webpackConfigPath: string, modulePath: string,
     })
 }
 
+function setExtension(filePath: string, newExtension: string) {
+    const oldExtensionIfAny = path.extname(filePath);
+    const basenameWithoutExtension = path.basename(filePath, oldExtensionIfAny);
+    return path.join(path.dirname(filePath), basenameWithoutExtension) + newExtension;
+}
+
 function loadViaWebpackNoCache<T>(webpackConfigPath: string, modulePath: string) {
     return new Promise<T>((resolve, reject) => {
         // Load the Webpack config and make alterations needed for loading the output into Node
@@ -94,8 +100,13 @@ function loadViaWebpackNoCache<T>(webpackConfigPath: string, modulePath: string)
                             + stats.toString({ chunks: false }));
                     }
 
+                    // The dynamically-built module will only appear in node-inspector if it has some nonempty
+                    // file path. The following value is arbitrary (since there's no real compiled file on disk)
+                    // but is sufficient to enable debugging.
+                    const fakeModulePath = setExtension(modulePath, '.js');
+
                     const fileContent = compiler.outputFileSystem.readFileSync(outputVirtualPath, 'utf8');
-                    const moduleInstance = requireFromString<T>(fileContent);
+                    const moduleInstance = requireFromString<T>(fileContent, fakeModulePath);
                     resolve(moduleInstance);
                 } catch(ex) {
                     reject(ex);
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/typings/require-from-string.d.ts
@@ -1,3 +1,3 @@
 export namespace requirefromstring {
-    export function requireFromString<T>(fileContent: string): T;
+    export function requireFromString<T>(fileContent: string, filename?: string): T;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aspnet-webpack",`
`3`		`- "version": "1.0.6",`
	`3`	`+ "version": "1.0.7",`
`4`	`4`	`"description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`export namespace requirefromstring {`
`2`		`- export function requireFromString<T>(fileContent: string): T;`
	`2`	`+ export function requireFromString<T>(fileContent: string, filename?: string): T;`
`3`	`3`	`}`