@plotdb/srcbuild 0.0.32 → 0.0.36

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

@@ -109,13 +109,13 @@ pugbuild.prototype = import$(Object.create(base.prototype), {
           });
         },
         'md': function(text, opt){
-          return marked(text);
+          return marked.parse(text);
         }
       },
       json: function(it){
         return JSON.parse(fs.readFileSync(it));
       },
-      md: marked,
+      md: marked.parse,
       yaml: function(it){
         return jsYaml.load(fs.readFileSync(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,28 +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(o.defer) == "undefined" ? true : !!o.defer);
+      - defer = (typeof(c.defer) == "undefined" ? true : !!c.defer);
       if /^https?:\/\/./.exec(url)
-        script(type="text/javascript",src=url, defer=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=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.32",
+  "version": "0.0.36",
   "description": "",
   "main": "./dist/main.js",
   "files": [
@@ -12,7 +12,8 @@
     "srcbuild-pug": "./dist/pug-cli"
   },
   "scripts": {
-    "start": "./dist/cli"
+    "prepare": "mkdir -p ./node_modules/@plotdb/srcbuild/dist; cp dist/lib.pug ./node_modules/@plotdb/srcbuild/dist/",
+    "start": "./node_modules/.bin/lsc watch.ls"
   },
   "license": "MIT",
   "homepage": "https://github.com/plotdb/srcbuild",
@@ -29,7 +30,7 @@
     "anymatch": "^3.1.2",
     "browserify": "^17.0.0",
     "chokidar": "^3.5.1",
-    "colors": "^1.4.0",
+    "@plotdb/colors": "^0.0.1",
     "fs-extra": "^9.1.0",
     "glslify": "^7.1.1",
     "i18next": "^19.9.2",
@@ -37,7 +38,7 @@
     "i18next-http-middleware": "^3.1.0",
     "js-yaml": "^4.0.0",
     "livescript": "^1.6.0",
-    "marked": "^2.0.1",
+    "marked": "^4.0.10",
     "pug": "^3.0.2",
     "require-reload": "^0.2.2",
     "stylus": "^0.55.0",