@plotdb/srcbuild 0.0.30 → 0.0.34

package/CHANGELOG.md

@@ -0,0 +1,177 @@
+# Change Log
+
+## v0.0.34
+
+ - support legacy syntax in libLoader for script loading
+ - fix bug: `libLoader.root` doesn't work properly
+
+
+## v0.0.33
+
+ - support relative path in bundle.json
+ - add test case for bundler
+ - use local script for testing
+
+
+## v0.0.32
+
+ - bug fix: `defer` in libLoader should be by default true.
+ - bug fix: stylus extension doesn't provide correct path for dependencies.
+
+
+## v0.0.31
+
+ - bug fix: the `script` and `css` mixin supports should be done by `postParse` plugin instead of code modification.
+
+
+## v0.0.30
+
+ - directly support `script` and `css` mixin in pug compiling.
+
+
+## v0.0.29
+
+ - bug fix: bundle not rebuild when bundle config file updated
+ - bug fix: bundler exception not caught
+
+
+## v0.0.28
+
+ - totally remove `compress` option to prevent unwanted side effect of code removal
+
+
+## v0.0.27
+
+ - dont compress unused in pug lsc filter for our potential use of custom script block design in @plotdb/block
+
+
+## v0.0.26
+
+ - remove log
+
+
+## v0.0.25
+
+ - pass `ignored` to adapter to bypass unnecessary files to save time 
+ - by default minimize javascript and css in pug filter.
+
+
+## v0.0.24
+
+ - set `doctype` to `html` also in `pug-cli` to prevent `t="t"` generation.
+
+
+## v0.0.23
+
+ - set `doctype` to `html` to prevent `t="t"` generation.
+
+
+## v0.0.22
+
+ - add `srcbuild-pug` command for building pug with extapi
+ - fix yaml loading issue by using `load` instead of `safe-load`.
+
+
+## v0.0.21
+
+ - fix module resolving path bug
+
+
+## v0.0.20
+
+ - resolve module path from basedir in ext/pug.
+
+
+## v0.0.19
+
+ - bump stylus version to 0.55.0 for removing deprecated dependencies
+
+
+## v0.0.18
+
+ - fix bug: lsc builder doesn't build unless glslify is enabled
+
+
+## v0.0.17
+
+ - support `json` API for reading json file in pug
+
+
+## v0.0.16
+
+ - fix bug: glslify transformed by browserify should have basedir from src file dir.
+
+
+## v0.0.15
+
+ - upgrade `path-parse` to fix vulnerability
+ - support glslify transfomration by option `use-glslify`
+
+
+## v0.0.14
+
+ - add `i18n.intlbase` and `i18n.langauge` pug api and deprecate `intlbase` pug api.
+
+
+## v0.0.13
+
+ - fix bug: incorrect parameter passing in view/pug to ext/pug
+
+
+## v0.0.12
+
+ - add bundling sample code
+ - fix bundling file path shown in log
+
+
+## v0.0.11
+
+ - fix bug: `desdir` and `base` not passed to pug in pug view constructor
+
+
+## v0.0.10
+
+ - fix bug: basedir should be opt.basedir
+
+
+## v0.0.9
+
+ - support pug view engine for express
+
+
+## v0.0.8
+
+ - fix bug: trying to get mtime of a non-existed file. 
+ - support options for files to ignore. by default, ignore `.git` folders.
+
+
+## v0.0.7
+
+ - simplify log
+
+
+## v0.0.6
+
+ - trap exception during `log-dependencies` and prevent from further building.
+ - keep old dependency if `log-dependencies` fails.
+
+
+## v0.0.5
+
+ - support bundling
+
+
+## v0.0.4
+
+ - fix bug in ext/pug: basedir doesn't exist when initing, causing problem when getting dependencies. use path.resolve(srcdir) instead.
+
+
+## v0.0.3
+
+ - fix typo
+
+
+## v0.0.2
+
+ - fix bug: let pug use correct filename and basedir parameter. resolve pug files correctly
+

package/README.md

@@ -97,6 +97,10 @@ Except common options, each builder may support different options:
      - *NOTE* this is an experiment feature and may be removed ( move to standalone builder ) in the future.
  - `bundle`: bundle options. includes:
    - `configFile`: json file storing bundle configuration. optional.
+   - `relativePath`: use relative path for paths in config file. default false. possible values:
+     - `false`: all files in `configFile` are relative to current working directory.
+     - `true`: all files in `configFile` are relative to the directory containing `bundle.json`
+     - or, specific a path as the relative root.
    - `config`: bundle configuration in following format:
      {
        "css": {

package/dist/ext/bundle.js

@@ -16,6 +16,11 @@ bundlebuild = function(opt){
     js: {}
   };
   this.configFile = opt.configFile || null;
+  this._relativePath = !(opt.relativePath != null)
+    ? false
+    : typeof opt.relativePath === 'string'
+      ? opt.relativePath
+      : this.configFile ? path.dirname(this.configFile) : false;
   this.prepareConfig();
   return this.init(import$({
     srcdir: 'static',
@@ -24,10 +29,18 @@ bundlebuild = function(opt){
 };
 bundlebuild.prototype = import$(Object.create(base.prototype), {
   prepareConfig: function(){
-    var type, name, ref$, list, i$, len$, f;
+    var type, name, ref$, list, i$, len$, f, this$ = this;
     if (this.configFile && fs.existsSync(this.configFile)) {
       this.config = JSON.parse(fs.readFileSync(this.configFile).toString());
     }
+    if (typeof this._relativePath === 'string') {
+      for (type in this.config) {
+        for (name in ref$ = this.config[type]) {
+          list = ref$[name];
+          this.config[type][name] = list.map(fn$);
+        }
+      }
+    }
     this.fileList = new Set();
     this.fileMap = {};
     for (type in this.config) {
@@ -44,6 +57,9 @@ bundlebuild.prototype = import$(Object.create(base.prototype), {
       }
     }
     return this.fileList.add(this.configFile);
+    function fn$(f){
+      return path.join(this$._relativePath, f);
+    }
   },
   getDependencies: function(file){
     return file === this.configFile

package/dist/ext/pug.js

@@ -59,6 +59,24 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
           }
           args = res$;
           return this$.pugResolve.apply(this$, args);
+        },
+        postParse: function(dom, opt){
+          if (dom.nodes[0].type !== 'Doctype') {
+            return dom;
+          }
+          dom.nodes.splice(1, 0, {
+            type: 'Include',
+            block: {
+              type: 'Block',
+              nodes: []
+            },
+            file: {
+              type: 'FileReference',
+              filename: opt.filename,
+              path: '@/@plotdb/srcbuild/dist/lib.pug'
+            }
+          });
+          return dom;
         }
       }],
       filters: {
@@ -205,7 +223,6 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
             continue;
           }
           code = fs.readFileSync(src).toString();
-          code = "include @/@plotdb/srcbuild/dist/lib.pug\n" + code;
           try {
             t1 = Date.now();
             if (/^\/\/- ?module ?/.exec(code)) {

package/dist/ext/stylus.js

@@ -18,7 +18,7 @@ stylusbuild = function(opt){
 };
 stylusbuild.prototype = import$(Object.create(base.prototype), {
   getDependencies: function(file){
-    var code, ret, root;
+    var code, ret, root, this$ = this;
     code = fs.readFileSync(file).toString();
     ret = code.split('\n').map(function(it){
       return /\s*(@import)\s+(.+)$/.exec(it);
@@ -27,7 +27,7 @@ stylusbuild.prototype = import$(Object.create(base.prototype), {
     }).map(function(it){
       return it[2].replace(/'/g, '').replace(/(\.styl)?$/, '.styl');
     }).map(function(it){
-      return it;
+      return path.join(this$.srcdir, it);
     });
     root = path.resolve('.') + '/';
     return (ret || []).map(function(it){

package/dist/lib.pug

@@ -4,7 +4,7 @@
     libLoader = {
       js: {url: {}},
       css: {url: {}},
-      root: function(r) { this._root = r; },
+      root: function(r) { libLoader._r = r; },
       _r: "/assets/lib",
       _v: "",
       version: function(v) { libLoader._v = (v ? "?v=" + v : ""); }
@@ -12,27 +12,30 @@
     if(version) { libLoader.version(version); }
   }
 
-mixin script(os)
+mixin script(os,cfg)
   -
     if(!Array.isArray(os)) { os = [os]; }
   each o in os
     -
-      if(typeof(o) == "string") { url = o; }
+      c = o;
+      if(typeof(o) == "string") { url = o; c = cfg || {};}
       else if(o.url) { url = o.url; }
       else { url = libLoader._r + "/" + o.name + "/" + (o.version || 'main') + "/" + (o.path || "index.min.js"); }
     if !libLoader.js.url[url]
       - libLoader.js.url[url] = true;
+      - defer = (typeof(c.defer) == "undefined" ? true : !!c.defer);
       if /^https?:\/\/./.exec(url)
-        script(type="text/javascript",src=url, defer=!!o.defer, async=!!o.async)
+        script(type="text/javascript",src=url, defer=defer, async=!!c.async)
       else
-        script(type="text/javascript",src=url + libLoader._v, defer=!!o.defer, async=!!o.async)
+        script(type="text/javascript",src=url + libLoader._v, defer=defer, async=!!c.async)
 
-mixin css(os)
+mixin css(os,cfg)
   -
     if(!Array.isArray(os)) { os = [os]; }
   each o in os
     -
-      if(typeof(o) == "string") { url = o; }
+      c = o;
+      if(typeof(o) == "string") { url = o; c = cfg || {};}
       else if(o.url) { url = o.url; }
       else { url = libLoader._r + "/" + o.name + "/" + (o.version || 'main') + "/" + (o.path || "index.min.css"); }
     if !libLoader.css.url[url]

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.30",
+  "version": "0.0.34",
   "description": "",
   "main": "./dist/main.js",
   "files": [
@@ -12,7 +12,7 @@
     "srcbuild-pug": "./dist/pug-cli"
   },
   "scripts": {
-    "start": "./dist/cli"
+    "start": "./node_modules/.bin/lsc watch.ls"
   },
   "license": "MIT",
   "homepage": "https://github.com/plotdb/srcbuild",