Merge pull request sintaxi#526 from sintaxi/ko-terraform-v1.0.0

Update to Terraform v1.0.0
1yx · Apr 28, 2016 · 502ae19 · 502ae19
2 parents a79bee2 + f5be3de
commit 502ae19
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -50,7 +50,9 @@ exports.mimeType = function(source){
     return mime.lookup('html')
   }else if(['.less', '.styl', '.scss', '.sass'].indexOf(ext)  !== -1){
     return mime.lookup('css')
-  }else{
+  } else if (['.js', '.coffee'].indexOf(ext) !== -1) {
+    return mime.lookup('js')
+  } else {
     return mime.lookup(source)
   }
 

diff --git a/lib/index.js b/lib/index.js
@@ -229,7 +229,7 @@ exports.compile = function(projectPath, outputPath, callback){
    */
   var copyFile = function(file, done){
     var ext = path.extname(file)
-    if(!terraform.helpers.shouldIgnore(file) && [".jade", ".ejs", ".md", ".styl", ".less", ".scss", ".sass", ".coffee"].indexOf(ext) === -1){
+    if(!terraform.helpers.shouldIgnore(file) && [".jade", ".ejs", ".md", ".styl", ".less", ".scss", ".sass", ".js", ".coffee"].indexOf(ext) === -1){
       var localPath = path.resolve(outputPath, file)
       fs.mkdirp(path.dirname(localPath), function(err){
         fs.copy(path.resolve(setup.publicPath, file), localPath, done)

diff --git a/lib/middleware.js b/lib/middleware.js
@@ -315,10 +315,21 @@ exports.underscore = function(req, rsp, next){
  */
 exports.mwl = function(req, rsp, next){
   var ext = path.extname(req.url).replace(/^\./, '')
+  req.originalExt = ext
 
-  if(terraform.helpers.processors["html"].indexOf(ext) !== -1 || terraform.helpers.processors["css"].indexOf(ext) !== -1 || terraform.helpers.processors["js"].indexOf(ext) !== -1){
-    notFound(req, rsp, next)
-  }else{
+  // This prevents the source files from being served, but also
+  // has to factor in that in this brave new world, sometimes
+  // `.html` (Handlebars, others), `.css` (PostCSS), and
+  // `.js` (Browserify) are actually being used to specify
+  // source files
+
+  if (['js'].indexOf(ext) === -1) {
+    if (terraform.helpers.processors["html"].indexOf(ext) !== -1 || terraform.helpers.processors["css"].indexOf(ext) !== -1 || terraform.helpers.processors["js"].indexOf(ext) !== -1) {
+      notFound(req, rsp, next)
+    } else {
+      next()
+    }
+  } else {
     next()
   }
 }
@@ -333,7 +344,9 @@ exports.static = function(req, res, next) {
   var options  = {}
   var redirect = true
 
-  if ('GET' != req.method && 'HEAD' != req.method) return next();
+  if ('GET' != req.method && 'HEAD' != req.method) return next()
+  if (['js'].indexOf(path.extname(req.url).replace(/^\./, '')) !== -1) return next()
+
   var pathn = parse(req).pathname;
   var pause = utilsPause(req);