regen

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Logs
 
+## v5.6.2
+
+ - fix bug: block cache doesn't work if path contains `index.html`
+
+
 ## v5.6.1
 
  - fix bug: host should return null if no match, considering list returns empty list if nothing matches.

bundle.js

@@ -421,6 +421,7 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
   _get: function(opt){
     var ref$, ns, n, v, p, obj, ref1$, that, key$, ver, c, ref2$, this$ = this;
     ref$ = [opt.ns || '', opt.name, opt.version || 'main', opt.path || 'index.html'], ns = ref$[0], n = ref$[1], v = ref$[2], p = ref$[3];
+    p = p.replace(/\/(index\.html)?$/, '');
     obj = {
       ns: ns,
       name: n,
@@ -431,7 +432,6 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
     if (!(n && v)) {
       return err("", 1015);
     }
-    p = p.replace(/\/(index\.html)?$/, '');
     (ref$ = (ref1$ = this.hash)[ns] || (ref1$[ns] = {}))[n] || (ref$[n] = {});
     if (/[^0-9.]/.exec(v) && !opt.force) {
       if (((ref$ = this._ver.map)[ns] || (ref$[ns] = {}))[n] && this._ver.map[ns][n][v]) {

bundle.min.js

@@ -421,6 +421,7 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
   _get: function(opt){
     var ref$, ns, n, v, p, obj, ref1$, that, key$, ver, c, ref2$, this$ = this;
     ref$ = [opt.ns || '', opt.name, opt.version || 'main', opt.path || 'index.html'], ns = ref$[0], n = ref$[1], v = ref$[2], p = ref$[3];
+    p = p.replace(/\/(index\.html)?$/, '');
     obj = {
       ns: ns,
       name: n,
@@ -431,7 +432,6 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
     if (!(n && v)) {
       return err("", 1015);
     }
-    p = p.replace(/\/(index\.html)?$/, '');
     (ref$ = (ref1$ = this.hash)[ns] || (ref1$[ns] = {}))[n] || (ref$[n] = {});
     if (/[^0-9.]/.exec(v) && !opt.force) {
       if (((ref$ = this._ver.map)[ns] || (ref$[ns] = {}))[n] && this._ver.map[ns][n][v]) {

index.js

@@ -436,6 +436,7 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
   _get: function(opt){
     var ref$, ns, n, v, p, obj, ref1$, that, key$, ver, c, ref2$, this$ = this;
     ref$ = [opt.ns || '', opt.name, opt.version || 'main', opt.path || 'index.html'], ns = ref$[0], n = ref$[1], v = ref$[2], p = ref$[3];
+    p = p.replace(/\/(index\.html)?$/, '');
     obj = {
       ns: ns,
       name: n,
@@ -446,7 +447,6 @@ block.manager.prototype = import$(Object.create(Object.prototype), {
     if (!(n && v)) {
       return err("", 1015);
     }
-    p = p.replace(/\/(index\.html)?$/, '');
     (ref$ = (ref1$ = this.hash)[ns] || (ref1$[ns] = {}))[n] || (ref$[n] = {});
     if (/[^0-9.]/.exec(v) && !opt.force) {
       if (((ref$ = this._ver.map)[ns] || (ref$[ns] = {}))[n] && this._ver.map[ns][n][v]) {

index.min.js

@@ -1 +1 @@
-{"author":"zbryikt","name":"@plotdb/block","license":"MIT","description":"block","version":"5.6.1","browser":"index.min.js","main":"node.js","homepage":"https://github.com/plotdb/block","repository":{"type":"git","url":"https://github.com/plotdb/block"},"engines":{"node":">=10.14.1","npm":">=6.4.1"},"scripts":{"start":"npx server -r web -o true"},"devDependencies":{"@loadingio/bootstrap.ext":"^0.0.12","@loadingio/debounce.js":"^1.0.1","@loadingio/ldcolorpicker":"^3.0.6","@loadingio/ldquery":"^3.0.6","@loadingio/loading.css":"^3.2.1","@plotdb/datadom":"^0.2.0","@plotdb/json0":"^0.0.5","@zbryikt/template":"^2.4.1","body-parser":"^1.19.0","bootstrap":"^4.6.1","bootstrap.native":"^3.0.15","d3":"^7.6.1","d3-array":"^3.0.0","d3-geo":"^2.0.0","fedep":"^1.6.0","jsdom":"^20.0.3","jsoneditor":"^9.1.1","ldbutton":"^2.0.5","ldcolor":"^1.1.3","ldcover":"^3.5.6","lderror":"^2.4.6","ldfile":"^2.0.1","ldiconfont":"^0.2.8","ldloader":"^3.0.3","ldview":"^1.5.2","livescript":"^1.6.0","proxise":"^1.0.1","sharedb-wrapper":"^1.0.0","stylus":"^0.55.0","uglify-js":"^3.13.1","uglifycss":"^0.0.29"},"peerDependencies":{"@plotdb/csscope":"^5.0.4","@plotdb/rescope":"^5.0.16","proxise":"^1.0.1"},"frontendDependencies":{"root":"web/static/assets/lib","modules":["bootstrap","bootstrap.native","@loadingio/ldquery","@loadingio/debounce.js","@loadingio/loading.css","@loadingio/bootstrap.ext","@loadingio/ldcolorpicker","ldview","ldcolor","ldloader","lderror","ldfile","ldbutton","ldcover","jsoneditor","ldiconfont","proxise","@plotdb/datadom","@plotdb/csscope","@plotdb/rescope","@plotdb/semver","sharedb-wrapper","@plotdb/json0","d3","d3-array","d3-geo"]},"dependencies":{"@plotdb/semver":"^0.0.3","@plotdb/csscope":"^5.0.4","@plotdb/rescope":"^5.0.16","proxise":"^1.0.1","node-fetch":"^2.6.7"}}
+{"author":"zbryikt","name":"@plotdb/block","license":"MIT","description":"block","version":"5.6.2","browser":"index.min.js","main":"node.js","homepage":"https://github.com/plotdb/block","repository":{"type":"git","url":"git+https://github.com/plotdb/block.git"},"engines":{"node":">=10.14.1","npm":">=6.4.1"},"scripts":{"start":"npx server -r web -o true"},"devDependencies":{"@loadingio/bootstrap.ext":"^0.0.12","@loadingio/debounce.js":"^1.0.1","@loadingio/ldcolorpicker":"^3.0.6","@loadingio/ldquery":"^3.0.6","@loadingio/loading.css":"^3.2.1","@plotdb/datadom":"^0.2.0","@plotdb/json0":"^0.0.5","@zbryikt/template":"^2.4.1","body-parser":"^1.19.0","bootstrap":"^4.6.1","bootstrap.native":"^3.0.15","d3":"^7.6.1","d3-array":"^3.0.0","d3-geo":"^2.0.0","fedep":"^1.6.0","jsdom":"^20.0.3","jsoneditor":"^9.1.1","ldbutton":"^2.0.5","ldcolor":"^1.1.3","ldcover":"^3.5.6","lderror":"^2.4.6","ldfile":"^2.0.1","ldiconfont":"^0.2.8","ldloader":"^3.0.3","ldview":"^1.5.2","livescript":"^1.6.0","proxise":"^1.0.1","sharedb-wrapper":"^1.0.0","stylus":"^0.55.0","uglify-js":"^3.13.1","uglifycss":"^0.0.29"},"peerDependencies":{"@plotdb/csscope":"^5.0.4","@plotdb/rescope":"^5.0.16","proxise":"^1.0.1"},"frontendDependencies":{"root":"web/static/assets/lib","modules":["bootstrap","bootstrap.native","@loadingio/ldquery","@loadingio/debounce.js","@loadingio/loading.css","@loadingio/bootstrap.ext","@loadingio/ldcolorpicker","ldview","ldcolor","ldloader","lderror","ldfile","ldbutton","ldcover","jsoneditor","ldiconfont","proxise","@plotdb/datadom","@plotdb/csscope","@plotdb/rescope","@plotdb/semver","sharedb-wrapper","@plotdb/json0","d3","d3-array","d3-geo"]},"dependencies":{"@plotdb/semver":"^0.0.3","@plotdb/csscope":"^5.0.4","@plotdb/rescope":"^5.0.16","proxise":"^1.0.1","node-fetch":"^2.6.7"}}