@plotdb/srcbuild 0.0.60 → 0.0.62

package/README.md

@@ -245,30 +245,14 @@ Additionally, you can also use a list of modules:
 
 Use the second option object to specify additional parameters, including:
 
- - `pack`: *experimental* default false. Enable auto packing or not.
+ - `pack`: *experimental* *deprecated* default false. Enable auto packing or not.
    - if true, enable auto packing which trigger bundling automatically to a filename from md5 of all script urls.
    - require `bundler` option in pugbuild constructor.
    - doesn't work with external urls.
    - there are still issues about rebuilding and build from view.
+   - replaced by `bundle` filter, which runs in compile time.
  - `min`: default true. When true, use minimized packed file with pack option.
 
-#### Auto Packing Issue (TODO)
-
-Auto packing works fine with static built files. However, there are two issues:
-
- - it's kinda tricky to trigger a pack file rebuild if the pack file is mssing - since there is no clue from the hashed file name to the urls used.
- - may slow down dynamic generated views since each rendering checks if the bundled file should be rebuilt against its source files.
- - doesn't work for external urls.
-
-For the above issues, we can:
-
- - add additional information ( such as source pug name base64 string ) in the hashed file name for reversed resolving all source files
- - completely ignore auto packing with dynamic view rendering, instead we support ODB of bundle files
- - extend bundler to support remote file fetching
-
-These solutions will be left in TODOs.
-
-
 
 ### Filters
 
@@ -277,6 +261,11 @@ Following formats and filters are supported:
  - `lsc`: transpile content from livescript to JavaScript.
  - `stylus`: transpile content from `stylus` to `CSS`.
  - `md`: transpile content from `markdown` to `HTML`.
+ - `bundle`: bundle files including js, css or block. usage sample:
+
+    :bundle(options = {type: "block", files: [ { bid }, ...  ]})
+
+
 
 
 ### JS functions

package/dist/ext/bundle.js

@@ -419,9 +419,11 @@ build.prototype = import$(Object.create(base.prototype), {
     function fn$(n){
       if (typeof n === 'string') {
         return path.join(this$.reldir, n);
-      } else {
-        return this$.getPath(n);
       }
+      if (!n.type) {
+        n.type = type;
+      }
+      return this$.getPath(n);
     }
   },
   loadCaches: function(){
@@ -539,18 +541,13 @@ build.prototype = import$(Object.create(base.prototype), {
     return this.specmgr.touchCode(files);
   },
   desPath: function(arg$){
-    var name, type, _desdir, ext, des, desMin, desdir;
+    var name, type;
     name = arg$.name, type = arg$.type;
-    _desdir = path.join(this.desdir, 'assets', 'bundle');
-    ext = type === 'block' ? 'html' : type;
-    des = path.join(_desdir, name + "." + ext);
-    desMin = path.join(_desdir, name + ".min." + ext);
-    desdir = path.dirname(des);
-    return {
-      desdir: desdir,
-      des: des,
-      desMin: desMin
-    };
+    return build.desPath({
+      desdir: this.desdir,
+      name: name,
+      type: type
+    });
   },
   buildBySpec: function(spec){
     var this$ = this;
@@ -641,6 +638,20 @@ build.prototype = import$(Object.create(base.prototype), {
     });
   }
 });
+build.desPath = function(arg$){
+  var desdir, name, type, _desdir, ext, des, desMin;
+  desdir = arg$.desdir, name = arg$.name, type = arg$.type;
+  _desdir = path.join(desdir, 'assets', 'bundle');
+  ext = type === 'block' ? 'html' : type;
+  des = path.join(_desdir, name + "." + ext);
+  desMin = path.join(_desdir, name + ".min." + ext);
+  desdir = path.dirname(des);
+  return {
+    desdir: desdir,
+    des: des,
+    desMin: desMin
+  };
+};
 module.exports = build;
 function import$(obj, src){
   var own = {}.hasOwnProperty;

package/dist/ext/pug.js

@@ -1,5 +1,5 @@
 // Generated by LiveScript 1.6.0
-var fs, path, fsExtra, pug, livescript, uglifyJs, uglifycss, stylus, jsYaml, marked, crypto, colors, base, aux, cwd, pugbuild;
+var fs, path, fsExtra, pug, livescript, uglifyJs, uglifycss, stylus, jsYaml, marked, crypto, colors, base, aux, bundle, cwd, pugbuild;
 fs = require('fs');
 path = require('path');
 fsExtra = require('fs-extra');
@@ -14,6 +14,7 @@ crypto = require('crypto');
 colors = require('@plotdb/colors');
 base = require('./base');
 aux = require('../aux');
+bundle = require('./bundle');
 cwd = process.cwd();
 pugbuild = function(opt){
   opt == null && (opt = {});
@@ -134,17 +135,19 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
             if (this$.bundler) {
               this$.bundler.addSpec(spec);
               des = this$.bundler.desPath(spec);
-              relDesMin = path.relative(this$.desdir, des.desMin);
-              relDes = path.relative(this$.desdir, des.des);
-              if (o.type === 'css') {
-                return ret += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/" + relDesMin + "\"/>";
-              } else if (o.type === 'js') {
-                return ret += "<script type=\"text/javascript\" src=\"/" + relDesMin + "\"></script>";
-              } else if (o.type === 'block') {
-                return ret += "<link rel=\"block\" href=\"/" + relDesMin + "\">";
-              }
             } else {
-              return ret += "<!-- no bundler available for bundling " + name + " in type " + o.type + " -->";
+              des = bundle.desPath(import$({
+                desdir: this$.desdir
+              }, spec));
+            }
+            relDesMin = path.relative(this$.desdir, des.desMin);
+            relDes = path.relative(this$.desdir, des.des);
+            if (o.type === 'css') {
+              return ret += "<link rel=\"stylesheet\" type=\"text/css\" href=\"/" + relDesMin + "\"/>";
+            } else if (o.type === 'js') {
+              return ret += "<script type=\"text/javascript\" src=\"/" + relDesMin + "\"></script>";
+            } else if (o.type === 'block') {
+              return ret += "<link rel=\"block\" href=\"/" + relDesMin + "\">";
             }
           });
           return ret;

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "",
   "main": "./dist/main.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@loadingio/debounce.js": "^1.0.1",
-    "@plotdb/block": "^5.0.1",
+    "@plotdb/block": "^5.0.2",
     "@plotdb/colors": "^0.0.1",
     "anymatch": "^3.1.2",
     "browserify": "^17.0.0",
@@ -49,8 +49,8 @@
   },
   "devDependencies": {
     "@loadingio/bootstrap.ext": "^0.0.9",
-    "@plotdb/csscope": "^5.0.0",
-    "@plotdb/rescope": "^5.0.0",
+    "@plotdb/csscope": "^5.0.1",
+    "@plotdb/rescope": "^5.0.1",
     "@plotdb/semver": "^0.0.3",
     "@loadingio/ldquery": "^3.0.4",
     "bootstrap": "^4.6.1",