Switch ES2015 example to use middleware inlined into Startup.cs instead of MVC controller/action

SteveSandersonMS · SteveSandersonMS · commit e410affbd86f · 2015-11-02T21:02:47.000-08:00
diff --git a/samples/misc/ES2015Transpilation/Controllers/ScriptController.cs b/samples/misc/ES2015Transpilation/Controllers/ScriptController.cs
diff --git a/samples/misc/ES2015Transpilation/Startup.cs b/samples/misc/ES2015Transpilation/Startup.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Routing.Template;
 using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Configuration;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Logging;
 using Microsoft.AspNet.NodeServices;
+using Microsoft.AspNet.Http;
 
 namespace ES2015Example
 {
@@ -34,7 +34,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // Configure is called after ConfigureServices is called.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, INodeServices nodeServices)
         {
             loggerFactory.MinimumLevel = LogLevel.Information;
             loggerFactory.AddConsole();
@@ -57,13 +57,20 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 app.UseExceptionHandler("/Home/Error");
             }
             
-            app.UseMvc(routes => {
-                routes.MapRoute(
-                    name: "Script",
-                    template: "{*filename}",
-                    defaults: new { controller="Script", action="Transpile" },
-                    constraints: new { filename = @"js/(.*?)\.js" }
-                );                
+            // Dynamically transpile any .js files under the '/js/' directory
+            app.Use(next => async context => {
+                var requestPath = context.Request.Path.Value;
+                if (requestPath.StartsWith("/js/") && requestPath.EndsWith(".js")) {
+                    var fileInfo = env.WebRootFileProvider.GetFileInfo(requestPath); 
+                    if (fileInfo.Exists) {
+                        var transpiled = await nodeServices.Invoke("transpilation.js", fileInfo.PhysicalPath, requestPath);
+                        await context.Response.WriteAsync(transpiled);
+                        return;
+                    }
+                }
+                
+                // Not a JS file, or doesn't exist - let some other middleware handle it
+                await next.Invoke(context);
             });
             
             // Add static files to the request pipeline.
diff --git a/samples/misc/ES2015Transpilation/transpilation.js b/samples/misc/ES2015Transpilation/transpilation.js
@@ -1,9 +1,11 @@
+var fs = require('fs');
 var babelCore = require('babel-core');
 
-module.exports = function(cb, fileContents, url) {
-    var result = babelCore.transform(fileContents, { 
+module.exports = function(cb, physicalPath, requestPath) {
+    var originalContents = fs.readFileSync(physicalPath);
+    var result = babelCore.transform(originalContents, { 
     	sourceMaps: 'inline',
-    	sourceFileName: '/sourcemapped/' + url
+    	sourceFileName: '/sourcemapped' + requestPath
     });
     cb(null, result.code);
 }
