From 653e9c436a3a5b675e2c2414b072405bd3d33896 Mon Sep 17 00:00:00 2001 From: Jerome Simeon Date: Thu, 5 Jul 2018 10:15:31 -0400 Subject: [PATCH] (chore) Rebuild with latest dependencies Signed-off-by: Jerome Simeon --- package-lock.json | 84 ++++--------------------- packages/ergo-cli/lib/ergoc-lib.js | 9 +-- packages/ergo-compiler/lib/ergo-core.js | 9 +-- 3 files changed, 21 insertions(+), 81 deletions(-) diff --git a/package-lock.json b/package-lock.json index 579726269..6154b0b65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -537,9 +537,9 @@ "integrity": "sha1-Uui5hPSHLZUv8b3IuYOX0nxxRM8=" }, "commander": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==" + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, "comment-parser": { "version": "0.4.0", @@ -559,9 +559,9 @@ } }, "composer-common": { - "version": "0.19.8-20180603041248", - "resolved": "https://registry.npmjs.org/composer-common/-/composer-common-0.19.8-20180603041248.tgz", - "integrity": "sha512-WciWqhgpcQVphnBvXtUkNynl8DxN3rNnCjoRP3PrmrWP6/YfZQvGqAdRK+kAFy0KrbMAn4+4YsBKCJAUPUfhUg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/composer-common/-/composer-common-0.19.12.tgz", + "integrity": "sha512-QPERKrKFOHOCpFzKsdZX8CBVQqZ4348Y9eUyqcw41vS5vOKl1o+NWLLitcsSGOK+Wrj0q4tTlaITFt33kBSQ7Q==", "requires": { "acorn": "5.1.2", "axios": "0.17.1", @@ -578,13 +578,12 @@ "lorem-ipsum": "1.0.4", "minimatch": "3.0.3", "mkdirp": "0.5.1", - "node-plantuml": "0.5.0", "npm-paths": "0.1.3", "semver": "5.3.0", "sprintf-js": "1.0.3", "thenify": "3.2.1", "thenify-all": "1.6.0", - "uri-js": "3.0.2", + "urijs": "1.19.1", "uuid": "3.0.1", "winston": "2.3.1" } @@ -3377,11 +3376,6 @@ "supports-color": "4.4.0" }, "dependencies": { - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -3456,33 +3450,6 @@ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" }, - "node-nailgun-client": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/node-nailgun-client/-/node-nailgun-client-0.1.0.tgz", - "integrity": "sha1-tkJNsGA3gaGT82c4Xi1hXKbfILI=", - "requires": { - "commander": "2.16.0" - } - }, - "node-nailgun-server": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/node-nailgun-server/-/node-nailgun-server-0.1.3.tgz", - "integrity": "sha1-plCRjkhhXI18TSOT22cxblrQEvE=", - "requires": { - "commander": "2.16.0" - } - }, - "node-plantuml": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/node-plantuml/-/node-plantuml-0.5.0.tgz", - "integrity": "sha1-A8LthW5rJyxxShVoRTp0fCZv3B8=", - "requires": { - "commander": "2.16.0", - "node-nailgun-client": "0.1.0", - "node-nailgun-server": "0.1.3", - "plantuml-encoder": "1.2.5" - } - }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -6155,22 +6122,6 @@ } } }, - "plantuml-encoder": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/plantuml-encoder/-/plantuml-encoder-1.2.5.tgz", - "integrity": "sha512-viV7Sz+BJNX/sC3iyebh2VfLyAZKuu3+JuBs2ISms8+zoTGwPqwk3/WEDw/zROmGAJ/xD4sNd8zsBw/YmTo7ng==", - "requires": { - "pako": "1.0.3", - "utf8-bytes": "0.0.1" - }, - "dependencies": { - "pako": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.3.tgz", - "integrity": "sha1-X1FbDGci4ZgpIK6ABerLC3ynPM8=" - } - } - }, "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", @@ -6206,11 +6157,6 @@ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", @@ -7051,13 +6997,10 @@ "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=" }, - "uri-js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz", - "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=", - "requires": { - "punycode": "2.1.1" - } + "urijs": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz", + "integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==" }, "url-parse-lax": { "version": "1.0.0", @@ -7067,11 +7010,6 @@ "prepend-http": "1.0.4" } }, - "utf8-bytes": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/utf8-bytes/-/utf8-bytes-0.0.1.tgz", - "integrity": "sha1-EWsCVEjJtQAIHN+/H01sbDfYg30=" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/packages/ergo-cli/lib/ergoc-lib.js b/packages/ergo-cli/lib/ergoc-lib.js index cc917b2a7..7ce10e111 100644 --- a/packages/ergo-cli/lib/ergoc-lib.js +++ b/packages/ergo-cli/lib/ergoc-lib.js @@ -16989,8 +16989,9 @@ u=b[1],h=g9(bT[17],b[2],d,f,a,g,0),i=h[1],j=e(LJ,u),m=h[2],n=v(bT[19],j),o=e(LK, c=[0,[0,0,v(bT[19],0)],d];break;default:var w=v(bT[19],LQ),k=b[1],r=k[1],s=e(a,e(LN,a)),t=k[2],c=[0,[0,e(LP,e(r,e(LO,e(a,e(na(a,function(b){return iA(bT[18],j$,b[2][3],1,a,g,[0,[0,j$,j$],0],b[1])},t),s))))),w],d]}var x=c[2];return[0,e(l[1],c[1][1]),x]},[0,0,b],c)[1],a)))},nH=function(b,a){var -c=aH(function(a){return[1,a]},b);return h5(Kn,aG(c,aH(function(a){return[0,a]},a)),ns)},nI=function(b,a){var -c=h8(b[2],a);return av(nw,bM(function(a){return ng(a[1])},c))},nJ=function(d,c,b,a){return[6,d,c,0,b,a]},nK=function(e,d,c,b,a){return[6,e,d,[0,c],b,a]},nL=function(b,a){ao(b,a);ey(b,a);var +c=aH(function(a){return[1,a]},b);return h5(Kn,aG(c,aH(function(a){return[0,a]},a)),ns)},nI=function(a,b){var +c=h8(a[2],b);return bM(function(b){var +c=[0,a[1],b[2]],d=ng(b[1]);return av(function(a){return[0,nw(a),c]},d)},c)},nJ=function(d,c,b,a){return[6,d,c,0,b,a]},nK=function(e,d,c,b,a){return[6,e,d,[0,c],b,a]},nL=function(b,a){ao(b,a);ey(b,a);var j=0,k=0;try{var e=j,c=k;ao(b,a);ep(a);ao(b,a);var p=co(b,function(b,a,c){var @@ -26836,7 +26837,7 @@ x=a[2],i=oF([0,b,t]),g=a[4];switch(a[2]){case h=eR(fA(U0));break;case 1:var p=nH(g,c[1]),h=ka(fc,bM(function(a){var -b=a[1],c=nI(a,i);return av(K6,bM(function(a){return j_(b,a)},c))},p));break;case +b=a[1],c=nI(a,i);return av(K6,bM(function(a){return j_(b,a[1])},c))},p));break;case 2:var w=c[1],o=h5(nv,g,dZ(np,aH(nh,g),ns)),l=bM(function(a){return h5(h8,w,a[2])},o),r=bM(function(a){return h8(a[2],i)},l),m=bM(function(a){return ng(a[1])},r),s=bM(J$,m),h=ka(fc,bM(function(a){var i=a[2],f=ne(a),b=av(nw,m),c=bM(function(a){var @@ -26851,7 +26852,7 @@ c=[0,h9(d,f),j5];var k=nF(a),l=e(nG(h[2],0,0,a,o),k),j=c[1],m=e(a,e(mo(a,aH(function(h){var f=h[1],g=f[1],b=g[1],u=c[2],p=e(LH,v(bT[9],b)),q=e(v(bT[9],i),p),r=h[2],s=f[2],t=g[2],l=aC(b,g0)?Lj:LG,m=e(Ly,e(a,e(Lx,e(a,e(Lw,e(a,e(Lv,e(a,e(Lu,e(a,e(Lt,e(a,e(Ls,e(a,e(Lr,e(a,e(Lq,e(a,e(Lp,e(a,e(Lo,e(a,e(Ln,e(a,e(Lm,e(a,e(Ll,e(a,e(Lk,a))))))))))))))))))))))))))))),n=e(Lz,e(v(bT[9],b),m)),o=e(LF,e(q,e(LE,e(a,e(LD,e(l,e(LC,e(a,e(LB,e(a,e(LA,e(v(bT[9],i),n)))))))))))),j=e(K8,e(a,e(K7,a))),d=aC(b,g0),k=d?e(K9,a):d;return e(e(Li,e(a,e(Lh,e(a,e(Lg,e(a,e(Lf,e(t,e(Le,e(a,e(Ld,e(s,e(Lc,e(a,e(Lb,e(r,e(La,e(a,e(K$,e(u,e(K_,e(a,e(k,j))))))))))))))))))))))),o)},j)),l));return e(nE(a),m)},c)},s));break;default:var q=nH(g,c[1]),h=ka(fc,bM(function(a){var -b=a[1],c=nI(a,i);return av(LR,bM(function(a){return j_(b,a)},c))},q))}c[1]=f3(c[1],[0,i,0]);switch(x){case +b=a[1],c=nI(a,i);return av(LR,bM(function(a){return j_(b,a[1])},c))},q))}c[1]=f3(c[1],[0,i,0]);switch(x){case 0:var j=NB;break;case 1:var diff --git a/packages/ergo-compiler/lib/ergo-core.js b/packages/ergo-compiler/lib/ergo-core.js index df6b4d6b6..d43d43d44 100644 --- a/packages/ergo-compiler/lib/ergo-core.js +++ b/packages/ergo-compiler/lib/ergo-core.js @@ -16826,8 +16826,9 @@ u=b[1],h=gV(bP[17],b[2],d,f,a,g,0),i=h[1],j=e(J4,u),m=h[2],n=v(bP[19],j),o=e(J5, c=[0,[0,0,v(bP[19],0)],d];break;default:var w=v(bP[19],J$),k=b[1],r=k[1],s=e(a,e(J8,a)),t=k[2],c=[0,[0,e(J_,e(r,e(J9,e(a,e(mz(a,function(b){return ih(bP[18],jJ,b[2][3],1,a,g,[0,[0,jJ,jJ],0],b[1])},t),s))))),w],d]}var x=c[2];return[0,e(l[1],c[1][1]),x]},[0,0,b],c)[1],a)))},m6=function(b,a){var -c=aF(function(a){return[1,a]},b);return hN(II,aE(c,aF(function(a){return[0,a]},a)),mR)},m7=function(b,a){var -c=hQ(b[2],a);return av(mV,bK(function(a){return mF(a[1])},c))},Kb=bP[9],m8=function(d,c,b,a){return[6,d,c,0,b,a]},m9=function(e,d,c,b,a){return[6,e,d,[0,c],b,a]},m_=function(b,a){ao(b,a);ex(b,a);var +c=aF(function(a){return[1,a]},b);return hN(II,aE(c,aF(function(a){return[0,a]},a)),mR)},m7=function(a,b){var +c=hQ(a[2],b);return bK(function(b){var +c=[0,a[1],b[2]],d=mF(b[1]);return av(function(a){return[0,mV(a),c]},d)},c)},Kb=bP[9],m8=function(d,c,b,a){return[6,d,c,0,b,a]},m9=function(e,d,c,b,a){return[6,e,d,[0,c],b,a]},m_=function(b,a){ao(b,a);ex(b,a);var j=0,k=0;try{var e=j,c=k;ao(b,a);eo(a);ao(b,a);var p=cm(b,function(b,a,c){var @@ -26637,7 +26638,7 @@ c=h[4];switch(h[2]){case d=eR(fu(RH));break;case 1:var j=m6(c,a[1]),d=jK(eN,bK(function(a){var -c=a[1],d=m7(a,b);return av(Jp,bK(function(a){return jI(c,a)},d))},j));break;case +c=a[1],d=m7(a,b);return av(Jp,bK(function(a){return jI(c,a[1])},d))},j));break;case 2:var n=a[1],i=hN(mU,c,dZ(mO,aF(mG,c),mR)),f=bK(function(a){return hN(hQ,n,a[2])},i),l=bK(function(a){return hQ(a[2],b)},f),g=bK(function(a){return mF(a[1])},l),m=bK(Iu,g),d=jK(eN,bK(function(a){var i=a[2],h=mD(a),b=av(mV,g),c=bK(function(a){var @@ -26652,7 +26653,7 @@ c=[0,hR(d,h),jD];var k=m4(a),l=e(m5(f[2],0,0,a,o),k),g=c[1],m=e(a,e(lN(a,aF(function(h){var f=h[1],g=f[1],b=g[1],u=c[2],p=e(J2,v(bP[9],b)),q=e(v(bP[9],i),p),r=h[2],s=f[2],t=g[2],l=aC(b,gN)?JE:J1,m=e(JT,e(a,e(JS,e(a,e(JR,e(a,e(JQ,e(a,e(JP,e(a,e(JO,e(a,e(JN,e(a,e(JM,e(a,e(JL,e(a,e(JK,e(a,e(JJ,e(a,e(JI,e(a,e(JH,e(a,e(JG,e(a,e(JF,a))))))))))))))))))))))))))))),n=e(JU,e(v(bP[9],b),m)),o=e(J0,e(q,e(JZ,e(a,e(JY,e(l,e(JX,e(a,e(JW,e(a,e(JV,e(v(bP[9],i),n)))))))))))),j=e(Jr,e(a,e(Jq,a))),d=aC(b,gN),k=d?e(Js,a):d;return e(e(JD,e(a,e(JC,e(a,e(JB,e(a,e(JA,e(t,e(Jz,e(a,e(Jy,e(s,e(Jx,e(a,e(Jw,e(r,e(Jv,e(a,e(Ju,e(u,e(Jt,e(a,e(k,j))))))))))))))))))))))),o)},g)),l));return e(m3(a),m)},c)},m));break;default:var k=m6(c,a[1]),d=jK(eN,bK(function(a){var -c=a[1],d=m7(a,b);return av(Ka,bK(function(a){return jI(c,a)},d))},k))}a[1]=he(a[1],[0,b,0]);return d},RI=function(a){return fF(n2,LG)},RJ=function(b){var +c=a[1],d=m7(a,b);return av(Ka,bK(function(a){return jI(c,a[1])},d))},k))}a[1]=he(a[1],[0,b,0]);return d},RI=function(a){return fF(n2,LG)},RJ=function(b){var a=[0,0,1,0,0];hg(function(c){var b=c[2];a[3]=he(a[3],[0,b,0]);return nn(a,b)},LE);var c=b.cto;k_(c,function(b){b.map(g9(function(b,d,c){return nn(a,ev(b))}));return 0});var