harp 0.41.2 → 0.44.0

package/bin/harp

@@ -2,7 +2,7 @@
 
 var argv    = require('minimist')(process.argv.slice(2))
 var pkg     = require("../package.json")
-var colors  = require("colors")
+var colors  = require("@colors/colors")
 var path    = require("path")
 var boxt    = require("boxt")
 
@@ -19,7 +19,7 @@ var help = function(){
   var box = (...args) => console.log(boxt(...args).split("\n").join("\n "));
 
   log()
-  log("Harp".underline.blue, "〜".grey, "Static Web Server".brightYellow, "v".grey + pkg.version.grey)
+  log("Harp".underline.blue, "〜".grey, pkg.description.brightYellow, "v".grey + pkg.version.grey)
   log()
   // log("Process | Bundle | Generate - Just In Time".grey)
   // log()
@@ -32,8 +32,8 @@ var help = function(){
   log("  -h, --host                      " +"0.0.0.0".blue +"         server host to answer to")
   // log("  -c, --cache                     " +"false".blue +"           server memory cache")
   // log("  -t, --pretty                    " +"false".blue +"           server/compile keep whitespace")
-  log("  -h, --help                                      server/compile keep whitespace")
-  log("  -v, --version                                   server/compile keep whitespace")
+  log("  -h, --help                                      ")
+  log("  -v, --version                                   ")
   box(
 `${'PROCESSING'.grey }                          ${'DATA'.grey }                                   
   ${'.ejs  ->  .html' }                     ${'_data.json  -  directory data' }     
@@ -92,6 +92,18 @@ ${ ('http://localhost:' + port + "/").underline.cyan }`, { align: "left", color:
 }
 
 
+
+
+var duration = function(d){
+  if (d[0] < 1){
+    var ms = d[1].toString().substring(0,3)
+    return  + ms + "ms"
+  } else {
+    var ms = d[1].toString().substring(0,1)
+    return [d[0], ms].join(".") + "s"
+  }
+}
+
 /**
  * Compile
  */
@@ -100,12 +112,20 @@ if (argv["_"].length === 2){
   var projectPath = path.resolve(process.cwd(), argv["_"][0])
   var buildPath   = path.resolve(process.cwd(), argv["_"][1])
 
+  console.log()
+  console.log(" ", `Harp v${ pkg.version }`.yellow)
+  console.log(" ", "Generating Site & Bundling Assets...".blue)
+  console.log()
+
   harp.compile(projectPath, buildPath, function(errors, output){
     if(errors) {
       console.log(JSON.stringify(errors, null, 2))
       process.exit(1)
     }
-    //console.log("Done!".green)
+    console.log()
+    console.log(" ", "Done!".green, `(${ duration(output.stats.duration) })`.grey)
+    console.log()
   })
+
 }
 

package/lib/index.js

@@ -8,6 +8,7 @@ var helpers     = require('./helpers')
 var middleware  = require('./middleware')
 var pkg         = require('../package.json')
 var url         = require("url")
+var hrn         = require("human-readable-numbers")
 
 
 
@@ -154,6 +155,11 @@ exports.middleware = middleware;
  */
 
 exports.compile = function(projectPath, outputPath, callback){
+  const compileStart = process.hrtime()
+
+  var stats = {
+    types: {}
+  }
 
   /**
    * Both projectPath and outputPath are optional
@@ -176,7 +182,7 @@ exports.compile = function(projectPath, outputPath, callback){
   try{
     outputPath = path.resolve(projectPath, outputPath)
     var setup  = helpers.setup(projectPath, "production")
-    var terra   = terraform.root(setup.publicPath, setup.config.globals)
+    var terra  = terraform.root(setup.publicPath, setup.config.globals)
   }catch(err){
     return callback(err)
   }
@@ -196,6 +202,13 @@ exports.compile = function(projectPath, outputPath, callback){
     })
   }
 
+  var toHuman = function(bytes){
+    var human   = hrn.toHumanString(bytes)
+    var pattern = /\d+\D$/
+    if (pattern.test(human)) return human
+    return human + "B"
+  }
+
 
   /**
    * Compile and save file
@@ -204,40 +217,17 @@ exports.compile = function(projectPath, outputPath, callback){
   var compileFile = function(file, done){
     process.nextTick(function () {
       terra.render(file, function(error, body){
-        if(error){
-          done(error)
-        }else{
-          if(body){
-            var dest = path.resolve(outputPath, terraform.helpers.outputPath(file))
-            fs.mkdirp(path.dirname(dest), function(err){
-              fs.writeFile(dest, body, done)
-            })
-          }else{
-            if (file === "app.jsx"){
-              var results = esbuild.buildSync({
-                absWorkingDir: setup.publicPath,
-                entryPoints: [setup.publicPath + '/app.jsx'],
-                outfile: 'app.js',
-                bundle: true,
-                write: false,
-                plugins: [],
-              })
-              fs.writeFile([outputPath, "app.js"].join(path.sep), results.outputFiles[0]["text"], done)
-            }else if (file === "bundle.cjs"){
-              var results = esbuild.buildSync({
-                absWorkingDir: setup.publicPath,
-                entryPoints: [setup.publicPath + '/bundle.cjs'],
-                outfile: 'bundle.js',
-                bundle: true,
-                write: false,
-                plugins: [],
-              })
-              fs.writeFile([outputPath, "bundle.js"].join(path.sep), results.outputFiles[0]["text"], done)
-            } else {
-              done()  
-            }
-          }
-        }
+        if(error) return done(error)
+        if(!body) return done()
+        var dest = path.resolve(outputPath, terraform.helpers.outputPath(file))
+        fs.mkdirp(path.dirname(dest), function(err){
+          var sizeInBytes = body.length
+          var sizeHuman   = toHuman(sizeInBytes)
+          var sizePadded  = sizeHuman.padStart(8, " ")
+          var filePath    = `/${ terraform.helpers.outputPath(file) }`
+          console.log(sizePadded.green, filePath)
+          fs.writeFile(dest, body, done)
+        })
       })
     })
   }
@@ -253,7 +243,14 @@ exports.compile = function(projectPath, outputPath, callback){
     if(!terraform.helpers.shouldIgnore(file) && [".jsx", ".jade", ".ejs", ".md", ".styl", ".less", ".scss", ".sass", ".coffee", ".cjs"].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)
+        fs.stat(path.resolve(setup.publicPath, file), function(err, stats){
+          var sizeInBytes = stats.size
+          var sizeHuman   = toHuman(sizeInBytes)
+          var sizePadded  = sizeHuman.padStart(8, " ")
+          var filePath    = `/${ file }`
+          console.log(sizePadded.grey, filePath)  
+          fs.copy(path.resolve(setup.publicPath, file), localPath, done)
+        })
       })
     }else{
       done()
@@ -273,9 +270,12 @@ exports.compile = function(projectPath, outputPath, callback){
           callback(err)
         }else{
           async.each(results, copyFile, function(err){
+            stats.duration = process.hrtime(compileStart)
+
             setup.config['harp_version'] = pkg.version
             delete setup.config.globals
-            callback(null, setup.config)
+            setup.stats = stats
+            callback(null, setup)
           })
         }
       })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harp",
-  "version": "0.41.2",
-  "description": "Static web server with built in preprocessing",
+  "version": "0.44.0",
+  "description": "Static Web Server/Generator/Bundler",
   "author": "Brock Whitten <brock@chloi.io>",
   "contributors": [
     "Brock Whitten <brock@chloi.io>",
@@ -43,27 +43,28 @@
     "url": "https://github.com/sintaxi/harp.git"
   },
   "dependencies": {
-    "@dabh/colors": "^1.4.0",
+    "@colors/colors": "1.5.0",
     "async": "0.2.9",
-    "basic-auth": "^2.0.1",
-    "boxt": "^1.1.2",
-    "colors": "^1.4.0",
-    "connect": "^3.6.6",
+    "basic-auth": "2.0.1",
+    "boxt": "1.1.2",
+    "connect": "3.7.0",
     "envy-json": "0.2.1",
-    "fs-extra": "1.x",
-    "mime-types": "^2.1.24",
-    "minimist": "^1.2.5",
-    "parseurl": "^1.3.2",
+    "fs-extra": "10.1.0",
+    "human-readable-numbers": "0.9.5",
+    "mime-types": "2.1.35",
+    "minimist": "1.2.6",
+    "parseurl": "1.3.3",
     "pause": "0.1.0",
-    "send": "^0.17.1",
-    "terraform": "^1.20.2"
+    "send": "0.18.0",
+    "terraform": "1.22.1"
   },
   "devDependencies": {
-    "mocha": "^9.1.4",
-    "request": "^2.88.0",
+    "axios": "0.27.2",
+    "mocha": "10.0.0",
     "should": "3.3.2"
   },
   "scripts": {
+    "prepare": "git config core.hooksPath ./hooks",
     "test": "mocha --reporter spec -t 4000",
     "test:fallbacks": "mocha test/fallbacks.js -t 3000",
     "test:helpers": "mocha test/helpers.js -t 3000"