Support new prerendering mode that doesn't require you to deploy node_modules to production. This is a breaking change in aspnet-prerendering, hence the major version bump. The NuGet package is back-compatible though.

src/Microsoft.AspNetCore.SpaServices/Content/Node/prerenderer.js

@@ -52,29 +52,105 @@
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
-	// Pass through the invocation to the 'aspnet-prerendering' package, verifying that it can be loaded
-	function renderToString(callback) {
-	    var aspNetPrerendering;
+	var path = __webpack_require__(2);
+	// Separate declaration and export just to add type checking on function signature
+	exports.renderToString = renderToStringImpl;
+	// This function is invoked by .NET code (via NodeServices). Its job is to hand off execution to the application's
+	// prerendering boot function. It can operate in two modes:
+	// [1] Legacy mode
+	//     This is for backward compatibility with projects created with templates older than the generator version 0.6.0.
+	//     In this mode, we don't really do anything here - we just load the 'aspnet-prerendering' NPM module (which must
+	//     exist in node_modules, and must be v1.x (not v2+)), and pass through all the parameters to it. Code in
+	//     'aspnet-prerendering' v1.x will locate the boot function and invoke it.
+	//     The drawback to this mode is that, for it to work, you have to deploy node_modules to production.
+	// [2] Current mode
+	//     This is for projects created with the Yeoman generator 0.6.0+ (or projects manually updated). In this mode,
+	//     we don't invoke 'require' at runtime at all. All our dependencies are bundled into the NuGet package, so you
+	//     don't have to deploy node_modules to production.
+	// To determine whether we're in mode [1] or [2], the code locates your prerendering boot function, and checks whether
+	// a certain flag is attached to the function instance.
+	function renderToStringImpl(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds) {
 	    try {
-	        aspNetPrerendering = __webpack_require__(2);
+	        var renderToStringFunc = findRenderToStringFunc(applicationBasePath, bootModule);
+	        var isNotLegacyMode = renderToStringFunc && renderToStringFunc['isServerRenderer'];
+	        if (isNotLegacyMode) {
+	            // Current (non-legacy) mode - we invoke the exported function directly (instead of going through aspnet-prerendering)
+	            // It's type-safe to just apply the incoming args to this function, because we already type-checked that it's a RenderToStringFunc,
+	            // just like renderToStringImpl itself is.
+	            renderToStringFunc.apply(null, arguments);
+	        }
+	        else {
+	            // Legacy mode - just hand off execution to 'aspnet-prerendering' v1.x, which must exist in node_modules at runtime
+	            renderToStringFunc = __webpack_require__(3).renderToString;
+	            if (renderToStringFunc) {
+	                renderToStringFunc(callback, applicationBasePath, bootModule, absoluteRequestUrl, requestPathAndQuery, customDataParameter, overrideTimeoutMilliseconds);
+	            }
+	            else {
+	                callback('If you use aspnet-prerendering >= 2.0.0, you must update your server-side boot module to call createServerRenderer. '
+	                    + 'Either update your boot module code, or revert to aspnet-prerendering version 1.x');
+	            }
+	        }
 	    }
 	    catch (ex) {
-	        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
-	        // to find node_modules. Or they accidentally fail to deploy node_modules, or even to run 'npm install'.
-	        // Make sure such errors are reported back to the .NET part of the app.
-	        callback('Prerendering failed because of an error while loading \'aspnet-prerendering\'. Error was: '
+	        // Make sure loading errors are reported back to the .NET part of the app
+	        callback('Prerendering failed because of error: '
 	            + ex.stack
 	            + '\nCurrent directory is: '
 	            + process.cwd());
-	        return;
 	    }
-	    return aspNetPrerendering.renderToString.apply(this, arguments);
 	}
-	exports.renderToString = renderToString;
+	;
+	function findBootModule(applicationBasePath, bootModule) {
+	    var bootModuleNameFullPath = path.resolve(applicationBasePath, bootModule.moduleName);
+	    if (bootModule.webpackConfig) {
+	        // If you're using asp-prerender-webpack-config, you're definitely in legacy mode
+	        return null;
+	    }
+	    else {
+	        return require(bootModuleNameFullPath);
+	    }
+	}
+	function findRenderToStringFunc(applicationBasePath, bootModule) {
+	    // First try to load the module
+	    var foundBootModule = findBootModule(applicationBasePath, bootModule);
+	    if (foundBootModule === null) {
+	        return null; // Must be legacy mode
+	    }
+	    // Now try to pick out the function they want us to invoke
+	    var renderToStringFunc;
+	    if (bootModule.exportName) {
+	        // Explicitly-named export
+	        renderToStringFunc = foundBootModule[bootModule.exportName];
+	    }
+	    else if (typeof foundBootModule !== 'function') {
+	        // TypeScript-style default export
+	        renderToStringFunc = foundBootModule.default;
+	    }
+	    else {
+	        // Native default export
+	        renderToStringFunc = foundBootModule;
+	    }
+	    // Validate the result
+	    if (typeof renderToStringFunc !== 'function') {
+	        if (bootModule.exportName) {
+	            throw new Error("The module at " + bootModule.moduleName + " has no function export named " + bootModule.exportName + ".");
+	        }
+	        else {
+	            throw new Error("The module at " + bootModule.moduleName + " does not export a default function, and you have not specified which export to invoke.");
+	        }
+	    }
+	    return renderToStringFunc;
+	}
 
 
 /***/ },
 /* 2 */
+/***/ function(module, exports) {
+
+	module.exports = require("path");
+
+/***/ },
+/* 3 */
 /***/ function(module, exports) {
 
 	module.exports = require("aspnet-prerendering");

src/Microsoft.AspNetCore.SpaServices/Content/Node/webpack-dev-middleware.js

@@ -44,13 +44,14 @@
 /* 0 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = __webpack_require__(3);
+	module.exports = __webpack_require__(4);
 
 
 /***/ },
 /* 1 */,
 /* 2 */,
-/* 3 */
+/* 3 */,
+/* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
 	"use strict";
@@ -58,7 +59,7 @@
 	function createWebpackDevServer(callback) {
 	    var aspNetWebpack;
 	    try {
-	        aspNetWebpack = __webpack_require__(4);
+	        aspNetWebpack = __webpack_require__(5);
 	    }
 	    catch (ex) {
 	        // Developers sometimes have trouble with badly-configured Node installations, where it's unable
@@ -76,7 +77,7 @@
 
 
 /***/ },
-/* 4 */
+/* 5 */
 /***/ function(module, exports) {
 
 	module.exports = require("aspnet-webpack");