diff --git a/package-lock.json b/package-lock.json index 6bf80a2..503a2b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -501,7 +501,7 @@ }, "axios": { "version": "0.18.0", - "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "requires": { "follow-redirects": "^1.3.0", @@ -4138,7 +4138,7 @@ }, "eventemitter2": { "version": "0.4.14", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", + "resolved": "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=" }, "events": { @@ -5976,9 +5976,9 @@ "dev": true }, "html-to-xlsx": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/html-to-xlsx/-/html-to-xlsx-1.0.1.tgz", - "integrity": "sha512-MkDgOK6rXVZAK3WJsqHn7ZXxIZiKZqSg9s2kikdBoYNk4GIG9vLxJMFfv7GrA81vJ/A36Twzegl2uCq2v7a+gw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-to-xlsx/-/html-to-xlsx-1.0.2.tgz", + "integrity": "sha512-dGEjthSyiJXkEX8MCTOk5CMvlgQ84LF4OidR68wNMtjL/M6p19cM7tUktJn5olkrjzRekde5tPJqyADB10+u1g==", "requires": { "msexcel-builder-extended": "0.0.8", "uuid": "3.2.1" @@ -6778,9 +6778,8 @@ } }, "jsreport": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jsreport/-/jsreport-2.2.0.tgz", - "integrity": "sha512-HQkkAA5KVb9rJeCMdOvIh40Q5zGtSqQ1wLL50vZGwOJj7CxRv9HpwPKMEmtl1QyADax85Zj1i/fIDH+Ik5PYfQ==", + "version": "github:jsreport/jsreport#5d0eeaa72895f26fc32beb34741ae2886ef84a5a", + "from": "github:jsreport/jsreport", "requires": { "jsreport-assets": "1.0.1", "jsreport-authentication": "2.1.0", @@ -6790,14 +6789,14 @@ "jsreport-child-templates": "1.0.0", "jsreport-chrome-pdf": "1.1.5", "jsreport-cli": "2.0.3", - "jsreport-core": "2.1.1", + "jsreport-core": "2.2.0", "jsreport-data": "2.0.1", "jsreport-debug": "2.0.1", - "jsreport-express": "2.2.0", + "jsreport-express": "2.2.1", "jsreport-freeze": "2.0.0", "jsreport-fs-store": "2.1.6", "jsreport-handlebars": "2.0.0", - "jsreport-html-to-xlsx": "2.1.1", + "jsreport-html-to-xlsx": "2.1.2", "jsreport-import-export": "1.0.0", "jsreport-jsrender": "2.0.0", "jsreport-licensing": "2.0.0", @@ -6807,7 +6806,7 @@ "jsreport-resources": "2.0.0", "jsreport-sample-template": "2.1.0", "jsreport-scheduling": "2.0.2", - "jsreport-scripts": "2.0.3", + "jsreport-scripts": "2.0.4", "jsreport-studio": "2.1.1", "jsreport-tags": "2.0.0", "jsreport-templates": "2.0.0", @@ -6819,72 +6818,6 @@ "semver": "5.5.1" }, "dependencies": { - "ajv": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz", - "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=", - "requires": { - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0", - "uri-js": "^3.0.2" - } - }, - "camelcase": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", - "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz", - "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", - "requires": { - "xregexp": "4.0.0" - } - }, - "jsreport-core": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/jsreport-core/-/jsreport-core-2.1.1.tgz", - "integrity": "sha512-f8+uVIEkkLypPEfctYYRfr/f1w8typ9NvUHLaI/6pj+sxRSEFIi3/jt6+2V68QVnm9swg4C/IRCtAA9IozheWw==", - "requires": { - "@babel/code-frame": "7.0.0-beta.46", - "ajv": "6.4.0", - "app-root-path": "2.0.1", - "bluebird": "3.5.1", - "camelcase": "5.0.0", - "debug": "3.1.0", - "decamelize": "2.0.0", - "deepmerge": "2.1.0", - "has-own-deep": "1.1.0", - "listener-collection": "1.2.0", - "lodash.get": "4.4.2", - "lodash.groupby": "4.6.0", - "lodash.omit": "4.5.0", - "lodash.set": "4.3.2", - "lru-cache": "4.1.1", - "mingo": "2.1.1", - "mkdirp": "0.5.1", - "nconf": "0.10.0", - "node.extend": "2.0.0", - "reap2": "1.0.1", - "script-manager": "0.7.1", - "stack-trace": "0.0.10", - "streamifier": "0.1.1", - "unset-value": "1.0.0", - "vm2": "3.5.2", - "winston": "2.4.0", - "winston-transport": "3.0.1" - } - }, "semver": { "version": "5.5.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz", @@ -7070,6 +7003,16 @@ "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.3.0", "uri-js": "^3.0.2" + }, + "dependencies": { + "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.0" + } + } } }, "camelcase": { @@ -7091,7 +7034,19 @@ "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==", "requires": { "xregexp": "4.0.0" + }, + "dependencies": { + "xregexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", + "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==" + } } + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" } } }, @@ -7143,9 +7098,9 @@ } }, "jsreport-express": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jsreport-express/-/jsreport-express-2.2.0.tgz", - "integrity": "sha512-A8AiAZ12+vUpi2kZtWNAB+fophi5PImNj2cNu+PiZFtZaLqy4bSJaNvm1Ec58v7TTPwf4MzgqJomhIsoi0/CRQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jsreport-express/-/jsreport-express-2.2.1.tgz", + "integrity": "sha512-RRQjbPcaqVvPj4BiyxcQw88rqwFP1zuU/n1rCGUxQWbRsXWyATpcLNu0+Ia5Lyf1TwL4xloiPLVXFaHmfqm2iw==", "requires": { "bluebird": "3.5.1", "body-parser": "1.18.2", @@ -7216,14 +7171,14 @@ } }, "jsreport-html-to-xlsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/jsreport-html-to-xlsx/-/jsreport-html-to-xlsx-2.1.1.tgz", - "integrity": "sha512-kNxblvF06u74yfeAeMUC1uahXV6QrH089yKMHJcDLyVVnu+b/36rhLlIx5HwCCLsoePJ48twJ2kPG6SL/ySLIw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/jsreport-html-to-xlsx/-/jsreport-html-to-xlsx-2.1.2.tgz", + "integrity": "sha512-z+7J6oOrR/6vuZbTmSKJoRcLV/IL6E7ORgR2DnCM6NaQbIW2URGv4RvZPiNPRZwVxjKcWmxu1QQ9qRLVCkHWGw==", "requires": { "chrome-page-eval": "1.0.1", - "html-to-xlsx": "1.0.1", + "html-to-xlsx": "1.0.2", "node.extend": "2.0.0", - "phantom-page-eval": "1.0.0", + "phantom-page-eval": "1.0.1", "request": "2.83.0", "stream-to-array": "2.3.0" } @@ -7260,7 +7215,7 @@ "dependencies": { "request": { "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "resolved": "http://registry.npmjs.org/request/-/request-2.85.0.tgz", "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { "aws-sign2": "~0.7.0", @@ -7399,9 +7354,9 @@ } }, "jsreport-scripts": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/jsreport-scripts/-/jsreport-scripts-2.0.3.tgz", - "integrity": "sha512-hrHCds7GbriGVUh2YXQsHaIJkozzp10T4i/S6t7MZjBZPHUNZExvPX2fflAIMij3LzEIf9kuG96NQCFJ7Hct+A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/jsreport-scripts/-/jsreport-scripts-2.0.4.tgz", + "integrity": "sha512-WHzNgANeflIbXFcuEh1R8Bj3LE8e/Ia/zbfdLT7XaqlilGGcEVGirlBBKd+9Ktd0oi4j+261OOu8dG7kJsauPg==", "requires": { "bluebird": "3.5.1", "nanoid": "1.0.1" @@ -10216,9 +10171,9 @@ } }, "phantom-page-eval": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/phantom-page-eval/-/phantom-page-eval-1.0.0.tgz", - "integrity": "sha512-XUNkXWRGS+HoFX0zzXFRM63tCSlTdxwbjJ3frVGZ9mIK9E7zOldVfpd5Ou+I+XA709tEnM60wN46x6+fOguVZQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/phantom-page-eval/-/phantom-page-eval-1.0.1.tgz", + "integrity": "sha512-mOkbNUk6b2wci/L+vouZMbeJdwXPk9g7GIdOCO5WqE7XTo711AOTNsk0oFObXFWv9DFxScEbVbHoZALJL+7nlA==", "requires": { "debug": "3.1.0", "nanoid": "1.0.2" @@ -11931,33 +11886,6 @@ "revalidator": "0.1.x", "utile": "0.3.x", "winston": "2.x" - }, - "dependencies": { - "async": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=" - }, - "winston": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz", - "integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==", - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "dependencies": { - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=" - } - } - } } }, "prop-types": { @@ -14681,21 +14609,6 @@ "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==" }, - "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.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - } - } - }, "urix": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", @@ -15461,11 +15374,6 @@ "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=" }, - "xregexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz", - "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==" - }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index d4db3f0..ff1f520 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ "connect-ensure-login": "0.1.1", "eslint-config-standard-react": "7.0.2", "ip": "1.1.5", - "jsreport": "2.2.0", - "jsreport-core": "2.2.0", + "jsreport": "jsreport/jsreport", "jsreport-ejs": "2.0.0", "jsreport-electron-pdf": "3.0.0", "jsreport-fop-pdf": "2.0.0", diff --git a/server.js b/server.js index 7cb701b..50a9d2f 100644 --- a/server.js +++ b/server.js @@ -1,9 +1,6 @@ const winston = require('winston') require('winston-loggly') -// just temporary hack until we release full jsreport -require('rimraf').sync('node_modules/jsreport/node_modules/jsreport-core') - if (!process.env.ip && !process.env.stack) { console.log('Using local ip address and localdev stack') process.env.ip = require('ip').address() diff --git a/test/test.js b/test/test.js index ee5d22a..2f89c0f 100644 --- a/test/test.js +++ b/test/test.js @@ -1,9 +1,6 @@ const jsreport = require('jsreport') const should = require('should') -// just temporary hack until we release full jsreport -require('rimraf').sync('node_modules/jsreport/node_modules/jsreport-core') - describe('playground', () => { let reporter