diff --git a/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css b/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css
index 93297562f54..9b7a269a099 100644
--- a/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css
+++ b/amp/TEMPLATE/ampTemplate/css_2/amp-wicket.css
@@ -684,4 +684,14 @@ input[disabled], select[disabled]{
.top-padding-10 {
padding-top: 10px;
+}
+.save-gray-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5); /* Black background with opacity */
+ z-index: 1000; /* Ensure it's above other elements */
+ display: none; /* Hidden by default */
}
\ No newline at end of file
diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/package-lock.json b/amp/TEMPLATE/ampTemplate/gisModule/dev/package-lock.json
index 13a25f08993..1dccda590c2 100644
--- a/amp/TEMPLATE/ampTemplate/gisModule/dev/package-lock.json
+++ b/amp/TEMPLATE/ampTemplate/gisModule/dev/package-lock.json
@@ -15,9 +15,9 @@
"@babel/polyfill": "^7.2.5",
"backbone": "1.1.2",
"bootstrap": "3.3.0",
- "brfs": "1.2.0",
- "browserify": "4.2.3",
- "browserify-shim": "3.6.0",
+ "brfs": "^1.2.0",
+ "browserify": "^5.12.0",
+ "browserify-shim": "3.8.12",
"cheerio": "0.18.0",
"css-element-queries": "1.0.0",
"d3-browserify": "3.4.12",
@@ -140,10 +140,19 @@
"node": ">= 0.6"
}
},
+ "node_modules/accessory": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/accessory/-/accessory-1.0.1.tgz",
+ "integrity": "sha512-c2ny6tnpucsHYScl68BfTOQaS/dtHaEdHTZk4FGrcTTx9ryIoZ8rvyuCVqFKXjmLvuWwN96ieZ8NZF2D5rSwBQ==",
+ "dev": true,
+ "dependencies": {
+ "dot-parts": "~1.0.0"
+ }
+ },
"node_modules/acorn": {
"version": "4.0.13",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
- "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+ "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -481,6 +490,24 @@
"node": ">=0.4.9"
}
},
+ "node_modules/asn1.js": {
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0",
+ "safer-buffer": "^2.1.0"
+ }
+ },
+ "node_modules/asn1.js/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
"node_modules/assert": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz",
@@ -527,7 +554,7 @@
"node_modules/astw": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
- "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
+ "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
"dev": true,
"dependencies": {
"acorn": "^4.0.3"
@@ -757,6 +784,12 @@
"file-uri-to-path": "1.0.0"
}
},
+ "node_modules/bn.js": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+ "dev": true
+ },
"node_modules/body": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -906,12 +939,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/brfs/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/brfs/node_modules/through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -934,38 +961,56 @@
"node": ">=0.4"
}
},
+ "node_modules/brorand": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+ "dev": true
+ },
"node_modules/browser-pack": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz",
- "integrity": "sha1-XRxSf1bFgmd0EcTbKhKGSP9r8VA=",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+ "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
"dev": true,
"dependencies": {
"combine-source-map": "~0.3.0",
- "JSONStream": "~0.6.4",
- "through": "~2.3.4"
+ "concat-stream": "~1.4.1",
+ "defined": "~0.0.0",
+ "JSONStream": "~0.8.4",
+ "through2": "~0.5.1",
+ "umd": "^2.1.0"
},
"bin": {
"browser-pack": "bin/cmd.js"
}
},
- "node_modules/browser-pack/node_modules/JSONStream": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
- "integrity": "sha1-SyyAY/j1Enh7I3X37p22kgj6Lcs=",
+ "node_modules/browser-pack/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "node_modules/browser-pack/node_modules/readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
"dev": true,
"dependencies": {
- "jsonparse": "0.0.5",
- "through": "~2.2.7"
- },
- "engines": {
- "node": "*"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
}
},
- "node_modules/browser-pack/node_modules/JSONStream/node_modules/through": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
- "integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=",
- "dev": true
+ "node_modules/browser-pack/node_modules/through2": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+ "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "~1.0.17",
+ "xtend": "~3.0.0"
+ }
},
"node_modules/browser-resolve": {
"version": "1.11.3",
@@ -983,13 +1028,13 @@
"dev": true
},
"node_modules/browserify": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/browserify/-/browserify-4.2.3.tgz",
- "integrity": "sha1-Dg2PmObfamZKosBVEg84SCRu5NA=",
+ "version": "5.13.1",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-5.13.1.tgz",
+ "integrity": "sha512-sAiNOb7ulxclpAC09rN/F4lHugBmIb7Iuqvb4OccAp7IcVQj6rwKO3b5HJ1PmGCSwYWKVhshrP7n/NglnthZqA==",
"dev": true,
"dependencies": {
"assert": "~1.1.0",
- "browser-pack": "~2.0.0",
+ "browser-pack": "^3.0.0",
"browser-resolve": "^1.3.0",
"browserify-zlib": "~0.1.2",
"buffer": "^2.3.0",
@@ -998,21 +1043,22 @@
"concat-stream": "~1.4.1",
"console-browserify": "^1.1.0",
"constants-browserify": "~0.0.1",
- "crypto-browserify": "^2.1.8",
+ "crypto-browserify": "^3.0.0",
"deep-equal": "~0.2.1",
"defined": "~0.0.0",
- "deps-sort": "~0.1.1",
- "derequire": "~0.8.0",
+ "deps-sort": "^1.3.5",
"domain-browser": "~1.1.0",
- "duplexer": "~0.1.1",
+ "duplexer2": "~0.0.2",
"events": "~1.0.0",
- "glob": "~3.2.8",
+ "glob": "^4.0.5",
"http-browserify": "^1.4.0",
"https-browserify": "~0.0.0",
"inherits": "~2.0.1",
- "insert-module-globals": "~6.0.0",
+ "insert-module-globals": "^6.1.0",
+ "isarray": "0.0.1",
"JSONStream": "~0.8.3",
- "module-deps": "~2.1.1",
+ "labeled-stream-splicer": "^1.0.0",
+ "module-deps": "^3.5.0",
"os-browserify": "~0.1.1",
"parents": "~0.0.1",
"path-browserify": "~0.0.0",
@@ -1022,11 +1068,11 @@
"readable-stream": "^1.0.27-1",
"resolve": "~0.7.1",
"shallow-copy": "0.0.1",
+ "shasum": "^1.0.0",
"shell-quote": "~0.0.1",
"stream-browserify": "^1.0.0",
- "stream-combiner": "~0.0.2",
- "string_decoder": "~0.0.0",
- "subarg": "0.0.1",
+ "string_decoder": "~0.10.0",
+ "subarg": "^1.0.0",
"syntax-error": "^1.1.1",
"through2": "^1.0.0",
"timers-browserify": "^1.0.1",
@@ -1041,20 +1087,67 @@
"browserify": "bin/cmd.js"
}
},
+ "node_modules/browserify-aes": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+ "dev": true,
+ "dependencies": {
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/browserify-cipher": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+ "dev": true,
+ "dependencies": {
+ "browserify-aes": "^1.0.4",
+ "browserify-des": "^1.0.0",
+ "evp_bytestokey": "^1.0.0"
+ }
+ },
+ "node_modules/browserify-des": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.1",
+ "des.js": "^1.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/browserify-rsa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^5.0.0",
+ "randombytes": "^2.0.1"
+ }
+ },
"node_modules/browserify-shim": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.6.0.tgz",
- "integrity": "sha1-jJO5MlCmQhN89gLkMEtqgTtxBf8=",
+ "version": "3.8.12",
+ "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.8.12.tgz",
+ "integrity": "sha512-v3YxiqZRcfJNORRTkFdRyd5doDFHa7yDpdsyMaqHC8OFMSOgfG5nq6+ti/ha9X9Jt1meSrYhD+7q9O6yrGVJHg==",
"dev": true,
"dependencies": {
- "exposify": "~0.2.0",
+ "exposify": "~0.4.3",
"mothership": "~0.2.0",
"rename-function-calls": "~0.1.0",
"resolve": "~0.6.1",
"through": "~2.3.4"
},
"peerDependencies": {
- "browserify": ">= 2.3.0 < 5"
+ "browserify": ">= 2.3.0 < 14"
}
},
"node_modules/browserify-shim/node_modules/resolve": {
@@ -1063,6 +1156,46 @@
"integrity": "sha1-3ZV5gufnNt699TtYpN2RdUV13UY=",
"dev": true
},
+ "node_modules/browserify-sign": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^5.1.1",
+ "browserify-rsa": "^4.0.1",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "elliptic": "^6.5.3",
+ "inherits": "^2.0.4",
+ "parse-asn1": "^5.1.5",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ }
+ },
+ "node_modules/browserify-sign/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/browserify-sign/node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
"node_modules/browserify-zlib": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
@@ -1072,6 +1205,40 @@
"pako": "~0.2.0"
}
},
+ "node_modules/browserify/node_modules/glob": {
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+ "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
+ "dev": true,
+ "dependencies": {
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^2.0.1",
+ "once": "^1.3.0"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/browserify/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "node_modules/browserify/node_modules/minimatch": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+ "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+ "deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^1.0.0"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/browserify/node_modules/through2": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
@@ -1117,6 +1284,12 @@
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
"dev": true
},
+ "node_modules/buffer-xor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+ "dev": true
+ },
"node_modules/bufferstreams": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-0.0.2.tgz",
@@ -1264,6 +1437,16 @@
"fsevents": "^0.3.1"
}
},
+ "node_modules/cipher-base": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
"node_modules/class-utils": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1537,7 +1720,7 @@
"node_modules/combine-source-map": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
- "integrity": "sha1-2edPWT2c1DgHMSy12EbUUe+qnrc=",
+ "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
"dev": true,
"dependencies": {
"convert-source-map": "~0.3.0",
@@ -1698,6 +1881,49 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
+ "node_modules/create-ecdh": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "elliptic": "^6.5.3"
+ }
+ },
+ "node_modules/create-ecdh/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
+ "node_modules/create-hash": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
+ }
+ },
+ "node_modules/create-hmac": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+ "dev": true,
+ "dependencies": {
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
"node_modules/cryptiles": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
@@ -1713,13 +1939,22 @@
}
},
"node_modules/crypto-browserify": {
- "version": "2.1.10",
- "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.10.tgz",
- "integrity": "sha1-TyymMRhDzwh83wCOQ6TzaG725rs=",
+ "version": "3.12.0",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"dev": true,
"dependencies": {
- "ripemd160": "0.2.0",
- "sha.js": "2.1.6"
+ "browserify-cipher": "^1.0.0",
+ "browserify-sign": "^4.0.0",
+ "create-ecdh": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.0",
+ "diffie-hellman": "^5.0.0",
+ "inherits": "^2.0.1",
+ "pbkdf2": "^3.0.3",
+ "public-encrypt": "^4.0.0",
+ "randombytes": "^2.0.0",
+ "randomfill": "^1.0.3"
},
"engines": {
"node": "*"
@@ -1955,42 +2190,68 @@
}
},
"node_modules/deps-sort": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz",
- "integrity": "sha1-2qL7YUoXyWN9gB4vVTOa43DzYRo=",
+ "version": "1.3.9",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
+ "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
"dev": true,
"dependencies": {
- "JSONStream": "~0.6.4",
- "minimist": "~0.0.1",
- "through": "~2.3.4"
+ "JSONStream": "^1.0.3",
+ "shasum": "^1.0.0",
+ "subarg": "^1.0.0",
+ "through2": "^1.0.0"
},
"bin": {
"deps-sort": "bin/cmd.js"
}
},
+ "node_modules/deps-sort/node_modules/jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+ "dev": true,
+ "engines": [
+ "node >= 0.2.0"
+ ]
+ },
"node_modules/deps-sort/node_modules/JSONStream": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
- "integrity": "sha1-SyyAY/j1Enh7I3X37p22kgj6Lcs=",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"dependencies": {
- "jsonparse": "0.0.5",
- "through": "~2.2.7"
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
+ },
+ "bin": {
+ "JSONStream": "bin.js"
},
"engines": {
"node": "*"
}
},
- "node_modules/deps-sort/node_modules/JSONStream/node_modules/through": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
- "integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=",
- "dev": true
+ "node_modules/deps-sort/node_modules/through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "node_modules/deps-sort/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
},
"node_modules/derequire": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz",
- "integrity": "sha1-wffx2izt5Ere3gRzePA/RE6cTA0=",
+ "integrity": "sha512-luNtMBeScoqdoYW+Je4ROWJZjF6TLiNtbuqC/NAvBgXMn/s5SF4AUws9/NOoDnTLu/qg5c9oNZBfwzzQftkyOw==",
"dev": true,
"dependencies": {
"esprima-fb": "^3001.1.0-dev-harmony-fb",
@@ -1998,6 +2259,16 @@
"estraverse": "~1.5.0"
}
},
+ "node_modules/des.js": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+ "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
+ }
+ },
"node_modules/destroy": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -2014,28 +2285,36 @@
}
},
"node_modules/detective": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/detective/-/detective-2.3.0.tgz",
- "integrity": "sha1-IefSyoDxr5KRuP/kygmxqdvbWuM=",
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+ "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
"dev": true,
"dependencies": {
- "escodegen": "0.0.15",
- "esprima": "1.0.2"
+ "acorn": "^5.2.1",
+ "defined": "^1.0.0"
}
},
- "node_modules/detective/node_modules/esprima": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz",
- "integrity": "sha1-gDm/nOrE2dLBX2IyZPspK1UCzq8=",
+ "node_modules/detective/node_modules/acorn": {
+ "version": "5.7.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+ "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
"dev": true,
"bin": {
- "esparse": "bin/esparse.js",
- "esvalidate": "bin/esvalidate.js"
+ "acorn": "bin/acorn"
},
"engines": {
"node": ">=0.4.0"
}
},
+ "node_modules/detective/node_modules/defined": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/diff": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
@@ -2045,6 +2324,23 @@
"node": ">=0.3.1"
}
},
+ "node_modules/diffie-hellman": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "miller-rabin": "^4.0.0",
+ "randombytes": "^2.0.0"
+ }
+ },
+ "node_modules/diffie-hellman/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
"node_modules/dom-serializer": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
@@ -2089,6 +2385,12 @@
"domelementtype": "1"
}
},
+ "node_modules/dot-parts": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dot-parts/-/dot-parts-1.0.1.tgz",
+ "integrity": "sha512-DcAuaZ2hguFLkxrAwOlvYNFb4IE6xg1Ldzqpma4/UeiT0utd8/E17z1h9mH8s+9Hwh7SeLn83LpIykh/oBBxSw==",
+ "dev": true
+ },
"node_modules/duplexer": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -2183,6 +2485,27 @@
"integrity": "sha1-jJshKJjYzZ8alDZlDOe+ICyen/A=",
"dev": true
},
+ "node_modules/elliptic": {
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
+ "node_modules/elliptic/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
"node_modules/encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -2291,12 +2614,14 @@
}
},
"node_modules/escodegen": {
- "version": "0.0.15",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz",
- "integrity": "sha1-/9qcsmtws098wZ8diHVlOa+1Q70=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
+ "integrity": "sha512-md+WjA8K+DJELEYe0n4XAOE0XbUYfw2rzb8T+nhZ19OnQxlh+0jMLS6d+z2oqWugIh3uYKu1+KJh6QKeoogLzg==",
"dev": true,
"dependencies": {
- "esprima": ">= 1.0.0"
+ "esprima": "~1.0.4",
+ "estraverse": "~1.5.0",
+ "esutils": "~1.0.0"
},
"bin": {
"escodegen": "bin/escodegen.js",
@@ -2306,13 +2631,13 @@
"node": ">=0.4.0"
},
"optionalDependencies": {
- "source-map": ">= 0.1.2"
+ "source-map": "~0.1.30"
}
},
"node_modules/escope": {
"version": "0.0.16",
"resolved": "https://registry.npmjs.org/escope/-/escope-0.0.16.tgz",
- "integrity": "sha1-QYx6CvynIdr+ZZGT/Zhig+dGU48=",
+ "integrity": "sha512-3nipzlX/noBWi/vvQSLvifQ4lKalvX570eAVgrbK0TD0Cwlbh3EQ3OpcongoFaD7IeWIaQKsRS16Bt2epx71TQ==",
"dev": true,
"dependencies": {
"estraverse": ">= 0.0.2"
@@ -2359,7 +2684,7 @@
"node_modules/esrefactor": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz",
- "integrity": "sha1-0UJ5WigjOauB6Ta1t6IbEb8ZexM=",
+ "integrity": "sha512-QxD1acYl9jmkDI+0xnPcwjhrwiKvfaaAZV5cVXX5uXTSp9uJ7xddqXOfnNPzWP1JoorLwj7OWF+RQOLKh7Vnjw==",
"dev": true,
"dependencies": {
"escope": "~0.0.13",
@@ -2373,7 +2698,7 @@
"node_modules/esrefactor/node_modules/estraverse": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
- "integrity": "sha1-AaCTLf7ldGhKWYr1pnw7+bZCjbI=",
+ "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
"dev": true,
"engines": {
"node": ">=0.4.0"
@@ -2445,6 +2770,16 @@
"node": ">=0.4.x"
}
},
+ "node_modules/evp_bytestokey": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+ "dev": true,
+ "dependencies": {
+ "md5.js": "^1.3.4",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"node_modules/exists-stat": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/exists-stat/-/exists-stat-1.0.0.tgz",
@@ -2495,12 +2830,15 @@
}
},
"node_modules/exposify": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.2.0.tgz",
- "integrity": "sha1-R9hs4+COP/1gOTbc1eXmMRwyphI=",
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.4.3.tgz",
+ "integrity": "sha512-m88KxCqA0NNMVb0xMvpaddZ/rgzkE5H0qcdQvIXZhydk8bkK+NnoDzS6icIpiPnL5C3NGBRyc/3v0zfKoFv5tQ==",
"dev": true,
"dependencies": {
- "detective": "~2.3.0",
+ "globo": "~1.0.0",
+ "has-require": "~1.1.0",
+ "map-obj": "~1.0.1",
+ "replace-requires": "~1.0.1",
"through2": "~0.4.0",
"transformify": "~0.1.1"
}
@@ -2508,19 +2846,19 @@
"node_modules/exposify/node_modules/isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
- "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
"dev": true
},
"node_modules/exposify/node_modules/object-keys": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
- "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+ "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
"dev": true
},
"node_modules/exposify/node_modules/readable-stream": {
"version": "1.0.34",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
- "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -2529,16 +2867,10 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/exposify/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/exposify/node_modules/through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
- "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+ "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
"dev": true,
"dependencies": {
"readable-stream": "~1.0.17",
@@ -2548,7 +2880,7 @@
"node_modules/exposify/node_modules/xtend": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
- "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+ "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
"dev": true,
"dependencies": {
"object-keys": "~0.4.0"
@@ -3396,6 +3728,20 @@
"node": ">=0.10.0"
}
},
+ "node_modules/globo": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/globo/-/globo-1.0.2.tgz",
+ "integrity": "sha512-qGhegigP96gvoCqmjDrHLdMmvDjqcFHK3Y4kkHRZ4pwYg2TNcNbR3gCXyASPDTj0YAyin2WpyZK74mXJz9DE3Q==",
+ "dev": true,
+ "dependencies": {
+ "accessory": "~1.0.0",
+ "is-defined": "~1.0.0",
+ "ternary": "~1.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/globule": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
@@ -3751,12 +4097,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-changed/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-changed/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -3784,12 +4124,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "node_modules/gulp-changed/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-changed/node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -4091,12 +4425,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-concat/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-concat/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -4646,12 +4974,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-debug/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-debug/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -4679,12 +5001,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "node_modules/gulp-debug/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-debug/node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -4964,12 +5280,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-filter/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-filter/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -4997,12 +5307,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "node_modules/gulp-filter/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-filter/node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -5274,12 +5578,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-jscs/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-jscs/node_modules/readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -5551,12 +5849,6 @@
"node": "*"
}
},
- "node_modules/gulp-jshint/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-jshint/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -5871,12 +6163,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-less/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-less/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -5904,12 +6190,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "node_modules/gulp-less/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-less/node_modules/strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -6122,12 +6402,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-livereload/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-livereload/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -6498,12 +6772,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-mocha/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-mocha/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -6777,12 +7045,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-plumber/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-plumber/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -6951,12 +7213,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/gulp-rev-all/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-rev-all/node_modules/strip-ansi": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
@@ -7028,12 +7284,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/gulp-rev-replace/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-rev-replace/node_modules/through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -7074,12 +7324,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/gulp-rev/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-rev/node_modules/through2": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
@@ -7270,12 +7514,6 @@
"lodash.escape": "^3.0.0"
}
},
- "node_modules/gulp-rimraf/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-rimraf/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -7521,12 +7759,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/gulp-util/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/gulp-util/node_modules/through2": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
@@ -7765,12 +7997,6 @@
"node": "*"
}
},
- "node_modules/gulp-watch/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/gulp-watch/node_modules/object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -8640,6 +8866,12 @@
"node": ">= 0.10"
}
},
+ "node_modules/has-require": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.1.0.tgz",
+ "integrity": "sha512-7PdkTPmNxFPiyFtQlW+B8mXIqO/fPmVpmqXdWoXVbwWQNVZE7NHfRoDff7ZkhuxitzNTjI9WTtDTrAGPEhRUag==",
+ "dev": true
+ },
"node_modules/has-symbols": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
@@ -8724,6 +8956,53 @@
"node": ">=0.10.0"
}
},
+ "node_modules/hash-base": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/hash-base/node_modules/readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/hash-base/node_modules/string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.2.0"
+ }
+ },
+ "node_modules/hash.js": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.1"
+ }
+ },
"node_modules/hawk": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
@@ -8741,6 +9020,17 @@
"node": ">=0.8.0"
}
},
+ "node_modules/hmac-drbg": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+ "dev": true,
+ "dependencies": {
+ "hash.js": "^1.0.3",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
"node_modules/hoek": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
@@ -9054,7 +9344,7 @@
"node_modules/inline-source-map": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
- "integrity": "sha1-pSi1FOaJ/OkNswiehw2S9Sestes=",
+ "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
"dev": true,
"dependencies": {
"source-map": "~0.3.0"
@@ -9063,7 +9353,7 @@
"node_modules/inline-source-map/node_modules/source-map": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
- "integrity": "sha1-hYb7mloAXltQHiHNGLbyG0V60fk=",
+ "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -9073,44 +9363,116 @@
}
},
"node_modules/insert-module-globals": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz",
- "integrity": "sha1-7orrne4WgZ4zqhRYilWIJK8MFdw=",
+ "version": "6.6.3",
+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+ "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
"dev": true,
"dependencies": {
+ "combine-source-map": "~0.6.1",
"concat-stream": "~1.4.1",
- "JSONStream": "~0.7.1",
- "lexical-scope": "~1.1.0",
- "process": "~0.6.0",
- "through": "~2.3.4",
- "xtend": "^3.0.0"
+ "is-buffer": "^1.1.0",
+ "JSONStream": "^1.0.3",
+ "lexical-scope": "^1.2.0",
+ "process": "~0.11.0",
+ "through2": "^1.0.0",
+ "xtend": "^4.0.0"
},
"bin": {
"insert-module-globals": "bin/cmd.js"
}
},
+ "node_modules/insert-module-globals/node_modules/combine-source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+ "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
+ "dev": true,
+ "dependencies": {
+ "convert-source-map": "~1.1.0",
+ "inline-source-map": "~0.5.0",
+ "lodash.memoize": "~3.0.3",
+ "source-map": "~0.4.2"
+ }
+ },
+ "node_modules/insert-module-globals/node_modules/convert-source-map": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
+ "dev": true
+ },
+ "node_modules/insert-module-globals/node_modules/inline-source-map": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
+ "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
+ "dev": true,
+ "dependencies": {
+ "source-map": "~0.4.0"
+ }
+ },
+ "node_modules/insert-module-globals/node_modules/jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+ "dev": true,
+ "engines": [
+ "node >= 0.2.0"
+ ]
+ },
"node_modules/insert-module-globals/node_modules/JSONStream": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
- "integrity": "sha1-c0KQ5BUR7qfCz+FR+/mlY6l7l4Y=",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"dependencies": {
- "jsonparse": "0.0.5",
+ "jsonparse": "^1.2.0",
"through": ">=2.2.7 <3"
},
+ "bin": {
+ "JSONStream": "bin.js"
+ },
"engines": {
"node": "*"
}
},
"node_modules/insert-module-globals/node_modules/process": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz",
- "integrity": "sha1-fdm+gP+q7dTLYo8YJ/HLq23AkY8=",
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
"dev": true,
"engines": {
"node": ">= 0.6.0"
}
},
+ "node_modules/insert-module-globals/node_modules/source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+ "dev": true,
+ "dependencies": {
+ "amdefine": ">=0.0.4"
+ },
+ "engines": {
+ "node": ">=0.8.0"
+ }
+ },
+ "node_modules/insert-module-globals/node_modules/through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "node_modules/insert-module-globals/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
+ },
"node_modules/interpret": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
@@ -9183,9 +9545,9 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"node_modules/is-core-module": {
- "version": "2.8.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
- "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+ "version": "2.13.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+ "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
"dev": true,
"dependencies": {
"has": "^1.0.3"
@@ -9206,6 +9568,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-defined": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-defined/-/is-defined-1.0.0.tgz",
+ "integrity": "sha512-/drGiPCBGsJDhtnLkdcNl8QtEo9ddV10m0Y7wzkopIQM4u91wXhe84pZSH6RLukO2uJDtQoaAr1XoP0ilwsYzg==",
+ "dev": true
+ },
"node_modules/is-descriptor": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -9742,6 +10110,15 @@
"node": "*"
}
},
+ "node_modules/json-stable-stringify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+ "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+ "dev": true,
+ "dependencies": {
+ "jsonify": "~0.0.0"
+ }
+ },
"node_modules/json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -9767,6 +10144,15 @@
"node": "*"
}
},
+ "node_modules/jsonify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/jsonparse": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
@@ -9821,6 +10207,23 @@
"node": ">=0.10.0"
}
},
+ "node_modules/labeled-stream-splicer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+ "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
+ "dev": true,
+ "dependencies": {
+ "inherits": "^2.0.1",
+ "isarray": "~0.0.1",
+ "stream-splicer": "^1.1.0"
+ }
+ },
+ "node_modules/labeled-stream-splicer/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
"node_modules/last-run": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -9942,9 +10345,9 @@
}
},
"node_modules/lexical-scope": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.1.tgz",
- "integrity": "sha1-3rrBBnQ18TWdkPz9npS8su5Hsr8=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+ "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
"dev": true,
"dependencies": {
"astw": "^2.0.0"
@@ -10762,6 +11165,12 @@
"lodash.isobject": "~2.4.1"
}
},
+ "node_modules/lodash.memoize": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
+ "dev": true
+ },
"node_modules/lodash.noop": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
@@ -11380,6 +11789,17 @@
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
},
+ "node_modules/md5.js": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+ "dev": true,
+ "dependencies": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
"node_modules/media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -11410,12 +11830,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/meow/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/meow/node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -11468,6 +11882,25 @@
"node": ">=0.10.0"
}
},
+ "node_modules/miller-rabin": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.0.0",
+ "brorand": "^1.0.1"
+ },
+ "bin": {
+ "miller-rabin": "bin/miller-rabin"
+ }
+ },
+ "node_modules/miller-rabin/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
"node_modules/mime": {
"version": "1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
@@ -11494,6 +11927,18 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+ "dev": true
+ },
+ "node_modules/minimalistic-crypto-utils": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+ "dev": true
+ },
"node_modules/minimatch": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
@@ -11509,10 +11954,13 @@
}
},
"node_modules/minimist": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
- "dev": true
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/mixin-deep": {
"version": "1.3.2",
@@ -11572,12 +12020,6 @@
"mkdirp": "bin/cmd.js"
}
},
- "node_modules/mkdirp/node_modules/minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"node_modules/mocha": {
"version": "2.5.3",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
@@ -11662,24 +12104,25 @@
}
},
"node_modules/module-deps": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-2.1.5.tgz",
- "integrity": "sha1-N1qbyATM1kzrs8Yu5kN1Xws8zyk=",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+ "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
"dev": true,
"dependencies": {
- "browser-resolve": "~1.2.4",
+ "browser-resolve": "^1.7.0",
"concat-stream": "~1.4.5",
- "detective": "~3.1.0",
+ "defined": "^1.0.0",
+ "detective": "^4.0.0",
"duplexer2": "0.0.2",
- "inherits": "~2.0.1",
- "JSONStream": "~0.7.1",
- "minimist": "~0.0.9",
- "parents": "0.0.2",
- "readable-stream": "^1.0.27-1",
- "resolve": "~0.6.3",
- "stream-combiner": "~0.1.0",
- "subarg": "0.0.1",
- "through2": "~0.4.1"
+ "inherits": "^2.0.1",
+ "JSONStream": "^1.0.3",
+ "parents": "^1.0.0",
+ "readable-stream": "^1.1.13",
+ "resolve": "^1.1.3",
+ "stream-combiner2": "~1.0.0",
+ "subarg": "^1.0.0",
+ "through2": "^1.0.0",
+ "xtend": "^4.0.0"
},
"bin": {
"module-deps": "bin/cmd.js"
@@ -11688,129 +12131,90 @@
"node": ">= 0.6"
}
},
- "node_modules/module-deps/node_modules/browser-resolve": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
- "integrity": "sha1-Wa54IKgpVezTL1+3xGisIcRyOAY=",
+ "node_modules/module-deps/node_modules/defined": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
"dev": true,
- "dependencies": {
- "resolve": "0.6.3"
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/module-deps/node_modules/detective": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz",
- "integrity": "sha1-d3gkRKt1K4jKG+Lp0KA5Xx2iXu0=",
+ "node_modules/module-deps/node_modules/jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
"dev": true,
- "dependencies": {
- "escodegen": "~1.1.0",
- "esprima-fb": "3001.1.0-dev-harmony-fb"
- }
+ "engines": [
+ "node >= 0.2.0"
+ ]
},
- "node_modules/module-deps/node_modules/escodegen": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
- "integrity": "sha1-xmOSP24gqtSNDA+knzHG1PSTYM8=",
+ "node_modules/module-deps/node_modules/JSONStream": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"dependencies": {
- "esprima": "~1.0.4",
- "estraverse": "~1.5.0",
- "esutils": "~1.0.0"
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
},
"bin": {
- "escodegen": "bin/escodegen.js",
- "esgenerate": "bin/esgenerate.js"
+ "JSONStream": "bin.js"
},
"engines": {
- "node": ">=0.4.0"
- },
- "optionalDependencies": {
- "source-map": "~0.1.30"
+ "node": "*"
}
},
- "node_modules/module-deps/node_modules/isarray": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
- "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
- "dev": true
- },
- "node_modules/module-deps/node_modules/JSONStream": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
- "integrity": "sha1-c0KQ5BUR7qfCz+FR+/mlY6l7l4Y=",
+ "node_modules/module-deps/node_modules/parents": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
"dev": true,
"dependencies": {
- "jsonparse": "0.0.5",
- "through": ">=2.2.7 <3"
- },
- "engines": {
- "node": "*"
+ "path-platform": "~0.11.15"
}
},
- "node_modules/module-deps/node_modules/object-keys": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
- "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
- "dev": true
- },
- "node_modules/module-deps/node_modules/parents": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.2.tgz",
- "integrity": "sha1-ZxR4JuSX1AdZqvW6TJllm2A00wI=",
- "dev": true
- },
- "node_modules/module-deps/node_modules/readable-stream": {
- "version": "1.0.34",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
- "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "node_modules/module-deps/node_modules/path-platform": {
+ "version": "0.11.15",
+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
"dev": true,
- "dependencies": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
- "isarray": "0.0.1",
- "string_decoder": "~0.10.x"
+ "engines": {
+ "node": ">= 0.8.0"
}
},
"node_modules/module-deps/node_modules/resolve": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
- "integrity": "sha1-3ZV5gufnNt699TtYpN2RdUV13UY=",
- "dev": true
- },
- "node_modules/module-deps/node_modules/stream-combiner": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz",
- "integrity": "sha1-DcOJo8ID+PTVY2j5Xd5S65Jptb4=",
+ "version": "1.22.4",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+ "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
"dev": true,
"dependencies": {
- "duplexer": "~0.1.1",
- "through": "~2.3.4"
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/module-deps/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/module-deps/node_modules/through2": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
- "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
"dev": true,
"dependencies": {
- "readable-stream": "~1.0.17",
- "xtend": "~2.1.1"
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
}
},
"node_modules/module-deps/node_modules/xtend": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
- "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true,
- "dependencies": {
- "object-keys": "~0.4.0"
- },
"engines": {
"node": ">=0.4"
}
@@ -12386,6 +12790,19 @@
"path-platform": "^0.0.1"
}
},
+ "node_modules/parse-asn1": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+ "dev": true,
+ "dependencies": {
+ "asn1.js": "^5.2.0",
+ "browserify-aes": "^1.0.0",
+ "evp_bytestokey": "^1.0.0",
+ "pbkdf2": "^3.0.3",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"node_modules/parse-filepath": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -12473,6 +12890,15 @@
"node": ">=0.10.0"
}
},
+ "node_modules/patch-text": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/patch-text/-/patch-text-1.0.2.tgz",
+ "integrity": "sha512-r1P+pfiTgWrsMOk/aW64RGv0oLjdyP0LeaLv2dF+iUfaVLqicXRi2dkjGYDgQ/kHVYm4z4GEHnx36Q6uqiFNlA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/path-browserify": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -12577,6 +13003,22 @@
"through": "~2.3"
}
},
+ "node_modules/pbkdf2": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+ "dev": true,
+ "dependencies": {
+ "create-hash": "^1.1.2",
+ "create-hmac": "^1.1.4",
+ "ripemd160": "^2.0.1",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
"node_modules/picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -12735,6 +13177,26 @@
"dev": true,
"optional": true
},
+ "node_modules/public-encrypt": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+ "dev": true,
+ "dependencies": {
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "node_modules/public-encrypt/node_modules/bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ },
"node_modules/pump": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
@@ -13452,12 +13914,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/quote-stream/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/quote-stream/node_modules/through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -13509,6 +13965,25 @@
"node": ">=0.10.0"
}
},
+ "node_modules/randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "node_modules/randomfill": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+ "dev": true,
+ "dependencies": {
+ "randombytes": "^2.0.5",
+ "safe-buffer": "^5.1.0"
+ }
+ },
"node_modules/raw-body": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz",
@@ -13606,11 +14081,14 @@
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
- "node_modules/readable-stream/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
+ "node_modules/readable-wrap": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
+ "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "^1.1.13-1"
+ }
},
"node_modules/readdirp": {
"version": "1.4.0",
@@ -13659,11 +14137,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/readdirp/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
- },
"node_modules/rechoir": {
"version": "0.6.2",
"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -13846,27 +14319,6 @@
"esprima-fb": "3001.1.0-dev-harmony-fb"
}
},
- "node_modules/rename-function-calls/node_modules/escodegen": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
- "integrity": "sha1-xmOSP24gqtSNDA+knzHG1PSTYM8=",
- "dev": true,
- "dependencies": {
- "esprima": "~1.0.4",
- "estraverse": "~1.5.0",
- "esutils": "~1.0.0"
- },
- "bin": {
- "escodegen": "bin/escodegen.js",
- "esgenerate": "bin/esgenerate.js"
- },
- "engines": {
- "node": ">=0.4.0"
- },
- "optionalDependencies": {
- "source-map": "~0.1.30"
- }
- },
"node_modules/repeat-element": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
@@ -13918,6 +14370,39 @@
"node": ">= 0.10"
}
},
+ "node_modules/replace-requires": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/replace-requires/-/replace-requires-1.0.4.tgz",
+ "integrity": "sha512-9PpQ4IWrhJ+waLnakqT26sOIFW8SPTWZ/aEmz35Pq1V1k1A352nYDTkbhznTGUmYS2MsC0ULJ+2vChstBTxKRw==",
+ "dev": true,
+ "dependencies": {
+ "detective": "^4.5.0",
+ "has-require": "~1.2.1",
+ "patch-text": "~1.0.2",
+ "xtend": "~4.0.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/replace-requires/node_modules/has-require": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz",
+ "integrity": "sha512-JHMVoV2TG3LEFw/8UjxXJzCRGdOHJzzAXft7BafERh2rdPYZcS5N6Twv7Q8yLy9mciKsVBkXmpWSuLp5GUXNng==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^1.0.3"
+ }
+ },
+ "node_modules/replace-requires/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
+ },
"node_modules/request": {
"version": "2.40.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
@@ -14056,10 +14541,14 @@
}
},
"node_modules/ripemd160": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
- "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
- "dev": true
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+ "dev": true,
+ "dependencies": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
+ }
},
"node_modules/ruglify": {
"version": "1.0.0",
@@ -14122,6 +14611,12 @@
"ret": "~0.1.10"
}
},
+ "node_modules/safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+ "dev": true
+ },
"node_modules/seedrandom": {
"version": "2.3.11",
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.3.11.tgz",
@@ -14419,40 +14914,34 @@
"dev": true
},
"node_modules/sha.js": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.1.6.tgz",
- "integrity": "sha1-IObrgfPmbwgd34TdjwRkvqbAL9Q=",
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"dependencies": {
- "buffer": "~2.3.2"
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
},
"bin": {
"sha.js": "bin.js"
}
},
- "node_modules/sha.js/node_modules/buffer": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz",
- "integrity": "sha1-fkr1ojwV4T/L/VxaHsl0y2Fmikw=",
- "deprecated": "This version of 'buffer' is out-of-date. You must update to v2.8.3 or newer",
- "dev": true,
- "dependencies": {
- "base64-js": "~0.0.4",
- "ieee754": "~1.1.1"
- }
- },
- "node_modules/sha.js/node_modules/ieee754": {
- "version": "1.1.13",
- "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
- "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
- "dev": true
- },
"node_modules/shallow-copy": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz",
"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
"dev": true
},
+ "node_modules/shasum": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+ "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+ "dev": true,
+ "dependencies": {
+ "json-stable-stringify": "~0.0.0",
+ "sha.js": "~2.4.4"
+ }
+ },
"node_modules/shell-quote": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
@@ -14939,12 +15428,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "node_modules/static-module/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/static-module/node_modules/through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -14995,26 +15478,102 @@
"duplexer": "~0.1.1"
}
},
- "node_modules/stream-exhaust": {
+ "node_modules/stream-combiner2": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
- "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
- "dev": true
- },
- "node_modules/stream-shift": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
- "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
- "dev": true
+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+ "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
+ "dev": true,
+ "dependencies": {
+ "duplexer2": "~0.0.2",
+ "through2": "~0.5.1"
+ }
},
- "node_modules/string_decoder": {
+ "node_modules/stream-combiner2/node_modules/isarray": {
"version": "0.0.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz",
- "integrity": "sha1-9UctCo0WUOyCN1LSTm/WJ7Ob8UE=",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
"dev": true
},
- "node_modules/string-template": {
- "version": "0.2.1",
+ "node_modules/stream-combiner2/node_modules/readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "node_modules/stream-combiner2/node_modules/through2": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+ "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": "~1.0.17",
+ "xtend": "~3.0.0"
+ }
+ },
+ "node_modules/stream-exhaust": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+ "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+ "dev": true
+ },
+ "node_modules/stream-shift": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+ "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+ "dev": true
+ },
+ "node_modules/stream-splicer": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+ "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
+ "dev": true,
+ "dependencies": {
+ "indexof": "0.0.1",
+ "inherits": "^2.0.1",
+ "isarray": "~0.0.1",
+ "readable-stream": "^1.1.13-1",
+ "readable-wrap": "^1.0.0",
+ "through2": "^1.0.0"
+ }
+ },
+ "node_modules/stream-splicer/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "node_modules/stream-splicer/node_modules/through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "dependencies": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "node_modules/stream-splicer/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
+ }
+ },
+ "node_modules/string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+ },
+ "node_modules/string-template": {
+ "version": "0.2.1",
"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
"integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
"dev": true
@@ -15125,12 +15684,12 @@
}
},
"node_modules/subarg": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
- "integrity": "sha1-PVawfaz7xFu7Y/dnK0O2PkY2jjo=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
"dev": true,
"dependencies": {
- "minimist": "~0.0.7"
+ "minimist": "^1.1.0"
}
},
"node_modules/supports-color": {
@@ -15176,6 +15735,12 @@
"acorn-node": "^1.2.0"
}
},
+ "node_modules/ternary": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/ternary/-/ternary-1.0.0.tgz",
+ "integrity": "sha512-/e+OUAGiEqytNLXnDfFkuel0N0y9IGkmvuGIPkirI+zv0dx/jPvUZ2l8qV6KYk8lmmLrAqk4iLJtRduUA6AUKw==",
+ "dev": true
+ },
"node_modules/ternary-stream": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-1.2.3.tgz",
@@ -15290,12 +15855,6 @@
"string_decoder": "~0.10.x"
}
},
- "node_modules/through2/node_modules/string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"node_modules/through2/node_modules/xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -15605,7 +16164,7 @@
"node_modules/transformify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/transformify/-/transformify-0.1.2.tgz",
- "integrity": "sha1-mk9CoVRDPdcnuAV1Qoo8nlSJ6/E=",
+ "integrity": "sha512-BUZAqCslm5pVXExA8PfXcvp7exsUNqRcNzx+KXj3Bv0oMROqnAt4bvs9U8Z2wVPa40NvLWJ/oswN0kreNFxBUg==",
"dev": true,
"dependencies": {
"readable-stream": "~1.1.9"
@@ -16319,74 +16878,468 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/vow-fs/node_modules/minimatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "node_modules/vow-fs/node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/vow-queue": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
+ "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
+ "dev": true,
+ "dependencies": {
+ "vow": "^0.4.17"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/walk-sync": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.1.tgz",
+ "integrity": "sha1-VYoWrqyMDbWcAotzxm85doTs5GU=",
+ "dev": true,
+ "dependencies": {
+ "ensure-posix-path": "^1.0.0",
+ "matcher-collection": "^1.0.0"
+ }
+ },
+ "node_modules/watchify": {
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/watchify/-/watchify-0.10.2.tgz",
+ "integrity": "sha1-Y8nwtaaK1zNlx0OIDBkWNhDY6sM=",
+ "dev": true,
+ "dependencies": {
+ "browserify": "4.x",
+ "chokidar": "^0.8.1",
+ "optimist": "~0.5.0",
+ "shallow-copy": "0.0.1",
+ "through": "~2.3.4"
+ },
+ "bin": {
+ "watchify": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/browser-pack": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz",
+ "integrity": "sha512-wa2mYzXIk+0MC5N8xDA3sFUiyJx3GyK2ry1fyMSW2ON4XHDUz+YJTYSLAXFrSl6k/JDbfNBwaG8kuELQghAQRQ==",
+ "dev": true,
+ "dependencies": {
+ "combine-source-map": "~0.3.0",
+ "JSONStream": "~0.6.4",
+ "through": "~2.3.4"
+ },
+ "bin": {
+ "browser-pack": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/browser-pack/node_modules/JSONStream": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
+ "integrity": "sha512-ER8YVJ+Xk4a1g+d8Xq9RFe2rjsUHV9eSRqfwe9DS5J5ga8bKWx4FwXZNWXpGDYchuOfqf4NFmDlwuloqHIj/5A==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "0.0.5",
+ "through": "~2.2.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/watchify/node_modules/browser-pack/node_modules/JSONStream/node_modules/through": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/browserify": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-4.2.3.tgz",
+ "integrity": "sha512-94P3zDGuqOhNvPSeHLvdeNIA5GY7BAcZG0DB1RoxH++UQPiaucZN68WoKaVx95QK6KUeKBKhqkeBRvOTVdX4Fw==",
+ "dev": true,
+ "dependencies": {
+ "assert": "~1.1.0",
+ "browser-pack": "~2.0.0",
+ "browser-resolve": "^1.3.0",
+ "browserify-zlib": "~0.1.2",
+ "buffer": "^2.3.0",
+ "builtins": "~0.0.3",
+ "commondir": "0.0.1",
+ "concat-stream": "~1.4.1",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "~0.0.1",
+ "crypto-browserify": "^2.1.8",
+ "deep-equal": "~0.2.1",
+ "defined": "~0.0.0",
+ "deps-sort": "~0.1.1",
+ "derequire": "~0.8.0",
+ "domain-browser": "~1.1.0",
+ "duplexer": "~0.1.1",
+ "events": "~1.0.0",
+ "glob": "~3.2.8",
+ "http-browserify": "^1.4.0",
+ "https-browserify": "~0.0.0",
+ "inherits": "~2.0.1",
+ "insert-module-globals": "~6.0.0",
+ "JSONStream": "~0.8.3",
+ "module-deps": "~2.1.1",
+ "os-browserify": "~0.1.1",
+ "parents": "~0.0.1",
+ "path-browserify": "~0.0.0",
+ "process": "^0.7.0",
+ "punycode": "~1.2.3",
+ "querystring-es3": "~0.2.0",
+ "readable-stream": "^1.0.27-1",
+ "resolve": "~0.7.1",
+ "shallow-copy": "0.0.1",
+ "shell-quote": "~0.0.1",
+ "stream-browserify": "^1.0.0",
+ "stream-combiner": "~0.0.2",
+ "string_decoder": "~0.0.0",
+ "subarg": "0.0.1",
+ "syntax-error": "^1.1.1",
+ "through2": "^1.0.0",
+ "timers-browserify": "^1.0.1",
+ "tty-browserify": "~0.0.0",
+ "umd": "~2.1.0",
+ "url": "~0.10.1",
+ "util": "~0.10.1",
+ "vm-browserify": "~0.0.1",
+ "xtend": "^3.0.0"
+ },
+ "bin": {
+ "browserify": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/buffer": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz",
+ "integrity": "sha512-MNqufiw8CQ3yoNU7qRiccXWFd4NlelGBNTJYbauYlOCj+0SEJOIsvvrlhSopsoW0FxZAAq4yXO53I/VREIaGKQ==",
+ "deprecated": "This version of 'buffer' is out-of-date. You must update to v2.8.3 or newer",
+ "dev": true,
+ "dependencies": {
+ "base64-js": "~0.0.4",
+ "ieee754": "~1.1.1"
+ }
+ },
+ "node_modules/watchify/node_modules/chokidar": {
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.4.tgz",
+ "integrity": "sha1-OytQZoFwhlNLqBoJK9z0viW4vuA=",
+ "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+ "dev": true,
+ "optionalDependencies": {
+ "fsevents": "pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
+ "recursive-readdir": "0.0.2"
+ }
+ },
+ "node_modules/watchify/node_modules/crypto-browserify": {
+ "version": "2.1.10",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.10.tgz",
+ "integrity": "sha512-2HfNnWhgjFE76P5+Pvq4n7gQwYibHbqffxT48YK399+p1T05drxZBI/vetsVe3mShsYtw7NT0KPfhD7ketN63g==",
+ "dev": true,
+ "dependencies": {
+ "ripemd160": "0.2.0",
+ "sha.js": "2.1.6"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/watchify/node_modules/deps-sort": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz",
+ "integrity": "sha512-bF5sJp2YeGQAx+vI3KBQwn6wHHyuCcsrPS0qvqnNLgGF1NrjhdvopP3exfdLLKaFtS6V5K/CMjQLtzR7C3Wa6A==",
+ "dev": true,
+ "dependencies": {
+ "JSONStream": "~0.6.4",
+ "minimist": "~0.0.1",
+ "through": "~2.3.4"
+ },
+ "bin": {
+ "deps-sort": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/deps-sort/node_modules/JSONStream": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
+ "integrity": "sha512-ER8YVJ+Xk4a1g+d8Xq9RFe2rjsUHV9eSRqfwe9DS5J5ga8bKWx4FwXZNWXpGDYchuOfqf4NFmDlwuloqHIj/5A==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "0.0.5",
+ "through": "~2.2.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/watchify/node_modules/deps-sort/node_modules/JSONStream/node_modules/through": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/detective": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz",
+ "integrity": "sha512-BIvQHuiVSRMufK1OnlpeAzVqF2yXD75ZzYIx8XV4VQiJ48chF/MMYAdsz/NkulhZznwb4fAX8vyi5CUc24I2BA==",
+ "dev": true,
+ "dependencies": {
+ "escodegen": "~1.1.0",
+ "esprima-fb": "3001.1.0-dev-harmony-fb"
+ }
+ },
+ "node_modules/watchify/node_modules/ieee754": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/insert-module-globals": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz",
+ "integrity": "sha512-4enFV8Caao6e6ezxe6/2JrLjwLka7adyvyOM39Lird3Z8aOboAY+uCs/RSbwSbVVhzZF/OQMw4h/5KbOB+eo2w==",
+ "dev": true,
+ "dependencies": {
+ "concat-stream": "~1.4.1",
+ "JSONStream": "~0.7.1",
+ "lexical-scope": "~1.1.0",
+ "process": "~0.6.0",
+ "through": "~2.3.4",
+ "xtend": "^3.0.0"
+ },
+ "bin": {
+ "insert-module-globals": "bin/cmd.js"
+ }
+ },
+ "node_modules/watchify/node_modules/insert-module-globals/node_modules/JSONStream": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+ "integrity": "sha512-hVgF0Ox1AtvxJmpwzb2dOEUz2ms1J8DZVbqKUSIGSyPBPy0MuxCJsQxj8y5dadTzsjI+T4TpyyhXORPdz15m9w==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "0.0.5",
+ "through": ">=2.2.7 <3"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/watchify/node_modules/insert-module-globals/node_modules/process": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz",
+ "integrity": "sha512-wKdRDRIisD/dfTBK678QFFEwi1oI5Q8U4JCu4lJSRZn7QlTilsXXlE/JytTY5xA8bAIADkwXaU8Vt6zE8ClzVw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
+ "node_modules/watchify/node_modules/isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/lexical-scope": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.1.tgz",
+ "integrity": "sha512-g7yj6l+qIPeVUruqnF1WQ7D4naBvMMY5+1a4B8l7AbJVHGb93AdEB7nk9uVciwFo+Y+SxKW1ZmEXjTuuZEiyYQ==",
+ "dev": true,
+ "dependencies": {
+ "astw": "^2.0.0"
+ }
+ },
+ "node_modules/watchify/node_modules/minimist": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+ "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/module-deps": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-2.1.5.tgz",
+ "integrity": "sha512-5xDKabxJZpz8+NsSeSmHxr6ZUwsbrtG2zdKUOyj/9RNOKFF4HFSOnWH8ZJWbLJO1F3pDcpj6dmpvPXIiJIydBg==",
+ "dev": true,
+ "dependencies": {
+ "browser-resolve": "~1.2.4",
+ "concat-stream": "~1.4.5",
+ "detective": "~3.1.0",
+ "duplexer2": "0.0.2",
+ "inherits": "~2.0.1",
+ "JSONStream": "~0.7.1",
+ "minimist": "~0.0.9",
+ "parents": "0.0.2",
+ "readable-stream": "^1.0.27-1",
+ "resolve": "~0.6.3",
+ "stream-combiner": "~0.1.0",
+ "subarg": "0.0.1",
+ "through2": "~0.4.1"
+ },
+ "bin": {
+ "module-deps": "bin/cmd.js"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/browser-resolve": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
+ "integrity": "sha512-z8CRZZEv/MVAuJ9u9/LwzAcGswFtWbdAHh8f8ZkHgThUb88rBZbpwoxYZaQnmbAxvCoOA1gFIONrspStOhldkg==",
+ "dev": true,
+ "dependencies": {
+ "resolve": "0.6.3"
+ }
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/JSONStream": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+ "integrity": "sha512-hVgF0Ox1AtvxJmpwzb2dOEUz2ms1J8DZVbqKUSIGSyPBPy0MuxCJsQxj8y5dadTzsjI+T4TpyyhXORPdz15m9w==",
+ "dev": true,
+ "dependencies": {
+ "jsonparse": "0.0.5",
+ "through": ">=2.2.7 <3"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/resolve": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
+ "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/stream-combiner": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz",
+ "integrity": "sha512-/RD3Tuc5XWyB2zLMO1kZlSUC7Pogi64BoYPDbAHEkFJNt5RKmRmsrEU3Kpr0hNxQ1p/KlUWBeJflr5zLtmdYGw==",
+ "dev": true,
+ "dependencies": {
+ "duplexer": "~0.1.1",
+ "through": "~2.3.4"
+ }
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/module-deps/node_modules/through2": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+ "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
"dev": true,
"dependencies": {
- "brace-expansion": "^1.1.7"
- },
- "engines": {
- "node": "*"
+ "readable-stream": "~1.0.17",
+ "xtend": "~2.1.1"
}
},
- "node_modules/vow-queue": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.3.tgz",
- "integrity": "sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==",
+ "node_modules/watchify/node_modules/module-deps/node_modules/xtend": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+ "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
"dev": true,
"dependencies": {
- "vow": "^0.4.17"
+ "object-keys": "~0.4.0"
},
"engines": {
- "node": ">= 0.8.0"
+ "node": ">=0.4"
}
},
- "node_modules/walk-sync": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.1.tgz",
- "integrity": "sha1-VYoWrqyMDbWcAotzxm85doTs5GU=",
+ "node_modules/watchify/node_modules/object-keys": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+ "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/optimist": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz",
+ "integrity": "sha1-hcjBRUszFeSniUfoV7HfAzRQv7w=",
"dev": true,
"dependencies": {
- "ensure-posix-path": "^1.0.0",
- "matcher-collection": "^1.0.0"
+ "wordwrap": "~0.0.2"
}
},
- "node_modules/watchify": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/watchify/-/watchify-0.10.2.tgz",
- "integrity": "sha1-Y8nwtaaK1zNlx0OIDBkWNhDY6sM=",
+ "node_modules/watchify/node_modules/parents": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.2.tgz",
+ "integrity": "sha512-yrIRMwRkp5H3d6X9f8Pohz4wtiHnn+KTccwE5kj0Q4Tx1i3FIeZCY7avrxVPcDt6Bm+8Mv0Me6yPLbhB+QNGOg==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/ripemd160": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
+ "integrity": "sha512-JJsJ74Mw4sUDDisXGDnNNyN9xWmt5HcH6Kwvb/0m/IvTKjnLAtZfzeoLdpxk44AxQZki54oCCd+Kt0nPQ2AF2g==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/sha.js": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.1.6.tgz",
+ "integrity": "sha512-l1th5h1wxFv/nXn81ZxQWM+yafIB6F40FrQuI9N5jUsU0nYQC/vrmQQky7AR9HHCfimR060tD05V1zMUIvRsZA==",
"dev": true,
"dependencies": {
- "browserify": "4.x",
- "chokidar": "^0.8.1",
- "optimist": "~0.5.0",
- "shallow-copy": "0.0.1",
- "through": "~2.3.4"
+ "buffer": "~2.3.2"
},
"bin": {
- "watchify": "bin/cmd.js"
+ "sha.js": "bin.js"
}
},
- "node_modules/watchify/node_modules/chokidar": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.4.tgz",
- "integrity": "sha1-OytQZoFwhlNLqBoJK9z0viW4vuA=",
- "deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
+ "node_modules/watchify/node_modules/string_decoder": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz",
+ "integrity": "sha512-nWi0z/o2vMFV7SJoJDEGqCUPfcpdC/hzCNnbHWhzt6SenBdJ3vVK0aeZuqnVVQ8fPci2h2WXIL6N3O+OJHJhZA==",
+ "dev": true
+ },
+ "node_modules/watchify/node_modules/subarg": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+ "integrity": "sha512-6HUY31sAPDdNBT4Gy1c2a2mfpzRiFPMOsR9eQkqO2ZMIVL11mPzywLgsSSGYJ+UVidEfds6XEsh4RnZiDbM60A==",
"dev": true,
- "optionalDependencies": {
- "fsevents": "pipobscure/fsevents#7dcdf9fa3f8956610fd6f69f72c67bace2de7138",
- "recursive-readdir": "0.0.2"
+ "dependencies": {
+ "minimist": "~0.0.7"
}
},
- "node_modules/watchify/node_modules/optimist": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz",
- "integrity": "sha1-hcjBRUszFeSniUfoV7HfAzRQv7w=",
+ "node_modules/watchify/node_modules/through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
"dev": true,
"dependencies": {
- "wordwrap": "~0.0.2"
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "node_modules/watchify/node_modules/through2/node_modules/xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4"
}
},
"node_modules/websocket-driver": {
@@ -16669,10 +17622,19 @@
}
}
},
+ "accessory": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/accessory/-/accessory-1.0.1.tgz",
+ "integrity": "sha512-c2ny6tnpucsHYScl68BfTOQaS/dtHaEdHTZk4FGrcTTx9ryIoZ8rvyuCVqFKXjmLvuWwN96ieZ8NZF2D5rSwBQ==",
+ "dev": true,
+ "requires": {
+ "dot-parts": "~1.0.0"
+ }
+ },
"acorn": {
"version": "4.0.13",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
- "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+ "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
"dev": true
},
"acorn-node": {
@@ -16919,6 +17881,26 @@
"dev": true,
"optional": true
},
+ "asn1.js": {
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0",
+ "safer-buffer": "^2.1.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
"assert": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/assert/-/assert-1.1.2.tgz",
@@ -16961,7 +17943,7 @@
"astw": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
- "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
+ "integrity": "sha512-E/4z//dvN0lfr8zAx8hXeQ8o3nRoQaL/wqI7fAALEvh/40mnyUxfFB9MwyDHYKVDtS3cp3Pow5s96djZR5lkWw==",
"dev": true,
"requires": {
"acorn": "^4.0.3"
@@ -17145,6 +18127,12 @@
"file-uri-to-path": "1.0.0"
}
},
+ "bn.js": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
+ "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==",
+ "dev": true
+ },
"body": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
@@ -17274,12 +18262,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -17301,33 +18283,52 @@
}
}
},
+ "brorand": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+ "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==",
+ "dev": true
+ },
"browser-pack": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz",
- "integrity": "sha1-XRxSf1bFgmd0EcTbKhKGSP9r8VA=",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz",
+ "integrity": "sha512-BHla5EbbxjNyLMFUMamVjeTY+q1QwHbrYNXlWOkw71QcBqAQF7maJyNh3OI/V0d5YyNdMYD6tiPhJB9ukBo99Q==",
"dev": true,
"requires": {
"combine-source-map": "~0.3.0",
- "JSONStream": "~0.6.4",
- "through": "~2.3.4"
+ "concat-stream": "~1.4.1",
+ "defined": "~0.0.0",
+ "JSONStream": "~0.8.4",
+ "through2": "~0.5.1",
+ "umd": "^2.1.0"
},
"dependencies": {
- "JSONStream": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
- "integrity": "sha1-SyyAY/j1Enh7I3X37p22kgj6Lcs=",
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
"dev": true,
"requires": {
- "jsonparse": "0.0.5",
- "through": "~2.2.7"
- },
- "dependencies": {
- "through": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
- "integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=",
- "dev": true
- }
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "through2": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+ "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "~1.0.17",
+ "xtend": "~3.0.0"
}
}
}
@@ -17350,13 +18351,13 @@
}
},
"browserify": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/browserify/-/browserify-4.2.3.tgz",
- "integrity": "sha1-Dg2PmObfamZKosBVEg84SCRu5NA=",
+ "version": "5.13.1",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-5.13.1.tgz",
+ "integrity": "sha512-sAiNOb7ulxclpAC09rN/F4lHugBmIb7Iuqvb4OccAp7IcVQj6rwKO3b5HJ1PmGCSwYWKVhshrP7n/NglnthZqA==",
"dev": true,
"requires": {
"assert": "~1.1.0",
- "browser-pack": "~2.0.0",
+ "browser-pack": "^3.0.0",
"browser-resolve": "^1.3.0",
"browserify-zlib": "~0.1.2",
"buffer": "^2.3.0",
@@ -17365,21 +18366,22 @@
"concat-stream": "~1.4.1",
"console-browserify": "^1.1.0",
"constants-browserify": "~0.0.1",
- "crypto-browserify": "^2.1.8",
+ "crypto-browserify": "^3.0.0",
"deep-equal": "~0.2.1",
"defined": "~0.0.0",
- "deps-sort": "~0.1.1",
- "derequire": "~0.8.0",
+ "deps-sort": "^1.3.5",
"domain-browser": "~1.1.0",
- "duplexer": "~0.1.1",
+ "duplexer2": "~0.0.2",
"events": "~1.0.0",
- "glob": "~3.2.8",
+ "glob": "^4.0.5",
"http-browserify": "^1.4.0",
"https-browserify": "~0.0.0",
"inherits": "~2.0.1",
- "insert-module-globals": "~6.0.0",
+ "insert-module-globals": "^6.1.0",
+ "isarray": "0.0.1",
"JSONStream": "~0.8.3",
- "module-deps": "~2.1.1",
+ "labeled-stream-splicer": "^1.0.0",
+ "module-deps": "^3.5.0",
"os-browserify": "~0.1.1",
"parents": "~0.0.1",
"path-browserify": "~0.0.0",
@@ -17389,11 +18391,11 @@
"readable-stream": "^1.0.27-1",
"resolve": "~0.7.1",
"shallow-copy": "0.0.1",
+ "shasum": "^1.0.0",
"shell-quote": "~0.0.1",
"stream-browserify": "^1.0.0",
- "stream-combiner": "~0.0.2",
- "string_decoder": "~0.0.0",
- "subarg": "0.0.1",
+ "string_decoder": "~0.10.0",
+ "subarg": "^1.0.0",
"syntax-error": "^1.1.1",
"through2": "^1.0.0",
"timers-browserify": "^1.0.1",
@@ -17405,6 +18407,33 @@
"xtend": "^3.0.0"
},
"dependencies": {
+ "glob": {
+ "version": "4.5.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+ "integrity": "sha512-I0rTWUKSZKxPSIAIaqhSXTM/DiII6wame+rEC3cFA5Lqmr9YmdL7z6Hj9+bdWtTvoY1Su4/OiMLmb37Y7JzvJQ==",
+ "dev": true,
+ "requires": {
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^2.0.1",
+ "once": "^1.3.0"
+ }
+ },
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "minimatch": {
+ "version": "2.0.10",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+ "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^1.0.0"
+ }
+ },
"through2": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
@@ -17425,13 +18454,60 @@
}
}
},
+ "browserify-aes": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+ "dev": true,
+ "requires": {
+ "buffer-xor": "^1.0.3",
+ "cipher-base": "^1.0.0",
+ "create-hash": "^1.1.0",
+ "evp_bytestokey": "^1.0.3",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "browserify-cipher": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+ "dev": true,
+ "requires": {
+ "browserify-aes": "^1.0.4",
+ "browserify-des": "^1.0.0",
+ "evp_bytestokey": "^1.0.0"
+ }
+ },
+ "browserify-des": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "^1.0.1",
+ "des.js": "^1.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
+ "browserify-rsa": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+ "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^5.0.0",
+ "randombytes": "^2.0.1"
+ }
+ },
"browserify-shim": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.6.0.tgz",
- "integrity": "sha1-jJO5MlCmQhN89gLkMEtqgTtxBf8=",
+ "version": "3.8.12",
+ "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.8.12.tgz",
+ "integrity": "sha512-v3YxiqZRcfJNORRTkFdRyd5doDFHa7yDpdsyMaqHC8OFMSOgfG5nq6+ti/ha9X9Jt1meSrYhD+7q9O6yrGVJHg==",
"dev": true,
"requires": {
- "exposify": "~0.2.0",
+ "exposify": "~0.4.3",
"mothership": "~0.2.0",
"rename-function-calls": "~0.1.0",
"resolve": "~0.6.1",
@@ -17446,6 +18522,45 @@
}
}
},
+ "browserify-sign": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^5.1.1",
+ "browserify-rsa": "^4.0.1",
+ "create-hash": "^1.2.0",
+ "create-hmac": "^1.1.7",
+ "elliptic": "^6.5.3",
+ "inherits": "^2.0.4",
+ "parse-asn1": "^5.1.5",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.2.0"
+ }
+ }
+ }
+ },
"browserify-zlib": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
@@ -17478,6 +18593,12 @@
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
"dev": true
},
+ "buffer-xor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+ "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
+ "dev": true
+ },
"bufferstreams": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-0.0.2.tgz",
@@ -17597,6 +18718,16 @@
"readdirp": "^1.3.0"
}
},
+ "cipher-base": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
"class-utils": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -17822,7 +18953,7 @@
"combine-source-map": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz",
- "integrity": "sha1-2edPWT2c1DgHMSy12EbUUe+qnrc=",
+ "integrity": "sha512-HRKa6g9SC1xd6ifto8ay6SxvyHaaQ50/8NO1ZONXx2hsIF9t/52qXa7Eeivaf5KFOSowK7Nm8TkIL/VC4khdBA==",
"dev": true,
"requires": {
"convert-source-map": "~0.3.0",
@@ -17959,6 +19090,51 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
+ "create-ecdh": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.1.0",
+ "elliptic": "^6.5.3"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
+ "create-hash": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "^1.0.1",
+ "inherits": "^2.0.1",
+ "md5.js": "^1.3.4",
+ "ripemd160": "^2.0.1",
+ "sha.js": "^2.4.0"
+ }
+ },
+ "create-hmac": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "^1.0.3",
+ "create-hash": "^1.1.0",
+ "inherits": "^2.0.1",
+ "ripemd160": "^2.0.0",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
"cryptiles": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
@@ -17970,13 +19146,22 @@
}
},
"crypto-browserify": {
- "version": "2.1.10",
- "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.10.tgz",
- "integrity": "sha1-TyymMRhDzwh83wCOQ6TzaG725rs=",
+ "version": "3.12.0",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"dev": true,
"requires": {
- "ripemd160": "0.2.0",
- "sha.js": "2.1.6"
+ "browserify-cipher": "^1.0.0",
+ "browserify-sign": "^4.0.0",
+ "create-ecdh": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "create-hmac": "^1.1.0",
+ "diffie-hellman": "^5.0.0",
+ "inherits": "^2.0.1",
+ "pbkdf2": "^3.0.3",
+ "public-encrypt": "^4.0.0",
+ "randombytes": "^2.0.0",
+ "randomfill": "^1.0.3"
}
},
"css-element-queries": {
@@ -18155,40 +19340,55 @@
"dev": true
},
"deps-sort": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz",
- "integrity": "sha1-2qL7YUoXyWN9gB4vVTOa43DzYRo=",
+ "version": "1.3.9",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
+ "integrity": "sha512-aEnmQuu/Hf5h8akL8QshYWzk9MVBg/JYMyNq/Lz68i69nR17tunjP6o/AC6Tn48c8ayzG6aeKs6OoFOtVCtvrQ==",
"dev": true,
"requires": {
- "JSONStream": "~0.6.4",
- "minimist": "~0.0.1",
- "through": "~2.3.4"
+ "JSONStream": "^1.0.3",
+ "shasum": "^1.0.0",
+ "subarg": "^1.0.0",
+ "through2": "^1.0.0"
},
"dependencies": {
+ "jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+ "dev": true
+ },
"JSONStream": {
- "version": "0.6.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
- "integrity": "sha1-SyyAY/j1Enh7I3X37p22kgj6Lcs=",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"requires": {
- "jsonparse": "0.0.5",
- "through": "~2.2.7"
- },
- "dependencies": {
- "through": {
- "version": "2.2.7",
- "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
- "integrity": "sha1-bo4hIAGR1OtqmfbwEN9Gqhxusr0=",
- "dev": true
- }
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
+ }
+ },
+ "through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
}
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
}
}
},
"derequire": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz",
- "integrity": "sha1-wffx2izt5Ere3gRzePA/RE6cTA0=",
+ "integrity": "sha512-luNtMBeScoqdoYW+Je4ROWJZjF6TLiNtbuqC/NAvBgXMn/s5SF4AUws9/NOoDnTLu/qg5c9oNZBfwzzQftkyOw==",
"dev": true,
"requires": {
"esprima-fb": "^3001.1.0-dev-harmony-fb",
@@ -18196,6 +19396,16 @@
"estraverse": "~1.5.0"
}
},
+ "des.js": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+ "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
+ }
+ },
"destroy": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
@@ -18209,19 +19419,25 @@
"dev": true
},
"detective": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/detective/-/detective-2.3.0.tgz",
- "integrity": "sha1-IefSyoDxr5KRuP/kygmxqdvbWuM=",
+ "version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
+ "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
"dev": true,
"requires": {
- "escodegen": "0.0.15",
- "esprima": "1.0.2"
+ "acorn": "^5.2.1",
+ "defined": "^1.0.0"
},
"dependencies": {
- "esprima": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz",
- "integrity": "sha1-gDm/nOrE2dLBX2IyZPspK1UCzq8=",
+ "acorn": {
+ "version": "5.7.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+ "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+ "dev": true
+ },
+ "defined": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
"dev": true
}
}
@@ -18232,6 +19448,25 @@
"integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
"dev": true
},
+ "diffie-hellman": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.1.0",
+ "miller-rabin": "^4.0.0",
+ "randombytes": "^2.0.0"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
"dom-serializer": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
@@ -18272,6 +19507,12 @@
"domelementtype": "1"
}
},
+ "dot-parts": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dot-parts/-/dot-parts-1.0.1.tgz",
+ "integrity": "sha512-DcAuaZ2hguFLkxrAwOlvYNFb4IE6xg1Ldzqpma4/UeiT0utd8/E17z1h9mH8s+9Hwh7SeLn83LpIykh/oBBxSw==",
+ "dev": true
+ },
"duplexer": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -18364,6 +19605,29 @@
"integrity": "sha1-jJshKJjYzZ8alDZlDOe+ICyen/A=",
"dev": true
},
+ "elliptic": {
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+ "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.11.9",
+ "brorand": "^1.1.0",
+ "hash.js": "^1.0.0",
+ "hmac-drbg": "^1.0.1",
+ "inherits": "^2.0.4",
+ "minimalistic-assert": "^1.0.1",
+ "minimalistic-crypto-utils": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
@@ -18466,19 +19730,21 @@
"dev": true
},
"escodegen": {
- "version": "0.0.15",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz",
- "integrity": "sha1-/9qcsmtws098wZ8diHVlOa+1Q70=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
+ "integrity": "sha512-md+WjA8K+DJELEYe0n4XAOE0XbUYfw2rzb8T+nhZ19OnQxlh+0jMLS6d+z2oqWugIh3uYKu1+KJh6QKeoogLzg==",
"dev": true,
"requires": {
- "esprima": ">= 1.0.0",
- "source-map": ">= 0.1.2"
+ "esprima": "~1.0.4",
+ "estraverse": "~1.5.0",
+ "esutils": "~1.0.0",
+ "source-map": "~0.1.30"
}
},
"escope": {
"version": "0.0.16",
"resolved": "https://registry.npmjs.org/escope/-/escope-0.0.16.tgz",
- "integrity": "sha1-QYx6CvynIdr+ZZGT/Zhig+dGU48=",
+ "integrity": "sha512-3nipzlX/noBWi/vvQSLvifQ4lKalvX570eAVgrbK0TD0Cwlbh3EQ3OpcongoFaD7IeWIaQKsRS16Bt2epx71TQ==",
"dev": true,
"requires": {
"estraverse": ">= 0.0.2"
@@ -18505,7 +19771,7 @@
"esrefactor": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz",
- "integrity": "sha1-0UJ5WigjOauB6Ta1t6IbEb8ZexM=",
+ "integrity": "sha512-QxD1acYl9jmkDI+0xnPcwjhrwiKvfaaAZV5cVXX5uXTSp9uJ7xddqXOfnNPzWP1JoorLwj7OWF+RQOLKh7Vnjw==",
"dev": true,
"requires": {
"escope": "~0.0.13",
@@ -18516,7 +19782,7 @@
"estraverse": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz",
- "integrity": "sha1-AaCTLf7ldGhKWYr1pnw7+bZCjbI=",
+ "integrity": "sha512-21DfBCsFJGb3HZr0vEBH1Wk1tGSbbzA8I/xtSSoy/pRtupHv0OgBmObcNGXM3ec6/pOXTOOUYY9/5bfluzz0sw==",
"dev": true
}
}
@@ -18575,6 +19841,16 @@
"integrity": "sha1-dYSdz+k9EPsFfDAFWv29UdBqjiQ=",
"dev": true
},
+ "evp_bytestokey": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+ "dev": true,
+ "requires": {
+ "md5.js": "^1.3.4",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"exists-stat": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/exists-stat/-/exists-stat-1.0.0.tgz",
@@ -18613,12 +19889,15 @@
}
},
"exposify": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.2.0.tgz",
- "integrity": "sha1-R9hs4+COP/1gOTbc1eXmMRwyphI=",
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.4.3.tgz",
+ "integrity": "sha512-m88KxCqA0NNMVb0xMvpaddZ/rgzkE5H0qcdQvIXZhydk8bkK+NnoDzS6icIpiPnL5C3NGBRyc/3v0zfKoFv5tQ==",
"dev": true,
"requires": {
- "detective": "~2.3.0",
+ "globo": "~1.0.0",
+ "has-require": "~1.1.0",
+ "map-obj": "~1.0.1",
+ "replace-requires": "~1.0.1",
"through2": "~0.4.0",
"transformify": "~0.1.1"
},
@@ -18626,19 +19905,19 @@
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
- "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
"dev": true
},
"object-keys": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
- "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+ "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
"dev": true
},
"readable-stream": {
"version": "1.0.34",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
- "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -18647,16 +19926,10 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
- "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+ "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
"dev": true,
"requires": {
"readable-stream": "~1.0.17",
@@ -18666,7 +19939,7 @@
"xtend": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
- "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+ "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
"dev": true,
"requires": {
"object-keys": "~0.4.0"
@@ -19362,6 +20635,17 @@
"which": "^1.2.14"
}
},
+ "globo": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/globo/-/globo-1.0.2.tgz",
+ "integrity": "sha512-qGhegigP96gvoCqmjDrHLdMmvDjqcFHK3Y4kkHRZ4pwYg2TNcNbR3gCXyASPDTj0YAyin2WpyZK74mXJz9DE3Q==",
+ "dev": true,
+ "requires": {
+ "accessory": "~1.0.0",
+ "is-defined": "~1.0.0",
+ "ternary": "~1.0.0"
+ }
+ },
"globule": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
@@ -20260,12 +21544,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -20290,12 +21568,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -20552,12 +21824,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -21027,12 +22293,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -21057,12 +22317,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -21303,12 +22557,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -21333,12 +22581,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -21564,12 +22806,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -21801,12 +23037,6 @@
"sigmund": "~1.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -22082,12 +23312,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -22112,12 +23336,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -22298,12 +23516,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -22609,12 +23821,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -22848,12 +24054,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -22958,12 +24158,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
@@ -23029,12 +24223,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"strip-ansi": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
@@ -23096,12 +24284,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -23277,12 +24459,6 @@
"lodash.escape": "^3.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -23495,12 +24671,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
@@ -23706,12 +24876,6 @@
"sigmund": "~1.0.0"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
@@ -23833,6 +24997,12 @@
"sparkles": "^1.0.0"
}
},
+ "has-require": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.1.0.tgz",
+ "integrity": "sha512-7PdkTPmNxFPiyFtQlW+B8mXIqO/fPmVpmqXdWoXVbwWQNVZE7NHfRoDff7ZkhuxitzNTjI9WTtDTrAGPEhRUag==",
+ "dev": true
+ },
"has-symbols": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
@@ -23899,6 +25069,49 @@
}
}
},
+ "hash-base": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.4",
+ "readable-stream": "^3.6.0",
+ "safe-buffer": "^5.2.0"
+ },
+ "dependencies": {
+ "readable-stream": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+ "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "~5.2.0"
+ }
+ }
+ }
+ },
+ "hash.js": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "minimalistic-assert": "^1.0.1"
+ }
+ },
"hawk": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
@@ -23912,6 +25125,17 @@
"sntp": "0.2.x"
}
},
+ "hmac-drbg": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+ "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==",
+ "dev": true,
+ "requires": {
+ "hash.js": "^1.0.3",
+ "minimalistic-assert": "^1.0.0",
+ "minimalistic-crypto-utils": "^1.0.1"
+ }
+ },
"hoek": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
@@ -24167,7 +25391,7 @@
"inline-source-map": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz",
- "integrity": "sha1-pSi1FOaJ/OkNswiehw2S9Sestes=",
+ "integrity": "sha512-RNlldBXZ7BBcVm3HjXIXiwKxih1lnuKbzeLBRDSB/qaqk8/g4JEZBjxpBQMhqEthQyGv7ycu8r/8PKGgBdIqrA==",
"dev": true,
"requires": {
"source-map": "~0.3.0"
@@ -24176,7 +25400,7 @@
"source-map": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz",
- "integrity": "sha1-hYb7mloAXltQHiHNGLbyG0V60fk=",
+ "integrity": "sha512-jz8leTIGS8+qJywWiO9mKza0hJxexdeIYXhDHw9avTQcXSNAGk3hiiRMpmI2Qf9dOrZDrDpgH9VNefzuacWC9A==",
"dev": true,
"requires": {
"amdefine": ">=0.0.4"
@@ -24185,33 +25409,93 @@
}
},
"insert-module-globals": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz",
- "integrity": "sha1-7orrne4WgZ4zqhRYilWIJK8MFdw=",
+ "version": "6.6.3",
+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz",
+ "integrity": "sha512-ryk8hTKUZCc300SPOOwx30WhE5oRUssPDVlIoO8vtoMNBy5HGeesVRl3HF7ra4ll42T0IdnwD9XR9svh6+RRhg==",
"dev": true,
"requires": {
+ "combine-source-map": "~0.6.1",
"concat-stream": "~1.4.1",
- "JSONStream": "~0.7.1",
- "lexical-scope": "~1.1.0",
- "process": "~0.6.0",
- "through": "~2.3.4",
- "xtend": "^3.0.0"
+ "is-buffer": "^1.1.0",
+ "JSONStream": "^1.0.3",
+ "lexical-scope": "^1.2.0",
+ "process": "~0.11.0",
+ "through2": "^1.0.0",
+ "xtend": "^4.0.0"
},
"dependencies": {
+ "combine-source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz",
+ "integrity": "sha512-XKRNtuZRlVDTuSGKsfZpXYz80y0XDbYS4a+FzafTgmYHy/ckruFBx7Nd6WaQnFHVI3O6IseWVdXUvZutMpjSkQ==",
+ "dev": true,
+ "requires": {
+ "convert-source-map": "~1.1.0",
+ "inline-source-map": "~0.5.0",
+ "lodash.memoize": "~3.0.3",
+ "source-map": "~0.4.2"
+ }
+ },
+ "convert-source-map": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+ "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==",
+ "dev": true
+ },
+ "inline-source-map": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz",
+ "integrity": "sha512-2WtHG0qX9OH9TVcxsLVfq3Tzr+qtL6PtWgoh0XAAKe4KkdA/57Q+OGJuRJHA4mZ2OZnkJ/ZAaXf9krLB12/nIg==",
+ "dev": true,
+ "requires": {
+ "source-map": "~0.4.0"
+ }
+ },
+ "jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
+ "dev": true
+ },
"JSONStream": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
- "integrity": "sha1-c0KQ5BUR7qfCz+FR+/mlY6l7l4Y=",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"requires": {
- "jsonparse": "0.0.5",
+ "jsonparse": "^1.2.0",
"through": ">=2.2.7 <3"
}
},
"process": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz",
- "integrity": "sha1-fdm+gP+q7dTLYo8YJ/HLq23AkY8=",
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
+ "dev": true,
+ "requires": {
+ "amdefine": ">=0.0.4"
+ }
+ },
+ "through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
"dev": true
}
}
@@ -24273,9 +25557,9 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"is-core-module": {
- "version": "2.8.1",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz",
- "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+ "version": "2.13.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+ "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
"dev": true,
"requires": {
"has": "^1.0.3"
@@ -24290,6 +25574,12 @@
"kind-of": "^3.0.2"
}
},
+ "is-defined": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-defined/-/is-defined-1.0.0.tgz",
+ "integrity": "sha512-/drGiPCBGsJDhtnLkdcNl8QtEo9ddV10m0Y7wzkopIQM4u91wXhe84pZSH6RLukO2uJDtQoaAr1XoP0ilwsYzg==",
+ "dev": true
+ },
"is-descriptor": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -24687,6 +25977,15 @@
}
}
},
+ "json-stable-stringify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+ "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==",
+ "dev": true,
+ "requires": {
+ "jsonify": "~0.0.0"
+ }
+ },
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -24706,6 +26005,12 @@
"integrity": "sha1-ttcDXHDEVw+IPH7cdZ3jrgPbM0M=",
"dev": true
},
+ "jsonify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+ "dev": true
+ },
"jsonparse": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
@@ -24745,6 +26050,25 @@
"is-buffer": "^1.1.5"
}
},
+ "labeled-stream-splicer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz",
+ "integrity": "sha512-3KBjPRnXrYC5h2jEf/d6hO7Lcl+38QzRVTOyHA2sFzZVMYwsUFuejlrOMwAjmz13hVBr9ruDS1RwE4YEz8P58w==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.1",
+ "isarray": "~0.0.1",
+ "stream-splicer": "^1.1.0"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ }
+ }
+ },
"last-run": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
@@ -24849,9 +26173,9 @@
}
},
"lexical-scope": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.1.tgz",
- "integrity": "sha1-3rrBBnQ18TWdkPz9npS8su5Hsr8=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+ "integrity": "sha512-ntJ8IcBCuKwudML7vAuT/L0aIMU0+9vO25K4CjLPYgzf1NZ0bAhJJBZrvkO+oUGgKcbdkH8UZdRsaEg+wULLRw==",
"dev": true,
"requires": {
"astw": "^2.0.0"
@@ -25577,6 +26901,12 @@
"lodash.isobject": "~2.4.1"
}
},
+ "lodash.memoize": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+ "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==",
+ "dev": true
+ },
"lodash.noop": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash.noop/-/lodash.noop-2.4.1.tgz",
@@ -26092,6 +27422,17 @@
"resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
"integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
},
+ "md5.js": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+ "dev": true,
+ "requires": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ }
+ },
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -26116,12 +27457,6 @@
"trim-newlines": "^1.0.0"
},
"dependencies": {
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -26169,6 +27504,24 @@
}
}
},
+ "miller-rabin": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.0.0",
+ "brorand": "^1.0.1"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
"mime": {
"version": "1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
@@ -26189,6 +27542,18 @@
"dev": true,
"optional": true
},
+ "minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+ "dev": true
+ },
+ "minimalistic-crypto-utils": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+ "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==",
+ "dev": true
+ },
"minimatch": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
@@ -26200,9 +27565,9 @@
}
},
"minimist": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
"dev": true
},
"mixin-deep": {
@@ -26248,14 +27613,6 @@
"dev": true,
"requires": {
"minimist": "^1.2.5"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- }
}
},
"mocha": {
@@ -26321,137 +27678,90 @@
}
},
"module-deps": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-2.1.5.tgz",
- "integrity": "sha1-N1qbyATM1kzrs8Yu5kN1Xws8zyk=",
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz",
+ "integrity": "sha512-EbWWlSGaCVidEsLsSzkY6l/jm0IcGDSQ8tGwtjM8joTrxqxP0om02Px9Np8D7FMZ/vZFdsOGbio+WqkKQxYuTA==",
"dev": true,
"requires": {
- "browser-resolve": "~1.2.4",
+ "browser-resolve": "^1.7.0",
"concat-stream": "~1.4.5",
- "detective": "~3.1.0",
+ "defined": "^1.0.0",
+ "detective": "^4.0.0",
"duplexer2": "0.0.2",
- "inherits": "~2.0.1",
- "JSONStream": "~0.7.1",
- "minimist": "~0.0.9",
- "parents": "0.0.2",
- "readable-stream": "^1.0.27-1",
- "resolve": "~0.6.3",
- "stream-combiner": "~0.1.0",
- "subarg": "0.0.1",
- "through2": "~0.4.1"
+ "inherits": "^2.0.1",
+ "JSONStream": "^1.0.3",
+ "parents": "^1.0.0",
+ "readable-stream": "^1.1.13",
+ "resolve": "^1.1.3",
+ "stream-combiner2": "~1.0.0",
+ "subarg": "^1.0.0",
+ "through2": "^1.0.0",
+ "xtend": "^4.0.0"
},
"dependencies": {
- "browser-resolve": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
- "integrity": "sha1-Wa54IKgpVezTL1+3xGisIcRyOAY=",
- "dev": true,
- "requires": {
- "resolve": "0.6.3"
- }
- },
- "detective": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz",
- "integrity": "sha1-d3gkRKt1K4jKG+Lp0KA5Xx2iXu0=",
- "dev": true,
- "requires": {
- "escodegen": "~1.1.0",
- "esprima-fb": "3001.1.0-dev-harmony-fb"
- }
- },
- "escodegen": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
- "integrity": "sha1-xmOSP24gqtSNDA+knzHG1PSTYM8=",
- "dev": true,
- "requires": {
- "esprima": "~1.0.4",
- "estraverse": "~1.5.0",
- "esutils": "~1.0.0",
- "source-map": "~0.1.30"
- }
+ "defined": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+ "dev": true
},
- "isarray": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
- "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "jsonparse": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
"dev": true
},
"JSONStream": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
- "integrity": "sha1-c0KQ5BUR7qfCz+FR+/mlY6l7l4Y=",
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+ "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
"dev": true,
"requires": {
- "jsonparse": "0.0.5",
+ "jsonparse": "^1.2.0",
"through": ">=2.2.7 <3"
}
},
- "object-keys": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
- "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
- "dev": true
- },
"parents": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.2.tgz",
- "integrity": "sha1-ZxR4JuSX1AdZqvW6TJllm2A00wI=",
- "dev": true
- },
- "readable-stream": {
- "version": "1.0.34",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
- "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+ "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==",
"dev": true,
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.1",
- "isarray": "0.0.1",
- "string_decoder": "~0.10.x"
+ "path-platform": "~0.11.15"
}
},
- "resolve": {
- "version": "0.6.3",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
- "integrity": "sha1-3ZV5gufnNt699TtYpN2RdUV13UY=",
+ "path-platform": {
+ "version": "0.11.15",
+ "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz",
+ "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==",
"dev": true
},
- "stream-combiner": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz",
- "integrity": "sha1-DcOJo8ID+PTVY2j5Xd5S65Jptb4=",
+ "resolve": {
+ "version": "1.22.4",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+ "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
"dev": true,
"requires": {
- "duplexer": "~0.1.1",
- "through": "~2.3.4"
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
- "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
"dev": true,
"requires": {
- "readable-stream": "~1.0.17",
- "xtend": "~2.1.1"
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
}
},
"xtend": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
- "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
- "dev": true,
- "requires": {
- "object-keys": "~0.4.0"
- }
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
}
}
},
@@ -26926,6 +28236,19 @@
"path-platform": "^0.0.1"
}
},
+ "parse-asn1": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+ "dev": true,
+ "requires": {
+ "asn1.js": "^5.2.0",
+ "browserify-aes": "^1.0.0",
+ "evp_bytestokey": "^1.0.0",
+ "pbkdf2": "^3.0.3",
+ "safe-buffer": "^5.1.1"
+ }
+ },
"parse-filepath": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -26991,6 +28314,12 @@
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
"dev": true
},
+ "patch-text": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/patch-text/-/patch-text-1.0.2.tgz",
+ "integrity": "sha512-r1P+pfiTgWrsMOk/aW64RGv0oLjdyP0LeaLv2dF+iUfaVLqicXRi2dkjGYDgQ/kHVYm4z4GEHnx36Q6uqiFNlA==",
+ "dev": true
+ },
"path-browserify": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -27079,6 +28408,19 @@
"through": "~2.3"
}
},
+ "pbkdf2": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+ "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+ "dev": true,
+ "requires": {
+ "create-hash": "^1.1.2",
+ "create-hmac": "^1.1.4",
+ "ripemd160": "^2.0.1",
+ "safe-buffer": "^5.0.1",
+ "sha.js": "^2.4.8"
+ }
+ },
"picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -27203,6 +28545,28 @@
"dev": true,
"optional": true
},
+ "public-encrypt": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+ "dev": true,
+ "requires": {
+ "bn.js": "^4.1.0",
+ "browserify-rsa": "^4.0.0",
+ "create-hash": "^1.1.0",
+ "parse-asn1": "^5.0.0",
+ "randombytes": "^2.0.1",
+ "safe-buffer": "^5.1.2"
+ },
+ "dependencies": {
+ "bn.js": {
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+ "dev": true
+ }
+ }
+ },
"pump": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
@@ -27795,12 +29159,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -27844,6 +29202,25 @@
}
}
},
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "randomfill": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+ "dev": true,
+ "requires": {
+ "randombytes": "^2.0.5",
+ "safe-buffer": "^5.1.0"
+ }
+ },
"raw-body": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.2.tgz",
@@ -27927,15 +29304,18 @@
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
- },
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
}
}
},
+ "readable-wrap": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz",
+ "integrity": "sha512-/8n0Mr10S+HGKFygQ42Z40JIXwafPH3A72pwmlNClThgsImV5LJJiCue5Je1asxwY082sYxq/+kTxH6nTn0w3g==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "^1.1.13-1"
+ }
+ },
"readdirp": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-1.4.0.tgz",
@@ -27975,11 +29355,6 @@
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
- },
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
}
}
},
@@ -28138,18 +29513,6 @@
"escodegen": "~1.1.0",
"esprima-fb": "3001.1.0-dev-harmony-fb"
}
- },
- "escodegen": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz",
- "integrity": "sha1-xmOSP24gqtSNDA+knzHG1PSTYM8=",
- "dev": true,
- "requires": {
- "esprima": "~1.0.4",
- "estraverse": "~1.5.0",
- "esutils": "~1.0.0",
- "source-map": "~0.1.30"
- }
}
}
},
@@ -28189,6 +29552,35 @@
"remove-trailing-separator": "^1.1.0"
}
},
+ "replace-requires": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/replace-requires/-/replace-requires-1.0.4.tgz",
+ "integrity": "sha512-9PpQ4IWrhJ+waLnakqT26sOIFW8SPTWZ/aEmz35Pq1V1k1A352nYDTkbhznTGUmYS2MsC0ULJ+2vChstBTxKRw==",
+ "dev": true,
+ "requires": {
+ "detective": "^4.5.0",
+ "has-require": "~1.2.1",
+ "patch-text": "~1.0.2",
+ "xtend": "~4.0.0"
+ },
+ "dependencies": {
+ "has-require": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz",
+ "integrity": "sha512-JHMVoV2TG3LEFw/8UjxXJzCRGdOHJzzAXft7BafERh2rdPYZcS5N6Twv7Q8yLy9mciKsVBkXmpWSuLp5GUXNng==",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "^1.0.3"
+ }
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
+ }
+ }
+ },
"request": {
"version": "2.40.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
@@ -28306,10 +29698,14 @@
"dev": true
},
"ripemd160": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
- "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
- "dev": true
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+ "dev": true,
+ "requires": {
+ "hash-base": "^3.0.0",
+ "inherits": "^2.0.1"
+ }
},
"ruglify": {
"version": "1.0.0",
@@ -28354,6 +29750,12 @@
"ret": "~0.1.10"
}
},
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+ "dev": true
+ },
"seedrandom": {
"version": "2.3.11",
"resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.3.11.tgz",
@@ -28601,30 +30003,13 @@
"dev": true
},
"sha.js": {
- "version": "2.1.6",
- "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.1.6.tgz",
- "integrity": "sha1-IObrgfPmbwgd34TdjwRkvqbAL9Q=",
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
"dev": true,
"requires": {
- "buffer": "~2.3.2"
- },
- "dependencies": {
- "buffer": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz",
- "integrity": "sha1-fkr1ojwV4T/L/VxaHsl0y2Fmikw=",
- "dev": true,
- "requires": {
- "base64-js": "~0.0.4",
- "ieee754": "~1.1.1"
- }
- },
- "ieee754": {
- "version": "1.1.13",
- "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
- "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
- "dev": true
- }
+ "inherits": "^2.0.1",
+ "safe-buffer": "^5.0.1"
}
},
"shallow-copy": {
@@ -28633,6 +30018,16 @@
"integrity": "sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=",
"dev": true
},
+ "shasum": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+ "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==",
+ "dev": true,
+ "requires": {
+ "json-stable-stringify": "~0.0.0",
+ "sha.js": "~2.4.4"
+ }
+ },
"shell-quote": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz",
@@ -29034,12 +30429,6 @@
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
"dev": true
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"through2": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
@@ -29086,6 +30475,46 @@
"duplexer": "~0.1.1"
}
},
+ "stream-combiner2": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz",
+ "integrity": "sha512-7DO1SfBVnyIyo9ytUjSyVojT5bp1ZY6h3pj7HUs6PwcRSd/r8mBOHbRwYC7nbHRakKzMKyNp5HWJRv4GgVherA==",
+ "dev": true,
+ "requires": {
+ "duplexer2": "~0.0.2",
+ "through2": "~0.5.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+ "dev": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "through2": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz",
+ "integrity": "sha512-zexCrAOTbjkBCXGyozn7hhS3aEaqdrc59mAD2E3dKYzV1vFuEGQ1hEDJN2oQMQFwy4he2zyLqPZV+AlfS8ZWJA==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "~1.0.17",
+ "xtend": "~3.0.0"
+ }
+ }
+ }
+ },
"stream-exhaust": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -29098,11 +30527,48 @@
"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
"dev": true
},
+ "stream-splicer": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz",
+ "integrity": "sha512-nmUMEbdm/sZYqe9dZs7mqJvTYpunsDbIWI5FiBCMc/hMVd6vwzy+ITmo7C3gcLYqrn+uQ1w+EJwooWvJ997JAA==",
+ "dev": true,
+ "requires": {
+ "indexof": "0.0.1",
+ "inherits": "^2.0.1",
+ "isarray": "~0.0.1",
+ "readable-stream": "^1.1.13-1",
+ "readable-wrap": "^1.0.0",
+ "through2": "^1.0.0"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ }
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
+ }
+ }
+ },
"string_decoder": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz",
- "integrity": "sha1-9UctCo0WUOyCN1LSTm/WJ7Ob8UE=",
- "dev": true
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
},
"string-template": {
"version": "0.2.1",
@@ -29185,12 +30651,12 @@
"dev": true
},
"subarg": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
- "integrity": "sha1-PVawfaz7xFu7Y/dnK0O2PkY2jjo=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+ "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==",
"dev": true,
"requires": {
- "minimist": "~0.0.7"
+ "minimist": "^1.1.0"
}
},
"supports-color": {
@@ -29224,6 +30690,12 @@
"acorn-node": "^1.2.0"
}
},
+ "ternary": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/ternary/-/ternary-1.0.0.tgz",
+ "integrity": "sha512-/e+OUAGiEqytNLXnDfFkuel0N0y9IGkmvuGIPkirI+zv0dx/jPvUZ2l8qV6KYk8lmmLrAqk4iLJtRduUA6AUKw==",
+ "dev": true
+ },
"ternary-stream": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-1.2.3.tgz",
@@ -29276,12 +30748,6 @@
"string_decoder": "~0.10.x"
}
},
- "string_decoder": {
- "version": "0.10.31",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
- },
"xtend": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -29602,7 +31068,7 @@
"transformify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/transformify/-/transformify-0.1.2.tgz",
- "integrity": "sha1-mk9CoVRDPdcnuAV1Qoo8nlSJ6/E=",
+ "integrity": "sha512-BUZAqCslm5pVXExA8PfXcvp7exsUNqRcNzx+KXj3Bv0oMROqnAt4bvs9U8Z2wVPa40NvLWJ/oswN0kreNFxBUg==",
"dev": true,
"requires": {
"readable-stream": "~1.1.9"
@@ -30247,6 +31713,103 @@
"through": "~2.3.4"
},
"dependencies": {
+ "browser-pack": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz",
+ "integrity": "sha512-wa2mYzXIk+0MC5N8xDA3sFUiyJx3GyK2ry1fyMSW2ON4XHDUz+YJTYSLAXFrSl6k/JDbfNBwaG8kuELQghAQRQ==",
+ "dev": true,
+ "requires": {
+ "combine-source-map": "~0.3.0",
+ "JSONStream": "~0.6.4",
+ "through": "~2.3.4"
+ },
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
+ "integrity": "sha512-ER8YVJ+Xk4a1g+d8Xq9RFe2rjsUHV9eSRqfwe9DS5J5ga8bKWx4FwXZNWXpGDYchuOfqf4NFmDlwuloqHIj/5A==",
+ "dev": true,
+ "requires": {
+ "jsonparse": "0.0.5",
+ "through": "~2.2.7"
+ },
+ "dependencies": {
+ "through": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+ "dev": true
+ }
+ }
+ }
+ }
+ },
+ "browserify": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/browserify/-/browserify-4.2.3.tgz",
+ "integrity": "sha512-94P3zDGuqOhNvPSeHLvdeNIA5GY7BAcZG0DB1RoxH++UQPiaucZN68WoKaVx95QK6KUeKBKhqkeBRvOTVdX4Fw==",
+ "dev": true,
+ "requires": {
+ "assert": "~1.1.0",
+ "browser-pack": "~2.0.0",
+ "browser-resolve": "^1.3.0",
+ "browserify-zlib": "~0.1.2",
+ "buffer": "^2.3.0",
+ "builtins": "~0.0.3",
+ "commondir": "0.0.1",
+ "concat-stream": "~1.4.1",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "~0.0.1",
+ "crypto-browserify": "^2.1.8",
+ "deep-equal": "~0.2.1",
+ "defined": "~0.0.0",
+ "deps-sort": "~0.1.1",
+ "derequire": "~0.8.0",
+ "domain-browser": "~1.1.0",
+ "duplexer": "~0.1.1",
+ "events": "~1.0.0",
+ "glob": "~3.2.8",
+ "http-browserify": "^1.4.0",
+ "https-browserify": "~0.0.0",
+ "inherits": "~2.0.1",
+ "insert-module-globals": "~6.0.0",
+ "JSONStream": "~0.8.3",
+ "module-deps": "~2.1.1",
+ "os-browserify": "~0.1.1",
+ "parents": "~0.0.1",
+ "path-browserify": "~0.0.0",
+ "process": "^0.7.0",
+ "punycode": "~1.2.3",
+ "querystring-es3": "~0.2.0",
+ "readable-stream": "^1.0.27-1",
+ "resolve": "~0.7.1",
+ "shallow-copy": "0.0.1",
+ "shell-quote": "~0.0.1",
+ "stream-browserify": "^1.0.0",
+ "stream-combiner": "~0.0.2",
+ "string_decoder": "~0.0.0",
+ "subarg": "0.0.1",
+ "syntax-error": "^1.1.1",
+ "through2": "^1.0.0",
+ "timers-browserify": "^1.0.1",
+ "tty-browserify": "~0.0.0",
+ "umd": "~2.1.0",
+ "url": "~0.10.1",
+ "util": "~0.10.1",
+ "vm-browserify": "~0.0.1",
+ "xtend": "^3.0.0"
+ }
+ },
+ "buffer": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-2.3.4.tgz",
+ "integrity": "sha512-MNqufiw8CQ3yoNU7qRiccXWFd4NlelGBNTJYbauYlOCj+0SEJOIsvvrlhSopsoW0FxZAAq4yXO53I/VREIaGKQ==",
+ "dev": true,
+ "requires": {
+ "base64-js": "~0.0.4",
+ "ieee754": "~1.1.1"
+ }
+ },
"chokidar": {
"version": "0.8.4",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-0.8.4.tgz",
@@ -30257,6 +31820,217 @@
"recursive-readdir": "0.0.2"
}
},
+ "crypto-browserify": {
+ "version": "2.1.10",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-2.1.10.tgz",
+ "integrity": "sha512-2HfNnWhgjFE76P5+Pvq4n7gQwYibHbqffxT48YK399+p1T05drxZBI/vetsVe3mShsYtw7NT0KPfhD7ketN63g==",
+ "dev": true,
+ "requires": {
+ "ripemd160": "0.2.0",
+ "sha.js": "2.1.6"
+ }
+ },
+ "deps-sort": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz",
+ "integrity": "sha512-bF5sJp2YeGQAx+vI3KBQwn6wHHyuCcsrPS0qvqnNLgGF1NrjhdvopP3exfdLLKaFtS6V5K/CMjQLtzR7C3Wa6A==",
+ "dev": true,
+ "requires": {
+ "JSONStream": "~0.6.4",
+ "minimist": "~0.0.1",
+ "through": "~2.3.4"
+ },
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.6.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz",
+ "integrity": "sha512-ER8YVJ+Xk4a1g+d8Xq9RFe2rjsUHV9eSRqfwe9DS5J5ga8bKWx4FwXZNWXpGDYchuOfqf4NFmDlwuloqHIj/5A==",
+ "dev": true,
+ "requires": {
+ "jsonparse": "0.0.5",
+ "through": "~2.2.7"
+ },
+ "dependencies": {
+ "through": {
+ "version": "2.2.7",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+ "integrity": "sha512-JIR0m0ybkmTcR8URann+HbwKmodP+OE8UCbsifQDYMLD5J3em1Cdn3MYPpbEd5elGDwmP98T+WbqP/tvzA5Mjg==",
+ "dev": true
+ }
+ }
+ }
+ }
+ },
+ "detective": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz",
+ "integrity": "sha512-BIvQHuiVSRMufK1OnlpeAzVqF2yXD75ZzYIx8XV4VQiJ48chF/MMYAdsz/NkulhZznwb4fAX8vyi5CUc24I2BA==",
+ "dev": true,
+ "requires": {
+ "escodegen": "~1.1.0",
+ "esprima-fb": "3001.1.0-dev-harmony-fb"
+ }
+ },
+ "ieee754": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+ "dev": true
+ },
+ "insert-module-globals": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.0.0.tgz",
+ "integrity": "sha512-4enFV8Caao6e6ezxe6/2JrLjwLka7adyvyOM39Lird3Z8aOboAY+uCs/RSbwSbVVhzZF/OQMw4h/5KbOB+eo2w==",
+ "dev": true,
+ "requires": {
+ "concat-stream": "~1.4.1",
+ "JSONStream": "~0.7.1",
+ "lexical-scope": "~1.1.0",
+ "process": "~0.6.0",
+ "through": "~2.3.4",
+ "xtend": "^3.0.0"
+ },
+ "dependencies": {
+ "JSONStream": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+ "integrity": "sha512-hVgF0Ox1AtvxJmpwzb2dOEUz2ms1J8DZVbqKUSIGSyPBPy0MuxCJsQxj8y5dadTzsjI+T4TpyyhXORPdz15m9w==",
+ "dev": true,
+ "requires": {
+ "jsonparse": "0.0.5",
+ "through": ">=2.2.7 <3"
+ }
+ },
+ "process": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.6.0.tgz",
+ "integrity": "sha512-wKdRDRIisD/dfTBK678QFFEwi1oI5Q8U4JCu4lJSRZn7QlTilsXXlE/JytTY5xA8bAIADkwXaU8Vt6zE8ClzVw==",
+ "dev": true
+ }
+ }
+ },
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+ "dev": true
+ },
+ "lexical-scope": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.1.tgz",
+ "integrity": "sha512-g7yj6l+qIPeVUruqnF1WQ7D4naBvMMY5+1a4B8l7AbJVHGb93AdEB7nk9uVciwFo+Y+SxKW1ZmEXjTuuZEiyYQ==",
+ "dev": true,
+ "requires": {
+ "astw": "^2.0.0"
+ }
+ },
+ "minimist": {
+ "version": "0.0.10",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+ "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==",
+ "dev": true
+ },
+ "module-deps": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-2.1.5.tgz",
+ "integrity": "sha512-5xDKabxJZpz8+NsSeSmHxr6ZUwsbrtG2zdKUOyj/9RNOKFF4HFSOnWH8ZJWbLJO1F3pDcpj6dmpvPXIiJIydBg==",
+ "dev": true,
+ "requires": {
+ "browser-resolve": "~1.2.4",
+ "concat-stream": "~1.4.5",
+ "detective": "~3.1.0",
+ "duplexer2": "0.0.2",
+ "inherits": "~2.0.1",
+ "JSONStream": "~0.7.1",
+ "minimist": "~0.0.9",
+ "parents": "0.0.2",
+ "readable-stream": "^1.0.27-1",
+ "resolve": "~0.6.3",
+ "stream-combiner": "~0.1.0",
+ "subarg": "0.0.1",
+ "through2": "~0.4.1"
+ },
+ "dependencies": {
+ "browser-resolve": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz",
+ "integrity": "sha512-z8CRZZEv/MVAuJ9u9/LwzAcGswFtWbdAHh8f8ZkHgThUb88rBZbpwoxYZaQnmbAxvCoOA1gFIONrspStOhldkg==",
+ "dev": true,
+ "requires": {
+ "resolve": "0.6.3"
+ }
+ },
+ "JSONStream": {
+ "version": "0.7.4",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz",
+ "integrity": "sha512-hVgF0Ox1AtvxJmpwzb2dOEUz2ms1J8DZVbqKUSIGSyPBPy0MuxCJsQxj8y5dadTzsjI+T4TpyyhXORPdz15m9w==",
+ "dev": true,
+ "requires": {
+ "jsonparse": "0.0.5",
+ "through": ">=2.2.7 <3"
+ }
+ },
+ "readable-stream": {
+ "version": "1.0.34",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+ "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+ "dev": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "resolve": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz",
+ "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==",
+ "dev": true
+ },
+ "stream-combiner": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.1.0.tgz",
+ "integrity": "sha512-/RD3Tuc5XWyB2zLMO1kZlSUC7Pogi64BoYPDbAHEkFJNt5RKmRmsrEU3Kpr0hNxQ1p/KlUWBeJflr5zLtmdYGw==",
+ "dev": true,
+ "requires": {
+ "duplexer": "~0.1.1",
+ "through": "~2.3.4"
+ }
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
+ "dev": true
+ },
+ "through2": {
+ "version": "0.4.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+ "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "~1.0.17",
+ "xtend": "~2.1.1"
+ }
+ },
+ "xtend": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+ "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==",
+ "dev": true,
+ "requires": {
+ "object-keys": "~0.4.0"
+ }
+ }
+ }
+ },
+ "object-keys": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+ "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==",
+ "dev": true
+ },
"optimist": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz",
@@ -30265,6 +32039,60 @@
"requires": {
"wordwrap": "~0.0.2"
}
+ },
+ "parents": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/parents/-/parents-0.0.2.tgz",
+ "integrity": "sha512-yrIRMwRkp5H3d6X9f8Pohz4wtiHnn+KTccwE5kj0Q4Tx1i3FIeZCY7avrxVPcDt6Bm+8Mv0Me6yPLbhB+QNGOg==",
+ "dev": true
+ },
+ "ripemd160": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
+ "integrity": "sha512-JJsJ74Mw4sUDDisXGDnNNyN9xWmt5HcH6Kwvb/0m/IvTKjnLAtZfzeoLdpxk44AxQZki54oCCd+Kt0nPQ2AF2g==",
+ "dev": true
+ },
+ "sha.js": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.1.6.tgz",
+ "integrity": "sha512-l1th5h1wxFv/nXn81ZxQWM+yafIB6F40FrQuI9N5jUsU0nYQC/vrmQQky7AR9HHCfimR060tD05V1zMUIvRsZA==",
+ "dev": true,
+ "requires": {
+ "buffer": "~2.3.2"
+ }
+ },
+ "string_decoder": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz",
+ "integrity": "sha512-nWi0z/o2vMFV7SJoJDEGqCUPfcpdC/hzCNnbHWhzt6SenBdJ3vVK0aeZuqnVVQ8fPci2h2WXIL6N3O+OJHJhZA==",
+ "dev": true
+ },
+ "subarg": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz",
+ "integrity": "sha512-6HUY31sAPDdNBT4Gy1c2a2mfpzRiFPMOsR9eQkqO2ZMIVL11mPzywLgsSSGYJ+UVidEfds6XEsh4RnZiDbM60A==",
+ "dev": true,
+ "requires": {
+ "minimist": "~0.0.7"
+ }
+ },
+ "through2": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+ "integrity": "sha512-zEbpaeSMHxczpTzO1KkMHjBC1enTA68ojeaZGG4toqdASpb9t4xUZaYFBq2/9OHo5nTGFVSYd4c910OR+6wxbQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": ">=1.1.13-1 <1.2.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
+ },
+ "dependencies": {
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
+ }
+ }
}
}
},
diff --git a/amp/TEMPLATE/ampTemplate/site-config.xml b/amp/TEMPLATE/ampTemplate/site-config.xml
index 4c8c7114f07..3bcef49bd07 100644
--- a/amp/TEMPLATE/ampTemplate/site-config.xml
+++ b/amp/TEMPLATE/ampTemplate/site-config.xml
@@ -1,7 +1,7 @@
-
+
]>
diff --git a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
index fb8f0a8a72c..20355b79053 100644
--- a/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
+++ b/amp/TEMPLATE/reamp/modules/activity/preview/actions/ActivityActions.jsx
@@ -172,7 +172,9 @@ export function loadActivityForActivityPreview(activityId) {
const fundings = activity[ActivityConstants.FUNDINGS];
if (activity[ActivityConstants.PPC_AMOUNT] && activityFundingInformation[ActivityConstants.PPC_AMOUNT]) {
activity[ActivityConstants.PPC_AMOUNT].amount = activityFundingInformation[ActivityConstants.PPC_AMOUNT];
- activity[ActivityConstants.PPC_AMOUNT].currency.value = currencyCode;
+ if (activity[ActivityConstants.PPC_AMOUNT].currency !== undefined) {
+ activity[ActivityConstants.PPC_AMOUNT].currency.value = currencyCode;
+ }
}
const transactions = [...FieldPathConstants.TRANSACTION_TYPES,
ActivityConstants.ESTIMATED_DISBURSEMENTS, ActivityConstants.MTEF_PROJECTIONS];
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
index 0d797d854f8..b30d2a3af7c 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
@@ -4,6 +4,7 @@ export const CALENDAR_SETTING = 'calendar-id';
export const ETH_BASE_CALENDAR = 'ETH-CAL';
export const GREG_BASE_CALENDAR = 'GREG-CAL';
export const EP_DATE_FORMAT = 'YYYY-MM-DD';
+export const CALENDAR_IS_FISCAL = 'is-fiscal';
export const NATIONAL_BUDGET_EXECUTION_PROCEDURES = 'National Budget Execution Procedures';
export const NATIONAL_FINANCIAL_REPORTING_PROCEDURES = 'National Financial Reporting Procedures';
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
index 69c93172348..411884840ac 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
@@ -95,7 +95,7 @@ class Utils {
static getCalendarPrefix(settingsWidget, calendars, translatedFY){
const fiscalYear = translatedFY ? translatedFY : Constants.FY;
const cal = calendars.filter( calendar => calendar.id == Utils.getCalendarId(settingsWidget) )[0];
- return cal.isFiscal ? fiscalYear + ' ' : '';
+ return cal[Constants.CALENDAR_IS_FISCAL] ? fiscalYear + ' ' : '';
}
diff --git a/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx b/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
index cbcfbec1e75..f4ee7a82030 100644
--- a/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
+++ b/amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
@@ -1,6 +1,8 @@
import React, { Component } from 'react';
import { Tooltip, OverlayTrigger } from 'react-bootstrap';
import { IMG_VALUE } from '../common/Constants';
+import {bindActionCreators} from "redux";
+import {connect} from "react-redux";
class HeaderToolTip extends Component {
@@ -39,3 +41,17 @@ import { IMG_VALUE } from '../common/Constants';
);
}
}
+
+
+function mapStateToProps( state, ownProps ) {
+ return {
+ translations: state.startUp.translations,
+ translate: state.startUp.translate
+ }
+}
+
+function mapDispatchToProps( dispatch ) {
+ return {actions: bindActionCreators({}, dispatch)}
+}
+
+export default connect( mapStateToProps, mapDispatchToProps )( HeaderToolTip );
diff --git a/amp/TEMPLATE/reamp/package-lock.json b/amp/TEMPLATE/reamp/package-lock.json
index 58f7c47edc6..4c8f67d3f55 100644
--- a/amp/TEMPLATE/reamp/package-lock.json
+++ b/amp/TEMPLATE/reamp/package-lock.json
@@ -22,7 +22,7 @@
"uglifyjs-webpack-plugin": "^1.3.0"
},
"devDependencies": {
- "amp-ui": "github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4",
+ "amp-ui": "github:devgateway/amp-ui#develop",
"babel-core": "^6.26.3",
"babel-jest": "^6.0.1",
"babel-loader": "^6.3.2",
@@ -66,9 +66,78 @@
"whatwg-fetch": "^0.9.0"
}
},
+ "../../../../amp-ui": {
+ "version": "2.1.1",
+ "extraneous": true,
+ "license": "MIT",
+ "dependencies": {
+ "docx": "^4.7.1",
+ "file-saver": "github:devgateway/FileSaver.js",
+ "fs": "0.0.1-security",
+ "he": "^1.2.0",
+ "moment": "^2.18.1",
+ "react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3"
+ },
+ "devDependencies": {
+ "@svgr/rollup": "^2.4.1",
+ "babel-core": "^6.26.3",
+ "babel-eslint": "^8.2.5",
+ "babel-plugin-external-helpers": "^6.22.0",
+ "babel-preset-env": "^1.7.0",
+ "babel-preset-react": "^6.24.1",
+ "babel-preset-stage-0": "^6.24.1",
+ "cross-env": "^5.1.4",
+ "docx": "^4.7.1",
+ "eslint": "^4.1.1",
+ "eslint-config-airbnb": "^15.0.0",
+ "eslint-config-standard": "^11.0.0",
+ "eslint-config-standard-react": "^6.0.0",
+ "eslint-formatter-pretty": "^1.1.0",
+ "eslint-plugin-flowtype-errors": "^2.0.1",
+ "eslint-plugin-import": "^2.13.0",
+ "eslint-plugin-jsx-a11y": "^5.0.0",
+ "eslint-plugin-mocha": "^4.7.0",
+ "eslint-plugin-node": "^7.0.1",
+ "eslint-plugin-promise": "^4.0.0",
+ "eslint-plugin-react": "^7.10.0",
+ "eslint-plugin-standard": "^3.1.0",
+ "file-saver": "git+ssh://github.com/devgateway/FileSaver.js",
+ "fs": "0.0.1-security",
+ "gh-pages": "^1.2.0",
+ "numeral": "^2.0.6",
+ "rc-checkbox": "^1.5.0",
+ "react": "15.4.2",
+ "react-bootstrap": "0.32.4",
+ "react-bootstrap-table": "^3.4.1",
+ "react-dom": "15.4.2",
+ "react-router": "^3.0.0",
+ "react-scripts": "^1.1.4",
+ "react-scrollspy": "3.1.1",
+ "rollup": "^0.64.1",
+ "rollup-plugin-babel": "^3.0.7",
+ "rollup-plugin-commonjs": "^9.1.3",
+ "rollup-plugin-img": "^1.1.0",
+ "rollup-plugin-node-resolve": "^3.3.0",
+ "rollup-plugin-peer-deps-external": "^2.2.0",
+ "rollup-plugin-postcss": "^1.6.2",
+ "rollup-plugin-url": "^1.4.0"
+ },
+ "engines": {
+ "node": ">=16",
+ "npm": ">=7"
+ },
+ "peerDependencies": {
+ "prop-types": "^15.5.4",
+ "react": "15.4.2",
+ "react-bootstrap": "0.32.4",
+ "react-bootstrap-table": "^3.4.1",
+ "react-dom": "15.4.2",
+ "react-scrollspy": "3.1.1"
+ }
+ },
"node_modules/@allenfang/react-toastr": {
"version": "2.8.2",
- "integrity": "sha1-C+9lhRieBXHda9/E75i8n5xH2gw=",
+ "integrity": "sha512-RlD4RTWghz1beVN8zoh4b6xkJp3OEEb4UVEzny6v9lmlWRw1UeTIVYfSZIQhQDq2VE2Yp2NkAzW1aP/LrO/vdg==",
"dependencies": {
"classnames": "^2.2.5",
"element-class": "^0.2.2",
@@ -80,7 +149,7 @@
},
"node_modules/@allenfang/react-toastr/node_modules/react": {
"version": "15.3.2",
- "integrity": "sha1-p7zNL+6K8SawMX4iLCjR1UUo0J4=",
+ "integrity": "sha512-yuJfSdf7yIqy2FrRFuepZtHEBRoatL/eGiZmgXe6d4jeNxWM0YZIacgXlabP9P2W9bPcmRBJOCXBqpP72lsTVA==",
"dependencies": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -92,44 +161,45 @@
},
"node_modules/@allenfang/react-toastr/node_modules/react-dom": {
"version": "15.3.2",
- "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8=",
+ "integrity": "sha512-FZuPYXNZx/xRYyE41uPlLpXAVwbQ4gyB38xPDu+osflCntg5MgIfBAmbhEsKkbzTBYWifjzrVsRzbncHFIPLkw==",
"peerDependencies": {
"react": "^15.3.2"
}
},
"node_modules/@babel/runtime": {
- "version": "7.17.2",
- "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+ "version": "7.22.15",
+ "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
"dependencies": {
- "regenerator-runtime": "^0.13.4"
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/runtime-corejs2": {
- "version": "7.17.2",
- "integrity": "sha512-EamjJvKlHTdSmJ8t6yHtqttdiA3xThvTNdmGb0Kh0oqRhV1SU2JGFU5TjVCg35Vnn8MYfUBHHtLZYHIY+W28qw==",
+ "version": "7.22.15",
+ "integrity": "sha512-CcAMW2o5uqgeXIXYYPrgmaYj1HOLvQb2DrBi7+bELD4nUVSKk+Sth+yYuGqSRf+aAiOv3sIZJTUiJBhoASJRLg==",
"dev": true,
"dependencies": {
- "core-js": "^2.6.5",
- "regenerator-runtime": "^0.13.4"
+ "core-js": "^2.6.12",
+ "regenerator-runtime": "^0.14.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/runtime-corejs2/node_modules/regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+ "version": "0.14.0",
+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
"dev": true
},
"node_modules/@babel/runtime/node_modules/regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+ "version": "0.14.0",
+ "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
},
"node_modules/@types/image-size": {
"version": "0.0.29",
+ "resolved": "https://registry.npmjs.org/@types/image-size/-/image-size-0.0.29.tgz",
"integrity": "sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg==",
"dev": true,
"dependencies": {
@@ -138,6 +208,7 @@
},
"node_modules/@types/jszip": {
"version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.4.1.tgz",
"integrity": "sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A==",
"deprecated": "This is a stub types definition. jszip provides its own type definitions, so you do not need this installed.",
"dev": true,
@@ -146,13 +217,14 @@
}
},
"node_modules/@types/node": {
- "version": "17.0.19",
- "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==",
+ "version": "20.6.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz",
+ "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==",
"dev": true
},
"node_modules/abbrev": {
"version": "1.0.9",
- "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+ "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==",
"dev": true
},
"node_modules/accepts": {
@@ -169,7 +241,7 @@
},
"node_modules/acorn": {
"version": "2.7.0",
- "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
+ "integrity": "sha512-pXK8ez/pVjqFdAgBkF1YPVRacuLQ9EXBKaKWaeh58WNfMkCmZhOZzu+NtKSPD5PHmCCHheQ5cD29qM1K4QTxIg==",
"dev": true,
"bin": {
"acorn": "bin/acorn"
@@ -180,7 +252,7 @@
},
"node_modules/acorn-globals": {
"version": "1.0.9",
- "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+ "integrity": "sha512-j3/4pkfih8W4NK22gxVSXcEonTpAHOHh0hu5BoZrKcOsW/4oBPxTi4Yk3SAj+FhC1f3+bRTkXdm4019gw1vg9g==",
"dev": true,
"dependencies": {
"acorn": "^2.1.0"
@@ -216,8 +288,7 @@
},
"node_modules/align-text": {
"version": "0.1.4",
- "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
- "dev": true,
+ "integrity": "sha512-GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg==",
"dependencies": {
"kind-of": "^3.0.2",
"longest": "^1.0.1",
@@ -229,16 +300,14 @@
},
"node_modules/amdefine": {
"version": "1.0.1",
- "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
- "dev": true,
+ "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==",
"engines": {
"node": ">=0.4.2"
}
},
"node_modules/amp-ui": {
"version": "2.1.1",
- "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#35d15a9efe2de868113fd47218a10743a393d5d4",
- "integrity": "sha512-EGpUyat29ddAvrhjtHQuipbc3qOK3ZSXhRcwHLtxF0F7POsa2TqLi9POmKp7FZKHcby4TjeJHrtFSuZ60GYA2A==",
+ "resolved": "git+ssh://git@github.com/devgateway/amp-ui.git#b1b1aa44216efadd64bcb32d5666c0f06b3cc464",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -262,29 +331,16 @@
"react-scrollspy": "3.1.1"
}
},
- "node_modules/amp-ui/node_modules/react-router-hash-link": {
- "name": "react-router-hash-link-v2/3",
- "resolved": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "object-assign": "^4.1.0",
- "react": "^15.4.1",
- "react-dom": "^15.4.1",
- "react-interactive": "^0.4.0",
- "react-router": "^3.0.0"
- }
- },
"node_modules/ansi-regex": {
"version": "2.1.1",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ansi-styles": {
"version": "2.2.1",
- "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+ "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
"engines": {
"node": ">=0.10.0"
}
@@ -292,7 +348,6 @@
"node_modules/anymatch": {
"version": "1.3.2",
"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
- "dev": true,
"dependencies": {
"micromatch": "^2.1.5",
"normalize-path": "^2.0.0"
@@ -312,7 +367,7 @@
},
"node_modules/arr-diff": {
"version": "2.0.0",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+ "integrity": "sha512-dtXTVMkh6VkEEA7OhXnN1Ecb8aAGFdZ1LFxtOCoqj4qkyOJMt7+qs6Ahdy6p/NQCPYsRSXXivhSB/J5E9jmYKA==",
"dependencies": {
"arr-flatten": "^1.0.1"
},
@@ -329,34 +384,33 @@
},
"node_modules/arr-union": {
"version": "3.1.0",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
- "dev": true,
+ "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/array-flatten": {
"version": "1.1.1",
- "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
"dev": true
},
"node_modules/array-unique": {
"version": "0.2.1",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+ "integrity": "sha512-G2n5bG5fSUCpnsXz4+8FUkYsGPkNfLn9YvS66U5qbTIXI2Ynnlo4Bi42bWv+omKUCqz+ejzfClwne0alJWJPhg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/arrify": {
"version": "1.0.1",
- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+ "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/asap": {
"version": "2.0.6",
- "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
},
"node_modules/asn1": {
"version": "0.2.6",
@@ -367,62 +421,50 @@
}
},
"node_modules/assert": {
- "version": "1.5.0",
- "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
- "dev": true,
+ "version": "1.5.1",
+ "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
"dependencies": {
- "object-assign": "^4.1.1",
- "util": "0.10.3"
+ "object.assign": "^4.1.4",
+ "util": "^0.10.4"
}
},
"node_modules/assert-plus": {
"version": "1.0.0",
- "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
"dev": true,
"engines": {
"node": ">=0.8"
}
},
- "node_modules/assert/node_modules/inherits": {
- "version": "2.0.1",
- "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
- "dev": true
- },
- "node_modules/assert/node_modules/util": {
- "version": "0.10.3",
- "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
- "dev": true,
- "dependencies": {
- "inherits": "2.0.1"
- }
- },
"node_modules/assign-symbols": {
"version": "1.0.0",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
- "dev": true,
+ "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/async": {
"version": "1.5.2",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
- "dev": true
+ "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="
},
"node_modules/async-each": {
- "version": "1.0.3",
- "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
- "dev": true
+ "version": "1.0.6",
+ "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://paulmillr.com/funding/"
+ }
+ ]
},
"node_modules/asynckit": {
"version": "0.4.0",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
"dev": true
},
"node_modules/atob": {
"version": "2.1.2",
"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
- "dev": true,
"bin": {
"atob": "bin/atob.js"
},
@@ -432,7 +474,7 @@
},
"node_modules/autoprefixer-core": {
"version": "5.2.1",
- "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=",
+ "integrity": "sha512-1X4srCG0vAe2ArX9d3Kfkuo5yREFZwKE5mH+VHZHIhmx0V8UjDPAKmNgJlWxxNbCAraHiDPTcT2kc+3i73jR/Q==",
"dev": true,
"dependencies": {
"browserslist": "~0.4.0",
@@ -443,20 +485,20 @@
},
"node_modules/aws-sign2": {
"version": "0.7.0",
- "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
"dev": true,
"engines": {
"node": "*"
}
},
"node_modules/aws4": {
- "version": "1.11.0",
- "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+ "version": "1.12.0",
+ "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
"dev": true
},
"node_modules/babel-code-frame": {
"version": "6.26.0",
- "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+ "integrity": "sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==",
"dependencies": {
"chalk": "^1.1.3",
"esutils": "^2.0.2",
@@ -504,7 +546,7 @@
},
"node_modules/babel-helper-bindify-decorators": {
"version": "6.24.1",
- "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+ "integrity": "sha512-TYX2QQATKA6Wssp6j7jqlw4QLmABDN1olRdEHndYvBXdaXM5dcx6j5rN0+nd+aVL+Th40fAEYvvw/Xxd/LETuQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -514,7 +556,7 @@
},
"node_modules/babel-helper-builder-binary-assignment-operator-visitor": {
"version": "6.24.1",
- "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+ "integrity": "sha512-gCtfYORSG1fUMX4kKraymq607FWgMWg+j42IFPc18kFQEsmtaibP4UrqsXt8FlEJle25HUd4tsoDR7H2wDhe9Q==",
"dev": true,
"dependencies": {
"babel-helper-explode-assignable-expression": "^6.24.1",
@@ -524,7 +566,7 @@
},
"node_modules/babel-helper-builder-react-jsx": {
"version": "6.26.0",
- "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+ "integrity": "sha512-02I9jDjnVEuGy2BR3LRm9nPRb/+Ja0pvZVLr1eI5TYAA/dB0Xoc+WBo50+aDfhGDLhlBY1+QURjn9uvcFd8gzg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -534,7 +576,7 @@
},
"node_modules/babel-helper-call-delegate": {
"version": "6.24.1",
- "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+ "integrity": "sha512-RL8n2NiEj+kKztlrVJM9JT1cXzzAdvWFh76xh/H1I4nKwunzE4INBXn8ieCZ+wh4zWszZk7NBS1s/8HR5jDkzQ==",
"dev": true,
"dependencies": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -545,7 +587,7 @@
},
"node_modules/babel-helper-define-map": {
"version": "6.26.0",
- "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+ "integrity": "sha512-bHkmjcC9lM1kmZcVpA5t2om2nzT/xiZpo6TJq7UlZ3wqKfzia4veeXbIhKvJXAMzhhEBd3cR1IElL5AenWEUpA==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -556,7 +598,7 @@
},
"node_modules/babel-helper-explode-assignable-expression": {
"version": "6.24.1",
- "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+ "integrity": "sha512-qe5csbhbvq6ccry9G7tkXbzNtcDiH4r51rrPUbwwoTzZ18AqxWYRZT6AOmxrpxKnQBW0pYlBI/8vh73Z//78nQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -566,7 +608,7 @@
},
"node_modules/babel-helper-explode-class": {
"version": "6.24.1",
- "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+ "integrity": "sha512-SFbWewr0/0U4AiRzsHqwsbOQeLXVa9T1ELdqEa2efcQB5KopTnunAqoj07TuHlN2lfTQNPGO/rJR4FMln5fVcA==",
"dev": true,
"dependencies": {
"babel-helper-bindify-decorators": "^6.24.1",
@@ -577,7 +619,7 @@
},
"node_modules/babel-helper-function-name": {
"version": "6.24.1",
- "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+ "integrity": "sha512-Oo6+e2iX+o9eVvJ9Y5eKL5iryeRdsIkwRYheCuhYdVHsdEQysbc2z2QkqCLIYnNxkT5Ss3ggrHdXiDI7Dhrn4Q==",
"dev": true,
"dependencies": {
"babel-helper-get-function-arity": "^6.24.1",
@@ -589,7 +631,7 @@
},
"node_modules/babel-helper-get-function-arity": {
"version": "6.24.1",
- "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+ "integrity": "sha512-WfgKFX6swFB1jS2vo+DwivRN4NB8XUdM3ij0Y1gnC21y1tdBoe6xjVnd7NSI6alv+gZXCtJqvrTeMW3fR/c0ng==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -598,7 +640,7 @@
},
"node_modules/babel-helper-hoist-variables": {
"version": "6.24.1",
- "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+ "integrity": "sha512-zAYl3tqerLItvG5cKYw7f1SpvIxS9zi7ohyGHaI9cgDUjAT6YcY9jIEH5CstetP5wHIVSceXwNS7Z5BpJg+rOw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -607,7 +649,7 @@
},
"node_modules/babel-helper-optimise-call-expression": {
"version": "6.24.1",
- "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+ "integrity": "sha512-Op9IhEaxhbRT8MDXx2iNuMgciu2V8lDvYCNQbDGjdBNCjaMvyLf4wl4A3b8IgndCyQF8TwfgsQ8T3VD8aX1/pA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -616,7 +658,7 @@
},
"node_modules/babel-helper-regex": {
"version": "6.26.0",
- "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+ "integrity": "sha512-VlPiWmqmGJp0x0oK27Out1D+71nVVCTSdlbhIVoaBAj2lUgrNjBCRR9+llO4lTSb2O4r7PJg+RobRkhBrf6ofg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -626,7 +668,7 @@
},
"node_modules/babel-helper-remap-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+ "integrity": "sha512-RYqaPD0mQyQIFRu7Ho5wE2yvA/5jxqCIj/Lv4BXNq23mHYu/vxikOy2JueLiBxQknwapwrJeNCesvY0ZcfnlHg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -638,7 +680,7 @@
},
"node_modules/babel-helper-replace-supers": {
"version": "6.24.1",
- "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+ "integrity": "sha512-sLI+u7sXJh6+ToqDr57Bv973kCepItDhMou0xCP2YPVmR1jkHSCY+p1no8xErbV1Siz5QE8qKT1WIwybSWlqjw==",
"dev": true,
"dependencies": {
"babel-helper-optimise-call-expression": "^6.24.1",
@@ -651,7 +693,7 @@
},
"node_modules/babel-helpers": {
"version": "6.24.1",
- "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+ "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
"dependencies": {
"babel-runtime": "^6.22.0",
"babel-template": "^6.24.1"
@@ -659,7 +701,7 @@
},
"node_modules/babel-jest": {
"version": "6.0.1",
- "integrity": "sha1-MTRjrSN22I5LaxMmRMu896pWMiE=",
+ "integrity": "sha512-IIqUfsIE62+lEDMhOFFiSv7O3evYSyyaBkYthfpL3EzmMjCTrCKGGduflxUxrzt8updYOEyvXONuRe1NIGUT4A==",
"dev": true,
"dependencies": {
"babel-core": "^6.0.0"
@@ -667,7 +709,7 @@
},
"node_modules/babel-loader": {
"version": "6.4.1",
- "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
+ "integrity": "sha512-hHvbCsXtwKIznu5Qmqfe/IwZ4O5frqe+j04fN/5u/9Rg48dpWIKyYqAN68N1wwqGSMToo4FhU9/MrH+QZlFdkQ==",
"dev": true,
"dependencies": {
"find-cache-dir": "^0.1.1",
@@ -682,14 +724,14 @@
},
"node_modules/babel-messages": {
"version": "6.23.0",
- "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+ "integrity": "sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==",
"dependencies": {
"babel-runtime": "^6.22.0"
}
},
"node_modules/babel-plugin-check-es2015-constants": {
"version": "6.22.0",
- "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+ "integrity": "sha512-B1M5KBP29248dViEo1owyY32lk1ZSH2DaNNrXLGt8lyjjHm7pBqAdQ7VKUPR6EEDO323+OvT3MQXbCin8ooWdA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -707,7 +749,7 @@
},
"node_modules/babel-plugin-istanbul/node_modules/find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
"dependencies": {
"locate-path": "^2.0.0"
},
@@ -717,80 +759,80 @@
},
"node_modules/babel-plugin-jest-hoist": {
"version": "19.0.0",
- "integrity": "sha1-SuKgTqYSpuc2UfP95SwXiZEwS+o="
+ "integrity": "sha512-bMlU8Y0lmia0Ari/qSjulDS1H7rPLtT5I4LBhk8oN/u0CzlAiVxcvU8nTgx0915aZx9+eboVBGbm0TJaEWM3NA=="
},
"node_modules/babel-plugin-syntax-async-functions": {
"version": "6.13.0",
- "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+ "integrity": "sha512-4Zp4unmHgw30A1eWI5EpACji2qMocisdXhAftfhXoSV9j0Tvj6nRFE3tOmRY912E0FMRm/L5xWE7MGVT2FoLnw==",
"dev": true
},
"node_modules/babel-plugin-syntax-async-generators": {
"version": "6.13.0",
- "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+ "integrity": "sha512-EbciFN5Jb9iqU9bqaLmmFLx2G8pAUsvpWJ6OzOWBNrSY9qTohXj+7YfZx6Ug1Qqh7tCb1EA7Jvn9bMC1HBiucg==",
"dev": true
},
"node_modules/babel-plugin-syntax-class-constructor-call": {
"version": "6.18.0",
- "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+ "integrity": "sha512-EEuBcXz/wZ81Jaac0LnMHtD4Mfz9XWn2oH2Xj+CHwz2SZWUqqdtR2BgWPSdTGMmxN/5KLSh4PImt9+9ZedDarA==",
"dev": true
},
"node_modules/babel-plugin-syntax-class-properties": {
"version": "6.13.0",
- "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+ "integrity": "sha512-chI3Rt9T1AbrQD1s+vxw3KcwC9yHtF621/MacuItITfZX344uhQoANjpoSJZleAmW2tjlolqB/f+h7jIqXa7pA==",
"dev": true
},
"node_modules/babel-plugin-syntax-decorators": {
"version": "6.13.0",
- "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+ "integrity": "sha512-AWj19x2aDm8qFQ5O2JcD6pwJDW1YdcnO+1b81t7gxrGjz5VHiUqeYWAR4h7zueWMalRelrQDXprv2FrY1dbpbw==",
"dev": true
},
"node_modules/babel-plugin-syntax-do-expressions": {
"version": "6.13.0",
- "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+ "integrity": "sha512-HD/5qJB9oSXzl0caxM+aRD7ENICXqcc3Up/8toDQk7zNIDE7TzsqtxC5f4t9Rwhu2Ya8l9l4j6b3vOsy+a6qxg==",
"dev": true
},
"node_modules/babel-plugin-syntax-dynamic-import": {
"version": "6.18.0",
- "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+ "integrity": "sha512-MioUE+LfjCEz65Wf7Z/Rm4XCP5k2c+TbMd2Z2JKc7U9uwjBhAfNPE48KC4GTGKhppMeYVepwDBNO/nGY6NYHBA==",
"dev": true
},
"node_modules/babel-plugin-syntax-exponentiation-operator": {
"version": "6.13.0",
- "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+ "integrity": "sha512-Z/flU+T9ta0aIEKl1tGEmN/pZiI1uXmCiGFRegKacQfEJzp7iNsKloZmyJlQr+75FCJtiFfGIK03SiCvCt9cPQ==",
"dev": true
},
"node_modules/babel-plugin-syntax-export-extensions": {
"version": "6.13.0",
- "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+ "integrity": "sha512-Eo0rcRaIDMld/W6mVhePiudIuLW+Cr/8eveW3mBREfZORScZgx4rh6BAPyvzdEc/JZvQ+LkC80t0VGFs6FX+lg==",
"dev": true
},
"node_modules/babel-plugin-syntax-flow": {
"version": "6.18.0",
- "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+ "integrity": "sha512-HbTDIoG1A1op7Tl/wIFQPULIBA61tsJ8Ntq2FAhLwuijrzosM/92kAfgU1Q3Kc7DH/cprJg5vDfuTY4QUL4rDA==",
"dev": true
},
"node_modules/babel-plugin-syntax-function-bind": {
"version": "6.13.0",
- "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+ "integrity": "sha512-m8yMoh9LIiNyeLdQs5I9G+3YXo4nqVsKQkk7YplrG4qAFbNi9hkZlow8HDHxhH9QOVFPHmy8+03NzRCdyChIKw==",
"dev": true
},
"node_modules/babel-plugin-syntax-jsx": {
"version": "6.18.0",
- "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+ "integrity": "sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==",
"dev": true
},
"node_modules/babel-plugin-syntax-object-rest-spread": {
"version": "6.13.0",
- "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+ "integrity": "sha512-C4Aq+GaAj83pRQ0EFgTvw5YO6T3Qz2KGrNRwIj9mSoNHVvdZY4KO2uA6HNtNXCw993iSZnckY1aLW8nOi8i4+w=="
},
"node_modules/babel-plugin-syntax-trailing-function-commas": {
"version": "6.22.0",
- "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+ "integrity": "sha512-Gx9CH3Q/3GKbhs07Bszw5fPTlU+ygrOGfAhEt7W2JICwufpC4SuO0mG0+4NykPBSYPMJhqvVlDBU17qB1D+hMQ==",
"dev": true
},
"node_modules/babel-plugin-transform-async-generator-functions": {
"version": "6.24.1",
- "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+ "integrity": "sha512-uT7eovUxtXe8Q2ufcjRuJIOL0hg6VAUJhiWJBLxH/evYAw+aqoJLcYTR8hqx13iOx/FfbCMHgBmXWZjukbkyPg==",
"dev": true,
"dependencies": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -800,7 +842,7 @@
},
"node_modules/babel-plugin-transform-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+ "integrity": "sha512-7BgYJujNCg0Ti3x0c/DL3tStvnKS6ktIYOmo9wginv/dfZOrbSZ+qG4IRRHMBOzZ5Awb1skTiAsQXg/+IWkZYw==",
"dev": true,
"dependencies": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -810,7 +852,7 @@
},
"node_modules/babel-plugin-transform-class-constructor-call": {
"version": "6.24.1",
- "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+ "integrity": "sha512-RvYukT1Nh7njz8P8326ztpQUGCKwmjgu6aRIx1lkvylWITYcskg29vy1Kp8WXIq7FvhXsz0Crf2kS94bjB690A==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-class-constructor-call": "^6.18.0",
@@ -820,7 +862,7 @@
},
"node_modules/babel-plugin-transform-class-properties": {
"version": "6.24.1",
- "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+ "integrity": "sha512-n4jtBA3OYBdvG5PRMKsMXJXHfLYw/ZOmtxCLOOwz6Ro5XlrColkStLnz1AS1L2yfPA9BKJ1ZNlmVCLjAL9DSIg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -831,7 +873,7 @@
},
"node_modules/babel-plugin-transform-decorators": {
"version": "6.24.1",
- "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+ "integrity": "sha512-skQ2CImwDkCHu0mkWvCOlBCpBIHW4/49IZWVwV4A/EnWjL9bB6UBvLyMNe3Td5XDStSZNhe69j4bfEW8dvUbew==",
"dev": true,
"dependencies": {
"babel-helper-explode-class": "^6.24.1",
@@ -843,7 +885,7 @@
},
"node_modules/babel-plugin-transform-do-expressions": {
"version": "6.22.0",
- "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+ "integrity": "sha512-yQwYqYg+Tnj1InA8W1rsItsZVhkv1Euc4KVua9ledtPz5PDWYz7LVyy6rDBpVYUWFZj5k6GUm3YZpCbIm8Tqew==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-do-expressions": "^6.8.0",
@@ -852,7 +894,7 @@
},
"node_modules/babel-plugin-transform-es2015-arrow-functions": {
"version": "6.22.0",
- "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+ "integrity": "sha512-PCqwwzODXW7JMrzu+yZIaYbPQSKjDTAsNNlK2l5Gg9g4rz2VzLnZsStvp/3c46GfXpwkyufb3NCyG9+50FF1Vg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -860,7 +902,7 @@
},
"node_modules/babel-plugin-transform-es2015-block-scoped-functions": {
"version": "6.22.0",
- "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+ "integrity": "sha512-2+ujAT2UMBzYFm7tidUsYh+ZoIutxJ3pN9IYrF1/H6dCKtECfhmB8UkHVpyxDwkj0CYbQG35ykoz925TUnBc3A==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -868,7 +910,7 @@
},
"node_modules/babel-plugin-transform-es2015-block-scoping": {
"version": "6.26.0",
- "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+ "integrity": "sha512-YiN6sFAQ5lML8JjCmr7uerS5Yc/EMbgg9G8ZNmk2E3nYX4ckHR01wrkeeMijEf5WHNK5TW0Sl0Uu3pv3EdOJWw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.26.0",
@@ -880,7 +922,7 @@
},
"node_modules/babel-plugin-transform-es2015-classes": {
"version": "6.24.1",
- "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+ "integrity": "sha512-5Dy7ZbRinGrNtmWpquZKZ3EGY8sDgIVB4CU8Om8q8tnMLrD/m94cKglVcHps0BCTdZ0TJeeAWOq2TK9MIY6cag==",
"dev": true,
"dependencies": {
"babel-helper-define-map": "^6.24.1",
@@ -896,7 +938,7 @@
},
"node_modules/babel-plugin-transform-es2015-computed-properties": {
"version": "6.24.1",
- "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+ "integrity": "sha512-C/uAv4ktFP/Hmh01gMTvYvICrKze0XVX9f2PdIXuriCSvUmV9j+u+BB9f5fJK3+878yMK6dkdcq+Ymr9mrcLzw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -905,7 +947,7 @@
},
"node_modules/babel-plugin-transform-es2015-destructuring": {
"version": "6.23.0",
- "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+ "integrity": "sha512-aNv/GDAW0j/f4Uy1OEPZn1mqD+Nfy9viFGBfQ5bZyT35YqOiqx7/tXdyfZkJ1sC21NyEsBdfDY6PYmLHF4r5iA==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -913,7 +955,7 @@
},
"node_modules/babel-plugin-transform-es2015-duplicate-keys": {
"version": "6.24.1",
- "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+ "integrity": "sha512-ossocTuPOssfxO2h+Z3/Ea1Vo1wWx31Uqy9vIiJusOP4TbF7tPs9U0sJ9pX9OJPf4lXRGj5+6Gkl/HHKiAP5ug==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -922,7 +964,7 @@
},
"node_modules/babel-plugin-transform-es2015-for-of": {
"version": "6.23.0",
- "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+ "integrity": "sha512-DLuRwoygCoXx+YfxHLkVx5/NpeSbVwfoTeBykpJK7JhYWlL/O8hgAK/reforUnZDlxasOrVPPJVI/guE3dCwkw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -930,7 +972,7 @@
},
"node_modules/babel-plugin-transform-es2015-function-name": {
"version": "6.24.1",
- "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+ "integrity": "sha512-iFp5KIcorf11iBqu/y/a7DK3MN5di3pNCzto61FqCNnUX4qeBwcV1SLqe10oXNnCaxBUImX3SckX2/o1nsrTcg==",
"dev": true,
"dependencies": {
"babel-helper-function-name": "^6.24.1",
@@ -940,7 +982,7 @@
},
"node_modules/babel-plugin-transform-es2015-literals": {
"version": "6.22.0",
- "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+ "integrity": "sha512-tjFl0cwMPpDYyoqYA9li1/7mGFit39XiNX5DKC/uCNjBctMxyL1/PT/l4rSlbvBG1pOKI88STRdUsWXB3/Q9hQ==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -948,7 +990,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-amd": {
"version": "6.24.1",
- "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+ "integrity": "sha512-LnIIdGWIKdw7zwckqx+eGjcS8/cl8D74A3BpJbGjKTFFNJSMrjN4bIh22HY1AlkUbeLG6X6OZj56BDvWD+OeFA==",
"dev": true,
"dependencies": {
"babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
@@ -969,7 +1011,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-systemjs": {
"version": "6.24.1",
- "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+ "integrity": "sha512-ONFIPsq8y4bls5PPsAWYXH/21Hqv64TBxdje0FvU3MhIV6QM2j5YS7KvAzg/nTIVLot2D2fmFQrFWCbgHlFEjg==",
"dev": true,
"dependencies": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -979,7 +1021,7 @@
},
"node_modules/babel-plugin-transform-es2015-modules-umd": {
"version": "6.24.1",
- "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+ "integrity": "sha512-LpVbiT9CLsuAIp3IG0tfbVo81QIhn6pE8xBJ7XSeCtFlMltuar5VuBV6y6Q45tpui9QWcy5i0vLQfCfrnF7Kiw==",
"dev": true,
"dependencies": {
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
@@ -989,7 +1031,7 @@
},
"node_modules/babel-plugin-transform-es2015-object-super": {
"version": "6.24.1",
- "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+ "integrity": "sha512-8G5hpZMecb53vpD3mjs64NhI1au24TAmokQ4B+TBFBjN9cVoGoOvotdrMMRmHvVZUEvqGUPWL514woru1ChZMA==",
"dev": true,
"dependencies": {
"babel-helper-replace-supers": "^6.24.1",
@@ -998,7 +1040,7 @@
},
"node_modules/babel-plugin-transform-es2015-parameters": {
"version": "6.24.1",
- "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+ "integrity": "sha512-8HxlW+BB5HqniD+nLkQ4xSAVq3bR/pcYW9IigY+2y0dI+Y7INFeTbfAQr+63T3E4UDsZGjyb+l9txUnABWxlOQ==",
"dev": true,
"dependencies": {
"babel-helper-call-delegate": "^6.24.1",
@@ -1011,7 +1053,7 @@
},
"node_modules/babel-plugin-transform-es2015-shorthand-properties": {
"version": "6.24.1",
- "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+ "integrity": "sha512-mDdocSfUVm1/7Jw/FIRNw9vPrBQNePy6wZJlR8HAUBLybNp1w/6lr6zZ2pjMShee65t/ybR5pT8ulkLzD1xwiw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -1020,7 +1062,7 @@
},
"node_modules/babel-plugin-transform-es2015-spread": {
"version": "6.22.0",
- "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+ "integrity": "sha512-3Ghhi26r4l3d0Js933E5+IhHwk0A1yiutj9gwvzmFbVV0sPMYk2lekhOufHBswX7NCoSeF4Xrl3sCIuSIa+zOg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1028,7 +1070,7 @@
},
"node_modules/babel-plugin-transform-es2015-sticky-regex": {
"version": "6.24.1",
- "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+ "integrity": "sha512-CYP359ADryTo3pCsH0oxRo/0yn6UsEZLqYohHmvLQdfS9xkf+MbCzE3/Kolw9OYIY4ZMilH25z/5CbQbwDD+lQ==",
"dev": true,
"dependencies": {
"babel-helper-regex": "^6.24.1",
@@ -1038,7 +1080,7 @@
},
"node_modules/babel-plugin-transform-es2015-template-literals": {
"version": "6.22.0",
- "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+ "integrity": "sha512-x8b9W0ngnKzDMHimVtTfn5ryimars1ByTqsfBDwAqLibmuuQY6pgBQi5z1ErIsUOWBdw1bW9FSz5RZUojM4apg==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1046,7 +1088,7 @@
},
"node_modules/babel-plugin-transform-es2015-typeof-symbol": {
"version": "6.23.0",
- "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+ "integrity": "sha512-fz6J2Sf4gYN6gWgRZaoFXmq93X+Li/8vf+fb0sGDVtdeWvxC9y5/bTD7bvfWMEq6zetGEHpWjtzRGSugt5kNqw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1054,7 +1096,7 @@
},
"node_modules/babel-plugin-transform-es2015-unicode-regex": {
"version": "6.24.1",
- "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+ "integrity": "sha512-v61Dbbihf5XxnYjtBN04B/JBvsScY37R1cZT5r9permN1cp+b70DY3Ib3fIkgn1DI9U3tGgBJZVD8p/mE/4JbQ==",
"dev": true,
"dependencies": {
"babel-helper-regex": "^6.24.1",
@@ -1064,7 +1106,7 @@
},
"node_modules/babel-plugin-transform-exponentiation-operator": {
"version": "6.24.1",
- "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+ "integrity": "sha512-LzXDmbMkklvNhprr20//RStKVcT8Cu+SQtX18eMHLhjHf2yFzwtQ0S2f0jQ+89rokoNdmwoSqYzAhq86FxlLSQ==",
"dev": true,
"dependencies": {
"babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
@@ -1074,7 +1116,7 @@
},
"node_modules/babel-plugin-transform-export-extensions": {
"version": "6.22.0",
- "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+ "integrity": "sha512-mtzELzINaYqdVglyZrDDVwkcFRuE7s6QUFWXxwffKAHB/NkfbJ2NJSytugB43ytIC8UVt30Ereyx+7gNyTkDLg==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-export-extensions": "^6.8.0",
@@ -1083,7 +1125,7 @@
},
"node_modules/babel-plugin-transform-flow-strip-types": {
"version": "6.22.0",
- "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+ "integrity": "sha512-TxIM0ZWNw9oYsoTthL3lvAK3+eTujzktoXJg4ubGvICGbVuXVYv5hHv0XXpz8fbqlJaGYY4q5SVzaSmsg3t4Fg==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-flow": "^6.18.0",
@@ -1092,7 +1134,7 @@
},
"node_modules/babel-plugin-transform-function-bind": {
"version": "6.22.0",
- "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+ "integrity": "sha512-9Ec4KYf1GurT39mlUjDSlN7HWSlB3u3mWRMogQbb+Y88lO0ZM3rJ0ADhPnQwWK9TbO6e/4E+Et1rrfGY9mFimA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-function-bind": "^6.8.0",
@@ -1101,7 +1143,7 @@
},
"node_modules/babel-plugin-transform-object-rest-spread": {
"version": "6.26.0",
- "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+ "integrity": "sha512-ocgA9VJvyxwt+qJB0ncxV8kb/CjfTcECUY4tQ5VT7nP6Aohzobm8CDFaQ5FHdvZQzLmf0sgDxB8iRXZXxwZcyA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-object-rest-spread": "^6.8.0",
@@ -1110,7 +1152,7 @@
},
"node_modules/babel-plugin-transform-react-display-name": {
"version": "6.25.0",
- "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+ "integrity": "sha512-QLYkLiZeeED2PKd4LuXGg5y9fCgPB5ohF8olWUuETE2ryHNRqqnXlEVP7RPuef89+HTfd3syptMGVHeoAu0Wig==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0"
@@ -1118,7 +1160,7 @@
},
"node_modules/babel-plugin-transform-react-jsx": {
"version": "6.24.1",
- "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+ "integrity": "sha512-s+q/Y2u2OgDPHRuod3t6zyLoV8pUHc64i/O7ZNgIOEdYTq+ChPeybcKBi/xk9VI60VriILzFPW+dUxAEbTxh2w==",
"dev": true,
"dependencies": {
"babel-helper-builder-react-jsx": "^6.24.1",
@@ -1128,7 +1170,7 @@
},
"node_modules/babel-plugin-transform-react-jsx-self": {
"version": "6.22.0",
- "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+ "integrity": "sha512-Y3ZHP1nunv0U1+ysTNwLK39pabHj6cPVsfN4TRC7BDBfbgbyF4RifP5kd6LnbuMV9wcfedQMe7hn1fyKc7IzTQ==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -1137,7 +1179,7 @@
},
"node_modules/babel-plugin-transform-react-jsx-source": {
"version": "6.22.0",
- "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+ "integrity": "sha512-pcDNDsZ9q/6LJmujQ/OhjeoIlp5Nl546HJ2yiFIJK3mYpgNXhI5/S9mXfVxu5yqWAi7HdI7e/q6a9xtzwL69Vw==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -1146,7 +1188,7 @@
},
"node_modules/babel-plugin-transform-regenerator": {
"version": "6.26.0",
- "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+ "integrity": "sha512-LS+dBkUGlNR15/5WHKe/8Neawx663qttS6AGqoOUhICc9d1KciBvtrQSuc0PI+CxQ2Q/S1aKuJ+u64GtLdcEZg==",
"dev": true,
"dependencies": {
"regenerator-transform": "^0.10.0"
@@ -1154,7 +1196,7 @@
},
"node_modules/babel-plugin-transform-strict-mode": {
"version": "6.24.1",
- "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+ "integrity": "sha512-j3KtSpjyLSJxNoCDrhwiJad8kw0gJ9REGj8/CqL0HeRyLnvUNYV9zcqluL6QJSXh3nfsLEmSLvwRfGzrgR96Pw==",
"dev": true,
"dependencies": {
"babel-runtime": "^6.22.0",
@@ -1163,12 +1205,12 @@
},
"node_modules/babel-plugin-typecheck": {
"version": "1.3.0",
- "integrity": "sha1-SQhlLTGLDLICjrBhbmXyXMVkrpM=",
+ "integrity": "sha512-lb3F7nd0tzaP12NRrBFG3liOIyugyaIaJwyz/rPgjOA0OgN5qdRoIrdxcFWFaxqO9OKVgLthy84vkSqYSSFJLg==",
"dev": true
},
"node_modules/babel-polyfill": {
"version": "6.26.0",
- "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+ "integrity": "sha512-F2rZGQnAdaHWQ8YAoeRbukc7HS9QgdgeyJ0rQDd485v9opwuPvjpPFcOOT/WmkKTdgy9ESgSPXDcTNpzrGr6iQ==",
"dependencies": {
"babel-runtime": "^6.26.0",
"core-js": "^2.5.0",
@@ -1177,7 +1219,7 @@
},
"node_modules/babel-preset-es2015": {
"version": "6.24.1",
- "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+ "integrity": "sha512-XfwUqG1Ry6R43m4Wfob+vHbIVBIqTg/TJY4Snku1iIzeH7mUnwHA8Vagmv+ZQbPwhS8HgsdQvy28Py3k5zpoFQ==",
"deprecated": "🙌 Thanks for using Babel: we recommend using babel-preset-env now: please read https://babeljs.io/env to update!",
"dev": true,
"dependencies": {
@@ -1209,7 +1251,7 @@
},
"node_modules/babel-preset-flow": {
"version": "6.23.0",
- "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+ "integrity": "sha512-PQZFJXnM3d80Vq4O67OE6EMVKIw2Vmzy8UXovqulNogCtblWU8rzP7Sm5YgHiCg4uejUxzCkHfNXQ4Z6GI+Dhw==",
"dev": true,
"dependencies": {
"babel-plugin-transform-flow-strip-types": "^6.22.0"
@@ -1217,14 +1259,14 @@
},
"node_modules/babel-preset-jest": {
"version": "19.0.0",
- "integrity": "sha1-ItZyAdAjJKGVgRKI6zgpS7PKw5Y=",
+ "integrity": "sha512-Jb+X0+98UWEuPQdZSGHC9ZKkngeIcpc9MKAM51Ze9GFJnpBuk7u9qDbN2Irh7JwZA3lc/MQ4I/RyObSqDFMbpw==",
"dependencies": {
"babel-plugin-jest-hoist": "^19.0.0"
}
},
"node_modules/babel-preset-react": {
"version": "6.24.1",
- "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+ "integrity": "sha512-phQe3bElbgF887UM0Dhz55d22ob8czTL1kbhZFwpCE6+R/X9kHktfwmx9JZb+bBSVRGphP5tZ9oWhVhlgjrX3Q==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-jsx": "^6.3.13",
@@ -1237,7 +1279,7 @@
},
"node_modules/babel-preset-stage-0": {
"version": "6.24.1",
- "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
+ "integrity": "sha512-MJD+xBbpsApbKlzAX0sOBF+VeFaUmv5s8FSOO7SSZpes1QgphCjq/UIGRFWSmQ/0i5bqQjLGCTXGGXqcLQ9JDA==",
"dev": true,
"dependencies": {
"babel-plugin-transform-do-expressions": "^6.22.0",
@@ -1247,7 +1289,7 @@
},
"node_modules/babel-preset-stage-1": {
"version": "6.24.1",
- "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+ "integrity": "sha512-rn+UOcd7BHDniq1SVxv2/AVVSVI1NK+hfS0I/iR6m6KbOi/aeBRcqBilqO73pd9VUpRXF2HFtlDuC9F2BEQqmg==",
"dev": true,
"dependencies": {
"babel-plugin-transform-class-constructor-call": "^6.24.1",
@@ -1257,7 +1299,7 @@
},
"node_modules/babel-preset-stage-2": {
"version": "6.24.1",
- "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+ "integrity": "sha512-9F+nquz+37PrlTSBdpeQBKnQfAMNBnryXw+m4qBh35FNbJPfzZz+sjN2G5Uf1CRedU9PH7fJkTbYijxmkLX8Og==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -1268,7 +1310,7 @@
},
"node_modules/babel-preset-stage-3": {
"version": "6.24.1",
- "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+ "integrity": "sha512-eCbEOF8uN0KypFXJmZXn2sTk7bPV9uM5xov7G/7BM08TbQEObsVs0cEWfy6NQySlfk7JBi/t+XJP1JkruYfthA==",
"dev": true,
"dependencies": {
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -1280,7 +1322,7 @@
},
"node_modules/babel-register": {
"version": "6.26.0",
- "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+ "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
"dependencies": {
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
@@ -1293,7 +1335,7 @@
},
"node_modules/babel-runtime": {
"version": "6.26.0",
- "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
"dependencies": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
@@ -1305,7 +1347,7 @@
},
"node_modules/babel-template": {
"version": "6.26.0",
- "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+ "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
"dependencies": {
"babel-runtime": "^6.26.0",
"babel-traverse": "^6.26.0",
@@ -1316,7 +1358,7 @@
},
"node_modules/babel-traverse": {
"version": "6.26.0",
- "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+ "integrity": "sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==",
"dependencies": {
"babel-code-frame": "^6.26.0",
"babel-messages": "^6.23.0",
@@ -1331,7 +1373,7 @@
},
"node_modules/babel-types": {
"version": "6.26.0",
- "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+ "integrity": "sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==",
"dependencies": {
"babel-runtime": "^6.26.0",
"esutils": "^2.0.2",
@@ -1348,13 +1390,12 @@
},
"node_modules/balanced-match": {
"version": "0.2.1",
- "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
+ "integrity": "sha512-euSOvfze1jPOf85KQOmZ2UcWDJ/dUJukTJdj4o9ZZLyjl7IjdIyE4fAQRSuGrxAjB9nvvvrl4N3bPtRq+W+SyQ==",
"dev": true
},
"node_modules/base": {
"version": "0.11.2",
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
- "dev": true,
"dependencies": {
"cache-base": "^1.0.1",
"class-utils": "^0.3.5",
@@ -1370,8 +1411,7 @@
},
"node_modules/base/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dependencies": {
"is-descriptor": "^1.0.0"
},
@@ -1381,8 +1421,7 @@
},
"node_modules/base/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
@@ -1390,7 +1429,6 @@
"node_modules/base64-js": {
"version": "1.5.1",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
- "dev": true,
"funding": [
{
"type": "github",
@@ -1408,12 +1446,12 @@
},
"node_modules/batch": {
"version": "0.6.1",
- "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
"dev": true
},
"node_modules/bcrypt-pbkdf": {
"version": "1.0.2",
- "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
"dev": true,
"dependencies": {
"tweetnacl": "^0.14.3"
@@ -1422,7 +1460,6 @@
"node_modules/big.js": {
"version": "3.2.0",
"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
- "dev": true,
"engines": {
"node": "*"
}
@@ -1430,37 +1467,39 @@
"node_modules/binary-extensions": {
"version": "1.13.1",
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/blacklist": {
"version": "1.1.4",
- "integrity": "sha1-st0J1hd2JbLKppg1o3somV+povI="
+ "integrity": "sha512-DWdfwimA1WQxVC69Vs1Fy525NbYwisMSCdYQmW9zyzOByz9OB/tQwrKZ3T3pbTkuFjnkJFlJuyiDjPiXL5kzew=="
},
"node_modules/bluebird": {
"version": "3.7.2",
"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
},
"node_modules/body-parser": {
- "version": "1.19.2",
- "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+ "version": "1.20.1",
+ "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "http-errors": "1.8.1",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
- "on-finished": "~2.3.0",
- "qs": "6.9.7",
- "raw-body": "2.4.3",
- "type-is": "~1.6.18"
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
},
"engines": {
- "node": ">= 0.8"
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
}
},
"node_modules/body-parser/node_modules/bytes": {
@@ -1483,9 +1522,12 @@
}
},
"node_modules/body-parser/node_modules/qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+ "version": "6.11.0",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
"engines": {
"node": ">=0.6"
},
@@ -1495,7 +1537,7 @@
},
"node_modules/boom": {
"version": "2.10.1",
- "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+ "integrity": "sha512-KbiZEa9/vofNcVJXGwdWWn25reQ3V3dHBWbS07FTF3/TOehLnm9GEhJV4T6ZvGPkShRpmUqYwnaCrkj0mRnP6Q==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -1528,7 +1570,7 @@
},
"node_modules/braces": {
"version": "1.8.5",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "integrity": "sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==",
"dependencies": {
"expand-range": "^1.8.1",
"preserve": "^0.2.0",
@@ -1540,7 +1582,7 @@
},
"node_modules/browser-request": {
"version": "0.3.3",
- "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=",
+ "integrity": "sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==",
"dev": true,
"engines": [
"node"
@@ -1548,28 +1590,25 @@
},
"node_modules/browserify-aes": {
"version": "0.4.0",
- "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
- "dev": true,
+ "integrity": "sha512-hnvbMhZ/Ete34qnoKKyjikiYQfZbl89d5UZ29cz3EG13cv/8VRyM8Zs84luB/O7BRzC3qSng9dVovJ6jghcAvg==",
"dependencies": {
"inherits": "^2.0.1"
}
},
"node_modules/browserify-zlib": {
"version": "0.1.4",
- "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
- "dev": true,
+ "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
"dependencies": {
"pako": "~0.2.0"
}
},
"node_modules/browserify-zlib/node_modules/pako": {
"version": "0.2.9",
- "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
- "dev": true
+ "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
},
"node_modules/browserslist": {
"version": "0.4.0",
- "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=",
+ "integrity": "sha512-/JVhaf9S6ru3THyiuwX5j86pT79r5UtgwV3s6w+KpGlmUzPxfMbI5OBxO88iFtqgdqPuNirprachS3m1611qKA==",
"deprecated": "Browserslist 2 could fail on reading Browserslist >3.0 config used in other tools.",
"dev": true,
"dependencies": {
@@ -1587,7 +1626,6 @@
"node_modules/buffer": {
"version": "4.9.2",
"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
- "dev": true,
"dependencies": {
"base64-js": "^1.0.2",
"ieee754": "^1.1.4",
@@ -1600,12 +1638,11 @@
},
"node_modules/builtin-status-codes": {
"version": "3.0.0",
- "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
- "dev": true
+ "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
},
"node_modules/bytes": {
"version": "3.0.0",
- "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+ "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -1631,13 +1668,13 @@
}
},
"node_modules/cacache/node_modules/glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
},
@@ -1651,7 +1688,6 @@
"node_modules/cache-base": {
"version": "1.0.1",
"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
- "dev": true,
"dependencies": {
"collection-visit": "^1.0.0",
"component-emitter": "^1.2.1",
@@ -1669,34 +1705,42 @@
},
"node_modules/cache-base/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/call-bind": {
+ "version": "1.0.2",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/camelcase": {
"version": "1.2.1",
- "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
- "dev": true,
+ "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/caniuse-db": {
- "version": "1.0.30001312",
- "integrity": "sha512-4eJfCSGxsF9JcQXBLdHclxkpLWv+Va7Y6QESYCWSdrR8b8x16TxUjCoOK/kU7SFC0BdcuK0nvt6ZkM59Q03LjQ==",
+ "version": "1.0.30001535",
+ "integrity": "sha512-GqX/YYHUWIiK3H9wneyTqg7yfcMcXJ8mKHzt/m3qzB+u4Q84mVEh00lkk6jVdiTgXkxZEVOOh2AQEtQsV3IkXA==",
"dev": true
},
"node_modules/caseless": {
"version": "0.12.0",
- "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+ "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
"dev": true
},
"node_modules/center-align": {
"version": "0.1.3",
- "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
- "dev": true,
+ "integrity": "sha512-Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==",
"dependencies": {
"align-text": "^0.1.3",
"lazy-cache": "^1.0.3"
@@ -1707,7 +1751,7 @@
},
"node_modules/chalk": {
"version": "1.1.3",
- "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+ "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
"dependencies": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
@@ -1721,9 +1765,8 @@
},
"node_modules/chokidar": {
"version": "1.7.0",
- "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+ "integrity": "sha512-mk8fAWcRUOxY7btlLtitj3A45jOwSAxH4tOFOoEGbVsl6cL6pPMWUy7dwZ/canfj3QEdP6FHSnf/l1c6/WkzVg==",
"deprecated": "Chokidar 2 will break on node v14+. Upgrade to chokidar 3 with 15x less dependencies.",
- "dev": true,
"dependencies": {
"anymatch": "^1.3.0",
"async-each": "^1.0.0",
@@ -1745,7 +1788,6 @@
"node_modules/class-utils": {
"version": "0.3.6",
"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
- "dev": true,
"dependencies": {
"arr-union": "^3.1.0",
"define-property": "^0.2.5",
@@ -1758,8 +1800,7 @@
},
"node_modules/class-utils/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dependencies": {
"is-descriptor": "^0.1.0"
},
@@ -1769,8 +1810,7 @@
},
"node_modules/class-utils/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -1780,8 +1820,7 @@
},
"node_modules/class-utils/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -1792,7 +1831,6 @@
"node_modules/class-utils/node_modules/is-descriptor": {
"version": "0.1.6",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -1805,26 +1843,24 @@
"node_modules/class-utils/node_modules/is-descriptor/node_modules/kind-of": {
"version": "5.1.0",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/class-utils/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/classnames": {
- "version": "2.3.1",
- "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+ "version": "2.3.2",
+ "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
},
"node_modules/cli-table": {
"version": "0.0.2",
- "integrity": "sha1-mChn4WQ1Mlxmwgih5xuVM26jCTs=",
+ "integrity": "sha512-pxlO2LG8dJMt+xR33zeICgkCje4SSueapy+FW7VjtD9HEUdOj7gl8lNCjCUWa9H4M3ao0ys/1kjLv86KY4tWmA==",
"dev": true,
"dependencies": {
"colors": "0.3.0"
@@ -1835,8 +1871,7 @@
},
"node_modules/cliui": {
"version": "2.1.0",
- "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
- "dev": true,
+ "integrity": "sha512-GIOYRizG+TGoc7Wgc1LiOTLare95R3mzKgoln+Q/lE4ceiYH19gUpl0l0Ffq4lJDEf3FxujMe6IBfOCs7pfqNA==",
"dependencies": {
"center-align": "^0.1.1",
"right-align": "^0.1.1",
@@ -1845,23 +1880,21 @@
},
"node_modules/cliui/node_modules/wordwrap": {
"version": "0.0.2",
- "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
- "dev": true,
+ "integrity": "sha512-xSBsCeh+g+dinoBv3GAOWM4LcVVO68wLXRanibtBSdUvkGWQRGeE9P7IwU9EmDDi4jA6L44lz15CGMwdw9N5+Q==",
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/clone": {
"version": "1.0.4",
- "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
- "dev": true,
+ "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
"engines": {
"node": ">=0.8"
}
},
"node_modules/co": {
"version": "4.6.0",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+ "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
"dev": true,
"optional": true,
"engines": {
@@ -1884,8 +1917,7 @@
},
"node_modules/collection-visit": {
"version": "1.0.0",
- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
- "dev": true,
+ "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
"dependencies": {
"map-visit": "^1.0.0",
"object-visit": "^1.0.0"
@@ -1896,7 +1928,7 @@
},
"node_modules/color": {
"version": "0.10.1",
- "integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
+ "integrity": "sha512-MGvoNNG3vGqFdWjEaj4/6aPqfzLEIlN30YEuSDRaJMujUMx7KTdizi1VzkGnp8Q+nX031k7BnbLv5q7ZkcN14A==",
"dev": true,
"dependencies": {
"color-convert": "^0.5.3",
@@ -1905,7 +1937,7 @@
},
"node_modules/color-convert": {
"version": "0.5.3",
- "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+ "integrity": "sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling==",
"dev": true
},
"node_modules/color-name": {
@@ -1915,7 +1947,7 @@
},
"node_modules/color-string": {
"version": "0.3.0",
- "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+ "integrity": "sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==",
"dev": true,
"dependencies": {
"color-name": "^1.0.0"
@@ -1923,7 +1955,7 @@
},
"node_modules/colormin": {
"version": "1.1.2",
- "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+ "integrity": "sha512-XSEQUUQUR/lXqGyddiNH3XYFUPYlYr1vXy9rTFMsSOw+J7Q6EQkdlQIrTlYn4TccpsOaUE1PYQNjBn20gwCdgQ==",
"dev": true,
"dependencies": {
"color": "^0.11.0",
@@ -1933,7 +1965,7 @@
},
"node_modules/colormin/node_modules/color": {
"version": "0.11.4",
- "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+ "integrity": "sha512-Ajpjd8asqZ6EdxQeqGzU5WBhhTfJ/0cA4Wlbre7e5vXfmDSmda7Ov6jeKoru+b0vHcb1CqvuroTHp5zIWzhVMA==",
"dev": true,
"dependencies": {
"clone": "^1.0.2",
@@ -1951,12 +1983,12 @@
},
"node_modules/colormin/node_modules/color-name": {
"version": "1.1.3",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
"dev": true
},
"node_modules/colors": {
"version": "0.3.0",
- "integrity": "sha1-wkfWTTTbDKTcjkPz7NbamNCvlOc=",
+ "integrity": "sha512-zRIkNRjxdyFV2Vuq0Bh8hL/rWgQsBM19aB6Uq9CMot2olUuD1DEPon9SB3GZNDrfOojb6a74AQhSM5BKrAr9tA==",
"dev": true,
"engines": {
"node": "*"
@@ -1979,12 +2011,11 @@
},
"node_modules/commondir": {
"version": "1.0.1",
- "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+ "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
},
"node_modules/component-emitter": {
"version": "1.3.0",
- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
- "dev": true
+ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
},
"node_modules/compressible": {
"version": "2.0.18",
@@ -2014,9 +2045,14 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/compression/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/concat-map": {
"version": "0.0.1",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
},
"node_modules/concat-stream": {
"version": "1.6.2",
@@ -2032,8 +2068,8 @@
}
},
"node_modules/concat-stream/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -2044,6 +2080,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/concat-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/concat-stream/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -2061,13 +2101,11 @@
},
"node_modules/console-browserify": {
"version": "1.2.0",
- "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
- "dev": true
+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
},
"node_modules/constants-browserify": {
"version": "1.0.0",
- "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
- "dev": true
+ "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
},
"node_modules/content-disposition": {
"version": "0.5.4",
@@ -2080,43 +2118,21 @@
"node": ">= 0.6"
}
},
- "node_modules/content-disposition/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/content-type": {
- "version": "1.0.4",
- "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+ "version": "1.0.5",
+ "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
"dev": true,
"engines": {
"node": ">= 0.6"
}
},
"node_modules/convert-source-map": {
- "version": "1.8.0",
- "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "dependencies": {
- "safe-buffer": "~5.1.1"
- }
+ "version": "1.9.0",
+ "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
},
"node_modules/cookie": {
- "version": "0.4.2",
- "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+ "version": "0.5.0",
+ "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -2124,7 +2140,7 @@
},
"node_modules/cookie-signature": {
"version": "1.0.6",
- "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true
},
"node_modules/copy-concurrently": {
@@ -2141,8 +2157,7 @@
},
"node_modules/copy-descriptor": {
"version": "0.1.1",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
- "dev": true,
+ "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
"engines": {
"node": ">=0.10.0"
}
@@ -2150,16 +2165,16 @@
"node_modules/core-js": {
"version": "2.6.12",
"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
- "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
"hasInstallScript": true
},
"node_modules/core-util-is": {
"version": "1.0.2",
- "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
},
"node_modules/cover": {
"version": "0.2.9",
- "integrity": "sha1-JiAp37MXFNSAQ/7ZHt5lhZOVXdQ=",
+ "integrity": "sha512-ezch+ax5tw9w+9NDdh65VoMrfM8HfT7l/Tys8G4QQw58Yj7PeJ8DlBKDmV9cZuEUuoBoy4rdjVXKClrh8o6A1g==",
"dev": true,
"dependencies": {
"cli-table": "0.0.x",
@@ -2173,7 +2188,7 @@
},
"node_modules/cover/node_modules/which": {
"version": "1.0.9",
- "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
+ "integrity": "sha512-E87fdQ/eRJr9W1X4wTPejNy9zTW3FI2vpCZSJ/HAY+TkjKVC0TUm1jk6vn2Z7qay0DQy0+RBGdXxj+RmmiGZKQ==",
"dev": true,
"bin": {
"which": "bin/which"
@@ -2189,7 +2204,7 @@
},
"node_modules/cryptiles": {
"version": "2.0.5",
- "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+ "integrity": "sha512-FFN5KwpvvQTTS5hWPxrU8/QE4kQUc6uwZcrnlMBN82t1MgAtq8mnoDwINBly9Tdr02seeIIhtdF+UH1feBYGog==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -2202,8 +2217,7 @@
},
"node_modules/crypto-browserify": {
"version": "3.3.0",
- "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
- "dev": true,
+ "integrity": "sha512-9n5nGl6D8zb29Ui8Ji8pVdUIE3RUe6A9zQf2iLPjFKftnkkkJBCGb7TkYAFNjt9nfsvZTLL52CwxzS9Tw7Bujw==",
"dependencies": {
"browserify-aes": "0.4.0",
"pbkdf2-compat": "2.0.1",
@@ -2216,7 +2230,7 @@
},
"node_modules/css-color-names": {
"version": "0.0.4",
- "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+ "integrity": "sha512-zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q==",
"dev": true,
"engines": {
"node": "*"
@@ -2224,13 +2238,13 @@
},
"node_modules/css-list": {
"version": "0.1.3",
- "integrity": "sha1-p7M7RBn4PUEjIN3pEzoNEASUjXA=",
+ "integrity": "sha512-/ckGMggH8coLFPTyCLEPP0mlHAjTTdPNO/AcTMGhDvlOypkcYL3pA8U5hR+7poKsSfmVgSvg7XfC9WGvXzBQww==",
"deprecated": "Deprecated.",
"dev": true
},
"node_modules/css-loader": {
"version": "0.15.6",
- "integrity": "sha1-Iofe4oSCnr+4H6wLKU2nKbO/oUQ=",
+ "integrity": "sha512-DgyAT/6ss+muCMexkvwFJQImpCH7SAp5d59uQk8HtUG8ZUn6jyJ0HA8ncnIzHoUPRLlJkuSdtd5Hay+PxtcIjw==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.1",
@@ -2245,7 +2259,7 @@
},
"node_modules/css-selector-tokenizer": {
"version": "0.5.4",
- "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=",
+ "integrity": "sha512-4KF0VPHT7x/rSPnmUJ/wSzx1AVRnQAUVcuHJnlR2vo8ZKKp1oSh77iD7S/0PSwvMlBIdre0cTeFwWKvq7pn3KA==",
"dev": true,
"dependencies": {
"cssesc": "^0.1.0",
@@ -2254,7 +2268,7 @@
},
"node_modules/cssesc": {
"version": "0.1.0",
- "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+ "integrity": "sha512-72avb2vCIsNDBlSMYuxt2Cmg6Z4TTGqifblGs7IXGihhuEzghCb9Pu1Y6vzVPLC03OTXnAKsTm92ChZd4uzVBQ==",
"dev": true,
"bin": {
"cssesc": "bin/cssesc"
@@ -2262,7 +2276,7 @@
},
"node_modules/cssnano": {
"version": "2.6.1",
- "integrity": "sha1-f7NyEsz/RNPpNuAmxvZ14xR9gCQ=",
+ "integrity": "sha512-u3L8MNOBSP78DxKgVT6Gor04Cl6+S/XR/lMVHX0EzVU1tmOwHKtKd0LuXK17EhU/Y3TfFHgCyaJAV8rIy/7gNw==",
"dev": true,
"dependencies": {
"autoprefixer-core": "^5.2.1",
@@ -2307,19 +2321,19 @@
},
"node_modules/cssstyle": {
"version": "0.2.37",
- "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+ "integrity": "sha512-FUpKc+1FNBsHUr9IsfSGCovr8VuGOiiuzlgCyppKBjJi2jYTOFLN3oiiNRMIvYqbFzF38mqKj4BgcevzU5/kIA==",
"dev": true,
"dependencies": {
"cssom": "0.3.x"
}
},
"node_modules/cyclist": {
- "version": "1.0.1",
- "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+ "version": "1.0.2",
+ "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA=="
},
"node_modules/dashdash": {
"version": "1.14.1",
- "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0"
@@ -2337,23 +2351,21 @@
},
"node_modules/decamelize": {
"version": "1.2.0",
- "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
- "dev": true,
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/decode-uri-component": {
- "version": "0.2.0",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "dev": true,
+ "version": "0.2.2",
+ "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/deep-diff": {
"version": "0.3.4",
- "integrity": "sha1-qsXDmVIjar5fA3ojSQYLoBsArkg=",
+ "integrity": "sha512-Q2QODPwxBnMRbT8tUw1afL8PRY4mbMlJDU6HnLnDBNl/sAatNDG5vyk1pRt2bv3i60OY7X9ETXrH80SWX939EA==",
"dev": true
},
"node_modules/deep-is": {
@@ -2361,10 +2373,36 @@
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true
},
+ "node_modules/define-data-property": {
+ "version": "1.1.0",
+ "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+ "dependencies": {
+ "get-intrinsic": "^1.2.1",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/define-properties": {
+ "version": "1.2.1",
+ "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+ "dependencies": {
+ "define-data-property": "^1.0.1",
+ "has-property-descriptors": "^1.0.0",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/define-property": {
"version": "2.0.2",
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
- "dev": true,
"dependencies": {
"is-descriptor": "^1.0.2",
"isobject": "^3.0.1"
@@ -2375,46 +2413,53 @@
},
"node_modules/define-property/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/defined": {
- "version": "1.0.0",
- "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
- "dev": true
+ "version": "1.0.1",
+ "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/delayed-stream": {
"version": "1.0.0",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
"dev": true,
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/depd": {
- "version": "1.1.2",
- "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "version": "2.0.0",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
"dev": true,
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/destroy": {
- "version": "1.0.4",
- "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
- "dev": true
+ "version": "1.2.0",
+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
},
"node_modules/detect-hover": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-hover/-/detect-hover-1.0.3.tgz",
"integrity": "sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==",
"dev": true
},
"node_modules/detect-indent": {
"version": "4.0.0",
- "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+ "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
"dependencies": {
"repeating": "^2.0.0"
},
@@ -2424,7 +2469,8 @@
},
"node_modules/detect-it": {
"version": "2.1.1",
- "integrity": "sha1-39tgv/CX3p6+c2YgHFNQ1ODWQiU=",
+ "resolved": "https://registry.npmjs.org/detect-it/-/detect-it-2.1.1.tgz",
+ "integrity": "sha512-ZBC+LVUG18aBmw4JRakDM5fI7kYcsbwpJTVuU6za7cWRfyzzhVbIWZVayGnon1xFeIGxFN3jiZ8QON3YteUyCw==",
"dev": true,
"dependencies": {
"detect-hover": "^1.0.1",
@@ -2435,22 +2481,25 @@
},
"node_modules/detect-passive-events": {
"version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/detect-passive-events/-/detect-passive-events-1.0.5.tgz",
"integrity": "sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==",
"dev": true
},
"node_modules/detect-pointer": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-pointer/-/detect-pointer-1.0.3.tgz",
"integrity": "sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==",
"dev": true
},
"node_modules/detect-touch-events": {
"version": "1.0.1",
- "integrity": "sha1-EVWEqrdAnAuS3xA6sPv1KFzVDXE=",
+ "resolved": "https://registry.npmjs.org/detect-touch-events/-/detect-touch-events-1.0.1.tgz",
+ "integrity": "sha512-ZYSP1bEs68q4fICiaTepdEjwBR4Ybg7rCQfMySP5IrO3V+7smmaqVjcvQdo+wENCQT/rdEWnB+E+ugIq4s1TdA==",
"dev": true
},
"node_modules/diff": {
"version": "2.2.3",
- "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
+ "integrity": "sha512-9wfm3RLzMp/PyTFWuw9liEzdlxsdGixCW0ZTU1XDmtlAkvpVXTPGF8KnfSs0hm3BPbg19OrUPPsRkHXoREpP1g==",
"dev": true,
"engines": {
"node": ">=0.3.1"
@@ -2458,6 +2507,7 @@
},
"node_modules/docx": {
"version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/docx/-/docx-4.7.1.tgz",
"integrity": "sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw==",
"dev": true,
"dependencies": {
@@ -2489,8 +2539,8 @@
}
},
"node_modules/dom-serializer/node_modules/domelementtype": {
- "version": "2.2.0",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+ "version": "2.3.0",
+ "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
"dev": true,
"funding": [
{
@@ -2510,7 +2560,6 @@
"node_modules/domain-browser": {
"version": "1.2.0",
"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
- "dev": true,
"engines": {
"node": ">=0.4",
"npm": ">=1.2"
@@ -2549,8 +2598,8 @@
}
},
"node_modules/duplexify/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -2561,6 +2610,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/duplexify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/duplexify/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -2570,7 +2623,7 @@
},
"node_modules/ecc-jsbn": {
"version": "0.1.2",
- "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
"dev": true,
"dependencies": {
"jsbn": "~0.1.0",
@@ -2579,24 +2632,23 @@
},
"node_modules/ee-first": {
"version": "1.1.1",
- "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
"dev": true
},
"node_modules/element-class": {
"version": "0.2.2",
- "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4="
+ "integrity": "sha512-e4tkRAFtQkGiZB8fzxAFdjEbx5zajMb1GpiRwKs3lhOLxQcvdOIG7XlERT1sTX3/ulIUGZrgL02YZ0cRNC5OLQ=="
},
"node_modules/emojis-list": {
"version": "2.1.0",
- "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
- "dev": true,
+ "integrity": "sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==",
"engines": {
"node": ">= 0.10"
}
},
"node_modules/encodeurl": {
"version": "1.0.2",
- "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -2618,8 +2670,7 @@
},
"node_modules/enhanced-resolve": {
"version": "0.9.1",
- "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
- "dev": true,
+ "integrity": "sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw==",
"dependencies": {
"graceful-fs": "^4.1.2",
"memory-fs": "^0.2.0",
@@ -2631,8 +2682,7 @@
},
"node_modules/enhanced-resolve/node_modules/memory-fs": {
"version": "0.2.0",
- "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
- "dev": true
+ "integrity": "sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng=="
},
"node_modules/entities": {
"version": "1.1.2",
@@ -2658,24 +2708,24 @@
},
"node_modules/es6-promise": {
"version": "3.3.1",
- "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
+ "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
"dev": true
},
"node_modules/escape-html": {
"version": "1.0.3",
- "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
"dev": true
},
"node_modules/escape-string-regexp": {
"version": "1.0.5",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/escodegen": {
"version": "1.7.1",
- "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=",
+ "integrity": "sha512-2cd7+JUtUEmZVpGmfF9r+uRYXswJAkf85Ce8GvdBa7hSvdjY8hGo+rwC5syAgYzqHpfxNJzLntFjw6879yPbgQ==",
"dev": true,
"dependencies": {
"esprima": "^1.2.2",
@@ -2696,7 +2746,7 @@
},
"node_modules/escodegen/node_modules/esprima": {
"version": "1.2.5",
- "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=",
+ "integrity": "sha512-S9VbPDU0adFErpDai3qDkjq8+G05ONtKzcyNrPKg/ZKa+tf879nX2KexNU95b31UoTJjRLInNBHHHjFPoCd7lQ==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2708,7 +2758,7 @@
},
"node_modules/escodegen/node_modules/source-map": {
"version": "0.2.0",
- "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+ "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==",
"dev": true,
"optional": true,
"dependencies": {
@@ -2720,7 +2770,7 @@
},
"node_modules/esprima": {
"version": "2.5.0",
- "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=",
+ "integrity": "sha512-uM6hfS0/8ybNIj8SGRMdidPJy5uhWqWN/GIkyqnMAbCSL44yfFGLuBpRRCgOpBXBZt2OymQuM+IfahkqJq3DWw==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2732,7 +2782,7 @@
},
"node_modules/esprima-fb": {
"version": "4001.1001.0-dev-harmony-fb",
- "integrity": "sha1-9Qn2FuZtEcLFOWomHGGe3MtxKAo=",
+ "integrity": "sha512-TW7D+Ii7CDdaQqTG7uY0hrE9wm26sIzI+T7eoH9Z7bt6xJ8HDns0CXFjH5H3PP47j74h0ctNQd1QP0hw41+Bdw==",
"dev": true,
"bin": {
"esparse": "bin/esparse.js",
@@ -2744,7 +2794,7 @@
},
"node_modules/estraverse": {
"version": "1.9.3",
- "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+ "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -2759,7 +2809,7 @@
},
"node_modules/etag": {
"version": "1.8.1",
- "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -2772,21 +2822,17 @@
},
"node_modules/events": {
"version": "1.1.1",
- "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
- "dev": true,
+ "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
"engines": {
"node": ">=0.4.x"
}
},
"node_modules/eventsource": {
- "version": "1.1.0",
- "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
+ "version": "2.0.2",
+ "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
"dev": true,
- "dependencies": {
- "original": "^1.0.0"
- },
"engines": {
- "node": ">=0.12.0"
+ "node": ">=12.0.0"
}
},
"node_modules/exec-sh": {
@@ -2799,11 +2845,11 @@
},
"node_modules/exenv": {
"version": "1.2.2",
- "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+ "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
},
"node_modules/expand-brackets": {
"version": "0.1.5",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+ "integrity": "sha512-hxx03P2dJxss6ceIeri9cmYOT4SRs3Zk3afZwWpOsRqLqprhTR8u++SlC+sFGsQr7WGFPdMF7Gjc1njDLDK6UA==",
"dependencies": {
"is-posix-bracket": "^0.1.0"
},
@@ -2813,7 +2859,7 @@
},
"node_modules/expand-range": {
"version": "1.8.2",
- "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+ "integrity": "sha512-AFASGfIlnIbkKPQwX1yHaDjFvh/1gyKJODme52V6IORh69uEYgZp0o9C+qsIGNVEiuuhQU0CSSl++Rlegg1qvA==",
"dependencies": {
"fill-range": "^2.1.0"
},
@@ -2823,7 +2869,7 @@
},
"node_modules/exports-loader": {
"version": "0.6.4",
- "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=",
+ "integrity": "sha512-koRSTJrocXi3l7MKXSJPbNKUmewV2CewsWCZW+5KYxgkiZBjlEo4Z+DJuHDq4WzOi19drlyuT1xY7ADmwln8zQ==",
"dev": true,
"dependencies": {
"loader-utils": "^1.0.2",
@@ -2847,8 +2893,8 @@
}
},
"node_modules/exports-loader/node_modules/json5": {
- "version": "1.0.1",
- "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"dependencies": {
"minimist": "^1.2.0"
@@ -2858,8 +2904,8 @@
}
},
"node_modules/exports-loader/node_modules/loader-utils": {
- "version": "1.4.0",
- "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+ "version": "1.4.2",
+ "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"dependencies": {
"big.js": "^5.2.2",
@@ -2871,37 +2917,38 @@
}
},
"node_modules/express": {
- "version": "4.17.3",
- "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+ "version": "4.18.2",
+ "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
"dev": true,
"dependencies": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.19.2",
+ "body-parser": "1.20.1",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.4.2",
+ "cookie": "0.5.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
- "finalhandler": "~1.1.2",
+ "finalhandler": "1.2.0",
"fresh": "0.5.2",
+ "http-errors": "2.0.0",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.7",
- "qs": "6.9.7",
+ "qs": "6.11.0",
"range-parser": "~1.2.1",
"safe-buffer": "5.2.1",
- "send": "0.17.2",
- "serve-static": "1.14.2",
+ "send": "0.18.0",
+ "serve-static": "1.15.0",
"setprototypeof": "1.2.0",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
@@ -2911,9 +2958,12 @@
}
},
"node_modules/express/node_modules/qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
+ "version": "6.11.0",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
"engines": {
"node": ">=0.6"
},
@@ -2921,25 +2971,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/express/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/extend": {
"version": "3.0.2",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
@@ -2947,8 +2978,7 @@
},
"node_modules/extend-shallow": {
"version": "3.0.2",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "dev": true,
+ "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
"dependencies": {
"assign-symbols": "^1.0.0",
"is-extendable": "^1.0.1"
@@ -2960,7 +2990,6 @@
"node_modules/extend-shallow/node_modules/is-extendable": {
"version": "1.0.1",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "dev": true,
"dependencies": {
"is-plain-object": "^2.0.4"
},
@@ -2970,7 +2999,7 @@
},
"node_modules/extglob": {
"version": "0.3.2",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+ "integrity": "sha512-1FOj1LOwn42TMrruOHGt18HemVnbwAmAak7krWk+wa93KXxGbK+2jpezm+ytJYDaBX0/SPLZFHKM7m+tKobWGg==",
"dependencies": {
"is-extglob": "^1.0.0"
},
@@ -2980,7 +3009,7 @@
},
"node_modules/extsprintf": {
"version": "1.3.0",
- "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
"dev": true,
"engines": [
"node >=0.6.0"
@@ -2996,7 +3025,7 @@
},
"node_modules/fast-levenshtein": {
"version": "1.0.7",
- "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
+ "integrity": "sha512-hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A==",
"dev": true
},
"node_modules/fastparse": {
@@ -3016,8 +3045,8 @@
}
},
"node_modules/fb-watchman": {
- "version": "2.0.1",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
"dev": true,
"dependencies": {
"bser": "2.1.1"
@@ -3038,8 +3067,8 @@
},
"node_modules/fbjs/node_modules/core-js": {
"version": "1.2.7",
- "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=",
- "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js."
+ "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
+ "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js."
},
"node_modules/file-saver": {
"version": "2.0.2",
@@ -3049,14 +3078,14 @@
},
"node_modules/filename-regex": {
"version": "2.0.1",
- "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+ "integrity": "sha512-BTCqyBaWBTsauvnHiE8i562+EdJj+oUpkqWp2R1iCoR8f6oo8STRu3of7WJJ0TqWtxN50a5YFpzYK4Jj9esYfQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/fileset": {
"version": "0.2.1",
- "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
+ "integrity": "sha512-aK3PFyHSwWsBJCarRxMRIXSGamfroi9ehG8f4e5A2n5nSlEVHe8y44jNTIN4+HdZSpK3FNV0EdihH1iDWTdnGg==",
"dev": true,
"dependencies": {
"glob": "5.x",
@@ -3065,7 +3094,7 @@
},
"node_modules/fileset/node_modules/minimatch": {
"version": "2.0.10",
- "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+ "integrity": "sha512-jQo6o1qSVLEWaw3l+bwYA2X0uLuK2KjNh2wjgO7Q/9UJnXr1Q3yQKR8BI0/Bt/rPg75e6SMW4hW/6cBHVTZUjA==",
"deprecated": "Please update to minimatch 3.0.2 or higher to avoid a RegExp DoS issue",
"dev": true,
"dependencies": {
@@ -3090,16 +3119,16 @@
}
},
"node_modules/finalhandler": {
- "version": "1.1.2",
- "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+ "version": "1.2.0",
+ "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
"dev": true,
"dependencies": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"unpipe": "~1.0.0"
},
"engines": {
@@ -3108,7 +3137,7 @@
},
"node_modules/find-cache-dir": {
"version": "0.1.1",
- "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+ "integrity": "sha512-Z9XSBoNE7xQiV6MSgPuCfyMokH2K7JdpRkOYE1+mu3d4BFJtx3GW+f6Bo4q8IX6rlf5MYbLBKW0pjl2cWdkm2A==",
"dev": true,
"dependencies": {
"commondir": "^1.0.1",
@@ -3121,7 +3150,7 @@
},
"node_modules/find-up": {
"version": "1.1.2",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==",
"dependencies": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
@@ -3132,7 +3161,7 @@
},
"node_modules/flatten": {
"version": "0.0.1",
- "integrity": "sha1-VURAdm2goNYDmZ9DNFP2wvxqdcE=",
+ "integrity": "sha512-pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg==",
"deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
"dev": true,
"engines": {
@@ -3148,8 +3177,8 @@
}
},
"node_modules/flush-write-stream/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3160,6 +3189,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/flush-write-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/flush-write-stream/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -3168,8 +3201,8 @@
}
},
"node_modules/follow-redirects": {
- "version": "1.14.9",
- "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+ "version": "1.15.2",
+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"dev": true,
"funding": [
{
@@ -3188,14 +3221,14 @@
},
"node_modules/for-in": {
"version": "1.0.2",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/for-own": {
"version": "0.1.5",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
"dependencies": {
"for-in": "^1.0.1"
},
@@ -3205,7 +3238,7 @@
},
"node_modules/forever-agent": {
"version": "0.6.1",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
"dev": true,
"engines": {
"node": "*"
@@ -3234,8 +3267,7 @@
},
"node_modules/fragment-cache": {
"version": "0.2.1",
- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
- "dev": true,
+ "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
"dependencies": {
"map-cache": "^0.2.2"
},
@@ -3245,7 +3277,7 @@
},
"node_modules/fresh": {
"version": "0.5.2",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -3253,15 +3285,15 @@
},
"node_modules/from2": {
"version": "2.3.0",
- "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==",
"dependencies": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.0"
}
},
"node_modules/from2/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3272,6 +3304,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/from2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/from2/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -3281,12 +3317,13 @@
},
"node_modules/fs": {
"version": "0.0.1-security",
- "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=",
+ "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+ "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
"dev": true
},
"node_modules/fs-extra": {
"version": "0.14.0",
- "integrity": "sha1-RmCWxroticIAA4DaskULeFn/Z0M=",
+ "integrity": "sha512-cfijsB8nt4C9wwYDyDqpALcCIk1Wxj/fhN5eVDRRbJxQTTWyyDAqhERmS60g9+WMaPoNaUAz4xQL71Dez05g+A==",
"dev": true,
"dependencies": {
"jsonfile": "^2.0.0",
@@ -3296,7 +3333,7 @@
},
"node_modules/fs-write-stream-atomic": {
"version": "1.0.10",
- "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+ "integrity": "sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==",
"dependencies": {
"graceful-fs": "^4.1.2",
"iferr": "^0.1.5",
@@ -3305,8 +3342,8 @@
}
},
"node_modules/fs-write-stream-atomic/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -3317,7 +3354,11 @@
"util-deprecate": "~1.0.1"
}
},
- "node_modules/fs-write-stream-atomic/node_modules/string_decoder": {
+ "node_modules/fs-write-stream-atomic/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
+ "node_modules/fs-write-stream-atomic/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dependencies": {
@@ -3326,7 +3367,7 @@
},
"node_modules/fs.realpath": {
"version": "1.0.0",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/function-bind": {
"version": "1.1.1",
@@ -3334,20 +3375,32 @@
},
"node_modules/gather-stream": {
"version": "1.0.0",
- "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
+ "integrity": "sha512-NspYMi3rN3EKmMdejUXbtluDYrcRlTEBBFhWzVRZVsOx94OPxlXp0AzyPKyLiT7iaurcoTE/KcHsHP/PowNEaA==",
"dev": true
},
+ "node_modules/get-intrinsic": {
+ "version": "1.2.1",
+ "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/get-value": {
"version": "2.0.6",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
- "dev": true,
+ "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/getpass": {
"version": "0.1.7",
- "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0"
@@ -3355,7 +3408,7 @@
},
"node_modules/glob": {
"version": "5.0.15",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+ "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==",
"dev": true,
"dependencies": {
"inflight": "^1.0.4",
@@ -3370,7 +3423,7 @@
},
"node_modules/glob-base": {
"version": "0.3.0",
- "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+ "integrity": "sha512-ab1S1g1EbO7YzauaJLkgLp7DZVAqj9M/dvKlTt8DkXA2tiOIcSMrlVI2J1RZyB5iJVccEscjGn+kpOG9788MHA==",
"dependencies": {
"glob-parent": "^2.0.0",
"is-glob": "^2.0.0"
@@ -3381,7 +3434,7 @@
},
"node_modules/glob-parent": {
"version": "2.0.0",
- "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+ "integrity": "sha512-JDYOvfxio/t42HKdxkAYaCiBN7oYiuxykOxKxdaUW5Qn0zaYN3gRQWolrwdnf0shM9/EP0ebuuTmyoXNr1cC5w==",
"dependencies": {
"is-glob": "^2.0.0"
}
@@ -3393,17 +3446,27 @@
"node": ">=0.10.0"
}
},
+ "node_modules/gopd": {
+ "version": "1.0.1",
+ "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+ "dependencies": {
+ "get-intrinsic": "^1.1.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/graceful-fs": {
- "version": "4.2.9",
- "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+ "version": "4.2.11",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
},
"node_modules/handlebars": {
- "version": "4.7.7",
- "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+ "version": "4.7.8",
+ "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
"dev": true,
"dependencies": {
"minimist": "^1.2.5",
- "neo-async": "^2.6.0",
+ "neo-async": "^2.6.2",
"source-map": "^0.6.1",
"wordwrap": "^1.0.0"
},
@@ -3427,7 +3490,7 @@
},
"node_modules/har-schema": {
"version": "2.0.0",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
"dev": true,
"engines": {
"node": ">=4"
@@ -3458,7 +3521,7 @@
},
"node_modules/has-ansi": {
"version": "2.0.0",
- "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+ "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==",
"dependencies": {
"ansi-regex": "^2.0.0"
},
@@ -3468,16 +3531,44 @@
},
"node_modules/has-flag": {
"version": "1.0.0",
- "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
- "dev": true,
+ "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/has-property-descriptors": {
+ "version": "1.0.0",
+ "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+ "dependencies": {
+ "get-intrinsic": "^1.1.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-proto": {
+ "version": "1.0.1",
+ "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.0.3",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/has-value": {
"version": "1.0.0",
- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
- "dev": true,
+ "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
"dependencies": {
"get-value": "^2.0.6",
"has-values": "^1.0.0",
@@ -3489,16 +3580,14 @@
},
"node_modules/has-value/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/has-values": {
"version": "1.0.0",
- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
- "dev": true,
+ "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
"dependencies": {
"is-number": "^3.0.0",
"kind-of": "^4.0.0"
@@ -3509,8 +3598,7 @@
},
"node_modules/has-values/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -3520,8 +3608,7 @@
},
"node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -3531,8 +3618,7 @@
},
"node_modules/has-values/node_modules/kind-of": {
"version": "4.0.0",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "dev": true,
+ "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -3542,7 +3628,7 @@
},
"node_modules/hawk": {
"version": "3.1.3",
- "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+ "integrity": "sha512-X8xbmTc1cbPXcQV4WkLcRMALuyoxhfpFATmyuCxJPOAvrDS4DNnsTAOmKUxMTOWU6TzrTOkxPKwIx5ZOpJVSrg==",
"deprecated": "This module moved to @hapi/hawk. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
"dev": true,
"optional": true,
@@ -3558,6 +3644,7 @@
},
"node_modules/he": {
"version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true,
"bin": {
@@ -3566,7 +3653,7 @@
},
"node_modules/history": {
"version": "3.3.0",
- "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
+ "integrity": "sha512-ABLnJwKEZGXGqWsXaKYD8NNle49ZbKs1WEBlxrFsQ8dIudZpO5NJaH8WJOqh5lXVhAq7bHksfirrobBmrT7qBw==",
"dev": true,
"dependencies": {
"invariant": "^2.2.1",
@@ -3577,7 +3664,7 @@
},
"node_modules/hoek": {
"version": "2.16.3",
- "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+ "integrity": "sha512-V6Yw1rIcYV/4JsnggjBU0l4Kr+EXhpwqXRusENU1Xx6ro00IHPHYNynCuBTOZAPlr3AAmLvchH9I7N/VUdvOwQ==",
"deprecated": "This version has been deprecated in accordance with the hapi support policy (hapi.im/support). Please upgrade to the latest version to get the best features, bug fixes, and security patches. If you are unable to upgrade at this time, paid support is available for older versions (hapi.im/commercial).",
"dev": true,
"optional": true,
@@ -3595,7 +3682,7 @@
},
"node_modules/home-or-tmp": {
"version": "2.0.0",
- "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+ "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
"dependencies": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.1"
@@ -3622,23 +3709,23 @@
}
},
"node_modules/http-errors": {
- "version": "1.8.1",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "version": "2.0.0",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
"dev": true,
"dependencies": {
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"inherits": "2.0.4",
"setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
+ "statuses": "2.0.1",
"toidentifier": "1.0.1"
},
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/http-parser-js": {
- "version": "0.5.5",
- "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
+ "version": "0.5.8",
+ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
"dev": true
},
"node_modules/http-proxy": {
@@ -3656,7 +3743,7 @@
},
"node_modules/http-proxy-middleware": {
"version": "0.17.4",
- "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+ "integrity": "sha512-JtH3UZju4oXDdca28/kknbm/CFmt35vy0YV0PNOMWWWpn3rT9WV95IXN451xwBGSjy9L0Cah1O9TCMytboLdfw==",
"dev": true,
"dependencies": {
"http-proxy": "^1.16.2",
@@ -3667,7 +3754,7 @@
},
"node_modules/http-proxy-middleware/node_modules/is-extglob": {
"version": "2.1.1",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3675,7 +3762,7 @@
},
"node_modules/http-proxy-middleware/node_modules/is-glob": {
"version": "3.1.0",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"dev": true,
"dependencies": {
"is-extglob": "^2.1.0"
@@ -3686,7 +3773,7 @@
},
"node_modules/http-signature": {
"version": "1.2.0",
- "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
"dev": true,
"dependencies": {
"assert-plus": "^1.0.0",
@@ -3700,8 +3787,7 @@
},
"node_modules/https-browserify": {
"version": "0.0.1",
- "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
- "dev": true
+ "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ=="
},
"node_modules/iconv-lite": {
"version": "0.6.3",
@@ -3716,7 +3802,6 @@
"node_modules/ieee754": {
"version": "1.2.1",
"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
- "dev": true,
"funding": [
{
"type": "github",
@@ -3734,10 +3819,11 @@
},
"node_modules/iferr": {
"version": "0.1.5",
- "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+ "integrity": "sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="
},
"node_modules/image-size": {
"version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
"integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==",
"dev": true,
"bin": {
@@ -3749,12 +3835,13 @@
},
"node_modules/immediate": {
"version": "3.0.6",
- "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
"dev": true
},
"node_modules/imports-loader": {
"version": "0.6.5",
- "integrity": "sha1-rnRlMDHVnjezwvslRKxhrq41MKY=",
+ "integrity": "sha512-fYIzBL9JOzJszvfeSGSKVjAtkWEtPUwP+OWiUxIWApcxsYh3iqZWZAp8xjTuhsvqglhqaetxeLLTaYyxIv1d4Q==",
"dev": true,
"dependencies": {
"loader-utils": "0.2.x",
@@ -3763,7 +3850,7 @@
},
"node_modules/imports-loader/node_modules/source-map": {
"version": "0.1.43",
- "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+ "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -3774,24 +3861,23 @@
},
"node_modules/imurmurhash": {
"version": "0.1.4",
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
"engines": {
"node": ">=0.8.19"
}
},
"node_modules/indexes-of": {
"version": "1.0.1",
- "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+ "integrity": "sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==",
"dev": true
},
"node_modules/indexof": {
"version": "0.0.1",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
- "dev": true
+ "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
},
"node_modules/inflight": {
"version": "1.0.6",
- "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -3803,8 +3889,7 @@
},
"node_modules/interpret": {
"version": "0.6.6",
- "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
- "dev": true
+ "integrity": "sha512-Vg6X07U0AOZb4HF6CWHa+jnJU8j71buKQ9Pc0C75qBXgvCYbxWBkGo4jnTS3O0MIc9FZtt0mB7h+uclojqdw1Q=="
},
"node_modules/invariant": {
"version": "2.2.4",
@@ -3823,7 +3908,7 @@
},
"node_modules/is-absolute-url": {
"version": "2.1.0",
- "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+ "integrity": "sha512-vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3832,7 +3917,6 @@
"node_modules/is-accessor-descriptor": {
"version": "1.0.0",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "dev": true,
"dependencies": {
"kind-of": "^6.0.0"
},
@@ -3843,19 +3927,17 @@
"node_modules/is-accessor-descriptor/node_modules/kind-of": {
"version": "6.0.3",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-arrayish": {
"version": "0.2.1",
- "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
},
"node_modules/is-binary-path": {
"version": "1.0.1",
- "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
- "dev": true,
+ "integrity": "sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==",
"dependencies": {
"binary-extensions": "^1.0.0"
},
@@ -3868,8 +3950,8 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
},
"node_modules/is-core-module": {
- "version": "2.8.1",
- "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+ "version": "2.13.0",
+ "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
"dependencies": {
"has": "^1.0.3"
},
@@ -3880,7 +3962,6 @@
"node_modules/is-data-descriptor": {
"version": "1.0.0",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "dev": true,
"dependencies": {
"kind-of": "^6.0.0"
},
@@ -3891,7 +3972,6 @@
"node_modules/is-data-descriptor/node_modules/kind-of": {
"version": "6.0.3",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -3899,7 +3979,6 @@
"node_modules/is-descriptor": {
"version": "1.0.2",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -3912,21 +3991,20 @@
"node_modules/is-descriptor/node_modules/kind-of": {
"version": "6.0.3",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-dotfile": {
"version": "1.0.3",
- "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+ "integrity": "sha512-9YclgOGtN/f8zx0Pr4FQYMdibBiTaH3sn52vjYip4ZSf6C4/6RfTEZ+MR4GvKhCxdPh21Bg42/WL55f6KSnKpg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-equal-shallow": {
"version": "0.1.3",
- "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+ "integrity": "sha512-0EygVC5qPvIyb+gSz7zdD5/AAoS6Qrx1e//6N4yv4oNm30kqvdmG66oZFWVlQHUWe5OjP08FuTw2IdT0EOTcYA==",
"dependencies": {
"is-primitive": "^2.0.0"
},
@@ -3936,14 +4014,14 @@
},
"node_modules/is-extendable": {
"version": "0.1.1",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-extglob": {
"version": "1.0.0",
- "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
"engines": {
"node": ">=0.10.0"
}
@@ -3960,7 +4038,7 @@
},
"node_modules/is-glob": {
"version": "2.0.1",
- "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
"dependencies": {
"is-extglob": "^1.0.0"
},
@@ -3970,7 +4048,7 @@
},
"node_modules/is-number": {
"version": "2.1.0",
- "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+ "integrity": "sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -3980,7 +4058,7 @@
},
"node_modules/is-plain-obj": {
"version": "1.1.0",
- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+ "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -3989,7 +4067,6 @@
"node_modules/is-plain-object": {
"version": "2.0.4",
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "dev": true,
"dependencies": {
"isobject": "^3.0.1"
},
@@ -3999,62 +4076,60 @@
},
"node_modules/is-plain-object/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-posix-bracket": {
"version": "0.1.1",
- "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+ "integrity": "sha512-Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-primitive": {
"version": "2.0.0",
- "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+ "integrity": "sha512-N3w1tFaRfk3UrPfqeRyD+GYDASU3W5VinKhlORy8EWVf/sIdDL9GAcew85XmktCfH+ngG7SRXEVDoO18WMdB/Q==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-stream": {
"version": "1.1.0",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+ "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-typedarray": {
"version": "1.0.0",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
"dev": true
},
"node_modules/is-utf8": {
"version": "0.2.1",
- "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+ "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
},
"node_modules/is-windows": {
"version": "1.0.2",
"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/isarray": {
"version": "1.0.0",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
},
"node_modules/isexe": {
"version": "2.0.0",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true
},
"node_modules/isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
"dependencies": {
"isarray": "1.0.0"
},
@@ -4064,24 +4139,24 @@
},
"node_modules/isomorphic-fetch": {
"version": "2.2.1",
- "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+ "integrity": "sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA==",
"dependencies": {
"node-fetch": "^1.0.1",
"whatwg-fetch": ">=0.10.0"
}
},
"node_modules/isomorphic-fetch/node_modules/whatwg-fetch": {
- "version": "3.6.2",
- "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+ "version": "3.6.19",
+ "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw=="
},
"node_modules/isstream": {
"version": "0.1.2",
- "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
"dev": true
},
"node_modules/istanbul": {
"version": "0.3.22",
- "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=",
+ "integrity": "sha512-8H/jxiee2UqX/mviKkPoKQYMxU2t995FC5PwO4zjWeDPOozjoeKqxEyN62l9o5+UgzvYQbrKgQjjxhGON8FcMg==",
"deprecated": "This module is no longer maintained, try this instead:\n npm i nyc\nVisit https://istanbul.js.org/integrations for other alternatives.",
"dev": true,
"dependencies": {
@@ -4123,12 +4198,12 @@
},
"node_modules/istanbul/node_modules/resolve": {
"version": "1.1.7",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==",
"dev": true
},
"node_modules/istanbul/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"dependencies": {
"has-flag": "^1.0.0"
@@ -4139,7 +4214,7 @@
},
"node_modules/jasmine-only": {
"version": "0.1.2",
- "integrity": "sha1-kb27r5B8wCjRmVao46c8kUR4O+c=",
+ "integrity": "sha512-J2qd9QiHrqi3Tg81LFMCzsMIFb+M7Lz+BtjDSbFyGqjuoKabPKLnP2GBqdZ6xrTf5etVlBIbEPNCEiwM7ToZ+w==",
"dev": true,
"dependencies": {
"coffee-script": "~ 1.6.3"
@@ -4147,7 +4222,7 @@
},
"node_modules/jasmine-only/node_modules/coffee-script": {
"version": "1.6.3",
- "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4=",
+ "integrity": "sha512-lpusDYw9xym9ZOqFIeQuzzvTvunm2nlRL++BYhUcLn+77vuidExZG+qDPSKUfDXvuaHeFK6QavntXF+HiOq+/Q==",
"deprecated": "CoffeeScript on NPM has moved to \"coffeescript\" (no hyphen)",
"dev": true,
"bin": {
@@ -4160,17 +4235,17 @@
},
"node_modules/jasmine-pit": {
"version": "2.0.2",
- "integrity": "sha1-dVccsb+swK51DWlIrUWNkbqA5ZY=",
+ "integrity": "sha512-RuiO/mG7+srYueK8/xKRMmSvWAZcgL+ouUgPGtNu9l0NNlCcuDUNUtOpmhHVODY3xLol4IwYOc+RImXfSfFpNA==",
"dev": true
},
"node_modules/javascript-natural-sort": {
"version": "0.7.1",
- "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
+ "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
"dev": true
},
"node_modules/jest-cli": {
"version": "0.5.10",
- "integrity": "sha1-s+S4E+C//8OPC34V6qi8j4RcaIc=",
+ "integrity": "sha512-ygEbnmAd5inHWyYEeRI1BMWu+yeybk+pTRWHXJQ8mXR/cOHiQHgVj3ksxenKyQZ4kF4vmWyJoeJrsh5EzrUstQ==",
"dev": true,
"dependencies": {
"coffee-script": "^1.10.0",
@@ -4202,12 +4277,12 @@
},
"node_modules/js-base64": {
"version": "2.1.9",
- "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+ "integrity": "sha512-f+5mYh8iF7FlF7zgmj/yqvvYQUHI0kAxGiLjIfNxZzqJ7RQNc4sjgp8crVJw0Kzv2O6aFGZWgMTnO71I9utHSg==",
"dev": true
},
"node_modules/js-tokens": {
"version": "3.0.2",
- "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+ "integrity": "sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg=="
},
"node_modules/js-yaml": {
"version": "3.14.1",
@@ -4235,12 +4310,12 @@
},
"node_modules/jsbn": {
"version": "0.1.1",
- "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
"dev": true
},
"node_modules/jsdom": {
"version": "6.5.1",
- "integrity": "sha1-tgZNanZRCBr0HVdu3Fa8UeABIsA=",
+ "integrity": "sha512-KeCN3yqR+MmjAZDnVZgIaL2tP9BxSFlsYZw9Z+zy64+jJzHc1m8ruccb83Qe8AG0xKUjpo2kxEGFCMtiF4MmAg==",
"dev": true,
"dependencies": {
"acorn": "^2.4.0",
@@ -4263,7 +4338,7 @@
},
"node_modules/jsesc": {
"version": "1.3.0",
- "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+ "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
"bin": {
"jsesc": "bin/jsesc"
}
@@ -4283,44 +4358,42 @@
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
},
"node_modules/json-stable-stringify": {
- "version": "1.0.1",
- "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+ "version": "1.0.2",
+ "integrity": "sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==",
"dev": true,
"dependencies": {
- "jsonify": "~0.0.0"
+ "jsonify": "^0.0.1"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/json-stringify-safe": {
"version": "5.0.1",
- "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
- "dev": true
- },
- "node_modules/json3": {
- "version": "3.3.3",
- "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
"dev": true
},
"node_modules/json5": {
"version": "0.5.1",
- "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+ "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
"bin": {
"json5": "lib/cli.js"
}
},
"node_modules/jsonfile": {
"version": "2.4.0",
- "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+ "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
"dev": true,
"optionalDependencies": {
"graceful-fs": "^4.1.6"
}
},
"node_modules/jsonify": {
- "version": "0.0.0",
- "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+ "version": "0.0.1",
+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
"dev": true,
- "engines": {
- "node": "*"
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/jsprim": {
@@ -4338,19 +4411,21 @@
}
},
"node_modules/jszip": {
- "version": "3.7.1",
- "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
"dev": true,
"dependencies": {
"lie": "~3.3.0",
"pako": "~1.0.2",
"readable-stream": "~2.3.6",
- "set-immediate-shim": "~1.0.1"
+ "setimmediate": "^1.0.5"
}
},
"node_modules/jszip/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -4362,8 +4437,15 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/jszip/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/jszip/node_modules/string_decoder": {
"version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"dependencies": {
@@ -4377,7 +4459,7 @@
},
"node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -4387,8 +4469,7 @@
},
"node_modules/lazy-cache": {
"version": "1.0.4",
- "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
- "dev": true,
+ "integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
"engines": {
"node": ">=0.10.0"
}
@@ -4416,7 +4497,7 @@
},
"node_modules/less-loader": {
"version": "2.2.3",
- "integrity": "sha1-ttj4E5yEk98J2ZKpOgBzSwj4RSg=",
+ "integrity": "sha512-U7lgRusyqTj1TUB6OBlmow6GigLk0n5ADuTSGblCp0nkXOk+lFq/lHTDXCHkm3WydZha2FVNZivEjCEZNFJCiw==",
"dev": true,
"dependencies": {
"loader-utils": "^0.2.5"
@@ -4427,7 +4508,7 @@
},
"node_modules/less/node_modules/ajv": {
"version": "4.11.8",
- "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+ "integrity": "sha512-I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4437,7 +4518,7 @@
},
"node_modules/less/node_modules/assert-plus": {
"version": "0.2.0",
- "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+ "integrity": "sha512-u1L0ZLywRziOVjUhRxI0Qg9G+4RnFB9H/Rq40YWn0dieDgO7vAYeJz6jKAO6t/aruzlDFLAPkQTT87e+f8Imaw==",
"dev": true,
"optional": true,
"engines": {
@@ -4446,7 +4527,7 @@
},
"node_modules/less/node_modules/aws-sign2": {
"version": "0.6.0",
- "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+ "integrity": "sha512-JnJpAS0p9RmixkOvW2XwDxxzs1bd4/VAGIl6Q0EC5YOo+p+hqIhtDhn/nmFnB/xUNXbLkpE2mOjgVIBRKD4xYw==",
"dev": true,
"optional": true,
"engines": {
@@ -4455,7 +4536,7 @@
},
"node_modules/less/node_modules/form-data": {
"version": "2.1.4",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "integrity": "sha512-8HWGSLAPr+AG0hBpsqi5Ob8HrLStN/LWeqhpFl14d7FJgHK48TmgLoALPz69XSUR65YJzDfLUX/BM8+MLJLghQ==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4469,7 +4550,7 @@
},
"node_modules/less/node_modules/har-schema": {
"version": "1.0.5",
- "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+ "integrity": "sha512-f8xf2GOR6Rgwc9FPTLNzgwB+JQ2/zMauYXSWmX5YV5acex6VomT0ocSuwR7BfXo5MpHi+jL+saaux2fwsGJDKQ==",
"dev": true,
"optional": true,
"engines": {
@@ -4478,7 +4559,7 @@
},
"node_modules/less/node_modules/har-validator": {
"version": "4.2.1",
- "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+ "integrity": "sha512-5Gbp6RAftMYYV3UEI4c4Vv3+a4dQ7taVyvHt+/L6kRt+f4HX1GweAk5UDWN0SvdVnRBzGQ6OG89pGaD9uSFnVw==",
"deprecated": "this library is no longer supported",
"dev": true,
"optional": true,
@@ -4492,7 +4573,7 @@
},
"node_modules/less/node_modules/http-signature": {
"version": "1.1.1",
- "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+ "integrity": "sha512-iUn0NcRULlDGtqNLN1Jxmzayk8ogm7NToldASyZBpM2qggbphjXzNOiw3piN8tgz+e/DRs6X5gAzFwTI6BCRcg==",
"dev": true,
"optional": true,
"dependencies": {
@@ -4507,7 +4588,7 @@
},
"node_modules/less/node_modules/image-size": {
"version": "0.5.5",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+ "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
"dev": true,
"optional": true,
"bin": {
@@ -4519,7 +4600,7 @@
},
"node_modules/less/node_modules/oauth-sign": {
"version": "0.8.2",
- "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+ "integrity": "sha512-VlF07iu3VV3+BTXj43Nmp6Irt/G7j/NgEctUS6IweH1RGhURjjCc2NWtzXFPXXWWfc7hgbXQdtiQu2LGp6MxUg==",
"dev": true,
"optional": true,
"engines": {
@@ -4528,13 +4609,13 @@
},
"node_modules/less/node_modules/performance-now": {
"version": "0.2.0",
- "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+ "integrity": "sha512-YHk5ez1hmMR5LOkb9iJkLKqoBlL7WD5M8ljC75ZfzXriuBIVNuecaXuU7e+hOwyqf24Wxhh7Vxgt7Hnw9288Tg==",
"dev": true,
"optional": true
},
"node_modules/less/node_modules/punycode": {
"version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==",
"dev": true,
"optional": true
},
@@ -4549,7 +4630,7 @@
},
"node_modules/less/node_modules/request": {
"version": "2.81.0",
- "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+ "integrity": "sha512-IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw==",
"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
"dev": true,
"optional": true,
@@ -4595,7 +4676,7 @@
},
"node_modules/levn": {
"version": "0.2.5",
- "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
+ "integrity": "sha512-mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w==",
"dev": true,
"dependencies": {
"prelude-ls": "~1.1.0",
@@ -4607,6 +4688,7 @@
},
"node_modules/lie": {
"version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
"integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
"dev": true,
"dependencies": {
@@ -4615,7 +4697,7 @@
},
"node_modules/load-json-file": {
"version": "1.1.0",
- "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==",
"dependencies": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
@@ -4629,8 +4711,7 @@
},
"node_modules/loader-utils": {
"version": "0.2.17",
- "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
- "dev": true,
+ "integrity": "sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==",
"dependencies": {
"big.js": "^3.1.3",
"emojis-list": "^2.0.0",
@@ -4640,7 +4721,7 @@
},
"node_modules/locate-path": {
"version": "2.0.0",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
"dependencies": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
@@ -4651,7 +4732,7 @@
},
"node_modules/locate-path/node_modules/path-exists": {
"version": "3.0.0",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
"engines": {
"node": ">=4"
}
@@ -4667,46 +4748,46 @@
},
"node_modules/lodash._basecopy": {
"version": "3.0.1",
- "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+ "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
"dev": true
},
"node_modules/lodash._basetostring": {
"version": "3.0.1",
- "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+ "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==",
"dev": true
},
"node_modules/lodash._basevalues": {
"version": "3.0.0",
- "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+ "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==",
"dev": true
},
"node_modules/lodash._getnative": {
"version": "3.9.1",
- "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+ "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
"dev": true
},
"node_modules/lodash._isiterateecall": {
"version": "3.0.9",
- "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+ "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
"dev": true
},
"node_modules/lodash._reinterpolate": {
"version": "3.0.0",
- "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+ "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
"dev": true
},
"node_modules/lodash._root": {
"version": "3.0.1",
- "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+ "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==",
"dev": true
},
"node_modules/lodash.assign": {
"version": "4.2.0",
- "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+ "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw=="
},
"node_modules/lodash.escape": {
"version": "3.2.0",
- "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+ "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
"dev": true,
"dependencies": {
"lodash._root": "^3.0.0"
@@ -4714,17 +4795,17 @@
},
"node_modules/lodash.isarguments": {
"version": "3.1.0",
- "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+ "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
"dev": true
},
"node_modules/lodash.isarray": {
"version": "3.0.4",
- "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+ "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
"dev": true
},
"node_modules/lodash.keys": {
"version": "3.1.2",
- "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+ "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
"dev": true,
"dependencies": {
"lodash._getnative": "^3.0.0",
@@ -4734,12 +4815,12 @@
},
"node_modules/lodash.restparam": {
"version": "3.6.1",
- "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+ "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
"dev": true
},
"node_modules/lodash.template": {
"version": "3.6.2",
- "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
+ "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==",
"dev": true,
"dependencies": {
"lodash._basecopy": "^3.0.0",
@@ -4755,7 +4836,7 @@
},
"node_modules/lodash.templatesettings": {
"version": "3.1.1",
- "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+ "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==",
"dev": true,
"dependencies": {
"lodash._reinterpolate": "^3.0.0",
@@ -4763,8 +4844,8 @@
}
},
"node_modules/loglevel": {
- "version": "1.8.0",
- "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
+ "version": "1.8.1",
+ "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
"engines": {
"node": ">= 0.6.0"
},
@@ -4775,8 +4856,7 @@
},
"node_modules/longest": {
"version": "1.0.1",
- "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
- "dev": true,
+ "integrity": "sha512-k+yt5n3l48JU4k8ftnKG6V7u32wyH2NfKzeMto9F/QRE0amxy/LayxwlvjjkZEIzqR+19IrtFO8p5kB9QaYUFg==",
"engines": {
"node": ">=0.10.0"
}
@@ -4811,7 +4891,7 @@
},
"node_modules/make-dir/node_modules/pify": {
"version": "3.0.0",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==",
"engines": {
"node": ">=4"
}
@@ -4826,16 +4906,14 @@
},
"node_modules/map-cache": {
"version": "0.2.2",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
- "dev": true,
+ "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/map-visit": {
"version": "1.0.0",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "dev": true,
+ "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
"dependencies": {
"object-visit": "^1.0.0"
},
@@ -4844,8 +4922,8 @@
}
},
"node_modules/math-expression-evaluator": {
- "version": "1.3.14",
- "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
+ "version": "1.4.0",
+ "integrity": "sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw==",
"dev": true
},
"node_modules/math-random": {
@@ -4854,7 +4932,7 @@
},
"node_modules/media-typer": {
"version": "0.3.0",
- "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -4862,17 +4940,15 @@
},
"node_modules/memory-fs": {
"version": "0.3.0",
- "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
- "dev": true,
+ "integrity": "sha512-QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ==",
"dependencies": {
"errno": "^0.1.3",
"readable-stream": "^2.0.1"
}
},
"node_modules/memory-fs/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -4883,10 +4959,13 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/memory-fs/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/memory-fs/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
@@ -4898,12 +4977,12 @@
},
"node_modules/merge-descriptors": {
"version": "1.0.1",
- "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+ "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
"dev": true
},
"node_modules/methods": {
"version": "1.1.2",
- "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
"dev": true,
"engines": {
"node": ">= 0.6"
@@ -4911,7 +4990,7 @@
},
"node_modules/micromatch": {
"version": "2.3.11",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+ "integrity": "sha512-LnU2XFEk9xxSJ6rfgAry/ty5qwUTyHYOBU0g4R6tIw5ljwgGIBmiKhRWLw5NpMOnrgUNcDJ4WMp8rl3sYVHLNA==",
"dependencies": {
"arr-diff": "^2.0.0",
"array-unique": "^0.2.1",
@@ -4943,19 +5022,19 @@
}
},
"node_modules/mime-db": {
- "version": "1.51.0",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "version": "1.52.0",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"dev": true,
"engines": {
"node": ">= 0.6"
}
},
"node_modules/mime-types": {
- "version": "2.1.34",
- "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+ "version": "2.1.35",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"dev": true,
"dependencies": {
- "mime-db": "1.51.0"
+ "mime-db": "1.52.0"
},
"engines": {
"node": ">= 0.6"
@@ -4972,8 +5051,11 @@
}
},
"node_modules/minimist": {
- "version": "1.2.5",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ "version": "1.2.8",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/mississippi": {
"version": "2.0.0",
@@ -4997,7 +5079,6 @@
"node_modules/mixin-deep": {
"version": "1.3.2",
"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
- "dev": true,
"dependencies": {
"for-in": "^1.0.2",
"is-extendable": "^1.0.1"
@@ -5009,7 +5090,6 @@
"node_modules/mixin-deep/node_modules/is-extendable": {
"version": "1.0.1",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "dev": true,
"dependencies": {
"is-plain-object": "^2.0.4"
},
@@ -5018,18 +5098,18 @@
}
},
"node_modules/mkdirp": {
- "version": "0.5.5",
- "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "version": "0.5.6",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
"dependencies": {
- "minimist": "^1.2.5"
+ "minimist": "^1.2.6"
},
"bin": {
"mkdirp": "bin/cmd.js"
}
},
"node_modules/moment": {
- "version": "2.29.1",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "version": "2.29.4",
+ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
"dev": true,
"engines": {
"node": "*"
@@ -5037,7 +5117,7 @@
},
"node_modules/move-concurrently": {
"version": "1.0.1",
- "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+ "integrity": "sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==",
"dependencies": {
"aproba": "^1.1.1",
"copy-concurrently": "^1.0.0",
@@ -5049,12 +5129,11 @@
},
"node_modules/ms": {
"version": "2.0.0",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/nanomatch": {
"version": "1.2.13",
"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
- "dev": true,
"dependencies": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -5074,16 +5153,14 @@
},
"node_modules/nanomatch/node_modules/arr-diff": {
"version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "dev": true,
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/nanomatch/node_modules/array-unique": {
"version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "dev": true,
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
"engines": {
"node": ">=0.10.0"
}
@@ -5091,14 +5168,13 @@
"node_modules/nanomatch/node_modules/kind-of": {
"version": "6.0.3",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/ncp": {
"version": "1.0.1",
- "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
+ "integrity": "sha512-akBX7I5X9KQDDWmYYgQlLbVbjkveTje2mioZjhLLrVt09akSZcoqXWE5LEn1E2fu8T7th1PZYGfewQsTkTLTmQ==",
"dev": true,
"bin": {
"ncp": "bin/ncp"
@@ -5119,7 +5195,7 @@
},
"node_modules/node-balanced": {
"version": "0.0.14",
- "integrity": "sha1-ozxyeFfTBE8eiL5y3X2anQtPwh8=",
+ "integrity": "sha512-X0dI9P/OTETpHEqMpv4BRvlj6U0iLV+2YcKf8XayxGdEA86YpaCg8CnxgsD77YldxgY21tjOxRdCsSGLRfS2Ug==",
"dev": true
},
"node_modules/node-fetch": {
@@ -5132,7 +5208,7 @@
},
"node_modules/node-haste": {
"version": "1.2.8",
- "integrity": "sha1-0vEOk9dWfCaJrIP8BNtNdsqnDzw=",
+ "integrity": "sha512-8eEwaAWGtLajkqYhJ7M+gqPpHqn+ax1rj8FWi5WJaJ4bIUzKx5uiqguTYLcH9W5MG8S+hLXMHrPgBZNaPzlgtQ==",
"dev": true,
"dependencies": {
"esprima-fb": "4001.1001.0-dev-harmony-fb"
@@ -5140,13 +5216,12 @@
},
"node_modules/node-int64": {
"version": "0.4.0",
- "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+ "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
"dev": true
},
"node_modules/node-libs-browser": {
"version": "0.7.0",
- "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
- "dev": true,
+ "integrity": "sha512-V0EeBff5/nauAta4yGYMdn/CYXpn2KYcE8r6rwU9qJDXG6wMrBhtWVfoKWphSvsnX+mZk6DzaGSO+Yz/MGBAGQ==",
"dependencies": {
"assert": "^1.1.1",
"browserify-zlib": "^0.1.4",
@@ -5175,13 +5250,11 @@
},
"node_modules/node-libs-browser/node_modules/punycode": {
"version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
- "dev": true
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
},
"node_modules/node-libs-browser/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -5195,24 +5268,26 @@
"node_modules/node-libs-browser/node_modules/readable-stream/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
+ "node_modules/node-libs-browser/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/node-libs-browser/node_modules/string_decoder": {
"version": "0.10.31",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
+ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
},
"node_modules/node-worker-pool": {
"version": "3.0.2",
- "integrity": "sha1-IQZTLJGhgnnj2aQRe1oqbaGgjpw=",
+ "integrity": "sha512-xyvOK6UXpZrUUzXV1GWmS52l9gQTc/GQKnPnSd7RJMigmrf+o0iCO80jFgqojGlEC+4/zfxi8uGtXUEE2pB72g==",
"dev": true
},
"node_modules/nopt": {
"version": "3.0.6",
- "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+ "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==",
"dev": true,
"dependencies": {
"abbrev": "1"
@@ -5233,7 +5308,7 @@
},
"node_modules/normalize-path": {
"version": "2.1.1",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
"dependencies": {
"remove-trailing-separator": "^1.0.1"
},
@@ -5243,12 +5318,12 @@
},
"node_modules/normalize-selector": {
"version": "0.2.0",
- "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+ "integrity": "sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==",
"dev": true
},
"node_modules/normalize-url": {
"version": "1.9.1",
- "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+ "integrity": "sha512-A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ==",
"dev": true,
"dependencies": {
"object-assign": "^4.0.1",
@@ -5262,7 +5337,7 @@
},
"node_modules/num2fraction": {
"version": "1.2.2",
- "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+ "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
"dev": true
},
"node_modules/numbro": {
@@ -5274,7 +5349,7 @@
},
"node_modules/numeral": {
"version": "2.0.6",
- "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=",
+ "integrity": "sha512-qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==",
"dev": true,
"engines": {
"node": "*"
@@ -5295,15 +5370,14 @@
},
"node_modules/object-assign": {
"version": "4.1.1",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/object-copy": {
"version": "0.1.0",
- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
- "dev": true,
+ "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
"dependencies": {
"copy-descriptor": "^0.1.0",
"define-property": "^0.2.5",
@@ -5315,8 +5389,7 @@
},
"node_modules/object-copy/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dependencies": {
"is-descriptor": "^0.1.0"
},
@@ -5326,8 +5399,7 @@
},
"node_modules/object-copy/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -5337,8 +5409,7 @@
},
"node_modules/object-copy/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -5349,7 +5420,6 @@
"node_modules/object-copy/node_modules/is-descriptor": {
"version": "0.1.6",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -5362,15 +5432,27 @@
"node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
"version": "5.1.0",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/object-inspect": {
+ "version": "1.12.3",
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/object-keys": {
+ "version": "1.1.1",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/object-visit": {
"version": "1.0.1",
- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
- "dev": true,
+ "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
"dependencies": {
"isobject": "^3.0.0"
},
@@ -5380,15 +5462,30 @@
},
"node_modules/object-visit/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
+ "node_modules/object.assign": {
+ "version": "4.1.4",
+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
+ "object-keys": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/object.omit": {
"version": "2.0.1",
- "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+ "integrity": "sha512-UiAM5mhmIuKLsOvrL+B0U2d1hXHF3bFYWIuH1LMpuV2EJEHG1Ntz06PgLEHjm6VFd87NpH8rastvPoyv6UW2fA==",
"dependencies": {
"for-own": "^0.1.4",
"is-extendable": "^0.1.1"
@@ -5399,8 +5496,7 @@
},
"node_modules/object.pick": {
"version": "1.3.0",
- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
- "dev": true,
+ "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
"dependencies": {
"isobject": "^3.0.1"
},
@@ -5410,15 +5506,14 @@
},
"node_modules/object.pick/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/on-finished": {
- "version": "2.3.0",
- "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+ "version": "2.4.1",
+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
"dev": true,
"dependencies": {
"ee-first": "1.1.1"
@@ -5437,14 +5532,14 @@
},
"node_modules/once": {
"version": "1.4.0",
- "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
"dependencies": {
"wrappy": "1"
}
},
"node_modules/open": {
"version": "0.0.5",
- "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
+ "integrity": "sha512-+X/dJYLapVO1VbC620DhtNZK9U4/kQVaTQp/Gh7cb6UTLYfGZzzU2ZXkWrOA/wBrf4UqAFwtLqXYTxe4tSnWQQ==",
"dev": true,
"engines": {
"node": ">= 0.6.0"
@@ -5452,8 +5547,7 @@
},
"node_modules/optimist": {
"version": "0.6.1",
- "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
- "dev": true,
+ "integrity": "sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==",
"dependencies": {
"minimist": "~0.0.1",
"wordwrap": "~0.0.2"
@@ -5461,20 +5555,18 @@
},
"node_modules/optimist/node_modules/minimist": {
"version": "0.0.10",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
- "dev": true
+ "integrity": "sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="
},
"node_modules/optimist/node_modules/wordwrap": {
"version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
- "dev": true,
+ "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
"engines": {
"node": ">=0.4.0"
}
},
"node_modules/optionator": {
"version": "0.5.0",
- "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=",
+ "integrity": "sha512-jUr7aBk/kCInAEsl+qxuw4ORpe458atDKXNLhyvPUD4NfnsJsbAViX1b9nb/0rS62lO8cIFd1VoiaXLQ+MybOw==",
"dev": true,
"dependencies": {
"deep-is": "~0.1.2",
@@ -5490,35 +5582,26 @@
},
"node_modules/optionator/node_modules/wordwrap": {
"version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+ "integrity": "sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==",
"dev": true,
"engines": {
"node": ">=0.4.0"
}
},
- "node_modules/original": {
- "version": "1.0.2",
- "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
- "dev": true,
- "dependencies": {
- "url-parse": "^1.4.3"
- }
- },
"node_modules/os-browserify": {
"version": "0.2.1",
- "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
- "dev": true
+ "integrity": "sha512-vHbnbzdqWJWvGOm7aOMDXHVUykPG0GdhfLkn5ZDmvbRI+wPj/XoB0/CRAkP9v28eZ7REIPPHJa+8ZEYixsWKmQ=="
},
"node_modules/os-homedir": {
"version": "1.0.2",
- "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+ "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/os-tmpdir": {
"version": "1.0.2",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
"engines": {
"node": ">=0.10.0"
}
@@ -5535,7 +5618,7 @@
},
"node_modules/p-locate": {
"version": "2.0.0",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
"dependencies": {
"p-limit": "^1.1.0"
},
@@ -5545,13 +5628,14 @@
},
"node_modules/p-try": {
"version": "1.0.0",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
"engines": {
"node": ">=4"
}
},
"node_modules/pako": {
"version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
"dev": true
},
@@ -5565,8 +5649,8 @@
}
},
"node_modules/parallel-transform/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -5577,6 +5661,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/parallel-transform/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/parallel-transform/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -5586,7 +5674,7 @@
},
"node_modules/parse-glob": {
"version": "3.0.4",
- "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+ "integrity": "sha512-FC5TeK0AwXzq3tUBFtH74naWkPQCEWs4K+xMxWZBlKDWu0bVHXGZa+KKqxKidd7xwhdZ19ZNuF2uO1M/r196HA==",
"dependencies": {
"glob-base": "^0.3.0",
"is-dotfile": "^1.0.0",
@@ -5599,7 +5687,7 @@
},
"node_modules/parse-json": {
"version": "2.2.0",
- "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
"dependencies": {
"error-ex": "^1.2.0"
},
@@ -5609,7 +5697,7 @@
},
"node_modules/parse5": {
"version": "1.5.1",
- "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+ "integrity": "sha512-w2jx/0tJzvgKwZa58sj2vAYq/S/K1QJfIB3cWYea/Iu1scFPDQQ3IQiVZTHWtRBwAjv2Yd7S/xeZf3XqLDb3bA==",
"dev": true
},
"node_modules/parseurl": {
@@ -5622,20 +5710,18 @@
},
"node_modules/pascalcase": {
"version": "0.1.1",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
- "dev": true,
+ "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/path-browserify": {
"version": "0.0.0",
- "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
- "dev": true
+ "integrity": "sha512-WA3pxi1olUQcsl82W576vkqhUSGp0uBtr/381pxx5WXLp3NC+AB99hUG3aGW7H0Kg9PFr1D8wv1iJeICe+9Mhw=="
},
"node_modules/path-exists": {
"version": "2.1.0",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==",
"dependencies": {
"pinkie-promise": "^2.0.0"
},
@@ -5645,7 +5731,7 @@
},
"node_modules/path-is-absolute": {
"version": "1.0.1",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
"engines": {
"node": ">=0.10.0"
}
@@ -5656,12 +5742,12 @@
},
"node_modules/path-to-regexp": {
"version": "0.1.7",
- "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
"dev": true
},
"node_modules/path-type": {
"version": "1.1.0",
- "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+ "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==",
"dependencies": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
@@ -5673,31 +5759,30 @@
},
"node_modules/pbkdf2-compat": {
"version": "2.0.1",
- "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
- "dev": true
+ "integrity": "sha512-JYubxYhymODUUWVq9/Tmo9VQFZ8LyrD/pbXVpwmt1Npr2z29KZwp7+IBT3/PRjr1xpecX4W1EcbjFjp8nE3stQ=="
},
"node_modules/performance-now": {
"version": "2.1.0",
- "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
"dev": true
},
"node_modules/pify": {
"version": "2.3.0",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/pinkie": {
"version": "2.0.4",
- "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+ "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/pinkie-promise": {
"version": "2.0.1",
- "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+ "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
"dependencies": {
"pinkie": "^2.0.0"
},
@@ -5707,7 +5792,7 @@
},
"node_modules/pkg-dir": {
"version": "1.0.0",
- "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+ "integrity": "sha512-c6pv3OE78mcZ92ckebVDqg0aWSoKhOTbwCV6qbCWMk546mAL9pZln0+QsN/yQ7fkucd4+yJPLrCBXNt8Ruk+Eg==",
"dev": true,
"dependencies": {
"find-up": "^1.0.0"
@@ -5722,15 +5807,14 @@
},
"node_modules/posix-character-classes": {
"version": "0.1.1",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
- "dev": true,
+ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/postcss": {
"version": "4.1.16",
- "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=",
+ "integrity": "sha512-aAutxE8MvL1bHylFMYb2c2nniFax8XDztHzZ+x5DVsNJnoW6VHvGSNSqdW3+ip255HCWfPjayVVFzMmyiL7opA==",
"dev": true,
"dependencies": {
"es6-promise": "~2.3.0",
@@ -5740,7 +5824,7 @@
},
"node_modules/postcss-calc": {
"version": "4.1.0",
- "integrity": "sha1-vuf/ySjHmGmZ7vF7LdiXDIk31HI=",
+ "integrity": "sha512-N6ppZeyWp/7NEgZUIPYK2krNFDPSVTv+fTJ0y+YfTsNc4LmRXZMsiHBcSJ3zSgU5Oc7r6eg6RX9bCAFq2LDP0w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11",
@@ -5750,7 +5834,7 @@
},
"node_modules/postcss-colormin": {
"version": "1.2.7",
- "integrity": "sha1-63Pb6DgE6pGYNWsTL2+Z9GAP1lQ=",
+ "integrity": "sha512-RuYPkKOTG1S493X83yeSf8HgcjTrMsy9+pyAXvYfv+Q07jlbX/h8ECwjhjFna6f/OK0YWgpEjxN+gRuE19EHzQ==",
"dev": true,
"dependencies": {
"color": "^0.10.1",
@@ -5761,7 +5845,7 @@
},
"node_modules/postcss-convert-values": {
"version": "1.3.1",
- "integrity": "sha1-I/GHxhP6d7Y3p4BblIteCJlpDkY=",
+ "integrity": "sha512-xZ6gewHaeK+CHOXXss6KnqCppRxJRadHESauJY+pkeMjrpMeJdlnCQmpEULqNNwcLYBj0UcnQ2DI8IoPuUcHNg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16",
@@ -5770,7 +5854,7 @@
},
"node_modules/postcss-discard-comments": {
"version": "1.2.1",
- "integrity": "sha1-hR3Ka5NUwPtjFssaEEj29eOWCtA=",
+ "integrity": "sha512-8EhZvSq4wF30EEoL8RGzFejBOFZ3UA6xCWXHR0v5mfbEw4htS4+qCDI1ejLIVPrFqRj7LbniIFM7BJsKo/Cjkw==",
"dev": true,
"dependencies": {
"node-balanced": "0.0.14",
@@ -5779,7 +5863,7 @@
},
"node_modules/postcss-discard-duplicates": {
"version": "1.2.1",
- "integrity": "sha1-SbsztNNHcQWwDQSDlfc6KQK8miU=",
+ "integrity": "sha512-ua2mOGv5kny6s+jSEjzxQla/BFS8P003lPAV7Z6/9NPHkWyukq76Gv3EUvhLBVnx14ToIpOJwDRrAoKo4TbktA==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5787,7 +5871,7 @@
},
"node_modules/postcss-discard-empty": {
"version": "1.1.2",
- "integrity": "sha1-KsVayPy4HCMEPmMQaTT9Y0cNXA0=",
+ "integrity": "sha512-+pmpPZNua5PksvWVUnQzaTfWxt4JWrzctpkQaynxEA+T20z/2mIr+JGWYHolTwaCkMgDGj0vuLAJxdwTRsclFQ==",
"dev": true,
"dependencies": {
"postcss": "^4.1.13"
@@ -5795,7 +5879,7 @@
},
"node_modules/postcss-discard-unused": {
"version": "1.0.3",
- "integrity": "sha1-Xsy5v6xGXqa+VjQpepx3gczQmIY=",
+ "integrity": "sha512-KjNXbZw66Yez992IUCG5z+6gjA1WgX3K2RtieFlB5k9U0Jp4M/NB7TL4tTj4I6Ug5LUzmVFB+nAtf0+9nYgjiA==",
"dev": true,
"dependencies": {
"flatten": "0.0.1",
@@ -5805,7 +5889,7 @@
},
"node_modules/postcss-filter-plugins": {
"version": "1.0.1",
- "integrity": "sha1-J/gnnV76t6o8FwmIE5hrS50dUOI=",
+ "integrity": "sha512-frP9Wq2HZhC6EYLl0e7AJb4GfscxJknnHb9AvTiypicPFinC/tTwKtr7Fy2Oij0BBhMcJL4WnVFSMs16/ZD2xA==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11",
@@ -5814,7 +5898,7 @@
},
"node_modules/postcss-font-family": {
"version": "1.2.1",
- "integrity": "sha1-dQJSSzmDox5q9k5LqhA07W7YQYw=",
+ "integrity": "sha512-c32Jf4YlO3p/y2KmTp328lDoNJJ+U/lJQomRhSwhTeZGTjDSPLLtfeq9WwHClZur/TRAMZeCQ1UByhKy0zmwGA==",
"dev": true,
"dependencies": {
"object-assign": "^3.0.0",
@@ -5824,7 +5908,7 @@
},
"node_modules/postcss-font-family/node_modules/object-assign": {
"version": "3.0.0",
- "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
+ "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -5832,7 +5916,7 @@
},
"node_modules/postcss-merge-idents": {
"version": "1.0.2",
- "integrity": "sha1-qToNrXj2UugjfZrew0LkHSwd01s=",
+ "integrity": "sha512-e/HiIm+YUrL11hX1H64is+P04PVixSFEe+Gmo8eNzCaCA5+SWNNr9O0ZAkogiUcGhITgbhl/+YGFnMJ7OrYM2g==",
"dev": true,
"dependencies": {
"css-list": "^0.1.0",
@@ -5841,7 +5925,7 @@
},
"node_modules/postcss-merge-longhand": {
"version": "1.0.2",
- "integrity": "sha1-QxcgZfz4We4RztMUH1ZkFMZzBX4=",
+ "integrity": "sha512-Or1dsH5Vk7WgzkiILVKdNKIVQgGGJQkVBEkt0fZiO4pmXKTuZBDFx7cFZ4MuTJhoK63jdlpLqeSL9KUzZ41H/Q==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5849,7 +5933,7 @@
},
"node_modules/postcss-merge-rules": {
"version": "1.3.6",
- "integrity": "sha1-sUrRf31AEqMYut032r1ZuT8TUy8=",
+ "integrity": "sha512-uZhWp298tCYHzQZz0qvgKbYY9jzp3doT3fDudvyQ1WnnLHgpaqWaRaixVmq82lT8IuR7Ike/yHUb+zrgE7Yhuw==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16"
@@ -5857,12 +5941,12 @@
},
"node_modules/postcss-message-helpers": {
"version": "2.0.0",
- "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+ "integrity": "sha512-tPLZzVAiIJp46TBbpXtrUAKqedXSyW5xDEo1sikrfEfnTs+49SBZR/xDdqCiJvSSbtr615xDsaMF3RrxS2jZlA==",
"dev": true
},
"node_modules/postcss-minify-font-weight": {
"version": "1.0.1",
- "integrity": "sha1-aI5CzfI27Osb1WOojPHSTQOgWIg=",
+ "integrity": "sha512-l2w8G/G2jjePa+SzeAAzMGSvsFgsfUIDuizG2VOqXsUy//tx1tL7daMptqzc+xo1Ji6ILs8xSMW4KF8uzBtXmg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11"
@@ -5870,7 +5954,7 @@
},
"node_modules/postcss-minify-selectors": {
"version": "1.5.0",
- "integrity": "sha1-5ZxWxtSVXaFXz30iv4Bptur1Jic=",
+ "integrity": "sha512-SqeHUr0Y+QMbfvpCcWu4lg8NiOlAIXoleDlrapgfwBBypFfxrKdUwimEc0e+ROQR0s+YZGYIz5RzxxeEBcnGDQ==",
"dev": true,
"dependencies": {
"javascript-natural-sort": "^0.7.1",
@@ -5882,7 +5966,7 @@
},
"node_modules/postcss-modules-extract-imports": {
"version": "0.0.5",
- "integrity": "sha1-zMy0Cz3SmFmZOEodumDGLJYKbaA=",
+ "integrity": "sha512-5aDf1iigEVDSOZVk6yqrfNl2R2oFlgvxs3vuClg7feV3r+ETcwuWEiJdzxMPdzfYq7psJ1QFUYcWOC8Q3+Rh1w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.11"
@@ -5890,7 +5974,7 @@
},
"node_modules/postcss-modules-local-by-default": {
"version": "0.0.11",
- "integrity": "sha1-qACvQyHDpOCFLRrlKeb8mRrTlec=",
+ "integrity": "sha512-e0m48wTMnsdZ62Ps23uvMsOvht6XL46UNM23jaAAxRgAdELEMARi3p1ogFll59u9K6i7cIFxunWYpxlTqvWLqw==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.1",
@@ -5899,7 +5983,7 @@
},
"node_modules/postcss-modules-scope": {
"version": "0.0.8",
- "integrity": "sha1-gck1+/KJJyOIyLoulqEcohugmgQ=",
+ "integrity": "sha512-iYDhIsMEGsnNpw+sAy7pNtaQA/FGZqUQX29A72yDU5ejLzWJNZOHyMshLsWquGsknTrmL4nSk7CFkq5N6vS02w==",
"dev": true,
"dependencies": {
"css-selector-tokenizer": "^0.5.0",
@@ -5908,7 +5992,7 @@
},
"node_modules/postcss-normalize-url": {
"version": "2.1.3",
- "integrity": "sha1-8StfShFDyV6gJfx/jgBQkFmPNgI=",
+ "integrity": "sha512-OSm6GAr4sl4BGzl6fcEW1Pr5mFjCRJpnPssQY0EvXeQbaC3omfbB1vEh+xc8Pyih9ewoYlLy2Bkfh492xscAXQ==",
"dev": true,
"dependencies": {
"is-absolute-url": "^2.0.0",
@@ -5920,7 +6004,7 @@
},
"node_modules/postcss-ordered-values": {
"version": "1.1.1",
- "integrity": "sha1-nu1PrS55Kr/D0EAs93O6+G/ne4E=",
+ "integrity": "sha512-CKE/Rck09Me8eEpOgn5DwzQOloCCgSqDQ96QDPXJnRZy4LddNM7F4p67wnBeNV5p4JNUW67HMBjtT8jDxsUA5g==",
"dev": true,
"dependencies": {
"postcss": "^4.1.16",
@@ -5929,7 +6013,7 @@
},
"node_modules/postcss-reduce-idents": {
"version": "1.0.3",
- "integrity": "sha1-p58bJIXiPZs8x6gfXsY6XCvewg0=",
+ "integrity": "sha512-0UubRdgHMxkMuKmtkkWqvq1NINZqekbL6qx21FZ3UwCoVEqOSV3YrMXdBP8rGb5tUt74DJ4NLFrYiQcvKJ9sZg==",
"dev": true,
"dependencies": {
"postcss": "^4.1.2",
@@ -5938,7 +6022,7 @@
},
"node_modules/postcss-selector-parser": {
"version": "1.3.3",
- "integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
+ "integrity": "sha512-YVWTPQprpsXhiQyZe3PW1U5stw+/OI7mMG7REN5sx9z6eaIpuzTUm5vy9RI4NTLR7hC9SqNYmxhyxTkorC2KFg==",
"dev": true,
"dependencies": {
"flatten": "^1.0.2",
@@ -5954,7 +6038,7 @@
},
"node_modules/postcss-single-charset": {
"version": "0.3.0",
- "integrity": "sha1-2n/Q3szPYy8bdMei7j41vilFZXM=",
+ "integrity": "sha512-PsdF5mfVqzPzwPBsIwTbcgnWqjHnEHD+tpCL19PvNnQUlqHDb5bxTkC6fH8uqLcEiS/ponEIsjKPp/HR0E32Bg==",
"deprecated": "Package no longer supported. Contact support@npmjs.com for more info.",
"dev": true,
"dependencies": {
@@ -5964,7 +6048,7 @@
},
"node_modules/postcss-unique-selectors": {
"version": "1.0.1",
- "integrity": "sha1-SBfnTHtPmZzgTI5mRRoZaRT12zw=",
+ "integrity": "sha512-91GmlJUS9AAwigXh3RCsx4SPMUkPUbjCYfH8kHOSziVKrPLutB0xchqIiLZ90j4B5gEQ+qCZBmcP6XcDojtOtQ==",
"dev": true,
"dependencies": {
"javascript-natural-sort": "^0.7.1",
@@ -5974,12 +6058,12 @@
},
"node_modules/postcss-value-parser": {
"version": "1.4.2",
- "integrity": "sha1-GGVjPhNwH4pyHng02tGFyxRKrQw=",
+ "integrity": "sha512-22vc2Fs4uAZTNRbQ9M7yU877FYXkKIq7aaTgm0gg+Q9Yj+SkcMVYjZ/hJ3adaUBJlZDz2dGLcjHzSt13mAMh+Q==",
"dev": true
},
"node_modules/postcss-zindex": {
"version": "1.1.3",
- "integrity": "sha1-SVZKtJ092hcGf42sHIM11/LQDOE=",
+ "integrity": "sha512-qJTMfyi9QDYI4RboxedqQHB9+JWrk6gNQqvQ2oKkL/NmwDCPRj1soaIW+P3OmA+i7qQebzU0d17MRDpYliFq1w==",
"dev": true,
"dependencies": {
"postcss": "^4.1.2"
@@ -5987,12 +6071,12 @@
},
"node_modules/postcss/node_modules/es6-promise": {
"version": "2.3.0",
- "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw=",
+ "integrity": "sha512-oyOjMhyKMLEjOOtvkwg0G4pAzLQ9WdbbeX7WdqKzvYXu+UFgD0Zo/Brq5Q49zNmnGPPzV5rmYvrr0jz1zWx8Iw==",
"dev": true
},
"node_modules/postcss/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -6003,7 +6087,7 @@
},
"node_modules/prelude-ls": {
"version": "1.1.2",
- "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
"dev": true,
"engines": {
"node": ">= 0.8.0"
@@ -6011,7 +6095,7 @@
},
"node_modules/prepend-http": {
"version": "1.0.4",
- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+ "integrity": "sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -6019,7 +6103,7 @@
},
"node_modules/preserve": {
"version": "0.2.0",
- "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+ "integrity": "sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==",
"engines": {
"node": ">=0.10.0"
}
@@ -6033,8 +6117,7 @@
},
"node_modules/process": {
"version": "0.11.10",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
- "dev": true,
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
"engines": {
"node": ">= 0.6.0"
}
@@ -6052,7 +6135,7 @@
},
"node_modules/promise-inflight": {
"version": "1.0.1",
- "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+ "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
},
"node_modules/prop-types": {
"version": "15.8.1",
@@ -6095,15 +6178,15 @@
},
"node_modules/prr": {
"version": "1.0.1",
- "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+ "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
},
"node_modules/pseudomap": {
"version": "1.0.2",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+ "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
},
"node_modules/psl": {
- "version": "1.8.0",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+ "version": "1.9.0",
+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
"dev": true
},
"node_modules/pump": {
@@ -6124,8 +6207,8 @@
}
},
"node_modules/punycode": {
- "version": "2.1.1",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "version": "2.3.0",
+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
"engines": {
"node": ">=6"
}
@@ -6140,7 +6223,7 @@
},
"node_modules/query-string": {
"version": "4.3.4",
- "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+ "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
"dev": true,
"dependencies": {
"object-assign": "^4.1.0",
@@ -6150,19 +6233,9 @@
"node": ">=0.10.0"
}
},
- "node_modules/querystring": {
- "version": "0.2.0",
- "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
- "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
- "dev": true,
- "engines": {
- "node": ">=0.4.x"
- }
- },
"node_modules/querystring-es3": {
"version": "0.2.1",
- "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
- "dev": true,
+ "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
"engines": {
"node": ">=0.4.x"
}
@@ -6207,12 +6280,12 @@
}
},
"node_modules/raw-body": {
- "version": "2.4.3",
- "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+ "version": "2.5.1",
+ "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
},
@@ -6241,7 +6314,7 @@
},
"node_modules/rc-checkbox": {
"version": "1.5.0",
- "integrity": "sha1-RkzptAsa2dEZUkztF0pgp7TrdSk=",
+ "integrity": "sha512-XAEKjZdSz0JPVrZZg1ZpPUEhi2q9M/bxr6RNUgzSJkhvFwD06UBqVQcJzGDr/izlbGGXnt6QA6sJ6uwTarvAYQ==",
"dependencies": {
"classnames": "2.x",
"rc-util": "^4.0.1"
@@ -6260,7 +6333,7 @@
},
"node_modules/react": {
"version": "15.4.2",
- "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=",
+ "integrity": "sha512-qfWUqdaiZjHlmsWI9Cvw9UvugnxluSsEoSOeykOiB37xQokYpxNqdQizNsAqVQvrNz4I8Pf7wCfB5g+ocvJS8Q==",
"dependencies": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -6272,7 +6345,7 @@
},
"node_modules/react-addons-update": {
"version": "15.3.2",
- "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4=",
+ "integrity": "sha512-IXmplRjYEq7iE0QnSrI4Dbne/7+CwlyGjp+4g1XbsSjSgnW4djKkfOsD7ZwCjYlXON1KU5rDfgC/Er1e9CgX0g==",
"peerDependencies": {
"react": "^15.3.2"
}
@@ -6302,7 +6375,7 @@
},
"node_modules/react-bootstrap-table": {
"version": "3.5.1",
- "integrity": "sha1-wkKKX+zpgj8La97ffxmGMKxVoWQ=",
+ "integrity": "sha512-BSgTbIFFQdhNJ36aBdTz44LHDPYCFbX74zFNSS0jnUlm588hlAsEuD1aUghiHLzQyMD4J46cxBCQy4b9s+NAMw==",
"dependencies": {
"@allenfang/react-toastr": "2.8.2",
"classnames": "^2.1.2",
@@ -6314,7 +6387,7 @@
},
"node_modules/react-bootstrap-table/node_modules/exenv": {
"version": "1.2.0",
- "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk="
+ "integrity": "sha512-4wr7O1jptvGPYWb1PHyX6QGcJlP3V7CRD4CPjw+k2k/Drbi2DMHic2OqnQ2kHEImmpAtNFJL1PNXbiN9JgXD6w=="
},
"node_modules/react-bootstrap-table/node_modules/react-modal": {
"version": "1.9.7",
@@ -6334,7 +6407,7 @@
},
"node_modules/react-bootstrap-typeahead": {
"version": "1.4.2",
- "integrity": "sha1-GRPjLOpNeb7NA6yrvZM2EWiEgVs=",
+ "integrity": "sha512-cNX0z5Inrlf8MyU9Wtq9mCmnLGr09Vm0H24uj7qPDw7qqIPWk8po3F8cv8CSPEYhul6mDMz1BA3R5Q7DqrYAjg==",
"dependencies": {
"classnames": "^2.2.0",
"create-react-class": "^15.5.2",
@@ -6370,7 +6443,7 @@
},
"node_modules/react-date-picker": {
"version": "3.1.10",
- "integrity": "sha1-X9V5jbxEqVfUciL3PUdWxs7V4Gk=",
+ "integrity": "sha512-zqCDgMfptEy6pmQ8+yZDFjAJtZBXbmz98x7JpSDIbww+CNujGhi9x9lxfF+WIg4/Wee43SnNpSjJctWQSjmQlQ==",
"deprecated": "React-Date-Picker 5.x and older is deprecated. The authors of these versions have disappeared. Please upgrade to version 6.x to get fully maintained package with support for React 16. It requires some changes on your side, but in most cases it shouldn't take you more than a few minutes. See project's page for instructions and support.",
"dev": true,
"dependencies": {
@@ -6384,7 +6457,7 @@
},
"node_modules/react-dom": {
"version": "15.4.2",
- "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=",
+ "integrity": "sha512-k5NZrskw9K6rTlgIH/z4exMQuQQfzF8z2G7Ic+9vODPTycx//qyuOTiAhYhjlOaHFsIH2IXWJ4n4JiwheDBXNA==",
"dependencies": {
"fbjs": "^0.8.1",
"loose-envify": "^1.1.0",
@@ -6396,11 +6469,11 @@
},
"node_modules/react-dom-factories": {
"version": "1.0.2",
- "integrity": "sha1-63cFxNs2+1AbOqOP91lhaqD/luA="
+ "integrity": "sha512-Bmic2N3oKji7vw9qjDr2dmwHvOATbFSnKy7EH0uT/qjvzIUsiXp6Yquk72LJ3WfMtRnq3ujXMMo7GsJeLPfFWw=="
},
"node_modules/react-filtered-multiselect": {
"version": "0.4.2",
- "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE=",
+ "integrity": "sha512-hYR3ThQ2hFvOt+TA3iUTh2F80rNUiSbSr54gq3Rlb4/bb99FD+7WtZiYRJvEOlCH4qBPmyglzWilPjF2M0igZg==",
"peerDependencies": {
"react": ">=0.14.0"
}
@@ -6420,7 +6493,7 @@
},
"node_modules/react-hot-api": {
"version": "0.4.7",
- "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=",
+ "integrity": "sha512-jFFfeyjTs/HOhXMgzQi71E2fp9W0IHoFaUrszUECfdmRF2q4JoADmtc1Zo0IgGvc4PUujAJ8q6su5R+0ttkAmg==",
"dev": true,
"peerDependencies": {
"react": ">=0.11.0 || ^0.14.0-rc"
@@ -6428,7 +6501,7 @@
},
"node_modules/react-hot-loader": {
"version": "1.3.1",
- "integrity": "sha1-yVZHrni3Pfzv9uxx/8sEGC/22vk=",
+ "integrity": "sha512-J8jCmvIKI/SNV4M+w0JNBw19/Ve+Hh4sg8WmQ+ldfGW9c0/2PU4d6LrJbyW6en8iJ6ygTxM810DgC2j8V+3T9g==",
"dev": true,
"dependencies": {
"react-hot-api": "^0.4.5",
@@ -6437,7 +6510,7 @@
},
"node_modules/react-hot-loader/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dev": true,
"dependencies": {
"amdefine": ">=0.0.4"
@@ -6448,7 +6521,7 @@
},
"node_modules/react-input-autosize": {
"version": "1.2.0",
- "integrity": "sha1-hyQQcRWfdCEjiXaR2meW7DO1fQU=",
+ "integrity": "sha512-xlmWqzUnBb07xPrsR8iWMOJ2wPqhCEy8jwspum09luCB1nDkDar6ychBZSM6DRZyLF2KFAPmvEVe0/UsbQUmmg==",
"dependencies": {
"create-react-class": "^15.5.2",
"prop-types": "^15.5.8"
@@ -6457,18 +6530,6 @@
"react": "^0.14 || ^15.0 || ^16.0.0-rc || ^16.0"
}
},
- "node_modules/react-interactive": {
- "version": "0.4.1",
- "integrity": "sha1-mRK5lyXPwrx0gPlT565fEnvzcug=",
- "dev": true,
- "dependencies": {
- "detect-it": "^2.0.0",
- "object-assign": "^4.1.0"
- },
- "peerDependencies": {
- "react": "^15.0.0"
- }
- },
"node_modules/react-is": {
"version": "16.13.1",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
@@ -6478,8 +6539,8 @@
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
},
"node_modules/react-modal": {
- "version": "3.14.4",
- "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==",
+ "version": "3.16.1",
+ "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
"dependencies": {
"exenv": "^1.2.0",
"prop-types": "^15.7.2",
@@ -6490,8 +6551,8 @@
"node": ">=8"
},
"peerDependencies": {
- "react": "^0.14.0 || ^15.0.0 || ^16 || ^17",
- "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17"
+ "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
+ "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
}
},
"node_modules/react-modal/node_modules/warning": {
@@ -6503,7 +6564,7 @@
},
"node_modules/react-number-input": {
"version": "15.5.1",
- "integrity": "sha1-54Ae1LFun5+6aZZNv3SsA7lw5FM=",
+ "integrity": "sha512-KeVOGdg7IHcSjaWvLRis/eTIV1dUctouQS5TvcdVF1oiXuH63bDQwBnM1Al+DXq3ZSfWC+0Th+ijyrTWjU4kKg==",
"dependencies": {
"babel-jest": "^19.0.0",
"babel-polyfill": "^6.23.0",
@@ -6514,7 +6575,7 @@
},
"node_modules/react-number-input/node_modules/babel-jest": {
"version": "19.0.0",
- "integrity": "sha1-WTI87ZmjqE01naIZyogQdP/Gzj8=",
+ "integrity": "sha512-7fL3UgmuZbgZRIj7k0fkkuC80opRoK7CvW1HqJus4zFvaR6eV9z2GeG/6uS/5XVD+h1db6C/Mz2DXKBJM2N4rg==",
"dependencies": {
"babel-core": "^6.0.0",
"babel-plugin-istanbul": "^4.0.0",
@@ -6523,7 +6584,7 @@
},
"node_modules/react-numeric-input": {
"version": "2.0.9",
- "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=",
+ "integrity": "sha512-cN8mSCd1xMNltBXxlBUSJZpDsPWDxlRg/5jmN70/TuHfxGg0O+pKRdR9z1UIq55vET4dgjr3u2DIzBIuQDUSjg==",
"dev": true,
"peerDependencies": {
"react": ">=0.14.0 || ^15.6.1"
@@ -6531,7 +6592,7 @@
},
"node_modules/react-onclickoutside": {
"version": "5.11.1",
- "integrity": "sha1-ADFOUlZ89V+rqUyrus0RlhkHBiM=",
+ "integrity": "sha512-iZKK+qUsGuqz+O3O/LtvDWkwmoqagC0EtRybhCJ3hawi9PF0ZaVrLnR24lqovbuvvUeA+cd1cWALOw+l1tfeaQ==",
"dependencies": {
"create-react-class": "^15.5.x"
}
@@ -6555,7 +6616,7 @@
},
"node_modules/react-prop-types": {
"version": "0.4.0",
- "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=",
+ "integrity": "sha512-IyjsJhDX9JkoOV9wlmLaS7z+oxYoIWhfzDcFy7inwoAKTu+VcVNrVpPmLeioJ94y6GeDRsnwarG1py5qofFQMg==",
"dependencies": {
"warning": "^3.0.0"
},
@@ -6598,14 +6659,39 @@
"react": "^0.14.0 || ^15.0.0 || ^16.0.0"
}
},
+ "node_modules/react-router-hash-link": {
+ "name": "react-router-hash-link-v2/3",
+ "resolved": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "object-assign": "^4.1.0",
+ "react": "^15.4.1",
+ "react-dom": "^15.4.1",
+ "react-interactive": "^0.4.0",
+ "react-router": "^3.0.0"
+ }
+ },
+ "node_modules/react-router-hash-link/node_modules/react-interactive": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/react-interactive/-/react-interactive-0.4.1.tgz",
+ "integrity": "sha512-IzWpnuKRZc7z3ss72+yk29bcZjxjiMz3Un4BnJw/0nlSXfm6ofQtcMTh+267siCaj9hQ24134suqoHL42z0y4g==",
+ "dev": true,
+ "dependencies": {
+ "detect-it": "^2.0.0",
+ "object-assign": "^4.1.0"
+ },
+ "peerDependencies": {
+ "react": "^15.0.0"
+ }
+ },
"node_modules/react-router-redux": {
"version": "4.0.8",
- "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=",
+ "integrity": "sha512-lzlK+S6jZnn17BZbzBe6F8ok3YAhGAUlyWgRu3cz5mT199gKxfem5lNu3qcgzRiVhNEOFVG0/pdT+1t4aWhoQw==",
"dev": true
},
"node_modules/react-scrollspy": {
"version": "3.1.1",
- "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.1.1.tgz",
"integrity": "sha512-0gu/zKi0eZ/PaVJZSe7ew5nNmmEjfb7z97YFuOOR5tbKkIQtKENm9b4KGUZBid7XkMEZkRShUFsQsEYxotBIEw==",
"deprecated": "No longer actively maintained. Please use @makotot/ghostui instead.",
"dev": true,
@@ -6659,7 +6745,7 @@
},
"node_modules/read-file-stdin": {
"version": "0.2.1",
- "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
+ "integrity": "sha512-dAqysQ4kfj9m5aejZOPr+aRGXZJXdLkMOLZ3BXMwMBQHiO+aylGBFJPh88AYPQrOf+D43F4Uc2oUIW9kBlItLA==",
"dev": true,
"dependencies": {
"gather-stream": "^1.0.0"
@@ -6667,7 +6753,7 @@
},
"node_modules/read-pkg": {
"version": "1.1.0",
- "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+ "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==",
"dependencies": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
@@ -6679,7 +6765,7 @@
},
"node_modules/read-pkg-up": {
"version": "1.0.1",
- "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+ "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==",
"dependencies": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
@@ -6689,8 +6775,8 @@
}
},
"node_modules/readable-stream": {
- "version": "3.6.0",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.2",
+ "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
@@ -6704,7 +6790,6 @@
"node_modules/readdirp": {
"version": "2.2.1",
"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
- "dev": true,
"dependencies": {
"graceful-fs": "^4.1.11",
"micromatch": "^3.1.10",
@@ -6716,16 +6801,14 @@
},
"node_modules/readdirp/node_modules/arr-diff": {
"version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "dev": true,
+ "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/readdirp/node_modules/array-unique": {
"version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "dev": true,
+ "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
"engines": {
"node": ">=0.10.0"
}
@@ -6733,7 +6816,6 @@
"node_modules/readdirp/node_modules/braces": {
"version": "2.3.2",
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
- "dev": true,
"dependencies": {
"arr-flatten": "^1.1.0",
"array-unique": "^0.3.2",
@@ -6752,8 +6834,7 @@
},
"node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -6763,8 +6844,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets": {
"version": "2.1.4",
- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
- "dev": true,
+ "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
"dependencies": {
"debug": "^2.3.3",
"define-property": "^0.2.5",
@@ -6780,8 +6860,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dependencies": {
"is-descriptor": "^0.1.0"
},
@@ -6791,8 +6870,7 @@
},
"node_modules/readdirp/node_modules/expand-brackets/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -6803,7 +6881,6 @@
"node_modules/readdirp/node_modules/expand-brackets/node_modules/is-descriptor": {
"version": "0.1.6",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -6816,7 +6893,6 @@
"node_modules/readdirp/node_modules/expand-brackets/node_modules/kind-of": {
"version": "5.1.0",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -6824,7 +6900,6 @@
"node_modules/readdirp/node_modules/extglob": {
"version": "2.0.4",
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
- "dev": true,
"dependencies": {
"array-unique": "^0.3.2",
"define-property": "^1.0.0",
@@ -6841,8 +6916,7 @@
},
"node_modules/readdirp/node_modules/extglob/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dependencies": {
"is-descriptor": "^1.0.0"
},
@@ -6852,8 +6926,7 @@
},
"node_modules/readdirp/node_modules/extglob/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -6863,8 +6936,7 @@
},
"node_modules/readdirp/node_modules/fill-range": {
"version": "4.0.0",
- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
- "dev": true,
+ "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
"dependencies": {
"extend-shallow": "^2.0.1",
"is-number": "^3.0.0",
@@ -6877,8 +6949,7 @@
},
"node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -6888,8 +6959,7 @@
},
"node_modules/readdirp/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -6899,8 +6969,7 @@
},
"node_modules/readdirp/node_modules/is-accessor-descriptor/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -6910,8 +6979,7 @@
},
"node_modules/readdirp/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -6921,8 +6989,7 @@
},
"node_modules/readdirp/node_modules/is-data-descriptor/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -6932,8 +6999,7 @@
},
"node_modules/readdirp/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -6943,8 +7009,7 @@
},
"node_modules/readdirp/node_modules/is-number/node_modules/kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
+ "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
"dependencies": {
"is-buffer": "^1.1.5"
},
@@ -6954,8 +7019,7 @@
},
"node_modules/readdirp/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
@@ -6963,7 +7027,6 @@
"node_modules/readdirp/node_modules/kind-of": {
"version": "6.0.3",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -6971,7 +7034,6 @@
"node_modules/readdirp/node_modules/micromatch": {
"version": "3.1.10",
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
- "dev": true,
"dependencies": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -6992,9 +7054,8 @@
}
},
"node_modules/readdirp/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -7005,17 +7066,20 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/readdirp/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/readdirp/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
"node_modules/reduce-css-calc": {
"version": "1.3.0",
- "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+ "integrity": "sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==",
"dev": true,
"dependencies": {
"balanced-match": "^0.4.2",
@@ -7025,7 +7089,7 @@
},
"node_modules/reduce-css-calc/node_modules/balanced-match": {
"version": "0.4.2",
- "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+ "integrity": "sha512-STw03mQKnGUYtoNjmowo4F2cRmIIxYEGiMsjjwla/u5P1lxadj/05WkNaFjNiKTgJkj8KiXbgAiRTmcQRwQNtg==",
"dev": true
},
"node_modules/reduce-function-call": {
@@ -7054,7 +7118,7 @@
},
"node_modules/redux-logger": {
"version": "2.10.2",
- "integrity": "sha1-PFpfCm8yV3wd6t9mVfJX+CxsOTc=",
+ "integrity": "sha512-Pfl6EPSjM5IJ23Jl/FpGos+zCnMfIdepY4CUOeaNOymVucKKa2XIrPQfYeGfZwRmiTbcZ6XdqYZ0it4GE3kT8w==",
"dev": true,
"dependencies": {
"deep-diff": "0.3.4"
@@ -7062,7 +7126,7 @@
},
"node_modules/redux-thunk": {
"version": "2.2.0",
- "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU=",
+ "integrity": "sha512-OOFWh9mt/7i94QPq4IAxhSIUyfIJJRnk6pe1IwgXethQik3kyg1wuxVZZlW9QOmL5rP/MrwzV+Cb+/HBKlvM8Q==",
"dev": true
},
"node_modules/regenerate": {
@@ -7072,7 +7136,7 @@
},
"node_modules/regenerator-runtime": {
"version": "0.10.5",
- "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+ "integrity": "sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w=="
},
"node_modules/regenerator-transform": {
"version": "0.10.1",
@@ -7097,7 +7161,6 @@
"node_modules/regex-not": {
"version": "1.0.2",
"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
- "dev": true,
"dependencies": {
"extend-shallow": "^3.0.2",
"safe-regex": "^1.1.0"
@@ -7108,7 +7171,7 @@
},
"node_modules/regexpu-core": {
"version": "2.0.0",
- "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+ "integrity": "sha512-tJ9+S4oKjxY8IZ9jmjnp/mtytu1u3iyIQAfmI51IKWH6bFf7XR1ybtaO6j7INhZKXOTYADk7V5qxaqLkmNxiZQ==",
"dev": true,
"dependencies": {
"regenerate": "^1.2.1",
@@ -7118,12 +7181,12 @@
},
"node_modules/regjsgen": {
"version": "0.2.0",
- "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+ "integrity": "sha512-x+Y3yA24uF68m5GA+tBjbGYo64xXVJpbToBaWCoSNSc1hdk6dfctaRWrNFTVJZIIhL5GxW8zwjoixbnifnK59g==",
"dev": true
},
"node_modules/regjsparser": {
"version": "0.1.5",
- "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+ "integrity": "sha512-jlQ9gYLfk2p3V5Ag5fYhA7fv7OHzd1KUH0PRP46xc3TgwjwgROIW572AfYg/X9kaNq/LJnu6oJcFRXlIrGoTRw==",
"dev": true,
"dependencies": {
"jsesc": "~0.5.0"
@@ -7134,7 +7197,7 @@
},
"node_modules/regjsparser/node_modules/jsesc": {
"version": "0.5.0",
- "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+ "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
"dev": true,
"bin": {
"jsesc": "bin/jsesc"
@@ -7142,7 +7205,7 @@
},
"node_modules/remove-trailing-separator": {
"version": "1.1.0",
- "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
},
"node_modules/repeat-element": {
"version": "1.1.4",
@@ -7153,14 +7216,14 @@
},
"node_modules/repeat-string": {
"version": "1.6.1",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+ "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
"engines": {
"node": ">=0.10"
}
},
"node_modules/repeating": {
"version": "2.0.1",
- "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+ "integrity": "sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==",
"dependencies": {
"is-finite": "^1.0.0"
},
@@ -7201,23 +7264,22 @@
},
"node_modules/require-main-filename": {
"version": "1.0.1",
- "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="
},
"node_modules/requires-port": {
"version": "1.0.0",
- "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
"dev": true
},
"node_modules/reselect": {
- "version": "4.1.7",
- "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz",
- "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A=="
+ "version": "4.1.8",
+ "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="
},
"node_modules/resolve": {
- "version": "1.22.0",
- "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+ "version": "1.22.6",
+ "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
"dependencies": {
- "is-core-module": "^2.8.1",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
},
@@ -7230,22 +7292,19 @@
},
"node_modules/resolve-url": {
"version": "0.2.1",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "deprecated": "https://github.com/lydell/resolve-url#deprecated",
- "dev": true
+ "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+ "deprecated": "https://github.com/lydell/resolve-url#deprecated"
},
"node_modules/ret": {
"version": "0.1.15",
"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
- "dev": true,
"engines": {
"node": ">=0.12"
}
},
"node_modules/right-align": {
"version": "0.1.3",
- "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
- "dev": true,
+ "integrity": "sha512-yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg==",
"dependencies": {
"align-text": "^0.1.1"
},
@@ -7264,13 +7323,13 @@
}
},
"node_modules/rimraf/node_modules/glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
},
@@ -7283,24 +7342,36 @@
},
"node_modules/ripemd160": {
"version": "0.2.0",
- "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
- "dev": true
+ "integrity": "sha512-JJsJ74Mw4sUDDisXGDnNNyN9xWmt5HcH6Kwvb/0m/IvTKjnLAtZfzeoLdpxk44AxQZki54oCCd+Kt0nPQ2AF2g=="
},
"node_modules/run-queue": {
"version": "1.0.3",
- "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+ "integrity": "sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==",
"dependencies": {
"aproba": "^1.1.1"
}
},
"node_modules/safe-buffer": {
- "version": "5.1.2",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
- },
- "node_modules/safe-regex": {
+ "version": "5.2.1",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/safe-regex": {
"version": "1.1.0",
- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
- "dev": true,
+ "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
"dependencies": {
"ret": "~0.1.10"
}
@@ -7311,7 +7382,7 @@
},
"node_modules/sane": {
"version": "1.7.0",
- "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=",
+ "integrity": "sha512-wxna76E1fVwXoNSUfSDGB1KKY/+ZIydOdQoFnMloJZTrkuJI4Twkr+2qn864GkzzPwXATHRUwhF9OpQWzIN+Kw==",
"deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
"dev": true,
"dependencies": {
@@ -7332,6 +7403,7 @@
},
"node_modules/sax": {
"version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true
},
@@ -7347,30 +7419,30 @@
}
},
"node_modules/semver": {
- "version": "5.7.1",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "version": "5.7.2",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
"bin": {
"semver": "bin/semver"
}
},
"node_modules/send": {
- "version": "0.17.2",
- "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+ "version": "0.18.0",
+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
"dev": true,
"dependencies": {
"debug": "2.6.9",
- "depd": "~1.1.2",
- "destroy": "~1.0.4",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"mime": "1.6.0",
"ms": "2.1.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"range-parser": "~1.2.1",
- "statuses": "~1.5.0"
+ "statuses": "2.0.1"
},
"engines": {
"node": ">= 0.8.0"
@@ -7387,7 +7459,7 @@
},
"node_modules/serve-index": {
"version": "1.9.1",
- "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+ "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
"dev": true,
"dependencies": {
"accepts": "~1.3.4",
@@ -7402,9 +7474,17 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/serve-index/node_modules/depd": {
+ "version": "1.1.2",
+ "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/serve-index/node_modules/http-errors": {
"version": "1.6.3",
- "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+ "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
"dev": true,
"dependencies": {
"depd": "~1.1.2",
@@ -7418,7 +7498,7 @@
},
"node_modules/serve-index/node_modules/inherits": {
"version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
"dev": true
},
"node_modules/serve-index/node_modules/setprototypeof": {
@@ -7426,32 +7506,31 @@
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
"dev": true
},
+ "node_modules/serve-index/node_modules/statuses": {
+ "version": "1.5.0",
+ "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/serve-static": {
- "version": "1.14.2",
- "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+ "version": "1.15.0",
+ "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
"dev": true,
"dependencies": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.3",
- "send": "0.17.2"
+ "send": "0.18.0"
},
"engines": {
"node": ">= 0.8.0"
}
},
- "node_modules/set-immediate-shim": {
- "version": "1.0.1",
- "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
- "dev": true,
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/set-value": {
"version": "2.0.1",
"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
- "dev": true,
"dependencies": {
"extend-shallow": "^2.0.1",
"is-extendable": "^0.1.1",
@@ -7464,8 +7543,7 @@
},
"node_modules/set-value/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -7475,7 +7553,7 @@
},
"node_modules/setimmediate": {
"version": "1.0.5",
- "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
},
"node_modules/setprototypeof": {
"version": "1.2.0",
@@ -7484,8 +7562,7 @@
},
"node_modules/sha.js": {
"version": "2.2.6",
- "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
- "dev": true,
+ "integrity": "sha512-GC+qN4sf/O6bDwz6CHaz8HVQfLbbNyIsXpTZLiD5c1badnWA63WVAH1msoCq+fXcV0dZ50jxTqKA8seu40845A==",
"bin": {
"sha.js": "bin.js"
}
@@ -7494,9 +7571,21 @@
"version": "1.1.0",
"integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
},
+ "node_modules/side-channel": {
+ "version": "1.0.4",
+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+ "dependencies": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/slash": {
"version": "1.0.0",
- "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+ "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
"engines": {
"node": ">=0.10.0"
}
@@ -7504,7 +7593,6 @@
"node_modules/snapdragon": {
"version": "0.8.2",
"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
- "dev": true,
"dependencies": {
"base": "^0.11.1",
"debug": "^2.2.0",
@@ -7522,7 +7610,6 @@
"node_modules/snapdragon-node": {
"version": "2.1.1",
"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
- "dev": true,
"dependencies": {
"define-property": "^1.0.0",
"isobject": "^3.0.0",
@@ -7534,8 +7621,7 @@
},
"node_modules/snapdragon-node/node_modules/define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
+ "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
"dependencies": {
"is-descriptor": "^1.0.0"
},
@@ -7545,8 +7631,7 @@
},
"node_modules/snapdragon-node/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
@@ -7554,7 +7639,6 @@
"node_modules/snapdragon-util": {
"version": "3.0.1",
"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
- "dev": true,
"dependencies": {
"kind-of": "^3.2.0"
},
@@ -7564,8 +7648,7 @@
},
"node_modules/snapdragon/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dependencies": {
"is-descriptor": "^0.1.0"
},
@@ -7575,8 +7658,7 @@
},
"node_modules/snapdragon/node_modules/extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
"dependencies": {
"is-extendable": "^0.1.0"
},
@@ -7586,8 +7668,7 @@
},
"node_modules/snapdragon/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -7597,8 +7678,7 @@
},
"node_modules/snapdragon/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -7609,7 +7689,6 @@
"node_modules/snapdragon/node_modules/is-descriptor": {
"version": "0.1.6",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -7622,14 +7701,13 @@
"node_modules/snapdragon/node_modules/is-descriptor/node_modules/kind-of": {
"version": "5.1.0",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/sntp": {
"version": "1.0.9",
- "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+ "integrity": "sha512-7bgVOAnPj3XjrKY577S+puCKGCRlUrcrEdsMeRXlg9Ghf5df/xNi6sONUa43WrHUd3TjJBF7O04jYoiY0FVa0A==",
"deprecated": "This module moved to @hapi/sntp. Please make sure to switch over as this distribution is no longer supported and may contain bugs and critical security issues.",
"dev": true,
"optional": true,
@@ -7651,16 +7729,21 @@
}
},
"node_modules/sockjs-client": {
- "version": "1.5.2",
- "integrity": "sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==",
+ "version": "1.6.1",
+ "integrity": "sha512-2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw==",
"dev": true,
"dependencies": {
- "debug": "^3.2.6",
- "eventsource": "^1.0.7",
- "faye-websocket": "^0.11.3",
+ "debug": "^3.2.7",
+ "eventsource": "^2.0.2",
+ "faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
- "json3": "^3.3.3",
- "url-parse": "^1.5.3"
+ "url-parse": "^1.5.10"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://tidelift.com/funding/github/npm/sockjs-client"
}
},
"node_modules/sockjs-client/node_modules/debug": {
@@ -7686,7 +7769,7 @@
},
"node_modules/sort-keys": {
"version": "1.1.2",
- "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+ "integrity": "sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg==",
"dev": true,
"dependencies": {
"is-plain-obj": "^1.0.0"
@@ -7697,19 +7780,17 @@
},
"node_modules/source-list-map": {
"version": "0.1.8",
- "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
- "dev": true
+ "integrity": "sha512-cabwdhnSNf/tTDMh/DXZXlkeQLvdYT5xfGYBohqHG7wb3bBQrQlHQNWM9NWSOboXXK1zgwz6JzS5e4hZq9vxMw=="
},
"node_modules/source-map": {
"version": "0.5.7",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/source-map-loader": {
"version": "0.2.4",
- "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
"integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
"dev": true,
"dependencies": {
@@ -7722,7 +7803,6 @@
},
"node_modules/source-map-loader/node_modules/async": {
"version": "2.6.4",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
"dev": true,
"dependencies": {
@@ -7731,7 +7811,6 @@
},
"node_modules/source-map-loader/node_modules/big.js": {
"version": "5.2.2",
- "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true,
"engines": {
@@ -7740,7 +7819,6 @@
},
"node_modules/source-map-loader/node_modules/emojis-list": {
"version": "3.0.0",
- "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true,
"engines": {
@@ -7749,7 +7827,6 @@
},
"node_modules/source-map-loader/node_modules/json5": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"dependencies": {
@@ -7761,7 +7838,6 @@
},
"node_modules/source-map-loader/node_modules/loader-utils": {
"version": "1.4.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"dependencies": {
@@ -7777,7 +7853,6 @@
"version": "0.5.3",
"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
"deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
- "dev": true,
"dependencies": {
"atob": "^2.1.2",
"decode-uri-component": "^0.2.0",
@@ -7796,12 +7871,11 @@
"node_modules/source-map-url": {
"version": "0.4.1",
"integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
- "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
- "dev": true
+ "deprecated": "See https://github.com/lydell/source-map-url#deprecated"
},
"node_modules/spdx-correct": {
- "version": "3.1.1",
- "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "version": "3.2.0",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
"dependencies": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
@@ -7820,13 +7894,12 @@
}
},
"node_modules/spdx-license-ids": {
- "version": "3.0.11",
- "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="
+ "version": "3.0.13",
+ "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
},
"node_modules/split-string": {
"version": "3.1.0",
"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
- "dev": true,
"dependencies": {
"extend-shallow": "^3.0.0"
},
@@ -7836,7 +7909,7 @@
},
"node_modules/sprintf-js": {
"version": "1.0.3",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
"dev": true
},
"node_modules/sshpk": {
@@ -7872,8 +7945,7 @@
},
"node_modules/static-extend": {
"version": "0.1.2",
- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
- "dev": true,
+ "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
"dependencies": {
"define-property": "^0.2.5",
"object-copy": "^0.1.0"
@@ -7884,8 +7956,7 @@
},
"node_modules/static-extend/node_modules/define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
+ "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
"dependencies": {
"is-descriptor": "^0.1.0"
},
@@ -7895,8 +7966,7 @@
},
"node_modules/static-extend/node_modules/is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
+ "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -7906,8 +7976,7 @@
},
"node_modules/static-extend/node_modules/is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
+ "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -7918,7 +7987,6 @@
"node_modules/static-extend/node_modules/is-descriptor": {
"version": "0.1.6",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"dependencies": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -7931,32 +7999,29 @@
"node_modules/static-extend/node_modules/is-descriptor/node_modules/kind-of": {
"version": "5.1.0",
"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/statuses": {
- "version": "1.5.0",
- "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+ "version": "2.0.1",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
"dev": true,
"engines": {
- "node": ">= 0.6"
+ "node": ">= 0.8"
}
},
"node_modules/stream-browserify": {
"version": "2.0.2",
"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
- "dev": true,
"dependencies": {
"inherits": "~2.0.1",
"readable-stream": "^2.0.2"
}
},
"node_modules/stream-browserify/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -7967,17 +8032,20 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/stream-browserify/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/stream-browserify/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
},
"node_modules/stream-cache": {
"version": "0.0.2",
- "integrity": "sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=",
+ "integrity": "sha512-FsMTiRi4aXOcbL3M2lh7yAOWqM7kfVWQfkJ6kelrhdKNpJJVm0IebICQ2LURsbC5w9XfPSRwd9DkfqDHR9OP3g==",
"dev": true,
"engines": {
"node": "*"
@@ -7994,7 +8062,6 @@
"node_modules/stream-http": {
"version": "2.8.3",
"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
- "dev": true,
"dependencies": {
"builtin-status-codes": "^3.0.0",
"inherits": "^2.0.1",
@@ -8004,9 +8071,8 @@
}
},
"node_modules/stream-http/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -8017,10 +8083,13 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/stream-http/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/stream-http/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.1.0"
}
@@ -8031,7 +8100,7 @@
},
"node_modules/strict-uri-encode": {
"version": "1.1.0",
- "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+ "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==",
"dev": true,
"engines": {
"node": ">=0.10.0"
@@ -8045,25 +8114,6 @@
"safe-buffer": "~5.2.0"
}
},
- "node_modules/string_decoder/node_modules/safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
- },
"node_modules/stringstream": {
"version": "0.0.6",
"integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
@@ -8072,7 +8122,7 @@
},
"node_modules/strip-ansi": {
"version": "3.0.1",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
"dependencies": {
"ansi-regex": "^2.0.0"
},
@@ -8082,7 +8132,7 @@
},
"node_modules/strip-bom": {
"version": "2.0.0",
- "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+ "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
"dependencies": {
"is-utf8": "^0.2.0"
},
@@ -8092,7 +8142,7 @@
},
"node_modules/style-loader": {
"version": "0.12.4",
- "integrity": "sha1-rn0GZdxNxlPaov6Xu5CRS8HSLZs=",
+ "integrity": "sha512-co82PY8WzQzvJPbmN97mkqIa6lBAa9N6azZUmMsS4Ezk7P6t01ejb9GpOeN5JY/0gcWBmCzyJIMJHcs/7rBaBA==",
"dev": true,
"dependencies": {
"loader-utils": "^0.2.7"
@@ -8100,7 +8150,7 @@
},
"node_modules/supports-color": {
"version": "2.0.0",
- "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+ "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
"engines": {
"node": ">=0.8.0"
}
@@ -8130,8 +8180,7 @@
},
"node_modules/tapable": {
"version": "0.1.10",
- "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
- "dev": true,
+ "integrity": "sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ==",
"engines": {
"node": ">=0.6"
}
@@ -8149,7 +8198,7 @@
},
"node_modules/through": {
"version": "2.3.8",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+ "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
"dev": true
},
"node_modules/through2": {
@@ -8161,8 +8210,8 @@
}
},
"node_modules/through2/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dependencies": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -8173,6 +8222,10 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/through2/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/through2/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -8191,7 +8244,6 @@
"node_modules/timers-browserify": {
"version": "2.0.12",
"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
- "dev": true,
"dependencies": {
"setimmediate": "^1.0.4"
},
@@ -8206,20 +8258,18 @@
},
"node_modules/to-arraybuffer": {
"version": "1.0.1",
- "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
- "dev": true
+ "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
},
"node_modules/to-fast-properties": {
"version": "1.0.3",
- "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+ "integrity": "sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/to-object-path": {
"version": "0.3.0",
- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
- "dev": true,
+ "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -8230,7 +8280,6 @@
"node_modules/to-regex": {
"version": "3.0.2",
"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
- "dev": true,
"dependencies": {
"define-property": "^2.0.2",
"extend-shallow": "^3.0.2",
@@ -8243,8 +8292,7 @@
},
"node_modules/to-regex-range": {
"version": "2.1.1",
- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
- "dev": true,
+ "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
"dependencies": {
"is-number": "^3.0.0",
"repeat-string": "^1.6.1"
@@ -8255,8 +8303,7 @@
},
"node_modules/to-regex-range/node_modules/is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
+ "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
"dependencies": {
"kind-of": "^3.0.2"
},
@@ -8286,24 +8333,23 @@
},
"node_modules/tr46": {
"version": "0.0.3",
- "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
"dev": true
},
"node_modules/trim-right": {
"version": "1.0.1",
- "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+ "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/tty-browserify": {
"version": "0.0.0",
- "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
- "dev": true
+ "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
},
"node_modules/tunnel-agent": {
"version": "0.6.0",
- "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
"dev": true,
"dependencies": {
"safe-buffer": "^5.0.1"
@@ -8314,12 +8360,12 @@
},
"node_modules/tweetnacl": {
"version": "0.14.5",
- "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
"dev": true
},
"node_modules/type-check": {
"version": "0.3.2",
- "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
"dev": true,
"dependencies": {
"prelude-ls": "~1.1.2"
@@ -8342,11 +8388,11 @@
},
"node_modules/typedarray": {
"version": "0.0.6",
- "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
},
"node_modules/ua-parser-js": {
- "version": "0.7.31",
- "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
+ "version": "0.7.36",
+ "integrity": "sha512-CPPLoCts2p7D8VbybttE3P2ylv0OBZEAy7a12DsulIEcAiMtWJy+PBgMXgWDI80D5UwqE8oQPHYnk13tm38M2Q==",
"funding": [
{
"type": "opencollective",
@@ -8355,6 +8401,10 @@
{
"type": "paypal",
"url": "https://paypal.me/faisalman"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/faisalman"
}
],
"engines": {
@@ -8384,8 +8434,8 @@
}
},
"node_modules/uglify-js": {
- "version": "3.15.1",
- "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+ "version": "3.17.4",
+ "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
"dev": true,
"optional": true,
"bin": {
@@ -8397,8 +8447,7 @@
},
"node_modules/uglify-to-browserify": {
"version": "1.0.2",
- "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
- "dev": true
+ "integrity": "sha512-vb2s1lYx2xBtUgy+ta+b2J/GLVUR+wmpINwHePmPRhOsIVCG2wDzKJ0n14GslH1BifsqVzSOwQhRaCAsZ/nI4Q=="
},
"node_modules/uglifyjs-webpack-plugin": {
"version": "1.3.0",
@@ -8422,7 +8471,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/find-cache-dir": {
"version": "1.0.0",
- "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+ "integrity": "sha512-46TFiBOzX7xq/PcSWfFwkyjpemdRnMe31UQF+os0y+1W3k95f6R4SEt02Hj4p3X0Mir9gfrkmOtshFidS0VPUg==",
"dependencies": {
"commondir": "^1.0.1",
"make-dir": "^1.0.0",
@@ -8434,7 +8483,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
"dependencies": {
"locate-path": "^2.0.0"
},
@@ -8444,7 +8493,7 @@
},
"node_modules/uglifyjs-webpack-plugin/node_modules/pkg-dir": {
"version": "2.0.0",
- "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+ "integrity": "sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw==",
"dependencies": {
"find-up": "^2.1.0"
},
@@ -8472,7 +8521,7 @@
},
"node_modules/underscore": {
"version": "1.2.4",
- "integrity": "sha1-6NpiQaoG9k3yRzuyWQuMF8hMPH4=",
+ "integrity": "sha512-WvFu6gnoSYDtm/hncQgO00QgFTxlmiw2Uv3DoU7yq5aLD4RhX7cUHO4TDU53JWy5E63Ex4yYsm1+9t2cZvefnQ==",
"dev": true,
"engines": {
"node": "*"
@@ -8480,7 +8529,7 @@
},
"node_modules/underscore.string": {
"version": "2.0.0",
- "integrity": "sha1-dHCFilSguzVg0DfaVtzGe1GB4Ro=",
+ "integrity": "sha512-36kUytY+40vDx+/MqchfGG6/QDy/FZPR0RY/vKIEU55yAvxivOwE46rIKMQ2uCIfwjxbI0PQpmljQ2MK80oYDA==",
"dev": true,
"engines": {
"node": "*"
@@ -8489,7 +8538,6 @@
"node_modules/union-value": {
"version": "1.0.1",
"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
- "dev": true,
"dependencies": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
@@ -8502,17 +8550,17 @@
},
"node_modules/uniq": {
"version": "1.0.1",
- "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+ "integrity": "sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==",
"dev": true
},
"node_modules/uniqid": {
"version": "1.0.0",
- "integrity": "sha1-JYJSTgdASESkLelPviv1SeG3RVU=",
+ "integrity": "sha512-o4DUU+v9cDISafUcACPKtwyTAnJjPoX75L725BabYxoXoN/D41jRiLEDV3GPQotU6LR36xtYPifprxLEG4OJ6g==",
"dev": true
},
"node_modules/uniqs": {
"version": "2.0.0",
- "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+ "integrity": "sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ==",
"dev": true
},
"node_modules/unique-filename": {
@@ -8531,7 +8579,7 @@
},
"node_modules/unpipe": {
"version": "1.0.0",
- "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -8539,8 +8587,7 @@
},
"node_modules/unset-value": {
"version": "1.0.0",
- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
- "dev": true,
+ "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
"dependencies": {
"has-value": "^0.3.1",
"isobject": "^3.0.0"
@@ -8551,8 +8598,7 @@
},
"node_modules/unset-value/node_modules/has-value": {
"version": "0.3.1",
- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
- "dev": true,
+ "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
"dependencies": {
"get-value": "^2.0.3",
"has-values": "^0.1.4",
@@ -8564,8 +8610,7 @@
},
"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "dev": true,
+ "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
"dependencies": {
"isarray": "1.0.0"
},
@@ -8575,16 +8620,14 @@
},
"node_modules/unset-value/node_modules/has-values": {
"version": "0.1.4",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
- "dev": true,
+ "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/unset-value/node_modules/isobject": {
"version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true,
+ "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
"engines": {
"node": ">=0.10.0"
}
@@ -8598,22 +8641,20 @@
},
"node_modules/urix": {
"version": "0.1.0",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "deprecated": "Please see https://github.com/lydell/urix#deprecated",
- "dev": true
+ "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+ "deprecated": "Please see https://github.com/lydell/urix#deprecated"
},
"node_modules/url": {
- "version": "0.11.0",
- "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
- "dev": true,
+ "version": "0.11.3",
+ "integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
"dependencies": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "punycode": "^1.4.1",
+ "qs": "^6.11.2"
}
},
"node_modules/url-parse": {
- "version": "1.5.9",
- "integrity": "sha512-HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==",
+ "version": "1.5.10",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
"dev": true,
"dependencies": {
"querystringify": "^2.1.1",
@@ -8621,14 +8662,25 @@
}
},
"node_modules/url/node_modules/punycode": {
- "version": "1.3.2",
- "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
- "dev": true
+ "version": "1.4.1",
+ "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+ },
+ "node_modules/url/node_modules/qs": {
+ "version": "6.11.2",
+ "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
},
"node_modules/use": {
"version": "3.1.1",
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
- "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -8636,23 +8688,21 @@
"node_modules/util": {
"version": "0.10.4",
"integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
- "dev": true,
"dependencies": {
"inherits": "2.0.3"
}
},
"node_modules/util-deprecate": {
"version": "1.0.2",
- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
},
"node_modules/util/node_modules/inherits": {
"version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "dev": true
+ "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
},
"node_modules/utils-merge": {
"version": "1.0.1",
- "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
"dev": true,
"engines": {
"node": ">= 0.4.0"
@@ -8677,7 +8727,7 @@
},
"node_modules/vary": {
"version": "1.1.2",
- "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
"dev": true,
"engines": {
"node": ">= 0.8"
@@ -8685,7 +8735,7 @@
},
"node_modules/verror": {
"version": "1.10.0",
- "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
"dev": true,
"engines": [
"node >=0.6.0"
@@ -8698,8 +8748,7 @@
},
"node_modules/vm-browserify": {
"version": "0.0.4",
- "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
- "dev": true,
+ "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
"dependencies": {
"indexof": "0.0.1"
}
@@ -8714,14 +8763,14 @@
},
"node_modules/warning": {
"version": "3.0.0",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+ "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==",
"dependencies": {
"loose-envify": "^1.0.0"
}
},
"node_modules/watch": {
"version": "0.10.0",
- "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw=",
+ "integrity": "sha512-FAk18nzhYggg939xgRRLJjvqmAKZciO24wr8neoxNPl87w8J3m784wxL4zFBwME+0gNQ2Sv/vfsCrUxPxU2Dmg==",
"dev": true,
"engines": [
"node >=0.1.95"
@@ -8729,8 +8778,7 @@
},
"node_modules/watchpack": {
"version": "0.2.9",
- "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
- "dev": true,
+ "integrity": "sha512-hmLWdxNfe0Ou1xaRj+ublbOYUaZJfVz1VuHQfERLVlUrLS21gUaGa2gWRl8L5Ej1aUS3KxFN+1qoWK4kZLMvKw==",
"dependencies": {
"async": "^0.9.0",
"chokidar": "^1.0.0",
@@ -8739,13 +8787,11 @@
},
"node_modules/watchpack/node_modules/async": {
"version": "0.9.2",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
- "dev": true
+ "integrity": "sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw=="
},
"node_modules/webpack": {
"version": "1.15.0",
- "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
- "dev": true,
+ "integrity": "sha512-+8bxNSHMZCWBa6hi++2A2pw9GmLUWY6lII+aIXlgUPpB+ClNrUKgP8hx0w+hxjWhX81hclUYPGFg+7NxgLTUYQ==",
"dependencies": {
"acorn": "^3.0.0",
"async": "^1.3.0",
@@ -8772,8 +8818,7 @@
},
"node_modules/webpack-core": {
"version": "0.6.9",
- "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
- "dev": true,
+ "integrity": "sha512-P6ZUGXn5buTEZyTStCHHLwtWGKSm/jA629Zgp4pcHSsy60CCsT9MaHDxNIPL+GGJ2KwOgI6ORwQtHcrYHAt2UQ==",
"dependencies": {
"source-list-map": "~0.1.7",
"source-map": "~0.4.1"
@@ -8784,8 +8829,7 @@
},
"node_modules/webpack-core/node_modules/source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
- "dev": true,
+ "integrity": "sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==",
"dependencies": {
"amdefine": ">=0.0.4"
},
@@ -8813,7 +8857,7 @@
},
"node_modules/webpack-dev-middleware/node_modules/memory-fs": {
"version": "0.4.1",
- "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+ "integrity": "sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==",
"dev": true,
"dependencies": {
"errno": "^0.1.3",
@@ -8821,8 +8865,8 @@
}
},
"node_modules/webpack-dev-middleware/node_modules/readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -8834,6 +8878,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "node_modules/webpack-dev-middleware/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/webpack-dev-middleware/node_modules/string_decoder": {
"version": "1.1.1",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
@@ -8844,7 +8893,7 @@
},
"node_modules/webpack-dev-server": {
"version": "1.16.5",
- "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=",
+ "integrity": "sha512-on9j8SBuJXa2lzyIAv0DasJT8SteshUrEjjKc/mc8D68U7RN0mIBZksAcjnPW72RSJa9scWZ+C+Dme76LDH+lA==",
"dev": true,
"dependencies": {
"compression": "^1.5.2",
@@ -8870,7 +8919,7 @@
},
"node_modules/webpack-dev-server/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"dependencies": {
"has-flag": "^1.0.0"
@@ -8900,8 +8949,7 @@
},
"node_modules/webpack/node_modules/acorn": {
"version": "3.3.0",
- "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
- "dev": true,
+ "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
"bin": {
"acorn": "bin/acorn"
},
@@ -8911,8 +8959,7 @@
},
"node_modules/webpack/node_modules/supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
- "dev": true,
+ "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dependencies": {
"has-flag": "^1.0.0"
},
@@ -8922,8 +8969,7 @@
},
"node_modules/webpack/node_modules/uglify-js": {
"version": "2.7.5",
- "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
- "dev": true,
+ "integrity": "sha512-RvbIYn4DIadCg1MV7YP7OrpxnVrtEieZzbK0KSQvwWGAHojqWJxInkQhmtYGRo9PTwwkJkljIgzMyA1VitEc4Q==",
"dependencies": {
"async": "~0.2.6",
"source-map": "~0.5.1",
@@ -8939,8 +8985,7 @@
},
"node_modules/webpack/node_modules/uglify-js/node_modules/async": {
"version": "0.2.10",
- "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
- "dev": true
+ "integrity": "sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
},
"node_modules/websocket-driver": {
"version": "0.7.4",
@@ -8965,12 +9010,12 @@
},
"node_modules/whatwg-fetch": {
"version": "0.9.0",
- "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=",
+ "integrity": "sha512-DIuh7/cloHxHYwS/oRXGgkALYAntijL63nsgMQsNSnBj825AysosAqA2ZbYXGRqpPRiNH7335dTqV364euRpZw==",
"dev": true
},
"node_modules/whatwg-url-compat": {
"version": "0.6.5",
- "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=",
+ "integrity": "sha512-vbg5+JVNwGtHRI3GheZGWrcUlxF9BXHbA80dLa+2XqJjlV/BK6upoi2j8dIRW9FGPUUyaMm7Hf1pTexHnsk85g==",
"dev": true,
"dependencies": {
"tr46": "~0.0.1"
@@ -8989,15 +9034,14 @@
},
"node_modules/window-size": {
"version": "0.1.0",
- "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
- "dev": true,
+ "integrity": "sha512-1pTPQDKTdd61ozlKGNCjhNRd+KPmgLSGa3mZTHoOliaGcESD8G1PXhh7c1fgiPjVbNVfgy2Faw4BI8/m0cC8Mg==",
"engines": {
"node": ">= 0.8.0"
}
},
"node_modules/wordwrap": {
"version": "1.0.0",
- "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
"dev": true
},
"node_modules/worker-farm": {
@@ -9009,20 +9053,22 @@
},
"node_modules/wrappy": {
"version": "1.0.2",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"node_modules/write-file-stdout": {
"version": "0.0.2",
- "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
+ "integrity": "sha512-KofbSPeePSre3soWCMaqcWHVZy9t/rbJaEMa2h19cupODsvc4eh7390Se1TjzZEL77rS+D6dznu0TLXyCbR+sw==",
"dev": true
},
"node_modules/xml": {
"version": "1.0.1",
- "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
"dev": true
},
"node_modules/xml-js": {
"version": "1.6.11",
+ "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
"integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
"dev": true,
"dependencies": {
@@ -9034,12 +9080,12 @@
},
"node_modules/xml-name-validator": {
"version": "2.0.1",
- "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
+ "integrity": "sha512-jRKe/iQYMyVJpzPH+3HL97Lgu5HrCfii+qSo+TfjKHtOnvbnvdVfMYrn9Q34YV81M2e5sviJlI6Ko9y+nByzvA==",
"dev": true
},
"node_modules/xmlhttprequest": {
"version": "1.8.0",
- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
+ "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==",
"dev": true,
"engines": {
"node": ">=0.4.0"
@@ -9058,12 +9104,11 @@
},
"node_modules/yallist": {
"version": "2.1.2",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+ "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="
},
"node_modules/yargs": {
"version": "3.10.0",
- "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
- "dev": true,
+ "integrity": "sha512-QFzUah88GAGy9lyDKGBqZdkYApt63rCXYBGYnEP4xDJPXNqXXnBDACnbrXnViV6jRSqAePwrATi2i8mfYm4L1A==",
"dependencies": {
"camelcase": "^1.0.2",
"cliui": "^2.1.0",
@@ -9075,7 +9120,6 @@
"dependencies": {
"@allenfang/react-toastr": {
"version": "2.8.2",
- "integrity": "sha1-C+9lhRieBXHda9/E75i8n5xH2gw=",
"requires": {
"classnames": "^2.2.5",
"element-class": "^0.2.2",
@@ -9087,7 +9131,6 @@
"dependencies": {
"react": {
"version": "15.3.2",
- "integrity": "sha1-p7zNL+6K8SawMX4iLCjR1UUo0J4=",
"requires": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -9096,41 +9139,38 @@
},
"react-dom": {
"version": "15.3.2",
- "integrity": "sha1-xGsKpTgNe4OOelnEp77/LtMVUx8="
+ "requires": {}
}
}
},
"@babel/runtime": {
- "version": "7.17.2",
- "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==",
+ "version": "7.22.15",
"requires": {
- "regenerator-runtime": "^0.13.4"
+ "regenerator-runtime": "^0.14.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+ "version": "0.14.0"
}
}
},
"@babel/runtime-corejs2": {
- "version": "7.17.2",
- "integrity": "sha512-EamjJvKlHTdSmJ8t6yHtqttdiA3xThvTNdmGb0Kh0oqRhV1SU2JGFU5TjVCg35Vnn8MYfUBHHtLZYHIY+W28qw==",
+ "version": "7.22.15",
"dev": true,
"requires": {
- "core-js": "^2.6.5",
- "regenerator-runtime": "^0.13.4"
+ "core-js": "^2.6.12",
+ "regenerator-runtime": "^0.14.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.13.9",
- "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+ "version": "0.14.0",
"dev": true
}
}
},
"@types/image-size": {
"version": "0.0.29",
+ "resolved": "https://registry.npmjs.org/@types/image-size/-/image-size-0.0.29.tgz",
"integrity": "sha512-d47SGzTnoUXSLRn3Kej43FZXLduZjHJqkb26BmxKp9fQveCvjfirtpk7a5iLCGkJ/rur9kxUf7DwD2eKlPxjMg==",
"dev": true,
"requires": {
@@ -9139,6 +9179,7 @@
},
"@types/jszip": {
"version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/@types/jszip/-/jszip-3.4.1.tgz",
"integrity": "sha512-TezXjmf3lj+zQ651r6hPqvSScqBLvyPI9FxdXBqpEwBijNGQ2NXpaFW/7joGzveYkKQUil7iiDHLo6LV71Pc0A==",
"dev": true,
"requires": {
@@ -9146,18 +9187,17 @@
}
},
"@types/node": {
- "version": "17.0.19",
- "integrity": "sha512-PfeQhvcMR4cPFVuYfBN4ifG7p9c+Dlh3yUZR6k+5yQK7wX3gDgVxBly4/WkBRs9x4dmcy1TVl08SY67wwtEvmA==",
+ "version": "20.6.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz",
+ "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==",
"dev": true
},
"abbrev": {
"version": "1.0.9",
- "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
"dev": true
},
"accepts": {
"version": "1.3.8",
- "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
"dev": true,
"requires": {
"mime-types": "~2.1.34",
@@ -9166,12 +9206,10 @@
},
"acorn": {
"version": "2.7.0",
- "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=",
"dev": true
},
"acorn-globals": {
"version": "1.0.9",
- "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
"dev": true,
"requires": {
"acorn": "^2.1.0"
@@ -9179,14 +9217,12 @@
},
"add-dom-event-listener": {
"version": "1.1.0",
- "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
"requires": {
"object-assign": "4.x"
}
},
"ajv": {
"version": "6.12.6",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"requires": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -9196,12 +9232,10 @@
},
"ajv-keywords": {
"version": "3.5.2",
- "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+ "requires": {}
},
"align-text": {
"version": "0.1.4",
- "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2",
"longest": "^1.0.1",
@@ -9209,15 +9243,12 @@
}
},
"amdefine": {
- "version": "1.0.1",
- "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
- "dev": true
+ "version": "1.0.1"
},
"amp-ui": {
- "version": "git+ssh://git@github.com/devgateway/amp-ui.git#35d15a9efe2de868113fd47218a10743a393d5d4",
- "integrity": "sha512-EGpUyat29ddAvrhjtHQuipbc3qOK3ZSXhRcwHLtxF0F7POsa2TqLi9POmKp7FZKHcby4TjeJHrtFSuZ60GYA2A==",
+ "version": "git+ssh://git@github.com/devgateway/amp-ui.git#b1b1aa44216efadd64bcb32d5666c0f06b3cc464",
"dev": true,
- "from": "amp-ui@github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4",
+ "from": "amp-ui@github:devgateway/amp-ui#develop",
"requires": {
"docx": "^4.7.1",
"file-saver": "github:devgateway/FileSaver.js",
@@ -9225,46 +9256,26 @@
"he": "^1.2.0",
"moment": "^2.18.1",
"react-router-hash-link": "git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3"
- },
- "dependencies": {
- "react-router-hash-link": {
- "version": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
- "dev": true,
- "from": "react-router-hash-link@git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3",
- "requires": {
- "object-assign": "^4.1.0",
- "react": "^15.4.1",
- "react-dom": "^15.4.1",
- "react-interactive": "^0.4.0",
- "react-router": "^3.0.0"
- }
- }
}
},
"ansi-regex": {
- "version": "2.1.1",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+ "version": "2.1.1"
},
"ansi-styles": {
- "version": "2.2.1",
- "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+ "version": "2.2.1"
},
"anymatch": {
"version": "1.3.2",
- "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
- "dev": true,
"requires": {
"micromatch": "^2.1.5",
"normalize-path": "^2.0.0"
}
},
"aproba": {
- "version": "1.2.0",
- "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ "version": "1.2.0"
},
"argparse": {
"version": "1.0.10",
- "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"dev": true,
"requires": {
"sprintf-js": "~1.0.2"
@@ -9272,102 +9283,65 @@
},
"arr-diff": {
"version": "2.0.0",
- "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
"requires": {
"arr-flatten": "^1.0.1"
}
},
"arr-flatten": {
- "version": "1.1.0",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+ "version": "1.1.0"
},
"arr-union": {
- "version": "3.1.0",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
- "dev": true
+ "version": "3.1.0"
},
"array-flatten": {
"version": "1.1.1",
- "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
"dev": true
},
"array-unique": {
- "version": "0.2.1",
- "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+ "version": "0.2.1"
},
"arrify": {
- "version": "1.0.1",
- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+ "version": "1.0.1"
},
"asap": {
- "version": "2.0.6",
- "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ "version": "2.0.6"
},
"asn1": {
"version": "0.2.6",
- "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
"dev": true,
"requires": {
"safer-buffer": "~2.1.0"
}
},
"assert": {
- "version": "1.5.0",
- "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
- "dev": true,
+ "version": "1.5.1",
"requires": {
- "object-assign": "^4.1.1",
- "util": "0.10.3"
- },
- "dependencies": {
- "inherits": {
- "version": "2.0.1",
- "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
- "dev": true
- },
- "util": {
- "version": "0.10.3",
- "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
- "dev": true,
- "requires": {
- "inherits": "2.0.1"
- }
- }
+ "object.assign": "^4.1.4",
+ "util": "^0.10.4"
}
},
"assert-plus": {
"version": "1.0.0",
- "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
"dev": true
},
"assign-symbols": {
- "version": "1.0.0",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
- "dev": true
+ "version": "1.0.0"
},
"async": {
- "version": "1.5.2",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
- "dev": true
+ "version": "1.5.2"
},
"async-each": {
- "version": "1.0.3",
- "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
- "dev": true
+ "version": "1.0.6"
},
"asynckit": {
"version": "0.4.0",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
"dev": true
},
"atob": {
- "version": "2.1.2",
- "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
- "dev": true
+ "version": "2.1.2"
},
"autoprefixer-core": {
"version": "5.2.1",
- "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=",
"dev": true,
"requires": {
"browserslist": "~0.4.0",
@@ -9378,17 +9352,14 @@
},
"aws-sign2": {
"version": "0.7.0",
- "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
"dev": true
},
"aws4": {
- "version": "1.11.0",
- "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+ "version": "1.12.0",
"dev": true
},
"babel-code-frame": {
"version": "6.26.0",
- "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"requires": {
"chalk": "^1.1.3",
"esutils": "^2.0.2",
@@ -9397,7 +9368,6 @@
},
"babel-core": {
"version": "6.26.3",
- "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
"requires": {
"babel-code-frame": "^6.26.0",
"babel-generator": "^6.26.0",
@@ -9422,7 +9392,6 @@
},
"babel-generator": {
"version": "6.26.1",
- "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
"requires": {
"babel-messages": "^6.23.0",
"babel-runtime": "^6.26.0",
@@ -9436,7 +9405,6 @@
},
"babel-helper-bindify-decorators": {
"version": "6.24.1",
- "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9446,7 +9414,6 @@
},
"babel-helper-builder-binary-assignment-operator-visitor": {
"version": "6.24.1",
- "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
"dev": true,
"requires": {
"babel-helper-explode-assignable-expression": "^6.24.1",
@@ -9456,7 +9423,6 @@
},
"babel-helper-builder-react-jsx": {
"version": "6.26.0",
- "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
"dev": true,
"requires": {
"babel-runtime": "^6.26.0",
@@ -9466,7 +9432,6 @@
},
"babel-helper-call-delegate": {
"version": "6.24.1",
- "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
"dev": true,
"requires": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -9477,7 +9442,6 @@
},
"babel-helper-define-map": {
"version": "6.26.0",
- "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
"dev": true,
"requires": {
"babel-helper-function-name": "^6.24.1",
@@ -9488,7 +9452,6 @@
},
"babel-helper-explode-assignable-expression": {
"version": "6.24.1",
- "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9498,7 +9461,6 @@
},
"babel-helper-explode-class": {
"version": "6.24.1",
- "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
"dev": true,
"requires": {
"babel-helper-bindify-decorators": "^6.24.1",
@@ -9509,7 +9471,6 @@
},
"babel-helper-function-name": {
"version": "6.24.1",
- "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
"dev": true,
"requires": {
"babel-helper-get-function-arity": "^6.24.1",
@@ -9521,7 +9482,6 @@
},
"babel-helper-get-function-arity": {
"version": "6.24.1",
- "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9530,7 +9490,6 @@
},
"babel-helper-hoist-variables": {
"version": "6.24.1",
- "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9539,7 +9498,6 @@
},
"babel-helper-optimise-call-expression": {
"version": "6.24.1",
- "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9548,7 +9506,6 @@
},
"babel-helper-regex": {
"version": "6.26.0",
- "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
"dev": true,
"requires": {
"babel-runtime": "^6.26.0",
@@ -9558,7 +9515,6 @@
},
"babel-helper-remap-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
"dev": true,
"requires": {
"babel-helper-function-name": "^6.24.1",
@@ -9570,7 +9526,6 @@
},
"babel-helper-replace-supers": {
"version": "6.24.1",
- "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
"dev": true,
"requires": {
"babel-helper-optimise-call-expression": "^6.24.1",
@@ -9583,7 +9538,6 @@
},
"babel-helpers": {
"version": "6.24.1",
- "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
"requires": {
"babel-runtime": "^6.22.0",
"babel-template": "^6.24.1"
@@ -9591,7 +9545,6 @@
},
"babel-jest": {
"version": "6.0.1",
- "integrity": "sha1-MTRjrSN22I5LaxMmRMu896pWMiE=",
"dev": true,
"requires": {
"babel-core": "^6.0.0"
@@ -9599,7 +9552,6 @@
},
"babel-loader": {
"version": "6.4.1",
- "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
"dev": true,
"requires": {
"find-cache-dir": "^0.1.1",
@@ -9610,14 +9562,12 @@
},
"babel-messages": {
"version": "6.23.0",
- "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
"requires": {
"babel-runtime": "^6.22.0"
}
},
"babel-plugin-check-es2015-constants": {
"version": "6.22.0",
- "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9625,7 +9575,6 @@
},
"babel-plugin-istanbul": {
"version": "4.1.6",
- "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
"requires": {
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
"find-up": "^2.1.0",
@@ -9635,7 +9584,6 @@
"dependencies": {
"find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": {
"locate-path": "^2.0.0"
}
@@ -9643,81 +9591,65 @@
}
},
"babel-plugin-jest-hoist": {
- "version": "19.0.0",
- "integrity": "sha1-SuKgTqYSpuc2UfP95SwXiZEwS+o="
+ "version": "19.0.0"
},
"babel-plugin-syntax-async-functions": {
"version": "6.13.0",
- "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
"dev": true
},
"babel-plugin-syntax-async-generators": {
"version": "6.13.0",
- "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
"dev": true
},
"babel-plugin-syntax-class-constructor-call": {
"version": "6.18.0",
- "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
"dev": true
},
"babel-plugin-syntax-class-properties": {
"version": "6.13.0",
- "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
"dev": true
},
"babel-plugin-syntax-decorators": {
"version": "6.13.0",
- "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
"dev": true
},
"babel-plugin-syntax-do-expressions": {
"version": "6.13.0",
- "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
"dev": true
},
"babel-plugin-syntax-dynamic-import": {
"version": "6.18.0",
- "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
"dev": true
},
"babel-plugin-syntax-exponentiation-operator": {
"version": "6.13.0",
- "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
"dev": true
},
"babel-plugin-syntax-export-extensions": {
"version": "6.13.0",
- "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
"dev": true
},
"babel-plugin-syntax-flow": {
"version": "6.18.0",
- "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
"dev": true
},
"babel-plugin-syntax-function-bind": {
"version": "6.13.0",
- "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
"dev": true
},
"babel-plugin-syntax-jsx": {
"version": "6.18.0",
- "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
"dev": true
},
"babel-plugin-syntax-object-rest-spread": {
- "version": "6.13.0",
- "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+ "version": "6.13.0"
},
"babel-plugin-syntax-trailing-function-commas": {
"version": "6.22.0",
- "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
"dev": true
},
"babel-plugin-transform-async-generator-functions": {
"version": "6.24.1",
- "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
"dev": true,
"requires": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -9727,7 +9659,6 @@
},
"babel-plugin-transform-async-to-generator": {
"version": "6.24.1",
- "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
"dev": true,
"requires": {
"babel-helper-remap-async-to-generator": "^6.24.1",
@@ -9737,7 +9668,6 @@
},
"babel-plugin-transform-class-constructor-call": {
"version": "6.24.1",
- "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
"dev": true,
"requires": {
"babel-plugin-syntax-class-constructor-call": "^6.18.0",
@@ -9747,7 +9677,6 @@
},
"babel-plugin-transform-class-properties": {
"version": "6.24.1",
- "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
"dev": true,
"requires": {
"babel-helper-function-name": "^6.24.1",
@@ -9758,7 +9687,6 @@
},
"babel-plugin-transform-decorators": {
"version": "6.24.1",
- "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
"dev": true,
"requires": {
"babel-helper-explode-class": "^6.24.1",
@@ -9770,7 +9698,6 @@
},
"babel-plugin-transform-do-expressions": {
"version": "6.22.0",
- "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
"dev": true,
"requires": {
"babel-plugin-syntax-do-expressions": "^6.8.0",
@@ -9779,7 +9706,6 @@
},
"babel-plugin-transform-es2015-arrow-functions": {
"version": "6.22.0",
- "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9787,7 +9713,6 @@
},
"babel-plugin-transform-es2015-block-scoped-functions": {
"version": "6.22.0",
- "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9795,7 +9720,6 @@
},
"babel-plugin-transform-es2015-block-scoping": {
"version": "6.26.0",
- "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
"dev": true,
"requires": {
"babel-runtime": "^6.26.0",
@@ -9807,7 +9731,6 @@
},
"babel-plugin-transform-es2015-classes": {
"version": "6.24.1",
- "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
"dev": true,
"requires": {
"babel-helper-define-map": "^6.24.1",
@@ -9823,7 +9746,6 @@
},
"babel-plugin-transform-es2015-computed-properties": {
"version": "6.24.1",
- "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9832,7 +9754,6 @@
},
"babel-plugin-transform-es2015-destructuring": {
"version": "6.23.0",
- "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9840,7 +9761,6 @@
},
"babel-plugin-transform-es2015-duplicate-keys": {
"version": "6.24.1",
- "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9849,7 +9769,6 @@
},
"babel-plugin-transform-es2015-for-of": {
"version": "6.23.0",
- "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9857,7 +9776,6 @@
},
"babel-plugin-transform-es2015-function-name": {
"version": "6.24.1",
- "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
"dev": true,
"requires": {
"babel-helper-function-name": "^6.24.1",
@@ -9867,7 +9785,6 @@
},
"babel-plugin-transform-es2015-literals": {
"version": "6.22.0",
- "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9875,7 +9792,6 @@
},
"babel-plugin-transform-es2015-modules-amd": {
"version": "6.24.1",
- "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
"dev": true,
"requires": {
"babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
@@ -9885,7 +9801,6 @@
},
"babel-plugin-transform-es2015-modules-commonjs": {
"version": "6.26.2",
- "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
"dev": true,
"requires": {
"babel-plugin-transform-strict-mode": "^6.24.1",
@@ -9896,7 +9811,6 @@
},
"babel-plugin-transform-es2015-modules-systemjs": {
"version": "6.24.1",
- "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
"dev": true,
"requires": {
"babel-helper-hoist-variables": "^6.24.1",
@@ -9906,7 +9820,6 @@
},
"babel-plugin-transform-es2015-modules-umd": {
"version": "6.24.1",
- "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
"dev": true,
"requires": {
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
@@ -9916,7 +9829,6 @@
},
"babel-plugin-transform-es2015-object-super": {
"version": "6.24.1",
- "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
"dev": true,
"requires": {
"babel-helper-replace-supers": "^6.24.1",
@@ -9925,7 +9837,6 @@
},
"babel-plugin-transform-es2015-parameters": {
"version": "6.24.1",
- "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
"dev": true,
"requires": {
"babel-helper-call-delegate": "^6.24.1",
@@ -9938,7 +9849,6 @@
},
"babel-plugin-transform-es2015-shorthand-properties": {
"version": "6.24.1",
- "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -9947,7 +9857,6 @@
},
"babel-plugin-transform-es2015-spread": {
"version": "6.22.0",
- "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9955,7 +9864,6 @@
},
"babel-plugin-transform-es2015-sticky-regex": {
"version": "6.24.1",
- "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
"dev": true,
"requires": {
"babel-helper-regex": "^6.24.1",
@@ -9965,7 +9873,6 @@
},
"babel-plugin-transform-es2015-template-literals": {
"version": "6.22.0",
- "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9973,7 +9880,6 @@
},
"babel-plugin-transform-es2015-typeof-symbol": {
"version": "6.23.0",
- "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -9981,7 +9887,6 @@
},
"babel-plugin-transform-es2015-unicode-regex": {
"version": "6.24.1",
- "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
"dev": true,
"requires": {
"babel-helper-regex": "^6.24.1",
@@ -9991,7 +9896,6 @@
},
"babel-plugin-transform-exponentiation-operator": {
"version": "6.24.1",
- "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
"dev": true,
"requires": {
"babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
@@ -10001,7 +9905,6 @@
},
"babel-plugin-transform-export-extensions": {
"version": "6.22.0",
- "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
"dev": true,
"requires": {
"babel-plugin-syntax-export-extensions": "^6.8.0",
@@ -10010,7 +9913,6 @@
},
"babel-plugin-transform-flow-strip-types": {
"version": "6.22.0",
- "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
"dev": true,
"requires": {
"babel-plugin-syntax-flow": "^6.18.0",
@@ -10019,7 +9921,6 @@
},
"babel-plugin-transform-function-bind": {
"version": "6.22.0",
- "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
"dev": true,
"requires": {
"babel-plugin-syntax-function-bind": "^6.8.0",
@@ -10028,7 +9929,6 @@
},
"babel-plugin-transform-object-rest-spread": {
"version": "6.26.0",
- "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
"dev": true,
"requires": {
"babel-plugin-syntax-object-rest-spread": "^6.8.0",
@@ -10037,7 +9937,6 @@
},
"babel-plugin-transform-react-display-name": {
"version": "6.25.0",
- "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0"
@@ -10045,7 +9944,6 @@
},
"babel-plugin-transform-react-jsx": {
"version": "6.24.1",
- "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
"dev": true,
"requires": {
"babel-helper-builder-react-jsx": "^6.24.1",
@@ -10055,7 +9953,6 @@
},
"babel-plugin-transform-react-jsx-self": {
"version": "6.22.0",
- "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
"dev": true,
"requires": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -10064,7 +9961,6 @@
},
"babel-plugin-transform-react-jsx-source": {
"version": "6.22.0",
- "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
"dev": true,
"requires": {
"babel-plugin-syntax-jsx": "^6.8.0",
@@ -10073,7 +9969,6 @@
},
"babel-plugin-transform-regenerator": {
"version": "6.26.0",
- "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
"dev": true,
"requires": {
"regenerator-transform": "^0.10.0"
@@ -10081,7 +9976,6 @@
},
"babel-plugin-transform-strict-mode": {
"version": "6.24.1",
- "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
"dev": true,
"requires": {
"babel-runtime": "^6.22.0",
@@ -10090,12 +9984,10 @@
},
"babel-plugin-typecheck": {
"version": "1.3.0",
- "integrity": "sha1-SQhlLTGLDLICjrBhbmXyXMVkrpM=",
"dev": true
},
"babel-polyfill": {
"version": "6.26.0",
- "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
"requires": {
"babel-runtime": "^6.26.0",
"core-js": "^2.5.0",
@@ -10104,7 +9996,6 @@
},
"babel-preset-es2015": {
"version": "6.24.1",
- "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
"dev": true,
"requires": {
"babel-plugin-check-es2015-constants": "^6.22.0",
@@ -10135,7 +10026,6 @@
},
"babel-preset-flow": {
"version": "6.23.0",
- "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
"dev": true,
"requires": {
"babel-plugin-transform-flow-strip-types": "^6.22.0"
@@ -10143,14 +10033,12 @@
},
"babel-preset-jest": {
"version": "19.0.0",
- "integrity": "sha1-ItZyAdAjJKGVgRKI6zgpS7PKw5Y=",
"requires": {
"babel-plugin-jest-hoist": "^19.0.0"
}
},
"babel-preset-react": {
"version": "6.24.1",
- "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
"dev": true,
"requires": {
"babel-plugin-syntax-jsx": "^6.3.13",
@@ -10163,7 +10051,6 @@
},
"babel-preset-stage-0": {
"version": "6.24.1",
- "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
"dev": true,
"requires": {
"babel-plugin-transform-do-expressions": "^6.22.0",
@@ -10173,7 +10060,6 @@
},
"babel-preset-stage-1": {
"version": "6.24.1",
- "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
"dev": true,
"requires": {
"babel-plugin-transform-class-constructor-call": "^6.24.1",
@@ -10183,7 +10069,6 @@
},
"babel-preset-stage-2": {
"version": "6.24.1",
- "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
"dev": true,
"requires": {
"babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -10194,7 +10079,6 @@
},
"babel-preset-stage-3": {
"version": "6.24.1",
- "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
"dev": true,
"requires": {
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
@@ -10206,7 +10090,6 @@
},
"babel-register": {
"version": "6.26.0",
- "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"requires": {
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
@@ -10219,21 +10102,18 @@
},
"babel-runtime": {
"version": "6.26.0",
- "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.11.1",
- "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+ "version": "0.11.1"
}
}
},
"babel-template": {
"version": "6.26.0",
- "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
"requires": {
"babel-runtime": "^6.26.0",
"babel-traverse": "^6.26.0",
@@ -10244,7 +10124,6 @@
},
"babel-traverse": {
"version": "6.26.0",
- "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
"requires": {
"babel-code-frame": "^6.26.0",
"babel-messages": "^6.23.0",
@@ -10259,7 +10138,6 @@
},
"babel-types": {
"version": "6.26.0",
- "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"requires": {
"babel-runtime": "^6.26.0",
"esutils": "^2.0.2",
@@ -10268,18 +10146,14 @@
}
},
"babylon": {
- "version": "6.18.0",
- "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+ "version": "6.18.0"
},
"balanced-match": {
"version": "0.2.1",
- "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=",
"dev": true
},
"base": {
"version": "0.11.2",
- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
- "dev": true,
"requires": {
"cache-base": "^1.0.1",
"class-utils": "^0.3.5",
@@ -10292,95 +10166,81 @@
"dependencies": {
"define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
"requires": {
"is-descriptor": "^1.0.0"
}
},
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"base64-js": {
- "version": "1.5.1",
- "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
- "dev": true
+ "version": "1.5.1"
},
"batch": {
"version": "0.6.1",
- "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
"dev": true
},
"bcrypt-pbkdf": {
"version": "1.0.2",
- "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"dev": true,
"requires": {
"tweetnacl": "^0.14.3"
}
},
"big.js": {
- "version": "3.2.0",
- "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
- "dev": true
+ "version": "3.2.0"
},
"binary-extensions": {
- "version": "1.13.1",
- "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
- "dev": true
+ "version": "1.13.1"
},
"blacklist": {
- "version": "1.1.4",
- "integrity": "sha1-st0J1hd2JbLKppg1o3somV+povI="
+ "version": "1.1.4"
},
"bluebird": {
- "version": "3.7.2",
- "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+ "version": "3.7.2"
},
"body-parser": {
- "version": "1.19.2",
- "integrity": "sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==",
+ "version": "1.20.1",
"dev": true,
"requires": {
"bytes": "3.1.2",
"content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "~1.1.2",
- "http-errors": "1.8.1",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
- "on-finished": "~2.3.0",
- "qs": "6.9.7",
- "raw-body": "2.4.3",
- "type-is": "~1.6.18"
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
},
"dependencies": {
"bytes": {
"version": "3.1.2",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
"dev": true
},
"iconv-lite": {
"version": "0.4.24",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
},
"qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
- "dev": true
+ "version": "6.11.0",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
"boom": {
"version": "2.10.1",
- "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true,
"optional": true,
"requires": {
@@ -10389,26 +10249,22 @@
},
"bootstrap": {
"version": "3.4.1",
- "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
- "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
},
"dependencies": {
"balanced-match": {
- "version": "1.0.2",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+ "version": "1.0.2"
}
}
},
"braces": {
"version": "1.8.5",
- "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
"requires": {
"expand-range": "^1.8.1",
"preserve": "^0.2.0",
@@ -10417,35 +10273,27 @@
},
"browser-request": {
"version": "0.3.3",
- "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc=",
"dev": true
},
"browserify-aes": {
"version": "0.4.0",
- "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
- "dev": true,
"requires": {
"inherits": "^2.0.1"
}
},
"browserify-zlib": {
"version": "0.1.4",
- "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
- "dev": true,
"requires": {
"pako": "~0.2.0"
},
"dependencies": {
"pako": {
- "version": "0.2.9",
- "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
- "dev": true
+ "version": "0.2.9"
}
}
},
"browserslist": {
"version": "0.4.0",
- "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=",
"dev": true,
"requires": {
"caniuse-db": "^1.0.30000153"
@@ -10453,7 +10301,6 @@
},
"bser": {
"version": "2.1.1",
- "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
"dev": true,
"requires": {
"node-int64": "^0.4.0"
@@ -10461,8 +10308,6 @@
},
"buffer": {
"version": "4.9.2",
- "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
- "dev": true,
"requires": {
"base64-js": "^1.0.2",
"ieee754": "^1.1.4",
@@ -10470,22 +10315,17 @@
}
},
"buffer-from": {
- "version": "1.1.2",
- "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+ "version": "1.1.2"
},
"builtin-status-codes": {
- "version": "3.0.0",
- "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
- "dev": true
+ "version": "3.0.0"
},
"bytes": {
"version": "3.0.0",
- "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
"dev": true
},
"cacache": {
"version": "10.0.4",
- "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
"requires": {
"bluebird": "^3.5.1",
"chownr": "^1.0.1",
@@ -10503,13 +10343,12 @@
},
"dependencies": {
"glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
@@ -10518,8 +10357,6 @@
},
"cache-base": {
"version": "1.0.1",
- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
- "dev": true,
"requires": {
"collection-visit": "^1.0.0",
"component-emitter": "^1.2.1",
@@ -10533,31 +10370,30 @@
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
+ "call-bind": {
+ "version": "1.0.2",
+ "requires": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ }
+ },
"camelcase": {
- "version": "1.2.1",
- "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
- "dev": true
+ "version": "1.2.1"
},
"caniuse-db": {
- "version": "1.0.30001312",
- "integrity": "sha512-4eJfCSGxsF9JcQXBLdHclxkpLWv+Va7Y6QESYCWSdrR8b8x16TxUjCoOK/kU7SFC0BdcuK0nvt6ZkM59Q03LjQ==",
+ "version": "1.0.30001535",
"dev": true
},
"caseless": {
"version": "0.12.0",
- "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
"dev": true
},
"center-align": {
"version": "0.1.3",
- "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
- "dev": true,
"requires": {
"align-text": "^0.1.3",
"lazy-cache": "^1.0.3"
@@ -10565,7 +10401,6 @@
},
"chalk": {
"version": "1.1.3",
- "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
@@ -10576,8 +10411,6 @@
},
"chokidar": {
"version": "1.7.0",
- "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
- "dev": true,
"requires": {
"anymatch": "^1.3.0",
"async-each": "^1.0.0",
@@ -10591,13 +10424,10 @@
}
},
"chownr": {
- "version": "1.1.4",
- "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+ "version": "1.1.4"
},
"class-utils": {
"version": "0.3.6",
- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
- "dev": true,
"requires": {
"arr-union": "^3.1.0",
"define-property": "^0.2.5",
@@ -10607,32 +10437,24 @@
"dependencies": {
"define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
"requires": {
"is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-descriptor": {
"version": "0.1.6",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -10640,26 +10462,20 @@
},
"dependencies": {
"kind-of": {
- "version": "5.1.0",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
+ "version": "5.1.0"
}
}
},
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"classnames": {
- "version": "2.3.1",
- "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+ "version": "2.3.2"
},
"cli-table": {
"version": "0.0.2",
- "integrity": "sha1-mChn4WQ1Mlxmwgih5xuVM26jCTs=",
"dev": true,
"requires": {
"colors": "0.3.0"
@@ -10667,8 +10483,6 @@
},
"cliui": {
"version": "2.1.0",
- "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
- "dev": true,
"requires": {
"center-align": "^0.1.1",
"right-align": "^0.1.1",
@@ -10676,32 +10490,24 @@
},
"dependencies": {
"wordwrap": {
- "version": "0.0.2",
- "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
- "dev": true
+ "version": "0.0.2"
}
}
},
"clone": {
- "version": "1.0.4",
- "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
- "dev": true
+ "version": "1.0.4"
},
"co": {
"version": "4.6.0",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true,
"optional": true
},
"coffee-script": {
"version": "1.12.7",
- "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
"dev": true
},
"collection-visit": {
"version": "1.0.0",
- "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
- "dev": true,
"requires": {
"map-visit": "^1.0.0",
"object-visit": "^1.0.0"
@@ -10709,7 +10515,6 @@
},
"color": {
"version": "0.10.1",
- "integrity": "sha1-wEGI34KiCd3rzOzazT7DIPGTc58=",
"dev": true,
"requires": {
"color-convert": "^0.5.3",
@@ -10718,17 +10523,14 @@
},
"color-convert": {
"version": "0.5.3",
- "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
"dev": true
},
"color-name": {
"version": "1.1.4",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"color-string": {
"version": "0.3.0",
- "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
"dev": true,
"requires": {
"color-name": "^1.0.0"
@@ -10736,7 +10538,6 @@
},
"colormin": {
"version": "1.1.2",
- "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
"dev": true,
"requires": {
"color": "^0.11.0",
@@ -10746,7 +10547,6 @@
"dependencies": {
"color": {
"version": "0.11.4",
- "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
"dev": true,
"requires": {
"clone": "^1.0.2",
@@ -10756,7 +10556,6 @@
},
"color-convert": {
"version": "1.9.3",
- "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
"dev": true,
"requires": {
"color-name": "1.1.3"
@@ -10764,40 +10563,32 @@
},
"color-name": {
"version": "1.1.3",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true
}
}
},
"colors": {
"version": "0.3.0",
- "integrity": "sha1-wkfWTTTbDKTcjkPz7NbamNCvlOc=",
"dev": true
},
"combined-stream": {
"version": "1.0.8",
- "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"dev": true,
"requires": {
"delayed-stream": "~1.0.0"
}
},
"commander": {
- "version": "2.13.0",
- "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA=="
+ "version": "2.13.0"
},
"commondir": {
- "version": "1.0.1",
- "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+ "version": "1.0.1"
},
"component-emitter": {
- "version": "1.3.0",
- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
- "dev": true
+ "version": "1.3.0"
},
"compressible": {
"version": "2.0.18",
- "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
"dev": true,
"requires": {
"mime-db": ">= 1.43.0 < 2"
@@ -10805,7 +10596,6 @@
},
"compression": {
"version": "1.7.4",
- "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
"dev": true,
"requires": {
"accepts": "~1.3.5",
@@ -10815,15 +10605,19 @@
"on-headers": "~1.0.2",
"safe-buffer": "5.1.2",
"vary": "~1.1.2"
+ },
+ "dependencies": {
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ }
}
},
"concat-map": {
- "version": "0.0.1",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ "version": "0.0.1"
},
"concat-stream": {
"version": "1.6.2",
- "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"requires": {
"buffer-from": "^1.0.0",
"inherits": "^2.0.3",
@@ -10832,8 +10626,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -10844,9 +10637,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -10855,59 +10650,38 @@
},
"connect-history-api-fallback": {
"version": "1.6.0",
- "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
"dev": true
},
"console-browserify": {
- "version": "1.2.0",
- "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
- "dev": true
+ "version": "1.2.0"
},
"constants-browserify": {
- "version": "1.0.0",
- "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
- "dev": true
+ "version": "1.0.0"
},
"content-disposition": {
"version": "0.5.4",
- "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
"dev": true,
"requires": {
"safe-buffer": "5.2.1"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true
- }
}
},
"content-type": {
- "version": "1.0.4",
- "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+ "version": "1.0.5",
"dev": true
},
"convert-source-map": {
- "version": "1.8.0",
- "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "requires": {
- "safe-buffer": "~5.1.1"
- }
+ "version": "1.9.0"
},
"cookie": {
- "version": "0.4.2",
- "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+ "version": "0.5.0",
"dev": true
},
"cookie-signature": {
"version": "1.0.6",
- "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
"dev": true
},
"copy-concurrently": {
"version": "1.0.5",
- "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
"requires": {
"aproba": "^1.1.1",
"fs-write-stream-atomic": "^1.0.8",
@@ -10918,21 +10692,16 @@
}
},
"copy-descriptor": {
- "version": "0.1.1",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
- "dev": true
+ "version": "0.1.1"
},
"core-js": {
- "version": "2.6.12",
- "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+ "version": "2.6.12"
},
"core-util-is": {
- "version": "1.0.2",
- "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+ "version": "1.0.2"
},
"cover": {
"version": "0.2.9",
- "integrity": "sha1-JiAp37MXFNSAQ/7ZHt5lhZOVXdQ=",
"dev": true,
"requires": {
"cli-table": "0.0.x",
@@ -10943,14 +10712,12 @@
"dependencies": {
"which": {
"version": "1.0.9",
- "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
"dev": true
}
}
},
"create-react-class": {
"version": "15.7.0",
- "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
"requires": {
"loose-envify": "^1.3.1",
"object-assign": "^4.1.1"
@@ -10958,7 +10725,6 @@
},
"cryptiles": {
"version": "2.0.5",
- "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
"dev": true,
"optional": true,
"requires": {
@@ -10967,8 +10733,6 @@
},
"crypto-browserify": {
"version": "3.3.0",
- "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
- "dev": true,
"requires": {
"browserify-aes": "0.4.0",
"pbkdf2-compat": "2.0.1",
@@ -10978,17 +10742,14 @@
},
"css-color-names": {
"version": "0.0.4",
- "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
"dev": true
},
"css-list": {
"version": "0.1.3",
- "integrity": "sha1-p7M7RBn4PUEjIN3pEzoNEASUjXA=",
"dev": true
},
"css-loader": {
"version": "0.15.6",
- "integrity": "sha1-Iofe4oSCnr+4H6wLKU2nKbO/oUQ=",
"dev": true,
"requires": {
"css-selector-tokenizer": "^0.5.1",
@@ -11003,7 +10764,6 @@
},
"css-selector-tokenizer": {
"version": "0.5.4",
- "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=",
"dev": true,
"requires": {
"cssesc": "^0.1.0",
@@ -11012,12 +10772,10 @@
},
"cssesc": {
"version": "0.1.0",
- "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
"dev": true
},
"cssnano": {
"version": "2.6.1",
- "integrity": "sha1-f7NyEsz/RNPpNuAmxvZ14xR9gCQ=",
"dev": true,
"requires": {
"autoprefixer-core": "^5.2.1",
@@ -11054,24 +10812,20 @@
},
"cssom": {
"version": "0.3.8",
- "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
"dev": true
},
"cssstyle": {
"version": "0.2.37",
- "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
"dev": true,
"requires": {
"cssom": "0.3.x"
}
},
"cyclist": {
- "version": "1.0.1",
- "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+ "version": "1.0.2"
},
"dashdash": {
"version": "1.14.1",
- "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"dev": true,
"requires": {
"assert-plus": "^1.0.0"
@@ -11079,82 +10833,84 @@
},
"debug": {
"version": "2.6.9",
- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
},
"decamelize": {
- "version": "1.2.0",
- "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
- "dev": true
+ "version": "1.2.0"
},
"decode-uri-component": {
- "version": "0.2.0",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "dev": true
+ "version": "0.2.2"
},
"deep-diff": {
"version": "0.3.4",
- "integrity": "sha1-qsXDmVIjar5fA3ojSQYLoBsArkg=",
"dev": true
},
"deep-is": {
"version": "0.1.4",
- "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true
},
+ "define-data-property": {
+ "version": "1.1.0",
+ "requires": {
+ "get-intrinsic": "^1.2.1",
+ "gopd": "^1.0.1",
+ "has-property-descriptors": "^1.0.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.2.1",
+ "requires": {
+ "define-data-property": "^1.0.1",
+ "has-property-descriptors": "^1.0.0",
+ "object-keys": "^1.1.1"
+ }
+ },
"define-property": {
"version": "2.0.2",
- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
- "dev": true,
"requires": {
"is-descriptor": "^1.0.2",
"isobject": "^3.0.1"
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"defined": {
- "version": "1.0.0",
- "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+ "version": "1.0.1",
"dev": true
},
"delayed-stream": {
"version": "1.0.0",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
"depd": {
- "version": "1.1.2",
- "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "version": "2.0.0",
"dev": true
},
"destroy": {
- "version": "1.0.4",
- "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+ "version": "1.2.0",
"dev": true
},
"detect-hover": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-hover/-/detect-hover-1.0.3.tgz",
"integrity": "sha512-HtLoY+tClgYucJNiovNICGWFp9nOGVmHY44s7L62iPqORXM9vujeWFaVcqtA7XRvp/2Y+4RBUfHbDKFGN+xxZQ==",
"dev": true
},
"detect-indent": {
"version": "4.0.0",
- "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
"requires": {
"repeating": "^2.0.0"
}
},
"detect-it": {
"version": "2.1.1",
- "integrity": "sha1-39tgv/CX3p6+c2YgHFNQ1ODWQiU=",
+ "resolved": "https://registry.npmjs.org/detect-it/-/detect-it-2.1.1.tgz",
+ "integrity": "sha512-ZBC+LVUG18aBmw4JRakDM5fI7kYcsbwpJTVuU6za7cWRfyzzhVbIWZVayGnon1xFeIGxFN3jiZ8QON3YteUyCw==",
"dev": true,
"requires": {
"detect-hover": "^1.0.1",
@@ -11165,26 +10921,29 @@
},
"detect-passive-events": {
"version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/detect-passive-events/-/detect-passive-events-1.0.5.tgz",
"integrity": "sha512-foW7Q35wwOCxVzW0xLf5XeB5Fhe7oyRgvkBYdiP9IWgLMzjqUqTvsJv9ymuEWGjY6AoDXD3OC294+Z9iuOw0QA==",
"dev": true
},
"detect-pointer": {
"version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/detect-pointer/-/detect-pointer-1.0.3.tgz",
"integrity": "sha512-d0o/Puo3fiGSCXy6H039h9Kwz+mmYCGKZ/qtPFnpN3WfsumjC1C9b5KKvRu+aYnfdI8peqN/iAe7dPd85qIt2g==",
"dev": true
},
"detect-touch-events": {
"version": "1.0.1",
- "integrity": "sha1-EVWEqrdAnAuS3xA6sPv1KFzVDXE=",
+ "resolved": "https://registry.npmjs.org/detect-touch-events/-/detect-touch-events-1.0.1.tgz",
+ "integrity": "sha512-ZYSP1bEs68q4fICiaTepdEjwBR4Ybg7rCQfMySP5IrO3V+7smmaqVjcvQdo+wENCQT/rdEWnB+E+ugIq4s1TdA==",
"dev": true
},
"diff": {
"version": "2.2.3",
- "integrity": "sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k=",
"dev": true
},
"docx": {
"version": "4.7.1",
+ "resolved": "https://registry.npmjs.org/docx/-/docx-4.7.1.tgz",
"integrity": "sha512-MTToHT11MV8Srnzy+JJ2gyotEhub3t5ey+96J12OCMujvLGjEoLigtTnIvMonKlA+TvDtNKbGsiU2h8WOD6wdw==",
"dev": true,
"requires": {
@@ -11198,14 +10957,12 @@
},
"dom-helpers": {
"version": "3.4.0",
- "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
"requires": {
"@babel/runtime": "^7.1.2"
}
},
"dom-serializer": {
"version": "0.2.2",
- "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
"dev": true,
"requires": {
"domelementtype": "^2.0.1",
@@ -11213,30 +10970,24 @@
},
"dependencies": {
"domelementtype": {
- "version": "2.2.0",
- "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+ "version": "2.3.0",
"dev": true
},
"entities": {
"version": "2.2.0",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
"dev": true
}
}
},
"domain-browser": {
- "version": "1.2.0",
- "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
- "dev": true
+ "version": "1.2.0"
},
"domelementtype": {
"version": "1.3.1",
- "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
"dev": true
},
"domhandler": {
"version": "2.4.2",
- "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
"dev": true,
"requires": {
"domelementtype": "1"
@@ -11244,7 +10995,6 @@
},
"domutils": {
"version": "1.7.0",
- "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
"dev": true,
"requires": {
"dom-serializer": "0",
@@ -11253,7 +11003,6 @@
},
"duplexify": {
"version": "3.7.1",
- "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
"requires": {
"end-of-stream": "^1.0.0",
"inherits": "^2.0.1",
@@ -11262,8 +11011,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11274,9 +11022,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11285,7 +11035,6 @@
},
"ecc-jsbn": {
"version": "0.1.2",
- "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"dev": true,
"requires": {
"jsbn": "~0.1.0",
@@ -11294,41 +11043,32 @@
},
"ee-first": {
"version": "1.1.1",
- "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
"dev": true
},
"element-class": {
- "version": "0.2.2",
- "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4="
+ "version": "0.2.2"
},
"emojis-list": {
- "version": "2.1.0",
- "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
- "dev": true
+ "version": "2.1.0"
},
"encodeurl": {
"version": "1.0.2",
- "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
"dev": true
},
"encoding": {
"version": "0.1.13",
- "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
"requires": {
"iconv-lite": "^0.6.2"
}
},
"end-of-stream": {
"version": "1.4.4",
- "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
"requires": {
"once": "^1.4.0"
}
},
"enhanced-resolve": {
"version": "0.9.1",
- "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"memory-fs": "^0.2.0",
@@ -11336,48 +11076,39 @@
},
"dependencies": {
"memory-fs": {
- "version": "0.2.0",
- "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
- "dev": true
+ "version": "0.2.0"
}
}
},
"entities": {
"version": "1.1.2",
- "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
"dev": true
},
"errno": {
"version": "0.1.8",
- "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
"requires": {
"prr": "~1.0.1"
}
},
"error-ex": {
"version": "1.3.2",
- "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"requires": {
"is-arrayish": "^0.2.1"
}
},
"es6-promise": {
"version": "3.3.1",
- "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
"dev": true
},
"escape-html": {
"version": "1.0.3",
- "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
"dev": true
},
"escape-string-regexp": {
- "version": "1.0.5",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ "version": "1.0.5"
},
"escodegen": {
"version": "1.7.1",
- "integrity": "sha1-MOz89mypjcZ80v0WKr626vqM5vw=",
"dev": true,
"requires": {
"esprima": "^1.2.2",
@@ -11389,12 +11120,10 @@
"dependencies": {
"esprima": {
"version": "1.2.5",
- "integrity": "sha1-CZNQL+r2aBODJXVvMPmlH+7sEek=",
"dev": true
},
"source-map": {
"version": "0.2.0",
- "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
"dev": true,
"optional": true,
"requires": {
@@ -11405,75 +11134,58 @@
},
"esprima": {
"version": "2.5.0",
- "integrity": "sha1-84ekb9NEwbGjm6+MIL+0O20AWMw=",
"dev": true
},
"esprima-fb": {
"version": "4001.1001.0-dev-harmony-fb",
- "integrity": "sha1-9Qn2FuZtEcLFOWomHGGe3MtxKAo=",
"dev": true
},
"estraverse": {
"version": "1.9.3",
- "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
"dev": true
},
"esutils": {
- "version": "2.0.3",
- "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+ "version": "2.0.3"
},
"etag": {
"version": "1.8.1",
- "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
"dev": true
},
"eventemitter3": {
"version": "4.0.7",
- "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
"dev": true
},
"events": {
- "version": "1.1.1",
- "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
- "dev": true
+ "version": "1.1.1"
},
"eventsource": {
- "version": "1.1.0",
- "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
- "dev": true,
- "requires": {
- "original": "^1.0.0"
- }
+ "version": "2.0.2",
+ "dev": true
},
"exec-sh": {
"version": "0.2.2",
- "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
"dev": true,
"requires": {
"merge": "^1.2.0"
}
},
"exenv": {
- "version": "1.2.2",
- "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+ "version": "1.2.2"
},
"expand-brackets": {
"version": "0.1.5",
- "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
"requires": {
"is-posix-bracket": "^0.1.0"
}
},
"expand-range": {
"version": "1.8.2",
- "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
"requires": {
"fill-range": "^2.1.0"
}
},
"exports-loader": {
"version": "0.6.4",
- "integrity": "sha1-1w/GEhl1s1/BKDDPUnVL4nQPyIY=",
"dev": true,
"requires": {
"loader-utils": "^1.0.2",
@@ -11482,25 +11194,21 @@
"dependencies": {
"big.js": {
"version": "5.2.2",
- "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true
},
"emojis-list": {
"version": "3.0.0",
- "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true
},
"json5": {
- "version": "1.0.1",
- "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
- "version": "1.4.0",
- "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+ "version": "1.4.2",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -11511,63 +11219,57 @@
}
},
"express": {
- "version": "4.17.3",
- "integrity": "sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==",
+ "version": "4.18.2",
"dev": true,
"requires": {
"accepts": "~1.3.8",
"array-flatten": "1.1.1",
- "body-parser": "1.19.2",
+ "body-parser": "1.20.1",
"content-disposition": "0.5.4",
"content-type": "~1.0.4",
- "cookie": "0.4.2",
+ "cookie": "0.5.0",
"cookie-signature": "1.0.6",
"debug": "2.6.9",
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
- "finalhandler": "~1.1.2",
+ "finalhandler": "1.2.0",
"fresh": "0.5.2",
+ "http-errors": "2.0.0",
"merge-descriptors": "1.0.1",
"methods": "~1.1.2",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
"path-to-regexp": "0.1.7",
"proxy-addr": "~2.0.7",
- "qs": "6.9.7",
+ "qs": "6.11.0",
"range-parser": "~1.2.1",
"safe-buffer": "5.2.1",
- "send": "0.17.2",
- "serve-static": "1.14.2",
+ "send": "0.18.0",
+ "serve-static": "1.15.0",
"setprototypeof": "1.2.0",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
},
"dependencies": {
"qs": {
- "version": "6.9.7",
- "integrity": "sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==",
- "dev": true
- },
- "safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true
+ "version": "6.11.0",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
"extend": {
"version": "3.0.2",
- "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
"dev": true
},
"extend-shallow": {
"version": "3.0.2",
- "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "dev": true,
"requires": {
"assign-symbols": "^1.0.0",
"is-extendable": "^1.0.1"
@@ -11575,8 +11277,6 @@
"dependencies": {
"is-extendable": {
"version": "1.0.1",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "dev": true,
"requires": {
"is-plain-object": "^2.0.4"
}
@@ -11585,45 +11285,37 @@
},
"extglob": {
"version": "0.3.2",
- "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
"requires": {
"is-extglob": "^1.0.0"
}
},
"extsprintf": {
"version": "1.3.0",
- "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
"dev": true
},
"fast-deep-equal": {
- "version": "3.1.3",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+ "version": "3.1.3"
},
"fast-json-stable-stringify": {
- "version": "2.1.0",
- "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+ "version": "2.1.0"
},
"fast-levenshtein": {
"version": "1.0.7",
- "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=",
"dev": true
},
"fastparse": {
"version": "1.1.2",
- "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
"dev": true
},
"faye-websocket": {
"version": "0.11.4",
- "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
"dev": true,
"requires": {
"websocket-driver": ">=0.5.1"
}
},
"fb-watchman": {
- "version": "2.0.1",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
"dev": true,
"requires": {
"bser": "2.1.1"
@@ -11631,7 +11323,6 @@
},
"fbjs": {
"version": "0.8.18",
- "integrity": "sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA==",
"requires": {
"core-js": "^1.0.0",
"isomorphic-fetch": "^2.1.1",
@@ -11643,8 +11334,7 @@
},
"dependencies": {
"core-js": {
- "version": "1.2.7",
- "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+ "version": "1.2.7"
}
}
},
@@ -11654,12 +11344,10 @@
"from": "file-saver@github:devgateway/FileSaver.js"
},
"filename-regex": {
- "version": "2.0.1",
- "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+ "version": "2.0.1"
},
"fileset": {
"version": "0.2.1",
- "integrity": "sha1-WI74lzxmI7KnbfRlEFaWuWqsgGc=",
"dev": true,
"requires": {
"glob": "5.x",
@@ -11668,7 +11356,6 @@
"dependencies": {
"minimatch": {
"version": "2.0.10",
- "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
"dev": true,
"requires": {
"brace-expansion": "^1.0.0"
@@ -11678,7 +11365,6 @@
},
"fill-range": {
"version": "2.2.4",
- "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
"requires": {
"is-number": "^2.1.0",
"isobject": "^2.0.0",
@@ -11688,22 +11374,20 @@
}
},
"finalhandler": {
- "version": "1.1.2",
- "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+ "version": "1.2.0",
"dev": true,
"requires": {
"debug": "2.6.9",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"parseurl": "~1.3.3",
- "statuses": "~1.5.0",
+ "statuses": "2.0.1",
"unpipe": "~1.0.0"
}
},
"find-cache-dir": {
"version": "0.1.1",
- "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
"dev": true,
"requires": {
"commondir": "^1.0.1",
@@ -11713,7 +11397,6 @@
},
"find-up": {
"version": "1.1.2",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"requires": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
@@ -11721,20 +11404,17 @@
},
"flatten": {
"version": "0.0.1",
- "integrity": "sha1-VURAdm2goNYDmZ9DNFP2wvxqdcE=",
"dev": true
},
"flush-write-stream": {
"version": "1.1.1",
- "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
"requires": {
"inherits": "^2.0.3",
"readable-stream": "^2.3.6"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11745,9 +11425,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11755,29 +11437,24 @@
}
},
"follow-redirects": {
- "version": "1.14.9",
- "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
+ "version": "1.15.2",
"dev": true
},
"for-in": {
- "version": "1.0.2",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+ "version": "1.0.2"
},
"for-own": {
"version": "0.1.5",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
"requires": {
"for-in": "^1.0.1"
}
},
"forever-agent": {
"version": "0.6.1",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
"dev": true
},
"form-data": {
"version": "2.3.3",
- "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
"dev": true,
"requires": {
"asynckit": "^0.4.0",
@@ -11787,33 +11464,27 @@
},
"forwarded": {
"version": "0.2.0",
- "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
"dev": true
},
"fragment-cache": {
"version": "0.2.1",
- "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
- "dev": true,
"requires": {
"map-cache": "^0.2.2"
}
},
"fresh": {
"version": "0.5.2",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
"dev": true
},
"from2": {
"version": "2.3.0",
- "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
"requires": {
"inherits": "^2.0.1",
"readable-stream": "^2.0.0"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11824,9 +11495,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11835,12 +11508,12 @@
},
"fs": {
"version": "0.0.1-security",
- "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=",
+ "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+ "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
"dev": true
},
"fs-extra": {
"version": "0.14.0",
- "integrity": "sha1-RmCWxroticIAA4DaskULeFn/Z0M=",
"dev": true,
"requires": {
"jsonfile": "^2.0.0",
@@ -11850,7 +11523,6 @@
},
"fs-write-stream-atomic": {
"version": "1.0.10",
- "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
"requires": {
"graceful-fs": "^4.1.2",
"iferr": "^0.1.5",
@@ -11859,8 +11531,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -11871,9 +11542,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -11881,26 +11554,29 @@
}
},
"fs.realpath": {
- "version": "1.0.0",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ "version": "1.0.0"
},
"function-bind": {
- "version": "1.1.1",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ "version": "1.1.1"
},
"gather-stream": {
"version": "1.0.0",
- "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=",
"dev": true
},
+ "get-intrinsic": {
+ "version": "1.2.1",
+ "requires": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-proto": "^1.0.1",
+ "has-symbols": "^1.0.3"
+ }
+ },
"get-value": {
- "version": "2.0.6",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
- "dev": true
+ "version": "2.0.6"
},
"getpass": {
"version": "0.1.7",
- "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"dev": true,
"requires": {
"assert-plus": "^1.0.0"
@@ -11908,7 +11584,6 @@
},
"glob": {
"version": "5.0.15",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
"dev": true,
"requires": {
"inflight": "^1.0.4",
@@ -11920,7 +11595,6 @@
},
"glob-base": {
"version": "0.3.0",
- "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
"requires": {
"glob-parent": "^2.0.0",
"is-glob": "^2.0.0"
@@ -11928,26 +11602,28 @@
},
"glob-parent": {
"version": "2.0.0",
- "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"requires": {
"is-glob": "^2.0.0"
}
},
"globals": {
- "version": "9.18.0",
- "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
+ "version": "9.18.0"
+ },
+ "gopd": {
+ "version": "1.0.1",
+ "requires": {
+ "get-intrinsic": "^1.1.3"
+ }
},
"graceful-fs": {
- "version": "4.2.9",
- "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="
+ "version": "4.2.11"
},
"handlebars": {
- "version": "4.7.7",
- "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
+ "version": "4.7.8",
"dev": true,
"requires": {
"minimist": "^1.2.5",
- "neo-async": "^2.6.0",
+ "neo-async": "^2.6.2",
"source-map": "^0.6.1",
"uglify-js": "^3.1.4",
"wordwrap": "^1.0.0"
@@ -11955,19 +11631,16 @@
"dependencies": {
"source-map": {
"version": "0.6.1",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
"har-schema": {
"version": "2.0.0",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
"dev": true
},
"har-validator": {
"version": "5.1.5",
- "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
"dev": true,
"requires": {
"ajv": "^6.12.3",
@@ -11976,27 +11649,33 @@
},
"has": {
"version": "1.0.3",
- "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
"requires": {
"function-bind": "^1.1.1"
}
},
"has-ansi": {
"version": "2.0.0",
- "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"has-flag": {
+ "version": "1.0.0"
+ },
+ "has-property-descriptors": {
"version": "1.0.0",
- "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
- "dev": true
+ "requires": {
+ "get-intrinsic": "^1.1.1"
+ }
+ },
+ "has-proto": {
+ "version": "1.0.1"
+ },
+ "has-symbols": {
+ "version": "1.0.3"
},
"has-value": {
"version": "1.0.0",
- "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
- "dev": true,
"requires": {
"get-value": "^2.0.6",
"has-values": "^1.0.0",
@@ -12004,16 +11683,12 @@
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"has-values": {
"version": "1.0.0",
- "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
- "dev": true,
"requires": {
"is-number": "^3.0.0",
"kind-of": "^4.0.0"
@@ -12021,16 +11696,12 @@
"dependencies": {
"is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -12039,8 +11710,6 @@
},
"kind-of": {
"version": "4.0.0",
- "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "dev": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -12049,7 +11718,6 @@
},
"hawk": {
"version": "3.1.3",
- "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
"dev": true,
"optional": true,
"requires": {
@@ -12061,12 +11729,12 @@
},
"he": {
"version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
"history": {
"version": "3.3.0",
- "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
"dev": true,
"requires": {
"invariant": "^2.2.1",
@@ -12077,13 +11745,11 @@
},
"hoek": {
"version": "2.16.3",
- "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true,
"optional": true
},
"hoist-non-react-statics": {
"version": "3.3.2",
- "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
"dev": true,
"requires": {
"react-is": "^16.7.0"
@@ -12091,19 +11757,16 @@
},
"home-or-tmp": {
"version": "2.0.0",
- "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.1"
}
},
"hosted-git-info": {
- "version": "2.8.9",
- "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+ "version": "2.8.9"
},
"htmlparser2": {
"version": "3.10.1",
- "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
"dev": true,
"requires": {
"domelementtype": "^1.3.1",
@@ -12115,25 +11778,22 @@
}
},
"http-errors": {
- "version": "1.8.1",
- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+ "version": "2.0.0",
"dev": true,
"requires": {
- "depd": "~1.1.2",
+ "depd": "2.0.0",
"inherits": "2.0.4",
"setprototypeof": "1.2.0",
- "statuses": ">= 1.5.0 < 2",
+ "statuses": "2.0.1",
"toidentifier": "1.0.1"
}
},
"http-parser-js": {
- "version": "0.5.5",
- "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==",
+ "version": "0.5.8",
"dev": true
},
"http-proxy": {
"version": "1.18.1",
- "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
"dev": true,
"requires": {
"eventemitter3": "^4.0.0",
@@ -12143,7 +11803,6 @@
},
"http-proxy-middleware": {
"version": "0.17.4",
- "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
"dev": true,
"requires": {
"http-proxy": "^1.16.2",
@@ -12154,12 +11813,10 @@
"dependencies": {
"is-extglob": {
"version": "2.1.1",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
"dev": true
},
"is-glob": {
"version": "3.1.0",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
"is-extglob": "^2.1.0"
@@ -12169,7 +11826,6 @@
},
"http-signature": {
"version": "1.2.0",
- "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"dev": true,
"requires": {
"assert-plus": "^1.0.0",
@@ -12178,39 +11834,34 @@
}
},
"https-browserify": {
- "version": "0.0.1",
- "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
- "dev": true
+ "version": "0.0.1"
},
"iconv-lite": {
"version": "0.6.3",
- "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"requires": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
}
},
"ieee754": {
- "version": "1.2.1",
- "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
- "dev": true
+ "version": "1.2.1"
},
"iferr": {
- "version": "0.1.5",
- "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE="
+ "version": "0.1.5"
},
"image-size": {
"version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.6.3.tgz",
"integrity": "sha512-47xSUiQioGaB96nqtp5/q55m0aBQSQdyIloMOc/x+QVTDZLNmXE892IIDrJ0hM1A5vcNUDD5tDffkSP5lCaIIA==",
"dev": true
},
"immediate": {
"version": "3.0.6",
- "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
"dev": true
},
"imports-loader": {
"version": "0.6.5",
- "integrity": "sha1-rnRlMDHVnjezwvslRKxhrq41MKY=",
"dev": true,
"requires": {
"loader-utils": "0.2.x",
@@ -12219,7 +11870,6 @@
"dependencies": {
"source-map": {
"version": "0.1.43",
- "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
"dev": true,
"requires": {
"amdefine": ">=0.0.4"
@@ -12228,110 +11878,84 @@
}
},
"imurmurhash": {
- "version": "0.1.4",
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+ "version": "0.1.4"
},
"indexes-of": {
"version": "1.0.1",
- "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true
},
"indexof": {
- "version": "0.0.1",
- "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
- "dev": true
+ "version": "0.0.1"
},
"inflight": {
"version": "1.0.6",
- "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
- "version": "2.0.4",
- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ "version": "2.0.4"
},
"interpret": {
- "version": "0.6.6",
- "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
- "dev": true
+ "version": "0.6.6"
},
"invariant": {
"version": "2.2.4",
- "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"requires": {
"loose-envify": "^1.0.0"
}
},
"ipaddr.js": {
"version": "1.9.1",
- "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
"dev": true
},
"is-absolute-url": {
"version": "2.1.0",
- "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
"dev": true
},
"is-accessor-descriptor": {
"version": "1.0.0",
- "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "dev": true,
"requires": {
"kind-of": "^6.0.0"
},
"dependencies": {
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true
+ "version": "6.0.3"
}
}
},
"is-arrayish": {
- "version": "0.2.1",
- "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+ "version": "0.2.1"
},
"is-binary-path": {
"version": "1.0.1",
- "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
- "dev": true,
"requires": {
"binary-extensions": "^1.0.0"
}
},
"is-buffer": {
- "version": "1.1.6",
- "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ "version": "1.1.6"
},
"is-core-module": {
- "version": "2.8.1",
- "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==",
+ "version": "2.13.0",
"requires": {
"has": "^1.0.3"
}
},
"is-data-descriptor": {
"version": "1.0.0",
- "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "dev": true,
"requires": {
"kind-of": "^6.0.0"
},
"dependencies": {
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true
+ "version": "6.0.3"
}
}
},
"is-descriptor": {
"version": "1.0.2",
- "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -12339,133 +11963,105 @@
},
"dependencies": {
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true
+ "version": "6.0.3"
}
}
},
"is-dotfile": {
- "version": "1.0.3",
- "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+ "version": "1.0.3"
},
"is-equal-shallow": {
"version": "0.1.3",
- "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
"requires": {
"is-primitive": "^2.0.0"
}
},
"is-extendable": {
- "version": "0.1.1",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+ "version": "0.1.1"
},
"is-extglob": {
- "version": "1.0.0",
- "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+ "version": "1.0.0"
},
"is-finite": {
- "version": "1.1.0",
- "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="
+ "version": "1.1.0"
},
"is-glob": {
"version": "2.0.1",
- "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"requires": {
"is-extglob": "^1.0.0"
}
},
"is-number": {
"version": "2.1.0",
- "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
"requires": {
"kind-of": "^3.0.2"
}
},
"is-plain-obj": {
"version": "1.1.0",
- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
"dev": true
},
"is-plain-object": {
"version": "2.0.4",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "dev": true,
"requires": {
"isobject": "^3.0.1"
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"is-posix-bracket": {
- "version": "0.1.1",
- "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+ "version": "0.1.1"
},
"is-primitive": {
- "version": "2.0.0",
- "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+ "version": "2.0.0"
},
"is-stream": {
- "version": "1.1.0",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ "version": "1.1.0"
},
"is-typedarray": {
"version": "1.0.0",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
"dev": true
},
"is-utf8": {
- "version": "0.2.1",
- "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+ "version": "0.2.1"
},
"is-windows": {
- "version": "1.0.2",
- "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
- "dev": true
+ "version": "1.0.2"
},
"isarray": {
- "version": "1.0.0",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ "version": "1.0.0"
},
"isexe": {
"version": "2.0.0",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
"dev": true
},
"isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
"requires": {
"isarray": "1.0.0"
}
},
"isomorphic-fetch": {
"version": "2.2.1",
- "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
"requires": {
"node-fetch": "^1.0.1",
"whatwg-fetch": ">=0.10.0"
},
"dependencies": {
"whatwg-fetch": {
- "version": "3.6.2",
- "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+ "version": "3.6.19"
}
}
},
"isstream": {
"version": "0.1.2",
- "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
"dev": true
},
"istanbul": {
"version": "0.3.22",
- "integrity": "sha1-PhZNhQIf4ZyYXR8OfvDD4i0BLrY=",
"dev": true,
"requires": {
"abbrev": "1.0.x",
@@ -12486,12 +12082,10 @@
"dependencies": {
"resolve": {
"version": "1.1.7",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
"dev": true
},
"supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
"has-flag": "^1.0.0"
@@ -12500,12 +12094,10 @@
}
},
"istanbul-lib-coverage": {
- "version": "1.2.1",
- "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="
+ "version": "1.2.1"
},
"istanbul-lib-instrument": {
"version": "1.10.2",
- "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
"requires": {
"babel-generator": "^6.18.0",
"babel-template": "^6.16.0",
@@ -12518,7 +12110,6 @@
},
"jasmine-only": {
"version": "0.1.2",
- "integrity": "sha1-kb27r5B8wCjRmVao46c8kUR4O+c=",
"dev": true,
"requires": {
"coffee-script": "~ 1.6.3"
@@ -12526,24 +12117,20 @@
"dependencies": {
"coffee-script": {
"version": "1.6.3",
- "integrity": "sha1-Y1XTLPGwTN/2tITl5xF4Ky8MOb4=",
"dev": true
}
}
},
"jasmine-pit": {
"version": "2.0.2",
- "integrity": "sha1-dVccsb+swK51DWlIrUWNkbqA5ZY=",
"dev": true
},
"javascript-natural-sort": {
"version": "0.7.1",
- "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
"dev": true
},
"jest-cli": {
"version": "0.5.10",
- "integrity": "sha1-s+S4E+C//8OPC34V6qi8j4RcaIc=",
"dev": true,
"requires": {
"coffee-script": "^1.10.0",
@@ -12569,16 +12156,13 @@
},
"js-base64": {
"version": "2.1.9",
- "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
"dev": true
},
"js-tokens": {
- "version": "3.0.2",
- "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+ "version": "3.0.2"
},
"js-yaml": {
"version": "3.14.1",
- "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
@@ -12587,19 +12171,16 @@
"dependencies": {
"esprima": {
"version": "4.0.1",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
"dev": true
}
}
},
"jsbn": {
"version": "0.1.1",
- "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"dev": true
},
"jsdom": {
"version": "6.5.1",
- "integrity": "sha1-tgZNanZRCBr0HVdu3Fa8UeABIsA=",
"dev": true,
"requires": {
"acorn": "^2.4.0",
@@ -12621,61 +12202,46 @@
}
},
"jsesc": {
- "version": "1.3.0",
- "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
+ "version": "1.3.0"
},
"json-loader": {
"version": "0.5.7",
- "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
"dev": true
},
"json-schema": {
"version": "0.4.0",
- "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
"dev": true
},
"json-schema-traverse": {
- "version": "0.4.1",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+ "version": "0.4.1"
},
"json-stable-stringify": {
- "version": "1.0.1",
- "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+ "version": "1.0.2",
"dev": true,
"requires": {
- "jsonify": "~0.0.0"
+ "jsonify": "^0.0.1"
}
},
"json-stringify-safe": {
"version": "5.0.1",
- "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
- "dev": true
- },
- "json3": {
- "version": "3.3.3",
- "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
"dev": true
},
"json5": {
- "version": "0.5.1",
- "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+ "version": "0.5.1"
},
"jsonfile": {
"version": "2.4.0",
- "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
"dev": true,
"requires": {
"graceful-fs": "^4.1.6"
}
},
"jsonify": {
- "version": "0.0.0",
- "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+ "version": "0.0.1",
"dev": true
},
"jsprim": {
"version": "1.4.2",
- "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
"dev": true,
"requires": {
"assert-plus": "1.0.0",
@@ -12685,19 +12251,21 @@
}
},
"jszip": {
- "version": "3.7.1",
- "integrity": "sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==",
+ "version": "3.10.1",
+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
"dev": true,
"requires": {
"lie": "~3.3.0",
"pako": "~1.0.2",
"readable-stream": "~2.3.6",
- "set-immediate-shim": "~1.0.1"
+ "setimmediate": "^1.0.5"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -12709,8 +12277,15 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
@@ -12721,24 +12296,19 @@
},
"keycode": {
"version": "2.2.1",
- "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
"dev": true
},
"kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
"is-buffer": "^1.1.5"
}
},
"lazy-cache": {
- "version": "1.0.4",
- "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
- "dev": true
+ "version": "1.0.4"
},
"less": {
"version": "2.7.3",
- "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
"dev": true,
"requires": {
"errno": "^0.1.1",
@@ -12753,7 +12323,6 @@
"dependencies": {
"ajv": {
"version": "4.11.8",
- "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"dev": true,
"optional": true,
"requires": {
@@ -12763,19 +12332,16 @@
},
"assert-plus": {
"version": "0.2.0",
- "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
"dev": true,
"optional": true
},
"aws-sign2": {
"version": "0.6.0",
- "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
"dev": true,
"optional": true
},
"form-data": {
"version": "2.1.4",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
"dev": true,
"optional": true,
"requires": {
@@ -12786,13 +12352,11 @@
},
"har-schema": {
"version": "1.0.5",
- "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
"dev": true,
"optional": true
},
"har-validator": {
"version": "4.2.1",
- "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
"dev": true,
"optional": true,
"requires": {
@@ -12802,7 +12366,6 @@
},
"http-signature": {
"version": "1.1.1",
- "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
"dev": true,
"optional": true,
"requires": {
@@ -12813,37 +12376,31 @@
},
"image-size": {
"version": "0.5.5",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true,
"optional": true
},
"oauth-sign": {
"version": "0.8.2",
- "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
"dev": true,
"optional": true
},
"performance-now": {
"version": "0.2.0",
- "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
"dev": true,
"optional": true
},
"punycode": {
"version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
"dev": true,
"optional": true
},
"qs": {
"version": "6.4.1",
- "integrity": "sha512-LQy1Q1fcva/UsnP/6Iaa4lVeM49WiOitu2T4hZCyA/elLKu37L99qcBJk4VCCk+rdLvnMzfKyiN3SZTqdAZGSQ==",
"dev": true,
"optional": true
},
"request": {
"version": "2.81.0",
- "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
"dev": true,
"optional": true,
"requires": {
@@ -12873,7 +12430,6 @@
},
"tough-cookie": {
"version": "2.3.4",
- "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
"dev": true,
"optional": true,
"requires": {
@@ -12884,7 +12440,6 @@
},
"less-loader": {
"version": "2.2.3",
- "integrity": "sha1-ttj4E5yEk98J2ZKpOgBzSwj4RSg=",
"dev": true,
"requires": {
"loader-utils": "^0.2.5"
@@ -12892,7 +12447,6 @@
},
"levn": {
"version": "0.2.5",
- "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=",
"dev": true,
"requires": {
"prelude-ls": "~1.1.0",
@@ -12901,6 +12455,7 @@
},
"lie": {
"version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
"integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
"dev": true,
"requires": {
@@ -12909,7 +12464,6 @@
},
"load-json-file": {
"version": "1.1.0",
- "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
@@ -12920,8 +12474,6 @@
},
"loader-utils": {
"version": "0.2.17",
- "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
- "dev": true,
"requires": {
"big.js": "^3.1.3",
"emojis-list": "^2.0.0",
@@ -12931,69 +12483,56 @@
},
"locate-path": {
"version": "2.0.0",
- "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"requires": {
"p-locate": "^2.0.0",
"path-exists": "^3.0.0"
},
"dependencies": {
"path-exists": {
- "version": "3.0.0",
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+ "version": "3.0.0"
}
}
},
"lodash": {
- "version": "4.17.21",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ "version": "4.17.21"
},
"lodash-es": {
"version": "4.17.21",
- "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
"dev": true
},
"lodash._basecopy": {
"version": "3.0.1",
- "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
"dev": true
},
"lodash._basetostring": {
"version": "3.0.1",
- "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
"dev": true
},
"lodash._basevalues": {
"version": "3.0.0",
- "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
"dev": true
},
"lodash._getnative": {
"version": "3.9.1",
- "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
"dev": true
},
"lodash._isiterateecall": {
"version": "3.0.9",
- "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
"dev": true
},
"lodash._reinterpolate": {
"version": "3.0.0",
- "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
"dev": true
},
"lodash._root": {
"version": "3.0.1",
- "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
"dev": true
},
"lodash.assign": {
- "version": "4.2.0",
- "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+ "version": "4.2.0"
},
"lodash.escape": {
"version": "3.2.0",
- "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
"dev": true,
"requires": {
"lodash._root": "^3.0.0"
@@ -13001,17 +12540,14 @@
},
"lodash.isarguments": {
"version": "3.1.0",
- "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
"dev": true
},
"lodash.isarray": {
"version": "3.0.4",
- "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
"dev": true
},
"lodash.keys": {
"version": "3.1.2",
- "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
"dev": true,
"requires": {
"lodash._getnative": "^3.0.0",
@@ -13021,12 +12557,10 @@
},
"lodash.restparam": {
"version": "3.6.1",
- "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
"dev": true
},
"lodash.template": {
"version": "3.6.2",
- "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
"dev": true,
"requires": {
"lodash._basecopy": "^3.0.0",
@@ -13042,7 +12576,6 @@
},
"lodash.templatesettings": {
"version": "3.1.1",
- "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
"dev": true,
"requires": {
"lodash._reinterpolate": "^3.0.0",
@@ -13050,24 +12583,19 @@
}
},
"loglevel": {
- "version": "1.8.0",
- "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA=="
+ "version": "1.8.1"
},
"longest": {
- "version": "1.0.1",
- "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
- "dev": true
+ "version": "1.0.1"
},
"loose-envify": {
"version": "1.4.0",
- "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
"lru-cache": {
"version": "4.1.5",
- "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
"requires": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
@@ -13075,65 +12603,51 @@
},
"make-dir": {
"version": "1.3.0",
- "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
"requires": {
"pify": "^3.0.0"
},
"dependencies": {
"pify": {
- "version": "3.0.0",
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+ "version": "3.0.0"
}
}
},
"makeerror": {
"version": "1.0.12",
- "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
"dev": true,
"requires": {
"tmpl": "1.0.5"
}
},
"map-cache": {
- "version": "0.2.2",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
- "dev": true
+ "version": "0.2.2"
},
"map-visit": {
"version": "1.0.0",
- "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "dev": true,
"requires": {
"object-visit": "^1.0.0"
}
},
"math-expression-evaluator": {
- "version": "1.3.14",
- "integrity": "sha512-M6AMrvq9bO8uL42KvQHPA2/SbAobA0R7gviUmPrcTcGfdwpaLitz4q2Euzx2lP9Oy88vxK3HOrsISgSwKsYS4A==",
+ "version": "1.4.0",
"dev": true
},
"math-random": {
- "version": "1.0.4",
- "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
+ "version": "1.0.4"
},
"media-typer": {
"version": "0.3.0",
- "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
"dev": true
},
"memory-fs": {
"version": "0.3.0",
- "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
- "dev": true,
"requires": {
"errno": "^0.1.3",
"readable-stream": "^2.0.1"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -13144,10 +12658,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -13156,22 +12671,18 @@
},
"merge": {
"version": "1.2.1",
- "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
"dev": true
},
"merge-descriptors": {
"version": "1.0.1",
- "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
"dev": true
},
"methods": {
"version": "1.1.2",
- "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
"dev": true
},
"micromatch": {
"version": "2.3.11",
- "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
"requires": {
"arr-diff": "^2.0.0",
"array-unique": "^0.2.1",
@@ -13190,36 +12701,30 @@
},
"mime": {
"version": "1.6.0",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
"dev": true
},
"mime-db": {
- "version": "1.51.0",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "version": "1.52.0",
"dev": true
},
"mime-types": {
- "version": "2.1.34",
- "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+ "version": "2.1.35",
"dev": true,
"requires": {
- "mime-db": "1.51.0"
+ "mime-db": "1.52.0"
}
},
"minimatch": {
"version": "3.1.2",
- "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
- "version": "1.2.5",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+ "version": "1.2.8"
},
"mississippi": {
"version": "2.0.0",
- "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
"requires": {
"concat-stream": "^1.5.0",
"duplexify": "^3.4.2",
@@ -13235,8 +12740,6 @@
},
"mixin-deep": {
"version": "1.3.2",
- "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
- "dev": true,
"requires": {
"for-in": "^1.0.2",
"is-extendable": "^1.0.1"
@@ -13244,8 +12747,6 @@
"dependencies": {
"is-extendable": {
"version": "1.0.1",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "dev": true,
"requires": {
"is-plain-object": "^2.0.4"
}
@@ -13253,20 +12754,17 @@
}
},
"mkdirp": {
- "version": "0.5.5",
- "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "version": "0.5.6",
"requires": {
- "minimist": "^1.2.5"
+ "minimist": "^1.2.6"
}
},
"moment": {
- "version": "2.29.1",
- "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
+ "version": "2.29.4",
"dev": true
},
"move-concurrently": {
"version": "1.0.1",
- "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
"requires": {
"aproba": "^1.1.1",
"copy-concurrently": "^1.0.0",
@@ -13277,13 +12775,10 @@
}
},
"ms": {
- "version": "2.0.0",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ "version": "2.0.0"
},
"nanomatch": {
"version": "1.2.13",
- "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
- "dev": true,
"requires": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -13299,45 +12794,34 @@
},
"dependencies": {
"arr-diff": {
- "version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "dev": true
+ "version": "4.0.0"
},
"array-unique": {
- "version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "dev": true
+ "version": "0.3.2"
},
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true
+ "version": "6.0.3"
}
}
},
"ncp": {
"version": "1.0.1",
- "integrity": "sha1-0VNn5cuHQyuhF9K/gP30Wuz7QkY=",
"dev": true
},
"negotiator": {
"version": "0.6.3",
- "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
"dev": true
},
"neo-async": {
"version": "2.6.2",
- "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
"dev": true
},
"node-balanced": {
"version": "0.0.14",
- "integrity": "sha1-ozxyeFfTBE8eiL5y3X2anQtPwh8=",
"dev": true
},
"node-fetch": {
"version": "1.7.3",
- "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
"requires": {
"encoding": "^0.1.11",
"is-stream": "^1.0.1"
@@ -13345,7 +12829,6 @@
},
"node-haste": {
"version": "1.2.8",
- "integrity": "sha1-0vEOk9dWfCaJrIP8BNtNdsqnDzw=",
"dev": true,
"requires": {
"esprima-fb": "4001.1001.0-dev-harmony-fb"
@@ -13353,13 +12836,10 @@
},
"node-int64": {
"version": "0.4.0",
- "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
"dev": true
},
"node-libs-browser": {
"version": "0.7.0",
- "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
- "dev": true,
"requires": {
"assert": "^1.1.1",
"browserify-zlib": "^0.1.4",
@@ -13387,14 +12867,10 @@
},
"dependencies": {
"punycode": {
- "version": "1.4.1",
- "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
- "dev": true
+ "version": "1.4.1"
},
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -13407,29 +12883,26 @@
"dependencies": {
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
- "version": "0.10.31",
- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
- "dev": true
+ "version": "0.10.31"
}
}
},
"node-worker-pool": {
"version": "3.0.2",
- "integrity": "sha1-IQZTLJGhgnnj2aQRe1oqbaGgjpw=",
"dev": true
},
"nopt": {
"version": "3.0.6",
- "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"dev": true,
"requires": {
"abbrev": "1"
@@ -13437,7 +12910,6 @@
},
"normalize-package-data": {
"version": "2.5.0",
- "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"requires": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -13447,19 +12919,16 @@
},
"normalize-path": {
"version": "2.1.1",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"requires": {
"remove-trailing-separator": "^1.0.1"
}
},
"normalize-selector": {
"version": "0.2.0",
- "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
"dev": true
},
"normalize-url": {
"version": "1.9.1",
- "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
"dev": true,
"requires": {
"object-assign": "^4.0.1",
@@ -13470,36 +12939,28 @@
},
"num2fraction": {
"version": "1.2.2",
- "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
"dev": true
},
"numbro": {
- "version": "1.11.1",
- "integrity": "sha512-qL0Etqbunz4RtPx4bNjMONe9HyUpgbrM4Sa3VpWY5oRdp9ry5DufAj6lCvnIcluRBA9QUacrllYc73QK0G6VAw=="
+ "version": "1.11.1"
},
"numeral": {
"version": "2.0.6",
- "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=",
"dev": true
},
"nwmatcher": {
"version": "1.4.4",
- "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==",
"dev": true
},
"oauth-sign": {
"version": "0.9.0",
- "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
"dev": true
},
"object-assign": {
- "version": "4.1.1",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+ "version": "4.1.1"
},
"object-copy": {
"version": "0.1.0",
- "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
- "dev": true,
"requires": {
"copy-descriptor": "^0.1.0",
"define-property": "^0.2.5",
@@ -13508,32 +12969,24 @@
"dependencies": {
"define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
"requires": {
"is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-descriptor": {
"version": "0.1.6",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -13541,32 +12994,40 @@
},
"dependencies": {
"kind-of": {
- "version": "5.1.0",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
+ "version": "5.1.0"
}
}
}
}
},
+ "object-inspect": {
+ "version": "1.12.3"
+ },
+ "object-keys": {
+ "version": "1.1.1"
+ },
"object-visit": {
"version": "1.0.1",
- "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
- "dev": true,
"requires": {
"isobject": "^3.0.0"
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
+ "object.assign": {
+ "version": "4.1.4",
+ "requires": {
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
+ "object-keys": "^1.1.1"
+ }
+ },
"object.omit": {
"version": "2.0.1",
- "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
"requires": {
"for-own": "^0.1.4",
"is-extendable": "^0.1.1"
@@ -13574,22 +13035,17 @@
},
"object.pick": {
"version": "1.3.0",
- "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
- "dev": true,
"requires": {
"isobject": "^3.0.1"
},
"dependencies": {
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"on-finished": {
- "version": "2.3.0",
- "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+ "version": "2.4.1",
"dev": true,
"requires": {
"ee-first": "1.1.1"
@@ -13597,45 +13053,35 @@
},
"on-headers": {
"version": "1.0.2",
- "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
"dev": true
},
"once": {
"version": "1.4.0",
- "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
"wrappy": "1"
}
},
"open": {
"version": "0.0.5",
- "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
"dev": true
},
"optimist": {
"version": "0.6.1",
- "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
- "dev": true,
"requires": {
"minimist": "~0.0.1",
"wordwrap": "~0.0.2"
},
"dependencies": {
"minimist": {
- "version": "0.0.10",
- "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
- "dev": true
+ "version": "0.0.10"
},
"wordwrap": {
- "version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
- "dev": true
+ "version": "0.0.3"
}
}
},
"optionator": {
"version": "0.5.0",
- "integrity": "sha1-t1qJlaLUF98ltuTjhi9QqohlE2g=",
"dev": true,
"requires": {
"deep-is": "~0.1.2",
@@ -13648,58 +13094,42 @@
"dependencies": {
"wordwrap": {
"version": "0.0.3",
- "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
"dev": true
}
}
},
- "original": {
- "version": "1.0.2",
- "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
- "dev": true,
- "requires": {
- "url-parse": "^1.4.3"
- }
- },
"os-browserify": {
- "version": "0.2.1",
- "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
- "dev": true
+ "version": "0.2.1"
},
"os-homedir": {
- "version": "1.0.2",
- "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+ "version": "1.0.2"
},
"os-tmpdir": {
- "version": "1.0.2",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+ "version": "1.0.2"
},
"p-limit": {
"version": "1.3.0",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
"requires": {
"p-try": "^1.0.0"
}
},
"p-locate": {
"version": "2.0.0",
- "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"requires": {
"p-limit": "^1.1.0"
}
},
"p-try": {
- "version": "1.0.0",
- "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+ "version": "1.0.0"
},
"pako": {
"version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
"dev": true
},
"parallel-transform": {
"version": "1.2.0",
- "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
"requires": {
"cyclist": "^1.0.1",
"inherits": "^2.0.3",
@@ -13707,8 +13137,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -13719,9 +13148,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -13730,7 +13161,6 @@
},
"parse-glob": {
"version": "3.0.4",
- "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
"requires": {
"glob-base": "^0.3.0",
"is-dotfile": "^1.0.0",
@@ -13740,54 +13170,42 @@
},
"parse-json": {
"version": "2.2.0",
- "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"requires": {
"error-ex": "^1.2.0"
}
},
"parse5": {
"version": "1.5.1",
- "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
"dev": true
},
"parseurl": {
"version": "1.3.3",
- "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
"dev": true
},
"pascalcase": {
- "version": "0.1.1",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
- "dev": true
+ "version": "0.1.1"
},
"path-browserify": {
- "version": "0.0.0",
- "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
- "dev": true
+ "version": "0.0.0"
},
"path-exists": {
"version": "2.1.0",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"requires": {
"pinkie-promise": "^2.0.0"
}
},
"path-is-absolute": {
- "version": "1.0.1",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ "version": "1.0.1"
},
"path-parse": {
- "version": "1.0.7",
- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+ "version": "1.0.7"
},
"path-to-regexp": {
"version": "0.1.7",
- "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
"dev": true
},
"path-type": {
"version": "1.1.0",
- "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"requires": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
@@ -13795,50 +13213,39 @@
}
},
"pbkdf2-compat": {
- "version": "2.0.1",
- "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
- "dev": true
+ "version": "2.0.1"
},
"performance-now": {
"version": "2.1.0",
- "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"dev": true
},
"pify": {
- "version": "2.3.0",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+ "version": "2.3.0"
},
"pinkie": {
- "version": "2.0.4",
- "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+ "version": "2.0.4"
},
"pinkie-promise": {
"version": "2.0.1",
- "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"requires": {
"pinkie": "^2.0.0"
}
},
"pkg-dir": {
"version": "1.0.0",
- "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
"dev": true,
"requires": {
"find-up": "^1.0.0"
}
},
"platform": {
- "version": "1.3.6",
- "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+ "version": "1.3.6"
},
"posix-character-classes": {
- "version": "0.1.1",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
- "dev": true
+ "version": "0.1.1"
},
"postcss": {
"version": "4.1.16",
- "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=",
"dev": true,
"requires": {
"es6-promise": "~2.3.0",
@@ -13848,12 +13255,10 @@
"dependencies": {
"es6-promise": {
"version": "2.3.0",
- "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw=",
"dev": true
},
"source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"requires": {
"amdefine": ">=0.0.4"
@@ -13863,7 +13268,6 @@
},
"postcss-calc": {
"version": "4.1.0",
- "integrity": "sha1-vuf/ySjHmGmZ7vF7LdiXDIk31HI=",
"dev": true,
"requires": {
"postcss": "^4.1.11",
@@ -13873,7 +13277,6 @@
},
"postcss-colormin": {
"version": "1.2.7",
- "integrity": "sha1-63Pb6DgE6pGYNWsTL2+Z9GAP1lQ=",
"dev": true,
"requires": {
"color": "^0.10.1",
@@ -13884,7 +13287,6 @@
},
"postcss-convert-values": {
"version": "1.3.1",
- "integrity": "sha1-I/GHxhP6d7Y3p4BblIteCJlpDkY=",
"dev": true,
"requires": {
"postcss": "^4.1.16",
@@ -13893,7 +13295,6 @@
},
"postcss-discard-comments": {
"version": "1.2.1",
- "integrity": "sha1-hR3Ka5NUwPtjFssaEEj29eOWCtA=",
"dev": true,
"requires": {
"node-balanced": "0.0.14",
@@ -13902,7 +13303,6 @@
},
"postcss-discard-duplicates": {
"version": "1.2.1",
- "integrity": "sha1-SbsztNNHcQWwDQSDlfc6KQK8miU=",
"dev": true,
"requires": {
"postcss": "^4.1.16"
@@ -13910,7 +13310,6 @@
},
"postcss-discard-empty": {
"version": "1.1.2",
- "integrity": "sha1-KsVayPy4HCMEPmMQaTT9Y0cNXA0=",
"dev": true,
"requires": {
"postcss": "^4.1.13"
@@ -13918,7 +13317,6 @@
},
"postcss-discard-unused": {
"version": "1.0.3",
- "integrity": "sha1-Xsy5v6xGXqa+VjQpepx3gczQmIY=",
"dev": true,
"requires": {
"flatten": "0.0.1",
@@ -13928,7 +13326,6 @@
},
"postcss-filter-plugins": {
"version": "1.0.1",
- "integrity": "sha1-J/gnnV76t6o8FwmIE5hrS50dUOI=",
"dev": true,
"requires": {
"postcss": "^4.1.11",
@@ -13937,7 +13334,6 @@
},
"postcss-font-family": {
"version": "1.2.1",
- "integrity": "sha1-dQJSSzmDox5q9k5LqhA07W7YQYw=",
"dev": true,
"requires": {
"object-assign": "^3.0.0",
@@ -13947,14 +13343,12 @@
"dependencies": {
"object-assign": {
"version": "3.0.0",
- "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
"dev": true
}
}
},
"postcss-merge-idents": {
"version": "1.0.2",
- "integrity": "sha1-qToNrXj2UugjfZrew0LkHSwd01s=",
"dev": true,
"requires": {
"css-list": "^0.1.0",
@@ -13963,7 +13357,6 @@
},
"postcss-merge-longhand": {
"version": "1.0.2",
- "integrity": "sha1-QxcgZfz4We4RztMUH1ZkFMZzBX4=",
"dev": true,
"requires": {
"postcss": "^4.1.16"
@@ -13971,7 +13364,6 @@
},
"postcss-merge-rules": {
"version": "1.3.6",
- "integrity": "sha1-sUrRf31AEqMYut032r1ZuT8TUy8=",
"dev": true,
"requires": {
"postcss": "^4.1.16"
@@ -13979,12 +13371,10 @@
},
"postcss-message-helpers": {
"version": "2.0.0",
- "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
"dev": true
},
"postcss-minify-font-weight": {
"version": "1.0.1",
- "integrity": "sha1-aI5CzfI27Osb1WOojPHSTQOgWIg=",
"dev": true,
"requires": {
"postcss": "^4.1.11"
@@ -13992,7 +13382,6 @@
},
"postcss-minify-selectors": {
"version": "1.5.0",
- "integrity": "sha1-5ZxWxtSVXaFXz30iv4Bptur1Jic=",
"dev": true,
"requires": {
"javascript-natural-sort": "^0.7.1",
@@ -14004,7 +13393,6 @@
},
"postcss-modules-extract-imports": {
"version": "0.0.5",
- "integrity": "sha1-zMy0Cz3SmFmZOEodumDGLJYKbaA=",
"dev": true,
"requires": {
"postcss": "^4.1.11"
@@ -14012,7 +13400,6 @@
},
"postcss-modules-local-by-default": {
"version": "0.0.11",
- "integrity": "sha1-qACvQyHDpOCFLRrlKeb8mRrTlec=",
"dev": true,
"requires": {
"css-selector-tokenizer": "^0.5.1",
@@ -14021,7 +13408,6 @@
},
"postcss-modules-scope": {
"version": "0.0.8",
- "integrity": "sha1-gck1+/KJJyOIyLoulqEcohugmgQ=",
"dev": true,
"requires": {
"css-selector-tokenizer": "^0.5.0",
@@ -14030,7 +13416,6 @@
},
"postcss-normalize-url": {
"version": "2.1.3",
- "integrity": "sha1-8StfShFDyV6gJfx/jgBQkFmPNgI=",
"dev": true,
"requires": {
"is-absolute-url": "^2.0.0",
@@ -14042,7 +13427,6 @@
},
"postcss-ordered-values": {
"version": "1.1.1",
- "integrity": "sha1-nu1PrS55Kr/D0EAs93O6+G/ne4E=",
"dev": true,
"requires": {
"postcss": "^4.1.16",
@@ -14051,7 +13435,6 @@
},
"postcss-reduce-idents": {
"version": "1.0.3",
- "integrity": "sha1-p58bJIXiPZs8x6gfXsY6XCvewg0=",
"dev": true,
"requires": {
"postcss": "^4.1.2",
@@ -14060,7 +13443,6 @@
},
"postcss-selector-parser": {
"version": "1.3.3",
- "integrity": "sha1-0u4Z33pk+O8hwacchvfUg1yIwoE=",
"dev": true,
"requires": {
"flatten": "^1.0.2",
@@ -14070,14 +13452,12 @@
"dependencies": {
"flatten": {
"version": "1.0.3",
- "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
"dev": true
}
}
},
"postcss-single-charset": {
"version": "0.3.0",
- "integrity": "sha1-2n/Q3szPYy8bdMei7j41vilFZXM=",
"dev": true,
"requires": {
"fs-extra": "^0.14.0",
@@ -14086,7 +13466,6 @@
},
"postcss-unique-selectors": {
"version": "1.0.1",
- "integrity": "sha1-SBfnTHtPmZzgTI5mRRoZaRT12zw=",
"dev": true,
"requires": {
"javascript-natural-sort": "^0.7.1",
@@ -14096,12 +13475,10 @@
},
"postcss-value-parser": {
"version": "1.4.2",
- "integrity": "sha1-GGVjPhNwH4pyHng02tGFyxRKrQw=",
"dev": true
},
"postcss-zindex": {
"version": "1.1.3",
- "integrity": "sha1-SVZKtJ092hcGf42sHIM11/LQDOE=",
"dev": true,
"requires": {
"postcss": "^4.1.2"
@@ -14109,45 +13486,35 @@
},
"prelude-ls": {
"version": "1.1.2",
- "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
"dev": true
},
"prepend-http": {
"version": "1.0.4",
- "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
"dev": true
},
"preserve": {
- "version": "0.2.0",
- "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+ "version": "0.2.0"
},
"private": {
- "version": "0.1.8",
- "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+ "version": "0.1.8"
},
"process": {
- "version": "0.11.10",
- "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
- "dev": true
+ "version": "0.11.10"
},
"process-nextick-args": {
- "version": "2.0.1",
- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+ "version": "2.0.1"
},
"promise": {
"version": "7.3.1",
- "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"requires": {
"asap": "~2.0.3"
}
},
"promise-inflight": {
- "version": "1.0.1",
- "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM="
+ "version": "1.0.1"
},
"prop-types": {
"version": "15.8.1",
- "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
"requires": {
"loose-envify": "^1.4.0",
"object-assign": "^4.1.1",
@@ -14156,7 +13523,6 @@
},
"prop-types-extra": {
"version": "1.1.1",
- "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==",
"requires": {
"react-is": "^16.3.2",
"warning": "^4.0.0"
@@ -14164,7 +13530,6 @@
"dependencies": {
"warning": {
"version": "4.0.3",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
@@ -14173,7 +13538,6 @@
},
"proxy-addr": {
"version": "2.0.7",
- "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
"dev": true,
"requires": {
"forwarded": "0.2.0",
@@ -14181,21 +13545,17 @@
}
},
"prr": {
- "version": "1.0.1",
- "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+ "version": "1.0.1"
},
"pseudomap": {
- "version": "1.0.2",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+ "version": "1.0.2"
},
"psl": {
- "version": "1.8.0",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+ "version": "1.9.0",
"dev": true
},
"pump": {
"version": "2.0.1",
- "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
@@ -14203,7 +13563,6 @@
},
"pumpify": {
"version": "1.5.1",
- "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
"requires": {
"duplexify": "^3.6.0",
"inherits": "^2.0.3",
@@ -14211,41 +13570,29 @@
}
},
"punycode": {
- "version": "2.1.1",
- "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+ "version": "2.3.0"
},
"qs": {
"version": "6.5.3",
- "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
"dev": true
},
"query-string": {
"version": "4.3.4",
- "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"dev": true,
"requires": {
"object-assign": "^4.1.0",
"strict-uri-encode": "^1.0.0"
}
},
- "querystring": {
- "version": "0.2.0",
- "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
- "dev": true
- },
"querystring-es3": {
- "version": "0.2.1",
- "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
- "dev": true
+ "version": "0.2.1"
},
"querystringify": {
"version": "2.2.0",
- "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
"dev": true
},
"randomatic": {
"version": "3.1.1",
- "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
"requires": {
"is-number": "^4.0.0",
"kind-of": "^6.0.0",
@@ -14253,39 +13600,33 @@
},
"dependencies": {
"is-number": {
- "version": "4.0.0",
- "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+ "version": "4.0.0"
},
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+ "version": "6.0.3"
}
}
},
"range-parser": {
"version": "1.2.1",
- "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
"dev": true
},
"raw-body": {
- "version": "2.4.3",
- "integrity": "sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==",
+ "version": "2.5.1",
"dev": true,
"requires": {
"bytes": "3.1.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"iconv-lite": "0.4.24",
"unpipe": "1.0.0"
},
"dependencies": {
"bytes": {
"version": "3.1.2",
- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
"dev": true
},
"iconv-lite": {
"version": "0.4.24",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
@@ -14295,7 +13636,6 @@
},
"rc-checkbox": {
"version": "1.5.0",
- "integrity": "sha1-RkzptAsa2dEZUkztF0pgp7TrdSk=",
"requires": {
"classnames": "2.x",
"rc-util": "^4.0.1"
@@ -14303,7 +13643,6 @@
},
"rc-util": {
"version": "4.21.1",
- "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==",
"requires": {
"add-dom-event-listener": "^1.1.0",
"prop-types": "^15.5.10",
@@ -14314,7 +13653,6 @@
},
"react": {
"version": "15.4.2",
- "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=",
"requires": {
"fbjs": "^0.8.4",
"loose-envify": "^1.1.0",
@@ -14323,11 +13661,10 @@
},
"react-addons-update": {
"version": "15.3.2",
- "integrity": "sha1-tjhcTbHl3zcYJeBhWwQ2DtlEMP4="
+ "requires": {}
},
"react-bootstrap": {
"version": "0.32.4",
- "integrity": "sha512-xj+JfaPOvnvr3ow0aHC7Y3HaBKZNR1mm361hVxVzVX3fcdJNIrfiodbQ0m9nLBpNxiKG6FTU2lq/SbTDYT2vew==",
"dev": true,
"requires": {
"@babel/runtime-corejs2": "^7.0.0",
@@ -14346,7 +13683,6 @@
},
"react-bootstrap-table": {
"version": "3.5.1",
- "integrity": "sha1-wkKKX+zpgj8La97ffxmGMKxVoWQ=",
"requires": {
"@allenfang/react-toastr": "2.8.2",
"classnames": "^2.1.2",
@@ -14354,12 +13690,10 @@
},
"dependencies": {
"exenv": {
- "version": "1.2.0",
- "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk="
+ "version": "1.2.0"
},
"react-modal": {
"version": "1.9.7",
- "integrity": "sha512-oZNqI0ZnPD7NnfObrCMz2hxHTAw5oEuhZJ+gnyFNIQB2rR8h1YbLQTfhms1mtSJigb0J23OOWElHjXYYaKO+wg==",
"requires": {
"create-react-class": "^15.5.2",
"element-class": "^0.2.0",
@@ -14373,7 +13707,6 @@
},
"react-bootstrap-typeahead": {
"version": "1.4.2",
- "integrity": "sha1-GRPjLOpNeb7NA6yrvZM2EWiEgVs=",
"requires": {
"classnames": "^2.2.0",
"create-react-class": "^15.5.2",
@@ -14390,7 +13723,6 @@
"dependencies": {
"react-overlays": {
"version": "0.7.4",
- "integrity": "sha512-7vsooMx3siLAuEfTs8FYeP/lAORWWFXTO8PON3KgX0Htq1Oa+po6ioSjGyO0/GO5CVSMNhpWt6V2opeexHgBuQ==",
"requires": {
"classnames": "^2.2.5",
"dom-helpers": "^3.2.1",
@@ -14403,7 +13735,6 @@
},
"react-date-picker": {
"version": "3.1.10",
- "integrity": "sha1-X9V5jbxEqVfUciL3PUdWxs7V4Gk=",
"dev": true,
"requires": {
"moment": "^2.8.0",
@@ -14412,7 +13743,6 @@
},
"react-dom": {
"version": "15.4.2",
- "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=",
"requires": {
"fbjs": "^0.8.1",
"loose-envify": "^1.1.0",
@@ -14420,16 +13750,14 @@
}
},
"react-dom-factories": {
- "version": "1.0.2",
- "integrity": "sha1-63cFxNs2+1AbOqOP91lhaqD/luA="
+ "version": "1.0.2"
},
"react-filtered-multiselect": {
"version": "0.4.2",
- "integrity": "sha1-gZaHX4nl/3zt8JFoQrFWz2hPgSE="
+ "requires": {}
},
"react-highlighter": {
"version": "0.4.3",
- "integrity": "sha512-dwItRaGRHBceuzZd5NXeroapdmZ2JCAWZ3AdwdthRlSkdtPCY18DWrd6mPmiMCfSB6lgVwwCPQl4unZzG5sXXw==",
"requires": {
"blacklist": "^1.1.4",
"create-react-class": "^15.6.2",
@@ -14439,12 +13767,11 @@
},
"react-hot-api": {
"version": "0.4.7",
- "integrity": "sha1-p+IqVtJS4Rq9k2a2EmTPRJLFgXE=",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"react-hot-loader": {
"version": "1.3.1",
- "integrity": "sha1-yVZHrni3Pfzv9uxx/8sEGC/22vk=",
"dev": true,
"requires": {
"react-hot-api": "^0.4.5",
@@ -14453,7 +13780,6 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"requires": {
"amdefine": ">=0.0.4"
@@ -14463,32 +13789,19 @@
},
"react-input-autosize": {
"version": "1.2.0",
- "integrity": "sha1-hyQQcRWfdCEjiXaR2meW7DO1fQU=",
"requires": {
"create-react-class": "^15.5.2",
"prop-types": "^15.5.8"
}
},
- "react-interactive": {
- "version": "0.4.1",
- "integrity": "sha1-mRK5lyXPwrx0gPlT565fEnvzcug=",
- "dev": true,
- "requires": {
- "detect-it": "^2.0.0",
- "object-assign": "^4.1.0"
- }
- },
"react-is": {
- "version": "16.13.1",
- "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+ "version": "16.13.1"
},
"react-lifecycles-compat": {
- "version": "3.0.4",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+ "version": "3.0.4"
},
"react-modal": {
- "version": "3.14.4",
- "integrity": "sha512-8surmulejafYCH9wfUmFyj4UfbSJwjcgbS9gf3oOItu4Hwd6ivJyVBETI0yHRhpJKCLZMUtnhzk76wXTsNL6Qg==",
+ "version": "3.16.1",
"requires": {
"exenv": "^1.2.0",
"prop-types": "^15.7.2",
@@ -14498,7 +13811,6 @@
"dependencies": {
"warning": {
"version": "4.0.3",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
"requires": {
"loose-envify": "^1.0.0"
}
@@ -14507,7 +13819,6 @@
},
"react-number-input": {
"version": "15.5.1",
- "integrity": "sha1-54Ae1LFun5+6aZZNv3SsA7lw5FM=",
"requires": {
"babel-jest": "^19.0.0",
"babel-polyfill": "^6.23.0",
@@ -14518,7 +13829,6 @@
"dependencies": {
"babel-jest": {
"version": "19.0.0",
- "integrity": "sha1-WTI87ZmjqE01naIZyogQdP/Gzj8=",
"requires": {
"babel-core": "^6.0.0",
"babel-plugin-istanbul": "^4.0.0",
@@ -14529,19 +13839,17 @@
},
"react-numeric-input": {
"version": "2.0.9",
- "integrity": "sha1-ro4awpiOi8yMS7PLEHuy2DutTlo=",
- "dev": true
+ "dev": true,
+ "requires": {}
},
"react-onclickoutside": {
"version": "5.11.1",
- "integrity": "sha1-ADFOUlZ89V+rqUyrus0RlhkHBiM=",
"requires": {
"create-react-class": "^15.5.x"
}
},
"react-overlays": {
"version": "0.8.3",
- "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==",
"dev": true,
"requires": {
"classnames": "^2.2.5",
@@ -14554,14 +13862,12 @@
},
"react-prop-types": {
"version": "0.4.0",
- "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=",
"requires": {
"warning": "^3.0.0"
}
},
"react-redux": {
"version": "4.4.10",
- "integrity": "sha512-tjL0Bmpkj75Td0k+lXlF8Fc8a9GuXFv/3ahUOCXExWs/jhsKiQeTffdH0j5byejCGCRL4tvGFYlrwBF1X/Aujg==",
"dev": true,
"requires": {
"create-react-class": "^15.5.1",
@@ -14574,7 +13880,6 @@
},
"react-router": {
"version": "3.2.6",
- "integrity": "sha512-nlxtQE8B22hb/JxdaslI1tfZacxFU8x8BJryXOnR2RxB4vc01zuHYAHAIgmBkdk1kzXaA25hZxK6KAH/+CXArw==",
"dev": true,
"requires": {
"create-react-class": "^15.5.1",
@@ -14587,15 +13892,36 @@
"warning": "^3.0.0"
}
},
+ "react-router-hash-link": {
+ "version": "git+ssh://git@github.com/rafgraph/react-router-hash-link.git#eb264491c6289cca534a368046a37d9aa3cbc7f7",
+ "dev": true,
+ "from": "react-router-hash-link@git://github.com/rafgraph/react-router-hash-link.git#react-router-v2/3",
+ "requires": {
+ "object-assign": "^4.1.0",
+ "react": "^15.4.1",
+ "react-dom": "^15.4.1",
+ "react-interactive": "^0.4.0",
+ "react-router": "^3.0.0"
+ },
+ "dependencies": {
+ "react-interactive": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/react-interactive/-/react-interactive-0.4.1.tgz",
+ "integrity": "sha512-IzWpnuKRZc7z3ss72+yk29bcZjxjiMz3Un4BnJw/0nlSXfm6ofQtcMTh+267siCaj9hQ24134suqoHL42z0y4g==",
+ "dev": true,
+ "requires": {
+ "detect-it": "^2.0.0",
+ "object-assign": "^4.1.0"
+ }
+ }
+ }
+ },
"react-router-redux": {
"version": "4.0.8",
- "integrity": "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=",
"dev": true
},
"react-scrollspy": {
"version": "3.1.1",
- "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.1.1.tgz",
- "integrity": "sha512-0gu/zKi0eZ/PaVJZSe7ew5nNmmEjfb7z97YFuOOR5tbKkIQtKENm9b4KGUZBid7XkMEZkRShUFsQsEYxotBIEw==",
"dev": true,
"requires": {
"babel-runtime": "^6.23.0",
@@ -14605,7 +13931,6 @@
},
"react-select": {
"version": "1.3.0",
- "integrity": "sha512-g/QAU1HZrzSfxkwMAo/wzi6/ezdWye302RGZevsATec07hI/iSxcpB1hejFIp7V63DJ8mwuign6KmB3VjdlinQ==",
"requires": {
"classnames": "^2.2.4",
"prop-types": "^15.5.8",
@@ -14614,7 +13939,6 @@
"dependencies": {
"react-input-autosize": {
"version": "2.2.2",
- "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==",
"requires": {
"prop-types": "^15.5.8"
}
@@ -14623,7 +13947,6 @@
},
"react-transition-group": {
"version": "2.9.0",
- "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
"dev": true,
"requires": {
"dom-helpers": "^3.4.0",
@@ -14634,7 +13957,6 @@
},
"read-file-stdin": {
"version": "0.2.1",
- "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=",
"dev": true,
"requires": {
"gather-stream": "^1.0.0"
@@ -14642,7 +13964,6 @@
},
"read-pkg": {
"version": "1.1.0",
- "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"requires": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
@@ -14651,15 +13972,13 @@
},
"read-pkg-up": {
"version": "1.0.1",
- "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"requires": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
}
},
"readable-stream": {
- "version": "3.6.0",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.2",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -14669,8 +13988,6 @@
},
"readdirp": {
"version": "2.2.1",
- "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.11",
"micromatch": "^3.1.10",
@@ -14678,19 +13995,13 @@
},
"dependencies": {
"arr-diff": {
- "version": "4.0.0",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "dev": true
+ "version": "4.0.0"
},
"array-unique": {
- "version": "0.3.2",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "dev": true
+ "version": "0.3.2"
},
"braces": {
"version": "2.3.2",
- "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
- "dev": true,
"requires": {
"arr-flatten": "^1.1.0",
"array-unique": "^0.3.2",
@@ -14706,8 +14017,6 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -14716,8 +14025,6 @@
},
"expand-brackets": {
"version": "2.1.4",
- "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
- "dev": true,
"requires": {
"debug": "^2.3.3",
"define-property": "^0.2.5",
@@ -14730,24 +14037,18 @@
"dependencies": {
"define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
"requires": {
"is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
},
"is-descriptor": {
"version": "0.1.6",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -14755,16 +14056,12 @@
}
},
"kind-of": {
- "version": "5.1.0",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
+ "version": "5.1.0"
}
}
},
"extglob": {
"version": "2.0.4",
- "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
- "dev": true,
"requires": {
"array-unique": "^0.3.2",
"define-property": "^1.0.0",
@@ -14778,16 +14075,12 @@
"dependencies": {
"define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
"requires": {
"is-descriptor": "^1.0.0"
}
},
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -14796,8 +14089,6 @@
},
"fill-range": {
"version": "4.0.0",
- "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
- "dev": true,
"requires": {
"extend-shallow": "^2.0.1",
"is-number": "^3.0.0",
@@ -14807,8 +14098,6 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -14817,16 +14106,12 @@
},
"is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -14835,16 +14120,12 @@
},
"is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -14853,16 +14134,12 @@
},
"is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
"version": "3.2.2",
- "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -14870,19 +14147,13 @@
}
},
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
},
"kind-of": {
- "version": "6.0.3",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "dev": true
+ "version": "6.0.3"
},
"micromatch": {
"version": "3.1.10",
- "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
- "dev": true,
"requires": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -14900,9 +14171,7 @@
}
},
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -14913,10 +14182,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -14925,7 +14195,6 @@
},
"reduce-css-calc": {
"version": "1.3.0",
- "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
"dev": true,
"requires": {
"balanced-match": "^0.4.2",
@@ -14935,14 +14204,12 @@
"dependencies": {
"balanced-match": {
"version": "0.4.2",
- "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
"dev": true
}
}
},
"reduce-function-call": {
"version": "1.0.3",
- "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
"dev": true,
"requires": {
"balanced-match": "^1.0.0"
@@ -14950,14 +14217,12 @@
"dependencies": {
"balanced-match": {
"version": "1.0.2",
- "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
}
}
},
"redux": {
"version": "3.7.2",
- "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
"dev": true,
"requires": {
"lodash": "^4.2.1",
@@ -14968,7 +14233,6 @@
},
"redux-logger": {
"version": "2.10.2",
- "integrity": "sha1-PFpfCm8yV3wd6t9mVfJX+CxsOTc=",
"dev": true,
"requires": {
"deep-diff": "0.3.4"
@@ -14976,21 +14240,17 @@
},
"redux-thunk": {
"version": "2.2.0",
- "integrity": "sha1-5hWhbha0ehmlFXZhM9Hj6Zt4UuU=",
"dev": true
},
"regenerate": {
"version": "1.4.2",
- "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
"dev": true
},
"regenerator-runtime": {
- "version": "0.10.5",
- "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+ "version": "0.10.5"
},
"regenerator-transform": {
"version": "0.10.1",
- "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
"dev": true,
"requires": {
"babel-runtime": "^6.18.0",
@@ -15000,15 +14260,12 @@
},
"regex-cache": {
"version": "0.4.4",
- "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
"requires": {
"is-equal-shallow": "^0.1.3"
}
},
"regex-not": {
"version": "1.0.2",
- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
- "dev": true,
"requires": {
"extend-shallow": "^3.0.2",
"safe-regex": "^1.1.0"
@@ -15016,7 +14273,6 @@
},
"regexpu-core": {
"version": "2.0.0",
- "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
"dev": true,
"requires": {
"regenerate": "^1.2.1",
@@ -15026,12 +14282,10 @@
},
"regjsgen": {
"version": "0.2.0",
- "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
"dev": true
},
"regjsparser": {
"version": "0.1.5",
- "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
"dev": true,
"requires": {
"jsesc": "~0.5.0"
@@ -15039,33 +14293,27 @@
"dependencies": {
"jsesc": {
"version": "0.5.0",
- "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
"dev": true
}
}
},
"remove-trailing-separator": {
- "version": "1.1.0",
- "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+ "version": "1.1.0"
},
"repeat-element": {
- "version": "1.1.4",
- "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="
+ "version": "1.1.4"
},
"repeat-string": {
- "version": "1.6.1",
- "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+ "version": "1.6.1"
},
"repeating": {
"version": "2.0.1",
- "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"requires": {
"is-finite": "^1.0.0"
}
},
"request": {
"version": "2.88.2",
- "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
"dev": true,
"requires": {
"aws-sign2": "~0.7.0",
@@ -15091,61 +14339,48 @@
}
},
"require-main-filename": {
- "version": "1.0.1",
- "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ "version": "1.0.1"
},
"requires-port": {
"version": "1.0.0",
- "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
"dev": true
},
"reselect": {
- "version": "4.1.7",
- "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz",
- "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A=="
+ "version": "4.1.8"
},
"resolve": {
- "version": "1.22.0",
- "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+ "version": "1.22.6",
"requires": {
- "is-core-module": "^2.8.1",
+ "is-core-module": "^2.13.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
}
},
"resolve-url": {
- "version": "0.2.1",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "dev": true
+ "version": "0.2.1"
},
"ret": {
- "version": "0.1.15",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
- "dev": true
+ "version": "0.1.15"
},
"right-align": {
"version": "0.1.3",
- "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
- "dev": true,
"requires": {
"align-text": "^0.1.1"
}
},
"rimraf": {
"version": "2.7.1",
- "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
"requires": {
"glob": "^7.1.3"
},
"dependencies": {
"glob": {
- "version": "7.2.0",
- "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+ "version": "7.2.3",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.1",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
@@ -15153,36 +14388,28 @@
}
},
"ripemd160": {
- "version": "0.2.0",
- "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
- "dev": true
+ "version": "0.2.0"
},
"run-queue": {
"version": "1.0.3",
- "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
"requires": {
"aproba": "^1.1.1"
}
},
"safe-buffer": {
- "version": "5.1.2",
- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ "version": "5.2.1"
},
"safe-regex": {
"version": "1.1.0",
- "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
- "dev": true,
"requires": {
"ret": "~0.1.10"
}
},
"safer-buffer": {
- "version": "2.1.2",
- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ "version": "2.1.2"
},
"sane": {
"version": "1.7.0",
- "integrity": "sha1-s1ebzLRclM8gNVzIESSZDf00bjA=",
"dev": true,
"requires": {
"anymatch": "^1.3.0",
@@ -15196,55 +14423,50 @@
},
"sax": {
"version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
"dev": true
},
"schema-utils": {
"version": "0.4.7",
- "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
"requires": {
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0"
}
},
"semver": {
- "version": "5.7.1",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+ "version": "5.7.2"
},
"send": {
- "version": "0.17.2",
- "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+ "version": "0.18.0",
"dev": true,
"requires": {
"debug": "2.6.9",
- "depd": "~1.1.2",
- "destroy": "~1.0.4",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"etag": "~1.8.1",
"fresh": "0.5.2",
- "http-errors": "1.8.1",
+ "http-errors": "2.0.0",
"mime": "1.6.0",
"ms": "2.1.3",
- "on-finished": "~2.3.0",
+ "on-finished": "2.4.1",
"range-parser": "~1.2.1",
- "statuses": "~1.5.0"
+ "statuses": "2.0.1"
},
"dependencies": {
"ms": {
"version": "2.1.3",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
}
}
},
"serialize-javascript": {
- "version": "1.9.1",
- "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="
+ "version": "1.9.1"
},
"serve-index": {
"version": "1.9.1",
- "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
"dev": true,
"requires": {
"accepts": "~1.3.4",
@@ -15256,9 +14478,12 @@
"parseurl": "~1.3.2"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "dev": true
+ },
"http-errors": {
"version": "1.6.3",
- "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true,
"requires": {
"depd": "~1.1.2",
@@ -15269,36 +14494,30 @@
},
"inherits": {
"version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
"dev": true
},
"setprototypeof": {
"version": "1.1.0",
- "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+ "dev": true
+ },
+ "statuses": {
+ "version": "1.5.0",
"dev": true
}
}
},
"serve-static": {
- "version": "1.14.2",
- "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+ "version": "1.15.0",
"dev": true,
"requires": {
"encodeurl": "~1.0.2",
"escape-html": "~1.0.3",
"parseurl": "~1.3.3",
- "send": "0.17.2"
+ "send": "0.18.0"
}
},
- "set-immediate-shim": {
- "version": "1.0.1",
- "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
- "dev": true
- },
"set-value": {
"version": "2.0.1",
- "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
- "dev": true,
"requires": {
"extend-shallow": "^2.0.1",
"is-extendable": "^0.1.1",
@@ -15308,8 +14527,6 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -15317,31 +14534,31 @@
}
},
"setimmediate": {
- "version": "1.0.5",
- "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+ "version": "1.0.5"
},
"setprototypeof": {
"version": "1.2.0",
- "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
"dev": true
},
"sha.js": {
- "version": "2.2.6",
- "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
- "dev": true
+ "version": "2.2.6"
},
"shallowequal": {
- "version": "1.1.0",
- "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+ "version": "1.1.0"
+ },
+ "side-channel": {
+ "version": "1.0.4",
+ "requires": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ }
},
"slash": {
- "version": "1.0.0",
- "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+ "version": "1.0.0"
},
"snapdragon": {
"version": "0.8.2",
- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
- "dev": true,
"requires": {
"base": "^0.11.1",
"debug": "^2.2.0",
@@ -15355,40 +14572,30 @@
"dependencies": {
"define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
"requires": {
"is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
"version": "2.0.1",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
"requires": {
"is-extendable": "^0.1.0"
}
},
"is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-descriptor": {
"version": "0.1.6",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -15396,9 +14603,7 @@
},
"dependencies": {
"kind-of": {
- "version": "5.1.0",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
+ "version": "5.1.0"
}
}
}
@@ -15406,8 +14611,6 @@
},
"snapdragon-node": {
"version": "2.1.1",
- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
- "dev": true,
"requires": {
"define-property": "^1.0.0",
"isobject": "^3.0.0",
@@ -15416,30 +14619,23 @@
"dependencies": {
"define-property": {
"version": "1.0.0",
- "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "dev": true,
"requires": {
"is-descriptor": "^1.0.0"
}
},
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"snapdragon-util": {
"version": "3.0.1",
- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
- "dev": true,
"requires": {
"kind-of": "^3.2.0"
}
},
"sntp": {
"version": "1.0.9",
- "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
"dev": true,
"optional": true,
"requires": {
@@ -15448,7 +14644,6 @@
},
"sockjs": {
"version": "0.3.24",
- "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
"dev": true,
"requires": {
"faye-websocket": "^0.11.3",
@@ -15458,27 +14653,23 @@
"dependencies": {
"uuid": {
"version": "8.3.2",
- "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
"dev": true
}
}
},
"sockjs-client": {
- "version": "1.5.2",
- "integrity": "sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==",
+ "version": "1.6.1",
"dev": true,
"requires": {
- "debug": "^3.2.6",
- "eventsource": "^1.0.7",
- "faye-websocket": "^0.11.3",
+ "debug": "^3.2.7",
+ "eventsource": "^2.0.2",
+ "faye-websocket": "^0.11.4",
"inherits": "^2.0.4",
- "json3": "^3.3.3",
- "url-parse": "^1.5.3"
+ "url-parse": "^1.5.10"
},
"dependencies": {
"debug": {
"version": "3.2.7",
- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"dev": true,
"requires": {
"ms": "^2.1.1"
@@ -15486,32 +14677,25 @@
},
"ms": {
"version": "2.1.3",
- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"dev": true
}
}
},
"sort-keys": {
"version": "1.1.2",
- "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
"dev": true,
"requires": {
"is-plain-obj": "^1.0.0"
}
},
"source-list-map": {
- "version": "0.1.8",
- "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
- "dev": true
+ "version": "0.1.8"
},
"source-map": {
- "version": "0.5.7",
- "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+ "version": "0.5.7"
},
"source-map-loader": {
"version": "0.2.4",
- "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
- "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
"dev": true,
"requires": {
"async": "^2.5.0",
@@ -15520,8 +14704,6 @@
"dependencies": {
"async": {
"version": "2.6.4",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
- "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
"dev": true,
"requires": {
"lodash": "^4.17.14"
@@ -15529,20 +14711,14 @@
},
"big.js": {
"version": "5.2.2",
- "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
- "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true
},
"emojis-list": {
"version": "3.0.0",
- "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
- "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true
},
"json5": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
- "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
@@ -15550,8 +14726,6 @@
},
"loader-utils": {
"version": "1.4.2",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
- "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
@@ -15563,8 +14737,6 @@
},
"source-map-resolve": {
"version": "0.5.3",
- "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
- "dev": true,
"requires": {
"atob": "^2.1.2",
"decode-uri-component": "^0.2.0",
@@ -15575,56 +14747,45 @@
},
"source-map-support": {
"version": "0.4.18",
- "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
"requires": {
"source-map": "^0.5.6"
}
},
"source-map-url": {
- "version": "0.4.1",
- "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
- "dev": true
+ "version": "0.4.1"
},
"spdx-correct": {
- "version": "3.1.1",
- "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "version": "3.2.0",
"requires": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
}
},
"spdx-exceptions": {
- "version": "2.3.0",
- "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+ "version": "2.3.0"
},
"spdx-expression-parse": {
"version": "3.0.1",
- "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"requires": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
}
},
"spdx-license-ids": {
- "version": "3.0.11",
- "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="
+ "version": "3.0.13"
},
"split-string": {
"version": "3.1.0",
- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
- "dev": true,
"requires": {
"extend-shallow": "^3.0.0"
}
},
"sprintf-js": {
"version": "1.0.3",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
"dev": true
},
"sshpk": {
"version": "1.17.0",
- "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
"dev": true,
"requires": {
"asn1": "~0.2.3",
@@ -15640,15 +14801,12 @@
},
"ssri": {
"version": "5.3.0",
- "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
"requires": {
"safe-buffer": "^5.1.1"
}
},
"static-extend": {
"version": "0.1.2",
- "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
- "dev": true,
"requires": {
"define-property": "^0.2.5",
"object-copy": "^0.1.0"
@@ -15656,32 +14814,24 @@
"dependencies": {
"define-property": {
"version": "0.2.5",
- "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "dev": true,
"requires": {
"is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
"version": "0.1.6",
- "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-data-descriptor": {
"version": "0.1.4",
- "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"is-descriptor": {
"version": "0.1.6",
- "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "dev": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -15689,32 +14839,25 @@
},
"dependencies": {
"kind-of": {
- "version": "5.1.0",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "dev": true
+ "version": "5.1.0"
}
}
}
}
},
"statuses": {
- "version": "1.5.0",
- "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+ "version": "2.0.1",
"dev": true
},
"stream-browserify": {
"version": "2.0.2",
- "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
- "dev": true,
"requires": {
"inherits": "~2.0.1",
"readable-stream": "^2.0.2"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -15725,10 +14868,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -15737,12 +14881,10 @@
},
"stream-cache": {
"version": "0.0.2",
- "integrity": "sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=",
"dev": true
},
"stream-each": {
"version": "1.2.3",
- "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
"requires": {
"end-of-stream": "^1.1.0",
"stream-shift": "^1.0.0"
@@ -15750,8 +14892,6 @@
},
"stream-http": {
"version": "2.8.3",
- "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
- "dev": true,
"requires": {
"builtin-status-codes": "^3.0.0",
"inherits": "^2.0.1",
@@ -15761,9 +14901,7 @@
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
- "dev": true,
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -15774,10 +14912,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
- "dev": true,
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -15785,83 +14924,62 @@
}
},
"stream-shift": {
- "version": "1.0.1",
- "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+ "version": "1.0.1"
},
"strict-uri-encode": {
"version": "1.1.0",
- "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
},
"string_decoder": {
"version": "1.3.0",
- "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
"requires": {
"safe-buffer": "~5.2.0"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.2.1",
- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true
- }
}
},
"stringstream": {
"version": "0.0.6",
- "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
"dev": true,
"optional": true
},
"strip-ansi": {
"version": "3.0.1",
- "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
"ansi-regex": "^2.0.0"
}
},
"strip-bom": {
"version": "2.0.0",
- "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"requires": {
"is-utf8": "^0.2.0"
}
},
"style-loader": {
"version": "0.12.4",
- "integrity": "sha1-rn0GZdxNxlPaov6Xu5CRS8HSLZs=",
"dev": true,
"requires": {
"loader-utils": "^0.2.7"
}
},
"supports-color": {
- "version": "2.0.0",
- "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+ "version": "2.0.0"
},
"supports-preserve-symlinks-flag": {
- "version": "1.0.0",
- "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+ "version": "1.0.0"
},
"symbol-observable": {
"version": "1.2.0",
- "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
"dev": true
},
"symbol-tree": {
"version": "3.2.4",
- "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
"dev": true
},
"tapable": {
- "version": "0.1.10",
- "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
- "dev": true
+ "version": "0.1.10"
},
"test-exclude": {
"version": "4.2.3",
- "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==",
"requires": {
"arrify": "^1.0.1",
"micromatch": "^2.3.11",
@@ -15872,20 +14990,17 @@
},
"through": {
"version": "2.3.8",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
"dev": true
},
"through2": {
"version": "2.0.5",
- "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
"requires": {
"readable-stream": "~2.3.6",
"xtend": "~4.0.1"
},
"dependencies": {
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -15896,9 +15011,11 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2"
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
@@ -15907,43 +15024,32 @@
},
"time-stamp": {
"version": "2.2.0",
- "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA==",
"dev": true
},
"timers-browserify": {
"version": "2.0.12",
- "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
- "dev": true,
"requires": {
"setimmediate": "^1.0.4"
}
},
"tmpl": {
"version": "1.0.5",
- "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
"dev": true
},
"to-arraybuffer": {
- "version": "1.0.1",
- "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
- "dev": true
+ "version": "1.0.1"
},
"to-fast-properties": {
- "version": "1.0.3",
- "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+ "version": "1.0.3"
},
"to-object-path": {
"version": "0.3.0",
- "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
},
"to-regex": {
"version": "3.0.2",
- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
- "dev": true,
"requires": {
"define-property": "^2.0.2",
"extend-shallow": "^3.0.2",
@@ -15953,8 +15059,6 @@
},
"to-regex-range": {
"version": "2.1.1",
- "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
- "dev": true,
"requires": {
"is-number": "^3.0.0",
"repeat-string": "^1.6.1"
@@ -15962,8 +15066,6 @@
"dependencies": {
"is-number": {
"version": "3.0.0",
- "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "dev": true,
"requires": {
"kind-of": "^3.0.2"
}
@@ -15972,12 +15074,10 @@
},
"toidentifier": {
"version": "1.0.1",
- "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
"dev": true
},
"tough-cookie": {
"version": "2.5.0",
- "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"dev": true,
"requires": {
"psl": "^1.1.28",
@@ -15986,21 +15086,16 @@
},
"tr46": {
"version": "0.0.3",
- "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
"dev": true
},
"trim-right": {
- "version": "1.0.1",
- "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+ "version": "1.0.1"
},
"tty-browserify": {
- "version": "0.0.0",
- "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
- "dev": true
+ "version": "0.0.0"
},
"tunnel-agent": {
"version": "0.6.0",
- "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"dev": true,
"requires": {
"safe-buffer": "^5.0.1"
@@ -16008,12 +15103,10 @@
},
"tweetnacl": {
"version": "0.14.5",
- "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
"dev": true
},
"type-check": {
"version": "0.3.2",
- "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
"prelude-ls": "~1.1.2"
@@ -16021,7 +15114,6 @@
},
"type-is": {
"version": "1.6.18",
- "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
"dev": true,
"requires": {
"media-typer": "0.3.0",
@@ -16029,41 +15121,33 @@
}
},
"typedarray": {
- "version": "0.0.6",
- "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+ "version": "0.0.6"
},
"ua-parser-js": {
- "version": "0.7.31",
- "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ=="
+ "version": "0.7.36"
},
"uglify-es": {
"version": "3.3.9",
- "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
"requires": {
"commander": "~2.13.0",
"source-map": "~0.6.1"
},
"dependencies": {
"source-map": {
- "version": "0.6.1",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "version": "0.6.1"
}
}
},
"uglify-js": {
- "version": "3.15.1",
- "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+ "version": "3.17.4",
"dev": true,
"optional": true
},
"uglify-to-browserify": {
- "version": "1.0.2",
- "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
- "dev": true
+ "version": "1.0.2"
},
"uglifyjs-webpack-plugin": {
"version": "1.3.0",
- "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
"requires": {
"cacache": "^10.0.4",
"find-cache-dir": "^1.0.0",
@@ -16077,7 +15161,6 @@
"dependencies": {
"find-cache-dir": {
"version": "1.0.0",
- "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
"requires": {
"commondir": "^1.0.1",
"make-dir": "^1.0.0",
@@ -16086,27 +15169,23 @@
},
"find-up": {
"version": "2.1.0",
- "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": {
"locate-path": "^2.0.0"
}
},
"pkg-dir": {
"version": "2.0.0",
- "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
"requires": {
"find-up": "^2.1.0"
}
},
"source-map": {
- "version": "0.6.1",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "version": "0.6.1"
}
}
},
"uncontrollable": {
"version": "5.1.0",
- "integrity": "sha512-5FXYaFANKaafg4IVZXUNtGyzsnYEvqlr9wQ3WpZxFpEUxl29A3H6Q4G1Dnnorvq9TGOGATBApWR4YpLAh+F5hw==",
"dev": true,
"requires": {
"invariant": "^2.2.4"
@@ -16114,18 +15193,14 @@
},
"underscore": {
"version": "1.2.4",
- "integrity": "sha1-6NpiQaoG9k3yRzuyWQuMF8hMPH4=",
"dev": true
},
"underscore.string": {
"version": "2.0.0",
- "integrity": "sha1-dHCFilSguzVg0DfaVtzGe1GB4Ro=",
"dev": true
},
"union-value": {
"version": "1.0.1",
- "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
- "dev": true,
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
@@ -16135,42 +15210,34 @@
},
"uniq": {
"version": "1.0.1",
- "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
"dev": true
},
"uniqid": {
"version": "1.0.0",
- "integrity": "sha1-JYJSTgdASESkLelPviv1SeG3RVU=",
"dev": true
},
"uniqs": {
"version": "2.0.0",
- "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
"dev": true
},
"unique-filename": {
"version": "1.1.1",
- "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
"requires": {
"unique-slug": "^2.0.0"
}
},
"unique-slug": {
"version": "2.0.2",
- "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
"requires": {
"imurmurhash": "^0.1.4"
}
},
"unpipe": {
"version": "1.0.0",
- "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
"dev": true
},
"unset-value": {
"version": "1.0.0",
- "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
- "dev": true,
"requires": {
"has-value": "^0.3.1",
"isobject": "^3.0.0"
@@ -16178,8 +15245,6 @@
"dependencies": {
"has-value": {
"version": "0.3.1",
- "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
- "dev": true,
"requires": {
"get-value": "^2.0.3",
"has-values": "^0.1.4",
@@ -16188,8 +15253,6 @@
"dependencies": {
"isobject": {
"version": "2.1.0",
- "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "dev": true,
"requires": {
"isarray": "1.0.0"
}
@@ -16197,48 +15260,42 @@
}
},
"has-values": {
- "version": "0.1.4",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
- "dev": true
+ "version": "0.1.4"
},
"isobject": {
- "version": "3.0.1",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "dev": true
+ "version": "3.0.1"
}
}
},
"uri-js": {
"version": "4.4.1",
- "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
"requires": {
"punycode": "^2.1.0"
}
},
"urix": {
- "version": "0.1.0",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "dev": true
+ "version": "0.1.0"
},
"url": {
- "version": "0.11.0",
- "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
- "dev": true,
+ "version": "0.11.3",
"requires": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "punycode": "^1.4.1",
+ "qs": "^6.11.2"
},
"dependencies": {
"punycode": {
- "version": "1.3.2",
- "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
- "dev": true
+ "version": "1.4.1"
+ },
+ "qs": {
+ "version": "6.11.2",
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
}
}
},
"url-parse": {
- "version": "1.5.9",
- "integrity": "sha512-HpOvhKBvre8wYez+QhHcYiVvVmeF6DVnuSOOPhe3cTum3BnqHhvKaZm8FU5yTiOu/Jut2ZpB2rA/SbBA1JIGlQ==",
+ "version": "1.5.10",
"dev": true,
"requires": {
"querystringify": "^2.1.1",
@@ -16246,42 +15303,32 @@
}
},
"use": {
- "version": "3.1.1",
- "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
- "dev": true
+ "version": "3.1.1"
},
"util": {
"version": "0.10.4",
- "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
- "dev": true,
"requires": {
"inherits": "2.0.3"
},
"dependencies": {
"inherits": {
- "version": "2.0.3",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "dev": true
+ "version": "2.0.3"
}
}
},
"util-deprecate": {
- "version": "1.0.2",
- "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+ "version": "1.0.2"
},
"utils-merge": {
"version": "1.0.1",
- "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
"dev": true
},
"uuid": {
"version": "3.4.0",
- "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
"dev": true
},
"validate-npm-package-license": {
"version": "3.0.4",
- "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"requires": {
"spdx-correct": "^3.0.0",
"spdx-expression-parse": "^3.0.0"
@@ -16289,12 +15336,10 @@
},
"vary": {
"version": "1.1.2",
- "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
"dev": true
},
"verror": {
"version": "1.10.0",
- "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"dev": true,
"requires": {
"assert-plus": "^1.0.0",
@@ -16304,15 +15349,12 @@
},
"vm-browserify": {
"version": "0.0.4",
- "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
- "dev": true,
"requires": {
"indexof": "0.0.1"
}
},
"walker": {
"version": "1.0.8",
- "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
"dev": true,
"requires": {
"makeerror": "1.0.12"
@@ -16320,20 +15362,16 @@
},
"warning": {
"version": "3.0.0",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
"requires": {
"loose-envify": "^1.0.0"
}
},
"watch": {
"version": "0.10.0",
- "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw=",
"dev": true
},
"watchpack": {
"version": "0.2.9",
- "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
- "dev": true,
"requires": {
"async": "^0.9.0",
"chokidar": "^1.0.0",
@@ -16341,16 +15379,12 @@
},
"dependencies": {
"async": {
- "version": "0.9.2",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
- "dev": true
+ "version": "0.9.2"
}
}
},
"webpack": {
"version": "1.15.0",
- "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
- "dev": true,
"requires": {
"acorn": "^3.0.0",
"async": "^1.3.0",
@@ -16370,22 +15404,16 @@
},
"dependencies": {
"acorn": {
- "version": "3.3.0",
- "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
- "dev": true
+ "version": "3.3.0"
},
"supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
- "dev": true,
"requires": {
"has-flag": "^1.0.0"
}
},
"uglify-js": {
"version": "2.7.5",
- "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
- "dev": true,
"requires": {
"async": "~0.2.6",
"source-map": "~0.5.1",
@@ -16394,9 +15422,7 @@
},
"dependencies": {
"async": {
- "version": "0.2.10",
- "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
- "dev": true
+ "version": "0.2.10"
}
}
}
@@ -16404,8 +15430,6 @@
},
"webpack-core": {
"version": "0.6.9",
- "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
- "dev": true,
"requires": {
"source-list-map": "~0.1.7",
"source-map": "~0.4.1"
@@ -16413,8 +15437,6 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
- "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
- "dev": true,
"requires": {
"amdefine": ">=0.0.4"
}
@@ -16423,7 +15445,6 @@
},
"webpack-dev-middleware": {
"version": "1.12.2",
- "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
"dev": true,
"requires": {
"memory-fs": "~0.4.1",
@@ -16435,7 +15456,6 @@
"dependencies": {
"memory-fs": {
"version": "0.4.1",
- "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
"dev": true,
"requires": {
"errno": "^0.1.3",
@@ -16443,8 +15463,7 @@
}
},
"readable-stream": {
- "version": "2.3.7",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -16456,9 +15475,12 @@
"util-deprecate": "~1.0.1"
}
},
+ "safe-buffer": {
+ "version": "5.1.2",
+ "dev": true
+ },
"string_decoder": {
"version": "1.1.1",
- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
"safe-buffer": "~5.1.0"
@@ -16468,7 +15490,6 @@
},
"webpack-dev-server": {
"version": "1.16.5",
- "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=",
"dev": true,
"requires": {
"compression": "^1.5.2",
@@ -16488,7 +15509,6 @@
"dependencies": {
"supports-color": {
"version": "3.2.3",
- "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
"has-flag": "^1.0.0"
@@ -16498,25 +15518,21 @@
},
"webpack-sources": {
"version": "1.4.3",
- "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
"requires": {
"source-list-map": "^2.0.0",
"source-map": "~0.6.1"
},
"dependencies": {
"source-list-map": {
- "version": "2.0.1",
- "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+ "version": "2.0.1"
},
"source-map": {
- "version": "0.6.1",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ "version": "0.6.1"
}
}
},
"websocket-driver": {
"version": "0.7.4",
- "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
"dev": true,
"requires": {
"http-parser-js": ">=0.5.1",
@@ -16526,17 +15542,14 @@
},
"websocket-extensions": {
"version": "0.1.4",
- "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
"dev": true
},
"whatwg-fetch": {
"version": "0.9.0",
- "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=",
"dev": true
},
"whatwg-url-compat": {
"version": "0.6.5",
- "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=",
"dev": true,
"requires": {
"tr46": "~0.0.1"
@@ -16544,45 +15557,40 @@
},
"which": {
"version": "1.3.1",
- "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
},
"window-size": {
- "version": "0.1.0",
- "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
- "dev": true
+ "version": "0.1.0"
},
"wordwrap": {
"version": "1.0.0",
- "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
"dev": true
},
"worker-farm": {
"version": "1.7.0",
- "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
"requires": {
"errno": "~0.1.7"
}
},
"wrappy": {
- "version": "1.0.2",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ "version": "1.0.2"
},
"write-file-stdout": {
"version": "0.0.2",
- "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=",
"dev": true
},
"xml": {
"version": "1.0.1",
- "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==",
"dev": true
},
"xml-js": {
"version": "1.6.11",
+ "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
"integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
"dev": true,
"requires": {
@@ -16591,30 +15599,23 @@
},
"xml-name-validator": {
"version": "2.0.1",
- "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=",
"dev": true
},
"xmlhttprequest": {
"version": "1.8.0",
- "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=",
"dev": true
},
"xtend": {
- "version": "4.0.2",
- "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+ "version": "4.0.2"
},
"y18n": {
- "version": "4.0.3",
- "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+ "version": "4.0.3"
},
"yallist": {
- "version": "2.1.2",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+ "version": "2.1.2"
},
"yargs": {
"version": "3.10.0",
- "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
- "dev": true,
"requires": {
"camelcase": "^1.0.2",
"cliui": "^2.1.0",
diff --git a/amp/TEMPLATE/reamp/package.json b/amp/TEMPLATE/reamp/package.json
index 0a00f928a6b..02f32d0af10 100644
--- a/amp/TEMPLATE/reamp/package.json
+++ b/amp/TEMPLATE/reamp/package.json
@@ -23,7 +23,7 @@
"author": "Alexei Savca",
"license": "inherit",
"devDependencies": {
- "amp-ui": "github:devgateway/amp-ui#35d15a9efe2de868113fd47218a10743a393d5d4",
+ "amp-ui": "github:devgateway/amp-ui#develop",
"babel-core": "^6.26.3",
"babel-jest": "^6.0.1",
"babel-loader": "^6.3.2",
diff --git a/amp/WEB-INF/applicationContext.xml b/amp/WEB-INF/applicationContext.xml
index 2e2a7063bd5..b8717993df1 100644
--- a/amp/WEB-INF/applicationContext.xml
+++ b/amp/WEB-INF/applicationContext.xml
@@ -6,25 +6,33 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd
+ http://www.springframework.org/schema/security/spring-security.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context.xsd">
+
+
+
+
+
+
+
-
+
+
-
+
@@ -40,31 +48,33 @@
-
+
-
-
+
+
+
-
+
+
-
+
-
-
+
+
-
+
-
+
@@ -73,7 +83,7 @@
-
@@ -84,17 +94,17 @@
-
+
-
+
-
-
+
+
@@ -102,10 +112,10 @@
-
+
-
+
@@ -117,67 +127,113 @@
-->
-
+
-
-
-
-
-
+
+
+
-
-
+
+
+
+
-
+
+
+
+
+
-
+
+
-
-
+
+
+
+
+
+
+
-
+
+
-
-
+
+
+
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
@@ -185,28 +241,22 @@
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
-
- false
-
+
-
+
-
+
diff --git a/amp/WEB-INF/src/hibernate.cfg.xml b/amp/WEB-INF/src/hibernate.cfg.xml
index c096b93b400..6e1b5418576 100644
--- a/amp/WEB-INF/src/hibernate.cfg.xml
+++ b/amp/WEB-INF/src/hibernate.cfg.xml
@@ -2,10 +2,13 @@
]>
- org.hibernate.transaction.JDBCTransactionFactory
+ jdbc
java:comp/env/ampDS
+ org.dgfoundation.amp.ar.viewfetcher.AmpPostgresDialect
&dialect;
thread
+ true
+ create
0
20
true
@@ -20,6 +23,8 @@
true
true
true 1, false 0, yes 'Y', no 'N'
- update
+ update
+ allow
+
diff --git a/amp/WEB-INF/src/logback.xml b/amp/WEB-INF/src/logback.xml
index dcaef31fd9b..2fab527adba 100644
--- a/amp/WEB-INF/src/logback.xml
+++ b/amp/WEB-INF/src/logback.xml
@@ -50,6 +50,7 @@
+
@@ -69,6 +70,7 @@
+
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/PropertyListable.java b/amp/WEB-INF/src/org/dgfoundation/amp/PropertyListable.java
index d12c2f6a3ed..f355eaaa8a8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/PropertyListable.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/PropertyListable.java
@@ -3,6 +3,9 @@
*/
package org.dgfoundation.amp;
+import org.apache.log4j.Logger;
+import org.digijava.module.aim.annotations.reports.IgnorePersistence;
+
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -11,14 +14,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.log4j.Logger;
-import org.digijava.module.aim.annotations.reports.IgnorePersistence;
+import java.util.*;
/**
* PropertyListable.java Implemented by Beans that can have their properties Listable
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/StandaloneJndiAMPInitializer.java b/amp/WEB-INF/src/org/dgfoundation/amp/StandaloneJndiAMPInitializer.java
index d0d960bea85..c7d110695ed 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/StandaloneJndiAMPInitializer.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/StandaloneJndiAMPInitializer.java
@@ -3,29 +3,24 @@
*/
package org.dgfoundation.amp;
-import java.io.File;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Properties;
+import org.apache.log4j.Logger;
+import org.digijava.module.aim.helper.Constants;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
-import javax.naming.CommunicationException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
+import javax.naming.*;
import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.InitialContextFactoryBuilder;
import javax.naming.spi.NamingManager;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.log4j.Logger;
-import org.digijava.module.aim.helper.Constants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
+import java.io.File;
+import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Properties;
/**
* @author mihai
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/Util.java b/amp/WEB-INF/src/org/dgfoundation/amp/Util.java
index d14071518bc..2358c3d994f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/Util.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/Util.java
@@ -1,39 +1,13 @@
-package org.dgfoundation.amp;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+package org.dgfoundation.amp;
import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
-import org.dgfoundation.amp.ar.workers.CategAmountColWorker;
import org.dgfoundation.amp.currencyconvertor.AmpCurrencyConvertor;
import org.dgfoundation.amp.currencyconvertor.CurrencyConvertor;
-import org.digijava.kernel.cache.AbstractCache;
-import org.digijava.kernel.entity.Locale;
import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.kernel.request.Site;
import org.digijava.kernel.user.User;
-import org.digijava.kernel.util.DigiCacheManager;
import org.digijava.kernel.util.RequestUtils;
import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
-import org.digijava.module.aim.dbentity.AmpOrgRole;
-import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.helper.TeamMember;
import org.digijava.module.aim.helper.fiscalcalendar.BaseCalendar;
@@ -44,14 +18,15 @@
import org.digijava.module.aim.util.Identifiable;
import org.digijava.module.editor.dbentity.Editor;
import org.digijava.module.editor.exception.EditorException;
-import org.digijava.module.editor.util.DbUtil;
import org.hibernate.HibernateException;
-import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.jdbc.ReturningWork;
-import org.hibernate.type.StringType;
import org.springframework.beans.BeanWrapperImpl;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.sql.SQLException;
+import java.util.*;
+
public final class Util {
protected static Logger logger = Logger.getLogger(Util.class);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java b/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java
index ed210d8d023..6e4ad6c2ef3 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/CachedMachineTranslationService.java
@@ -1,17 +1,5 @@
package org.dgfoundation.amp.aitranslation;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toMap;
-import static org.digijava.module.aim.helper.GlobalSettingsConstants.MACHINE_TRANSLATION_MAX_CHARACTERS;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Predicate;
-
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.tuple.Pair;
@@ -22,6 +10,21 @@
import org.hibernate.Session;
import org.hibernate.criterion.Restrictions;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Predicate;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static org.digijava.module.aim.helper.GlobalSettingsConstants.MACHINE_TRANSLATION_MAX_CHARACTERS;
+
/**
* This a IMachineTranslationService wrapper that uses caches translations and limits monthly usage is there is any.
*
@@ -73,12 +76,14 @@ private Pair, List> loadCachedTranslations(
for (int i = 0; i < contents.size(); i += BATCH_SIZE) {
List batchContents = contents.subList(i, Math.min(i + BATCH_SIZE, contents.size()));
- translations.addAll(PersistenceManager.getSession()
- .createCriteria(MachineTranslation.class)
- .add(Restrictions.eq("sourceLanguage", srcLang))
- .add(Restrictions.eq("targetLanguage", destLang))
- .add(Restrictions.in("text", batchContents))
- .list());
+ Session session = PersistenceManager.getRequestDBSession();
+ CriteriaBuilder builder = session.getCriteriaBuilder();
+ CriteriaQuery criteriaQuery = builder.createQuery(MachineTranslation.class);
+ Root root = criteriaQuery.from(MachineTranslation.class);
+ criteriaQuery.select(root).where(builder.equal(root.get("sourceLanguage"), srcLang),builder.equal(root.get("targetLanguage"), destLang),
+ builder.equal(root.get("text"), batchContents));
+
+ translations.addAll(session.createQuery(criteriaQuery).list());
}
return translations.stream().map(o -> ((MachineTranslation) o))
@@ -124,10 +129,13 @@ private Predicate upToCodePoints(int charsAllowed) {
}
private int getCharactersUsedThisMonth() {
- MachineTranslationCharactersUsed used = (MachineTranslationCharactersUsed) PersistenceManager.getSession()
- .createCriteria(MachineTranslationCharactersUsed.class)
- .add(Restrictions.eq("id", 1L))
- .uniqueResult();
+ Session session = PersistenceManager.getRequestDBSession();
+ CriteriaBuilder builder = session.getCriteriaBuilder();
+ CriteriaQuery criteriaQuery = builder.createQuery(MachineTranslationCharactersUsed.class);
+ Root root = criteriaQuery.from(MachineTranslationCharactersUsed.class);
+ criteriaQuery.select(root).where(builder.equal(root.get("id"),1L));
+
+ MachineTranslationCharactersUsed used = session.createQuery(criteriaQuery).uniqueResult();
if (used != null && used.getMonth().equals(getCurrentMonth())) {
return used.getUsed();
} else {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/GoogleMachineTranslationService.java b/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/GoogleMachineTranslationService.java
index 72fd69d62ab..2af10c0ac42 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/GoogleMachineTranslationService.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/aitranslation/GoogleMachineTranslationService.java
@@ -1,55 +1,30 @@
package org.dgfoundation.amp.aitranslation;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toMap;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ForkJoinPool;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
import au.com.bytecode.opencsv.CSVReader;
import au.com.bytecode.opencsv.CSVWriter;
import com.google.api.core.ApiFuture;
import com.google.api.gax.paging.Page;
-import com.google.cloud.storage.Blob;
-import com.google.cloud.storage.BlobInfo;
-import com.google.cloud.storage.Bucket;
-import com.google.cloud.storage.BucketInfo;
-import com.google.cloud.storage.Storage;
-import com.google.cloud.storage.StorageClass;
-import com.google.cloud.storage.StorageException;
-import com.google.cloud.storage.StorageOptions;
-import com.google.cloud.translate.v3.BatchTranslateTextRequest;
-import com.google.cloud.translate.v3.GcsDestination;
-import com.google.cloud.translate.v3.GcsSource;
-import com.google.cloud.translate.v3.InputConfig;
-import com.google.cloud.translate.v3.LocationName;
-import com.google.cloud.translate.v3.OutputConfig;
-import com.google.cloud.translate.v3.TranslateTextRequest;
-import com.google.cloud.translate.v3.TranslateTextResponse;
-import com.google.cloud.translate.v3.TranslationServiceClient;
+import com.google.cloud.storage.*;
+import com.google.cloud.translate.v3.*;
import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.http.HttpStatus;
import org.dgfoundation.amp.nireports.NiUtils;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+
/**
* This is a translation service that uses Google Translation API to do the actual translation. Additionally this
* service uses Google Cloud Storage API since this is required for using the batch translation calls.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/AlgoUtils.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/AlgoUtils.java
index 9d03b86e060..ba211a67d00 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/AlgoUtils.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/AlgoUtils.java
@@ -1,12 +1,11 @@
package org.dgfoundation.amp.algo;
+import org.digijava.module.aim.util.Identifiable;
+
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.digijava.module.aim.util.Identifiable;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/AmpCollections.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/AmpCollections.java
index f2251dadc61..a01c70c4569 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/AmpCollections.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/AmpCollections.java
@@ -1,32 +1,17 @@
package org.dgfoundation.amp.algo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import org.digijava.module.aim.util.Identifiable;
+
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.digijava.module.aim.util.Identifiable;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
public class AmpCollections {
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/DatabaseWaver.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/DatabaseWaver.java
index b1e8a4a3e26..b9686dc40ec 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/DatabaseWaver.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/DatabaseWaver.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.algo;
+import org.dgfoundation.amp.Util;
+import org.digijava.kernel.persistence.PersistenceManager;
+
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.dgfoundation.amp.Util;
-import org.digijava.kernel.persistence.PersistenceManager;
-
/**
* a waver which selects ids using a query like SELECT DISTINCT(BLA) FROM FOO WHERE X IN (in)
* @author Dolghier Constantin
@@ -32,7 +32,7 @@ public Set wave(Set in)
if (in == null)
return result;
String query = this.query.replace("$", Util.toCSStringForIN(in));
- List ids = PersistenceManager.getSession().createSQLQuery(query).list();
+ List ids = PersistenceManager.getSession().createNativeQuery(query).list();
for(Object longAsObj:ids)
result.add(PersistenceManager.getLong(longAsObj));
return result;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/Graph.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/Graph.java
index 2c08216aa37..66b27634541 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/Graph.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/Graph.java
@@ -1,18 +1,11 @@
package org.dgfoundation.amp.algo;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import com.google.common.base.Preconditions;
+
+import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
-import com.google.common.base.Preconditions;
-
/**
* generic graph algorithm holder
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/InclusiveTimer.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/InclusiveTimer.java
index 8039df3bf87..805105a4807 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/InclusiveTimer.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/InclusiveTimer.java
@@ -1,13 +1,13 @@
package org.dgfoundation.amp.algo.timing;
+import org.dgfoundation.amp.algo.ExceptionRunnable;
+import org.dgfoundation.amp.algo.VivificatingMap;
+
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Stack;
-import org.dgfoundation.amp.algo.ExceptionRunnable;
-import org.dgfoundation.amp.algo.VivificatingMap;
-
/**
* reentrant, multiple-threads-safe timer which can track how much a task and its subtasks took by modelling the runtime through a tree
* This class is thread-safe
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunNode.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunNode.java
index fa6cbaf10de..922f9c8fd79 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunNode.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunNode.java
@@ -1,17 +1,13 @@
package org.dgfoundation.amp.algo.timing;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.IntFunction;
-import java.util.function.LongFunction;
-
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang.StringUtils;
import org.dgfoundation.amp.algo.AlgoUtils;
+import java.util.*;
+import java.util.function.IntFunction;
+import java.util.function.LongFunction;
+
/**
* an object returned by InclusiveTimer to represent a read-only identifying view in the runtime tree
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunTree.java b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunTree.java
index 14b9cf4350c..541ba16ece7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunTree.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/algo/timing/RunTree.java
@@ -1,13 +1,9 @@
package org.dgfoundation.amp.algo.timing;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.dgfoundation.amp.nireports.NiUtils;
+import java.util.*;
+
public class RunTree implements RunNode {
protected final String name;
protected final RunTree parent;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/annotations/checkstyle/IgnoreCanonicalNames.java b/amp/WEB-INF/src/org/dgfoundation/amp/annotations/checkstyle/IgnoreCanonicalNames.java
index 9be9c7abb8a..67e37809d8f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/annotations/checkstyle/IgnoreCanonicalNames.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/annotations/checkstyle/IgnoreCanonicalNames.java
@@ -1,15 +1,12 @@
package org.dgfoundation.amp.annotations.checkstyle;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
@Documented
@Retention(RUNTIME)
@Target({ TYPE, METHOD, PARAMETER, FIELD })
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ARUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ARUtil.java
index 79a72caff42..6e0322a4613 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ARUtil.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ARUtil.java
@@ -6,23 +6,6 @@
*/
package org.dgfoundation.amp.ar;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
-import java.text.DateFormatSymbols;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -37,14 +20,7 @@
import org.dgfoundation.amp.ar.dimension.DonorDimension;
import org.dgfoundation.amp.ar.dimension.DonorGroupDimension;
import org.dgfoundation.amp.ar.dimension.DonorTypeDimension;
-import org.dgfoundation.amp.ar.view.xls.ColumnReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.GroupReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.IntWrapper;
-import org.dgfoundation.amp.ar.view.xls.PlainColumnReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.PlainGroupReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.RichColumnReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.RichGroupReportDataXLS;
-import org.dgfoundation.amp.ar.view.xls.XLSExportType;
+import org.dgfoundation.amp.ar.view.xls.*;
import org.dgfoundation.amp.ar.workers.CategAmountColWorker;
import org.dgfoundation.amp.ar.workers.MetaTextColWorker;
import org.dgfoundation.amp.ar.workers.TextColWorker;
@@ -55,14 +31,7 @@
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.kernel.util.RequestUtils;
-import org.digijava.module.aim.dbentity.AmpColumns;
-import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
-import org.digijava.module.aim.dbentity.AmpMeasures;
-import org.digijava.module.aim.dbentity.AmpOrgGroup;
-import org.digijava.module.aim.dbentity.AmpReportColumn;
-import org.digijava.module.aim.dbentity.AmpReportHierarchy;
-import org.digijava.module.aim.dbentity.AmpReportMeasures;
-import org.digijava.module.aim.dbentity.AmpReports;
+import org.digijava.module.aim.dbentity.*;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.helper.TeamMember;
@@ -71,14 +40,22 @@
import org.digijava.module.aim.util.DbUtil;
import org.digijava.module.aim.util.FeaturesUtil;
import org.digijava.module.aim.util.FiscalCalendarUtil;
-import org.digijava.module.budgetexport.reports.implementation.BudgetCategAmountColWorker;
-import org.digijava.module.budgetexport.reports.implementation.BudgetColumnReportDataXLS;
-import org.digijava.module.budgetexport.reports.implementation.BudgetGroupReportDataXLS;
-import org.digijava.module.budgetexport.reports.implementation.BudgetMetaTextColWorker;
-import org.digijava.module.budgetexport.reports.implementation.BudgetTextColWorker;
+import org.digijava.module.budgetexport.reports.implementation.*;
import org.digijava.module.budgetexport.util.BudgetExportConstants;
-import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.query.Query;
+import org.hibernate.type.BooleanType;
+import org.hibernate.type.LongType;
+import org.hibernate.type.StringType;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.text.DateFormatSymbols;
+import java.util.*;
/**
*
@@ -121,12 +98,12 @@ public static List getAllPublicReports(Boolean getTabs,String name,L
queryString +=" order by r.publishedDate desc ";
Query qry = session.createQuery(queryString);
if ( getTabs!=null )
- qry.setBoolean("getTabs", getTabs);
+ qry.setParameter("getTabs", getTabs, BooleanType.INSTANCE);
if (name != null) {
- qry.setString("name", '%' + name+ '%');
+ qry.setParameter("name", '%' + name+ '%', StringType.INSTANCE);
}
if(reportCategoryId !=null && !reportCategoryId.equals(new Long(0))){
- qry.setLong("repCat", reportCategoryId);
+ qry.setParameter("repCat", reportCategoryId, LongType.INSTANCE);
}
col= qry.list();
@@ -194,9 +171,9 @@ public static Constructor getConstrByParamNo(Class c, int paramNo, boolean useBu
public static Constructor getConstrByParamNo(Class c, int paramNo) {
Constructor[] clist = c.getConstructors();
- for (int j = 0; j < clist.length; j++) {
- if (clist[j].getParameterTypes().length == paramNo)
- return clist[j];
+ for (Constructor constructor : clist) {
+ if (constructor.getParameterTypes().length == paramNo)
+ return constructor;
}
logger.error("Cannot find a constructor with " + paramNo
+ " parameters for class " + c.getName());
@@ -316,20 +293,19 @@ public static Collection filterDonorGroups(Collection donorGroups)
logger.error("Collection of AmpOrgGroup should NOT be null in filterDonorGroups");
return ret;
}
- Iterator iter = donorGroups.iterator();
- while (iter.hasNext()) {
- AmpOrgGroup grp = (AmpOrgGroup) iter.next();
+ for (Object donorGroup : donorGroups) {
+ AmpOrgGroup grp = (AmpOrgGroup) donorGroup;
if (grp.getOrgType() != null
&& grp.getOrgType().getOrgType() != null
&& (grp.getOrgType().getOrgType().toLowerCase().contains(
- "gov") || grp.getOrgType().getOrgType()
- .toLowerCase().contains("gouv"))) {
+ "gov") || grp.getOrgType().getOrgType()
+ .toLowerCase().contains("gouv"))) {
continue;
}
ret.add(grp);
}
- Collections.sort((List)ret, new DbUtil.HelperAmpOrgGroupNameComparator());
+ ((List) ret).sort(new DbUtil.HelperAmpOrgGroupNameComparator());
return ret;
}
@@ -370,9 +346,8 @@ public static boolean hasHeaderValue(AmpColumns column){
public static boolean containsColumn(String columName, Set columns) {
if (columName == null)
return false;
- Iterator i = columns.iterator();
- while (i.hasNext()) {
- AmpReportColumn element = (AmpReportColumn) i.next();
+ for (Object column : columns) {
+ AmpReportColumn element = (AmpReportColumn) column;
if (element.getColumn().getColumnName().indexOf(columName) != -1)
return true;
}
@@ -406,7 +381,7 @@ public static List createOrderedColumns(Collection destMetaSet, AmpARFilter filter) {
- Iterator iter = src.iterator();
+ Iterator iter = src.iterator();
TreeSet> periods = new TreeSet>();
try{
ARUtil.initializePeriodValues(type, periods, filter);
@@ -426,21 +401,19 @@ public static void insertEmptyColumns (String type, CellColumn src, SortedSet 1 ) {
- for (int i=1; i< difference; i++) {
- Comparable comparable = ARUtil.getFuturePeriod(type, prevPeriod, i, first, last);
+ int difference = 0;
+ if (prevPeriod != null &&
+ (difference = ARUtil.periodDifference(type, prevPeriod, period)) > 1) {
+ for (int i = 1; i < difference; i++) {
+ Comparable comparable = ARUtil.getFuturePeriod(type, prevPeriod, i, first, last);
if (comparable != null)
- destMetaSet.add( new MetaInfo(type, comparable) );
+ destMetaSet.add(new MetaInfo(type, comparable));
}
-
+
}
- prevPeriod = period;
+ prevPeriod = period;
}
}
@@ -468,7 +441,7 @@ private static Comparable getFuturePeriod(String type, Object period, int step,
if ( ArConstants.QUARTER.equals( type ) ) {
String quarter = ((String)period ).substring(1);
- Integer quarterId = ( Integer.parseInt(quarter) );
+ int quarterId = ( Integer.parseInt(quarter) );
if ( quarterId >= 4 )
throw new Exception( "There is no quarter greater than: " + quarterId );
if ( quarterId + step > 4 )
@@ -488,7 +461,7 @@ private static Comparable getFuturePeriod(String type, Object period, int step,
if ( month.getMonthId() >= 11 )
throw new Exception("Calendar type is "+ ampFiscalCalendar.getBaseCal() +
". There is no month greater than: " + month.getMonthId());
- Integer newMonthId = month.getMonthId() + step;
+ int newMonthId = month.getMonthId() + step;
if ( newMonthId > 11 )
throw new Exception("Calendar type is "+ ampFiscalCalendar.getBaseCal() +
". Max month is 11. Trying to generate month: " + newMonthId);
@@ -499,7 +472,7 @@ private static Comparable getFuturePeriod(String type, Object period, int step,
if ( month.getMonthId() >= 13 )
throw new Exception("Calendar type is "+ ampFiscalCalendar.getBaseCal() +
". There is no month greater than: " + month.getMonthId());
- Integer newMonthId = month.getMonthId() + step;
+ int newMonthId = month.getMonthId() + step;
if ( newMonthId > 13 )
throw new Exception("Calendar type is "+ ampFiscalCalendar.getBaseCal() +
". Max month is 13. Trying to generate month: " + newMonthId);
@@ -567,24 +540,21 @@ public static void clearOrgGroupTypeDimensions(){
}
public static void cleanReportOfHtmlCodes(GroupReportData rd){
- for (Iterator it = rd.getItems().iterator(); it.hasNext();) {
- Object o = it.next();
- if(o instanceof GroupReportData) cleanReportOfHtmlCodes((GroupReportData)o);
- if(o instanceof ColumnReportData) {
+ for (Object o : rd.getItems()) {
+ if (o instanceof GroupReportData) cleanReportOfHtmlCodes((GroupReportData) o);
+ if (o instanceof ColumnReportData) {
ColumnReportData crd = (ColumnReportData) o;
- for (Iterator j = crd.getItems().iterator(); j.hasNext();) {
- Object oo = j.next();
- if(oo instanceof CellColumn){
- CellColumn cellColumn = (CellColumn)oo;
- for (Iterator k = cellColumn.getItems().iterator(); k.hasNext();) {
- Object cell = k.next();
+ for (Object oo : crd.getItems()) {
+ if (oo instanceof CellColumn) {
+ CellColumn cellColumn = (CellColumn) oo;
+ for (Object cell : cellColumn.getItems()) {
ARUtil.cleanCell(cell);
}
}
}
-
+
}
-
+
}
}
@@ -622,8 +592,7 @@ private static void cleanTextCell(TextCell cell) {
public static double retrievePercentageFromCell ( MetaTextCell mtc ) throws Exception {
MetaInfo mInfo = mtc.getMetaInfo(ArConstants.PERCENTAGE);
if ( mInfo != null && mInfo.getValue() > 0) { // ROTTEN: this "if" throws up on 0.0% cells masked as non-procented ones. See AmountCell::getAmount() for more comments of ways in which this is broken. AMP-13848
- Double percentage = mInfo.getValue();
- return percentage;
+ return mInfo.getValue();
}
if ( mInfo == null)
throw new Exception("Percentage metainfo in MetaTextCell " + mtc + " is null");
@@ -632,14 +601,11 @@ public static double retrievePercentageFromCell ( MetaTextCell mtc ) throws Exce
public static double retrieveParentPercetage( Long ownerId, Cell splitterCell ) throws Exception {
Column col = splitterCell.getColumn();
- Iterator iter = col.getItems().iterator();
- while (iter.hasNext()) {
- TextCell textCell = iter.next();
- if ( textCell instanceof MetaTextCell ) {
- MetaTextCell metaTextCell = (MetaTextCell) textCell;
- if ( splitterCell.getValue().equals(metaTextCell.getValue()) && ownerId.equals(metaTextCell.getOwnerId() ) ) {
- Double percentage = retrievePercentageFromCell(metaTextCell);
- return percentage;
+ for (TextCell textCell : (Iterable) col.getItems()) {
+ if (textCell instanceof MetaTextCell) {
+ MetaTextCell metaTextCell = (MetaTextCell) textCell;
+ if (splitterCell.getValue().equals(metaTextCell.getValue()) && ownerId.equals(metaTextCell.getOwnerId())) {
+ return retrievePercentageFromCell(metaTextCell);
}
}
}
@@ -666,9 +632,8 @@ public static GroupReportDataXLS instatiateGroupReportDataXLS (HttpSession sessi
if (session != null ) {
String budgetTypeReport = (String) session.getAttribute(BudgetExportConstants.BUDGET_EXPORT_TYPE );
if (budgetTypeReport != null ) {
- GroupReportDataXLS grd = new BudgetGroupReportDataXLS(wb, sheet, row, rowId,
+ return new BudgetGroupReportDataXLS(wb, sheet, row, rowId,
colId, null, rd);
- return grd;
}
}
@@ -691,12 +656,10 @@ public static boolean hasCurrentUserAccessRight(AmpReports report) {
HttpServletRequest request = TLSUtils.getRequest();
if( report!=null ) {
TeamMember tm = (TeamMember) request.getSession().getAttribute(org.digijava.module.aim.helper.Constants.CURRENT_MEMBER);
- if( tm==null || tm.getTeamId()==null ) {
- if( report.getPublicReport() )
- return true;
+ if( tm==null || tm.getTeamId()==null ) {
+ return report.getPublicReport();
} else {
- if( AmpARFilter.TEAM_MEMBER_ALL_MANAGEMENT_WORKSPACES.equals(tm.getTeamId()) || tm.getTeamId().equals(report.getOwnerId().getAmpTeam().getAmpTeamId()) )
- return true;
+ return AmpARFilter.TEAM_MEMBER_ALL_MANAGEMENT_WORKSPACES.equals(tm.getTeamId()) || tm.getTeamId().equals(report.getOwnerId().getAmpTeam().getAmpTeamId());
}
}
return false;
@@ -704,7 +667,7 @@ public static boolean hasCurrentUserAccessRight(AmpReports report) {
public static AmpColumns getColumnForView(String viewName) {
String query = "select c from " + AmpColumns.class.getName() + " c WHERE c.extractorView = :ev ORDER BY c.columnId";
- List res = PersistenceManager.getSession().createQuery(query).setString("ev", viewName).list();
+ List res = PersistenceManager.getRequestDBSession().createQuery(query).setParameter("ev", viewName,StringType.INSTANCE).list();
if (res.isEmpty())
return null;
return res.get(0);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityEraser.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityEraser.java
index b6bc70bfdd3..4b6283a7b17 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityEraser.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityEraser.java
@@ -1,16 +1,12 @@
package org.dgfoundation.amp.ar;
-import java.sql.SQLException;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-
import org.digijava.kernel.exception.DgException;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.kernel.util.DigiConfigManager;
import org.digijava.kernel.util.resource.ResourceStreamHandlerFactory;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
/**
* ActivityEraser.java
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityFilter.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityFilter.java
index fd81b0954fb..9a8472b51b6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityFilter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActivityFilter.java
@@ -1,8 +1,5 @@
package org.dgfoundation.amp.ar;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.lucene.document.Document;
@@ -17,6 +14,9 @@
import org.digijava.module.aim.startup.AMPStartupListener;
import org.digijava.module.aim.util.LuceneUtil;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
/**
* This class is used to filter activities according to filters.
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbCapitalCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbCapitalCellGenerator.java
index a296ddcfda8..f7e2277309c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbCapitalCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbCapitalCellGenerator.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar;
+import org.digijava.module.categorymanager.util.CategoryConstants;
+
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Set;
-
-import org.digijava.module.categorymanager.util.CategoryConstants;
/**
* @author alex
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbRecurrentCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbRecurrentCellGenerator.java
index 97c6aded47a..7947bbb716e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbRecurrentCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbRecurrentCellGenerator.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar;
+import org.digijava.module.categorymanager.util.CategoryConstants;
+
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Set;
-
-import org.digijava.module.categorymanager.util.CategoryConstants;
/**
* @author alex
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbSplitCapRecTotalsCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbSplitCapRecTotalsCellGenerator.java
index 5cc3763ea73..7f9e2db4c0e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbSplitCapRecTotalsCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ActualDisbSplitCapRecTotalsCellGenerator.java
@@ -1,14 +1,13 @@
package org.dgfoundation.amp.ar;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.digijava.module.aim.dbentity.AmpColumns;
import org.digijava.module.aim.dbentity.AmpReportHierarchy;
import org.digijava.module.aim.dbentity.AmpReports;
+import java.util.Collection;
+import java.util.Iterator;
+
public class ActualDisbSplitCapRecTotalsCellGenerator extends
SyntheticCellGenerator {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmountCellColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmountCellColumn.java
index a1d186412e0..69a87a4083f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmountCellColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmountCellColumn.java
@@ -6,15 +6,15 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ListCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpARFilter.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpARFilter.java
index 619614439e5..1ad4cd64089 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpARFilter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpARFilter.java
@@ -6,73 +6,44 @@
*/
package org.dgfoundation.amp.ar;
-import static java.util.Collections.emptySet;
-import static java.util.stream.Collectors.toSet;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.dgfoundation.amp.PropertyListable;
import org.dgfoundation.amp.Util;
import org.dgfoundation.amp.newreports.AmountsUnits;
-import org.dgfoundation.amp.newreports.ReportEnvBuilder;
import org.dgfoundation.amp.newreports.IReportEnvironment;
+import org.dgfoundation.amp.newreports.ReportEnvBuilder;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.annotations.reports.IgnorePersistence;
import org.digijava.module.aim.ar.util.FilterUtil;
-import org.digijava.module.aim.dbentity.AmpApplicationSettings;
-import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
-import org.digijava.module.aim.dbentity.AmpCurrency;
-import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
-import org.digijava.module.aim.dbentity.AmpIndicatorRiskRatings;
-import org.digijava.module.aim.dbentity.AmpOrgGroup;
-import org.digijava.module.aim.dbentity.AmpOrgType;
-import org.digijava.module.aim.dbentity.AmpOrganisation;
-import org.digijava.module.aim.dbentity.AmpReports;
-import org.digijava.module.aim.dbentity.AmpSector;
-import org.digijava.module.aim.dbentity.AmpTeam;
-import org.digijava.module.aim.dbentity.AmpTheme;
-import org.digijava.module.aim.dbentity.ApprovalStatus;
+import org.digijava.module.aim.dbentity.*;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.Constants.GlobalSettings;
import org.digijava.module.aim.helper.FormatHelper;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.helper.TeamMember;
-import org.digijava.module.aim.util.CurrencyUtil;
-import org.digijava.module.aim.util.DbUtil;
-import org.digijava.module.aim.util.DynLocationManagerUtil;
-import org.digijava.module.aim.util.FeaturesUtil;
-import org.digijava.module.aim.util.FiscalCalendarUtil;
+import org.digijava.module.aim.util.*;
import org.digijava.module.aim.util.caching.AmpCaching;
import org.digijava.module.categorymanager.dbentity.AmpCategoryValue;
+import javax.servlet.http.HttpServletRequest;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static java.util.Collections.emptySet;
+import static java.util.stream.Collectors.toSet;
+
/**
* Filtering bean. Holds info about filtering parameters and creates the
@@ -141,21 +112,21 @@ public class AmpARFilter extends PropertyListable {
* list of all legal values of AmpActivity::"approvalStatus". DO NOT CHANGE, make a different set with a subset of these if you need the subset only
*/
public static final Set ACTIVITY_STATUS = ImmutableSet.of(
- ApprovalStatus.APPROVED,
- ApprovalStatus.EDITED,
- ApprovalStatus.STARTED_APPROVED,
- ApprovalStatus.STARTED,
- ApprovalStatus.NOT_APPROVED,
- ApprovalStatus.REJECTED);
+ ApprovalStatus.approved,
+ ApprovalStatus.edited,
+ ApprovalStatus.startedapproved,
+ ApprovalStatus.started,
+ ApprovalStatus.not_approved,
+ ApprovalStatus.rejected);
public static final Set VALIDATED_ACTIVITY_STATUS = ImmutableSet.of(
- ApprovalStatus.APPROVED,
- ApprovalStatus.STARTED_APPROVED);
+ ApprovalStatus.approved,
+ ApprovalStatus.startedapproved);
public static final Set UNVALIDATED_ACTIVITY_STATUS = ImmutableSet.of(
- ApprovalStatus.STARTED,
- ApprovalStatus.EDITED,
- ApprovalStatus.REJECTED);
+ ApprovalStatus.started,
+ ApprovalStatus.edited,
+ ApprovalStatus.rejected);
/**
@@ -906,7 +877,7 @@ public void fillWithDefaultsFilter(Long ampReportId)
this.setApprovalStatusSelected(null);
this.setProjectImplementingUnits(null);
this.setSortByAsc(true);
- this.setHierarchySorters(new ArrayList());
+ this.setHierarchySorters(new ArrayList<>());
this.setIncludeLocationChildren(true);
this.budgetExport = false;
@@ -1113,11 +1084,11 @@ public static DecimalFormat buildCustomFormat(String decimalSeparator, String gr
Integer maximumFractionDigits, Boolean customUseGroupings, Integer groupingSize) {
DecimalFormat usedDecimalFormat = FormatHelper.getDecimalFormat();
- Character defaultDecimalSymbol = usedDecimalFormat.getDecimalFormatSymbols().getDecimalSeparator();
- Integer defaultDecimalPlaces = usedDecimalFormat.getMaximumFractionDigits();
- Character defaultGroupSeparator = usedDecimalFormat.getDecimalFormatSymbols().getGroupingSeparator();
- Boolean defaultUseGrouping = usedDecimalFormat.isGroupingUsed();
- Integer defaultGroupSize = usedDecimalFormat.getGroupingSize();
+ char defaultDecimalSymbol = usedDecimalFormat.getDecimalFormatSymbols().getDecimalSeparator();
+ int defaultDecimalPlaces = usedDecimalFormat.getMaximumFractionDigits();
+ char defaultGroupSeparator = usedDecimalFormat.getDecimalFormatSymbols().getGroupingSeparator();
+ boolean defaultUseGrouping = usedDecimalFormat.isGroupingUsed();
+ int defaultGroupSize = usedDecimalFormat.getGroupingSize();
DecimalFormat custom = new DecimalFormat();
DecimalFormatSymbols ds = new DecimalFormatSymbols();
@@ -1198,11 +1169,10 @@ protected static String generatePledgesSectorFilterSubquery(Set s, St
protected static String generatePledgesProgramFilterSubquery(Collection s, String classificationName){
if (s == null || s.isEmpty())
return null;
- String subquery = "SELECT fpp.pledge_id FROM amp_funding_pledges_program fpp inner join amp_theme p on fpp.amp_program_id=p.amp_theme_id "
+ return "SELECT fpp.pledge_id FROM amp_funding_pledges_program fpp inner join amp_theme p on fpp.amp_program_id=p.amp_theme_id "
+ "inner join AMP_PROGRAM_SETTINGS ps on ps.amp_program_settings_id=getprogramsettingid(fpp.amp_program_id) where ps.name='" + classificationName + "' AND "
+ " fpp.amp_program_id in ("
+ Util.toCSStringForIN(s) + ")";
- return subquery;
}
/**
@@ -1235,8 +1205,7 @@ public void generatePledgeFilterQuery()
String REGION_SELECTED_FILTER = "";
if (locationSelected != null) {
- Set allSelectedLocations = new HashSet();
- allSelectedLocations.addAll(locationSelected);
+ Set allSelectedLocations = new HashSet(locationSelected);
DynLocationManagerUtil.populateWithDescendants(allSelectedLocations, locationSelected, false);
this.pledgesLocations = new ArrayList();
@@ -1246,11 +1215,10 @@ public void generatePledgeFilterQuery()
this.relatedLocations = allSelectedLocations;
String allSelectedLocationString = Util.toCSString(allSelectedLocations);
- String subSelect = "SELECT aal.pledge_id FROM amp_funding_pledges_location aal, amp_location al " +
+
+ REGION_SELECTED_FILTER = "SELECT aal.pledge_id FROM amp_funding_pledges_location aal, amp_location al " +
"WHERE ( aal.location_id=al.location_id AND " +
"al.location_id IN (" + allSelectedLocationString + ") )";
-
- REGION_SELECTED_FILTER = subSelect;
}
if (donnorgAgency != null && donnorgAgency.size() > 0){
@@ -1700,13 +1668,8 @@ public String toString() {
if (i < propertyDescriptors.length)
ret.append("; ");
}
- } catch (IntrospectionException e) {
- logger.error(e.getMessage(), e);
- } catch (IllegalArgumentException e) {
- logger.error(e.getMessage(), e);
- } catch (IllegalAccessException e) {
- logger.error(e.getMessage(), e);
- } catch (InvocationTargetException e) {
+ } catch (IntrospectionException | IllegalArgumentException | IllegalAccessException |
+ InvocationTargetException e) {
logger.error(e.getMessage(), e);
}
return ret.toString();
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpReportGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpReportGenerator.java
index 0f550b894fe..f2160586d86 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpReportGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/AmpReportGenerator.java
@@ -6,33 +6,9 @@
*/
package org.dgfoundation.amp.ar;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpSession;
-
import org.dgfoundation.amp.Util;
import org.dgfoundation.amp.ar.ArConstants.SyntheticColumnsMeta;
-import org.dgfoundation.amp.ar.cell.AmountCell;
-import org.dgfoundation.amp.ar.cell.CategAmountCell;
-import org.dgfoundation.amp.ar.cell.CategCell;
-import org.dgfoundation.amp.ar.cell.Cell;
-import org.dgfoundation.amp.ar.cell.ListCell;
-import org.dgfoundation.amp.ar.cell.MetaTextCell;
-import org.dgfoundation.amp.ar.cell.TextCell;
+import org.dgfoundation.amp.ar.cell.*;
import org.dgfoundation.amp.ar.dimension.ARDimensionable;
import org.dgfoundation.amp.ar.dyn.DynamicColumnsUtil;
import org.dgfoundation.amp.ar.exception.IncompatibleColumnException;
@@ -47,17 +23,19 @@
import org.dgfoundation.amp.exprlogic.Values;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.module.aim.dbentity.AmpColumns;
-import org.digijava.module.aim.dbentity.AmpMeasures;
-import org.digijava.module.aim.dbentity.AmpReportColumn;
-import org.digijava.module.aim.dbentity.AmpReportHierarchy;
-import org.digijava.module.aim.dbentity.AmpReportMeasures;
-import org.digijava.module.aim.dbentity.AmpReports;
+import org.digijava.module.aim.dbentity.*;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.AdvancedReportUtil;
import org.digijava.module.aim.util.FeaturesUtil;
+import javax.servlet.http.HttpSession;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ArConstants.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ArConstants.java
index 4aa761a78c3..e4a77500fd3 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ArConstants.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ArConstants.java
@@ -6,18 +6,11 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-
import org.apache.commons.collections.MapUtils;
import org.digijava.module.aim.helper.Constants;
+import java.util.*;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalCellGenerator.java
index 0c26b23c5ae..37a733c3326 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalCellGenerator.java
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Set;
public class CapitalCellGenerator extends SyntheticCellGenerator {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalExpenditureCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalExpenditureCellGenerator.java
index f6a8508851f..14cd51fefe6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalExpenditureCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalExpenditureCellGenerator.java
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Set;
public class CapitalExpenditureCellGenerator extends SyntheticCellGenerator {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalSplitTotalsCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalSplitTotalsCellGenerator.java
index 7029d557672..9864233f62e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalSplitTotalsCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CapitalSplitTotalsCellGenerator.java
@@ -3,15 +3,14 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.digijava.module.aim.dbentity.AmpColumns;
import org.digijava.module.aim.dbentity.AmpReportHierarchy;
import org.digijava.module.aim.dbentity.AmpReports;
+import java.util.Collection;
+import java.util.Iterator;
+
/**
* @author Alex Gartner
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Categorizable.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Categorizable.java
index 7c556225c13..d31e739fb15 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Categorizable.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Categorizable.java
@@ -6,8 +6,6 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.HashSet;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellColumn.java
index 3d464616b56..23434ef2e43 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellColumn.java
@@ -6,24 +6,18 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ListCell;
-import org.dgfoundation.amp.ar.cell.TextCell;
import org.dgfoundation.amp.ar.exception.IncompatibleCellException;
import org.dgfoundation.amp.ar.helper.ReportHeadingLayoutCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
import org.digijava.module.aim.dbentity.AmpReports;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellFilterCriteria.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellFilterCriteria.java
index f93dbbb7af1..5097f5c12f8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellFilterCriteria.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CellFilterCriteria.java
@@ -1,6 +1,6 @@
package org.dgfoundation.amp.ar;
-import org.dgfoundation.amp.ar.cell.*;
+import org.dgfoundation.amp.ar.cell.Cell;
/**
* interface for specifying a way of filtering cells
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Column.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Column.java
index ac822fcf6b3..d8704e2d330 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Column.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Column.java
@@ -6,20 +6,15 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.helper.ReportHeadingLayoutCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
-import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.dbentity.AmpReports;
+import java.util.*;
+
/**
* Wraps the items that can be displayed in a report column. A Column can hold
* CellS,other ColumnS or some more exotic structures that are yet to be defined
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnFilterGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnFilterGenerator.java
index f3dcc32ece5..95881b90483 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnFilterGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnFilterGenerator.java
@@ -3,29 +3,20 @@
*/
package org.dgfoundation.amp.ar;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.log4j.Logger;
-import org.digijava.kernel.exception.DgException;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.module.aim.dbentity.AmpColumns;
import org.digijava.module.aim.dbentity.AmpColumnsFilters;
import org.digijava.module.aim.dbentity.AmpReportColumn;
import org.digijava.module.aim.util.AdvancedReportUtil;
import org.digijava.module.aim.util.Identifiable;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
/**
* @author mihai
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnReportData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnReportData.java
index b575ca9930a..870be91b24a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnReportData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ColumnReportData.java
@@ -6,21 +6,8 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.Map.Entry;
-
-import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.AmountCell;
+import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.MetaTextCell;
import org.dgfoundation.amp.ar.cell.TextCell;
import org.dgfoundation.amp.ar.dimension.ARDimension;
@@ -30,6 +17,9 @@
import org.digijava.module.aim.helper.KeyValue;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* flat report: X x Y
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CommitmentGapCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CommitmentGapCellGenerator.java
index 5432643c06f..645499cbf67 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/CommitmentGapCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/CommitmentGapCellGenerator.java
@@ -1,9 +1,11 @@
package org.dgfoundation.amp.ar;
-import java.util.*;
-
import org.dgfoundation.amp.ar.cell.CategAmountCell;
-import org.digijava.module.categorymanager.util.CategoryConstants;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
/**
* the generator which will generate Commitment Gap cells
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/FiscalPeriodHelper.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/FiscalPeriodHelper.java
index fe7807b4c93..c3b30740f93 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/FiscalPeriodHelper.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/FiscalPeriodHelper.java
@@ -1,10 +1,6 @@
package org.dgfoundation.amp.ar;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupColumn.java
index 9ba23b7a8ea..7fcac1f6b19 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupColumn.java
@@ -6,32 +6,21 @@
*/
package org.dgfoundation.amp.ar;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.dgfoundation.amp.Util;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.helper.ReportHeadingLayoutCell;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
-import org.digijava.kernel.persistence.WorkerException;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.dbentity.AmpMeasures;
import org.digijava.module.aim.dbentity.AmpReportMeasures;
import org.digijava.module.aim.dbentity.AmpReports;
-import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportData.java
index 29ee25d1dd4..8a99393a4bd 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportData.java
@@ -6,27 +6,19 @@
*/
package org.dgfoundation.amp.ar;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.dgfoundation.amp.ar.cell.*;
+import org.dgfoundation.amp.ar.cell.AmountCell;
+import org.dgfoundation.amp.ar.cell.Cell;
+import org.dgfoundation.amp.ar.cell.ComputedAmountCell;
+import org.dgfoundation.amp.ar.cell.ComputedMeasureCell;
import org.dgfoundation.amp.ar.exception.IncompatibleColumnException;
import org.dgfoundation.amp.ar.exception.UnidentifiedItemException;
import org.dgfoundation.amp.exprlogic.MathExpression;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
import org.dgfoundation.amp.exprlogic.Values;
-import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.helper.KeyValue;
-import org.digijava.module.aim.util.FeaturesUtil;
+
+import java.math.BigDecimal;
+import java.util.*;
/**
* complex report (e.g. non-flat, e.g. non-ColumnReportData)
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportDataCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportDataCacher.java
index 3f898825409..0cbe127f995 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportDataCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/GroupReportDataCacher.java
@@ -1,12 +1,11 @@
package org.dgfoundation.amp.ar;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.collections.map.LRUMap;
import org.digijava.kernel.request.TLSUtils;
-import java.util.Map;
+import javax.servlet.http.HttpSession;
import java.util.Collections;
+import java.util.Map;
/**
* per-HttpSession LRU cache holding GroupReportData instances, which knows how to regenerate them.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfo.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfo.java
index 8bd313a7317..3136ad61b97 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfo.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfo.java
@@ -7,9 +7,6 @@
package org.dgfoundation.amp.ar;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
/**
* Immutableclass describing objects with purpose of wrapping metainformation. a
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfoSet.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfoSet.java
index 7467ddae04f..5c248ce4648 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfoSet.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/MetaInfoSet.java
@@ -1,7 +1,8 @@
package org.dgfoundation.amp.ar;
-import java.util.*;
-import java.util.Map.Entry;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
/**
* holds the metadata of a cell, indexed by category for O(1) lookup
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/PercentageHelperMap.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/PercentageHelperMap.java
index 531fabb7f57..ffbd8b0b7b3 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/PercentageHelperMap.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/PercentageHelperMap.java
@@ -3,13 +3,13 @@
*/
package org.dgfoundation.amp.ar;
+import org.dgfoundation.amp.ar.PercentageHelperMap.PercentageHelperList;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
-import org.dgfoundation.amp.ar.PercentageHelperMap.PercentageHelperList;
-
/**
* @author Alex Gartner
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/PledgesToActivitiesBridge.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/PledgesToActivitiesBridge.java
index 452381e75a1..04684f604dd 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/PledgesToActivitiesBridge.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/PledgesToActivitiesBridge.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.ar;
-import java.util.Collections;
-import java.util.Map;
-import java.util.HashMap;
-
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.digijava.module.aim.dbentity.AmpColumns;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
public class PledgesToActivitiesBridge {
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportContextData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportContextData.java
index f57d8463b34..dace7ec453b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportContextData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportContextData.java
@@ -1,11 +1,5 @@
package org.dgfoundation.amp.ar;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.dgfoundation.amp.ar.dbentity.FilterDataSetInterface;
import org.dgfoundation.amp.error.CurrentReportContextIdException;
import org.digijava.kernel.request.TLSUtils;
@@ -14,6 +8,12 @@
import org.digijava.module.aim.dbentity.AmpReports;
import org.digijava.module.aim.helper.FormatHelper;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* holds all the information (AmpReports instance + extra information) needed to generate and render a report
* extra information == anything which is not not in an AmpReports instance or accessible through 1:1 relationships with one
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportData.java
index 9bbd2be47a3..976ddc1dfdd 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportData.java
@@ -6,24 +6,19 @@
*/
package org.dgfoundation.amp.ar;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
import org.apache.log4j.Logger;
-import org.bouncycastle.util.encoders.Base64Encoder;
import org.dgfoundation.amp.algo.AlgoUtils;
-import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.AmountCell;
+import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.exception.IncompatibleColumnException;
import org.dgfoundation.amp.ar.exception.UnidentifiedItemException;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
import org.digijava.module.aim.dbentity.AmpReports;
import org.digijava.module.aim.helper.KeyValue;
+import java.security.MessageDigest;
+import java.util.*;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportGenerator.java
index 232aadb4848..ecf27d3810e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/ReportGenerator.java
@@ -6,11 +6,6 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
@@ -18,13 +13,16 @@
import org.dgfoundation.amp.ar.filtercacher.FilterCacher;
import org.dgfoundation.amp.ar.filtercacher.NopFilterCacher;
import org.dgfoundation.amp.ar.viewfetcher.ColumnValuesCacher;
-import org.dgfoundation.amp.ar.viewfetcher.InternationalizedPropertyDescription;
import org.dgfoundation.amp.ar.viewfetcher.PropertyDescription;
-import org.digijava.module.aim.dbentity.AmpReportColumn;
import org.digijava.module.aim.dbentity.AmpReports;
import org.digijava.module.aim.util.ActivityUtil;
import org.digijava.module.fundingpledges.dbentity.PledgesEntityHelper;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/SyntheticCellGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/SyntheticCellGenerator.java
index e7de8358a0c..7920ec7680a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/SyntheticCellGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/SyntheticCellGenerator.java
@@ -1,19 +1,14 @@
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.servlet.http.HttpSession;
-
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.digijava.module.aim.dbentity.AmpMeasures;
import org.digijava.module.aim.dbentity.AmpReportMeasures;
import org.digijava.module.aim.dbentity.AmpReports;
+import javax.servlet.http.HttpSession;
+import java.util.ArrayList;
+import java.util.Collection;
+
public abstract class SyntheticCellGenerator {
private final String metaDataName;
private final String measureName;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalAmountColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalAmountColumn.java
index ce527b3b164..7f42ba7c674 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalAmountColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalAmountColumn.java
@@ -3,15 +3,15 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ListCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
public class TotalAmountColumn extends AmountCellColumn {
public boolean filterShowable;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalCommitmentsAmountColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalCommitmentsAmountColumn.java
index a1dbe18f9d2..32797d5bbe1 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalCommitmentsAmountColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalCommitmentsAmountColumn.java
@@ -3,16 +3,16 @@
*/
package org.dgfoundation.amp.ar;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.TotalCommitmentsAmountCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedAmountColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedAmountColumn.java
index 7f925aade01..266abdc583b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedAmountColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedAmountColumn.java
@@ -3,11 +3,6 @@
*/
package org.dgfoundation.amp.ar;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ComputedAmountCell;
@@ -15,6 +10,11 @@
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
import org.dgfoundation.amp.exprlogic.Values;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
* @author Sebastian Dimunzio Apr 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedMeasureColumn.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedMeasureColumn.java
index 788db2fafd2..0e9f2fbc1c8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedMeasureColumn.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/TotalComputedMeasureColumn.java
@@ -3,18 +3,16 @@
*/
package org.dgfoundation.amp.ar;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.dgfoundation.amp.ar.cell.AmountCell;
-import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ComputedMeasureCell;
import org.dgfoundation.amp.ar.workers.ColumnWorker;
import org.dgfoundation.amp.exprlogic.Values;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
* @author Sebastian Dimunzio Apr 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Viewable.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Viewable.java
index de06a378947..27fbd36f643 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/Viewable.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/Viewable.java
@@ -6,15 +6,11 @@
*/
package org.dgfoundation.amp.ar;
+import org.dgfoundation.amp.ar.view.xls.XLSExportType;
+
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.util.Hashtable;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.dgfoundation.amp.ar.view.xls.XLSExportType;
-
/**
* Class describing a viewable behaviour. Viewable objects always have a viewer
* name for each view modes (types). A viewer is responsible for showing the contents of the cell to the end user.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/WorkspaceFilter.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/WorkspaceFilter.java
index 9cfea026dcf..a04aa78ffe6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/WorkspaceFilter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/WorkspaceFilter.java
@@ -1,13 +1,5 @@
package org.dgfoundation.amp.ar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpSession;
-
import com.google.common.base.Joiner;
import org.apache.log4j.Logger;
import org.dgfoundation.amp.Util;
@@ -24,6 +16,9 @@
import org.digijava.module.aim.util.TeamMemberUtil;
import org.digijava.module.aim.util.TeamUtil;
+import javax.servlet.http.HttpSession;
+import java.util.*;
+
import static org.digijava.module.aim.helper.GlobalSettingsConstants.COMPUTED_MANAGEMENT_WORKSPACES;
/**
@@ -217,7 +212,7 @@ public static String getWorkspaceFilterQuery(HttpSession session) {
public static boolean isActivityWithinWorkspace(long ampActivityId) {
String str = getWorkspaceFilterQuery(TLSUtils.getRequest().getSession());
String query = String.format("SELECT (%d IN (%s)) AS rs", ampActivityId, str);
- java.util.List res = PersistenceManager.getSession().createSQLQuery(query).list();
+ java.util.List res = PersistenceManager.getSession().createNativeQuery(query).list();
return (Boolean) res.get(0);
}
@@ -248,11 +243,11 @@ public static String getViewableActivitiesIdByTeams(Collection te
*/
public static Set getComputedRelatedWorkspaces() {
String wsQuery = getWorkspaceFilterQuery(TLSUtils.getRequest().getSession());
- List res = PersistenceManager.getSession().createSQLQuery(wsQuery).list();
+ List res = PersistenceManager.getSession().createNativeQuery(wsQuery).list();
if (res != null && !res.isEmpty()) {
String activitiesQuery = "select amp_team_id from amp_activity_Version where amp_activity_id IN (" +
Joiner.on(',').join(res) + ")";
- List teamIds = PersistenceManager.getSession().createSQLQuery(activitiesQuery).list();
+ List teamIds = PersistenceManager.getSession().createNativeQuery(activitiesQuery).list();
return TeamUtil.getRelatedTeamsForTeamsById(teamIds);
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/AmountCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/AmountCell.java
index ce435a79717..d65afd7a13d 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/AmountCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/AmountCell.java
@@ -6,15 +6,11 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.*;
-
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.MetaInfo;
-import org.dgfoundation.amp.ar.PercentageHelperMap;
-import org.dgfoundation.amp.ar.ReportContextData;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.workers.AmountColWorker;
+import java.util.*;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategAmountCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategAmountCell.java
index e403ff7bdac..f4bf4d76376 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategAmountCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategAmountCell.java
@@ -5,27 +5,14 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.Categorizable;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.ar.CommitmentGapCellGenerator;
-import org.dgfoundation.amp.ar.FundingTypeSortedString;
-import org.dgfoundation.amp.ar.MetaInfo;
-import org.dgfoundation.amp.ar.MetaInfoSet;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.workers.CategAmountColWorker;
-import org.digijava.module.aim.dbentity.AmpColumns;
import org.digijava.module.aim.dbentity.AmpReportHierarchy;
import org.digijava.module.aim.helper.Constants;
import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategCell.java
index 34ff9cbdbd8..efcf2cf4193 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/CategCell.java
@@ -6,10 +6,6 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.Categorizable;
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.MetaInfoSet;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/Cell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/Cell.java
index 8b9098df816..1c2518a02a0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/Cell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/Cell.java
@@ -5,24 +5,16 @@
*/
package org.dgfoundation.amp.ar.cell;
+import org.apache.log4j.Logger;
+import org.dgfoundation.amp.ar.*;
+import org.dgfoundation.amp.ar.workers.ColumnWorker;
+import org.digijava.kernel.translator.TranslatorWorker;
+
import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.AmpReportGenerator;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.ColumnIdentifiable;
-import org.dgfoundation.amp.ar.ReportData;
-import org.dgfoundation.amp.ar.RowIdentifiable;
-import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.workers.ColumnWorker;
-import org.digijava.kernel.translator.TranslatorWorker;
-
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputableListCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputableListCell.java
index c38d9d1b3aa..a01099051bc 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputableListCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputableListCell.java
@@ -6,11 +6,11 @@
*/
package org.dgfoundation.amp.ar.cell;
+import org.dgfoundation.amp.ar.Computable;
+
import java.util.Iterator;
import java.util.List;
-import org.dgfoundation.amp.ar.Computable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedAmountCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedAmountCell.java
index 7d098e57d9d..7c8a82ed61a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedAmountCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedAmountCell.java
@@ -1,15 +1,13 @@
package org.dgfoundation.amp.ar.cell;
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.dgfoundation.amp.ar.ReportContextData;
import org.dgfoundation.amp.ar.workers.ComputedAmountColWorker;
import org.dgfoundation.amp.exprlogic.MathExpression;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
import org.dgfoundation.amp.exprlogic.Values;
-import org.digijava.module.aim.helper.FormatHelper;
+
+import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.Set;
public class ComputedAmountCell extends CategAmountCell {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedMeasureCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedMeasureCell.java
index f28cda409e8..95b9f8f015c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedMeasureCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ComputedMeasureCell.java
@@ -1,16 +1,12 @@
package org.dgfoundation.amp.ar.cell;
-import java.math.BigDecimal;
-import java.util.Iterator;
-
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.ColumnReportData;
import org.dgfoundation.amp.ar.ReportContextData;
-import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.exprlogic.MathExpression;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
import org.dgfoundation.amp.exprlogic.Values;
-import org.digijava.module.aim.helper.FormatHelper;
+
+import java.math.BigDecimal;
+import java.util.Iterator;
public class ComputedMeasureCell extends AmountCell {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/DateCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/DateCell.java
index 89adfe758d4..1c3e3798f6f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/DateCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/DateCell.java
@@ -6,15 +6,13 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.Date;
-
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.workers.DateColWorker;
-import org.digijava.module.aim.helper.EthDateWorker;
-import org.digijava.module.aim.helper.fiscalcalendar.EthiopianBasedWorker;
import org.digijava.module.aim.helper.fiscalcalendar.EthiopianCalendar;
import org.digijava.module.common.util.DateTimeUtil;
+import java.util.Date;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/IMetaCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/IMetaCell.java
index 90e2ff277d9..23e462925e5 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/IMetaCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/IMetaCell.java
@@ -3,8 +3,6 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.MetaInfo;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ListCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ListCell.java
index 8cfe559292c..9d3f7edfb72 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ListCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/ListCell.java
@@ -6,19 +6,13 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.GenericViews;
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.exception.IncompatibleCellException;
+import java.util.*;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewMetaDateCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewMetaDateCell.java
index cb53edcff40..3d47da86ff6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewMetaDateCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewMetaDateCell.java
@@ -3,12 +3,12 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.HashMap;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.workers.NewMetaDateColWorker;
+import java.util.HashMap;
+import java.util.Set;
+
/**
* @author Alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewTextCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewTextCell.java
index bd0c50a98a9..7ff1b79f5c4 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewTextCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/NewTextCell.java
@@ -3,12 +3,12 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.HashMap;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.workers.NewTextColWorker;
+import java.util.HashMap;
+import java.util.Set;
+
/**
* @author Alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TextCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TextCell.java
index 82145194780..419c94af58b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TextCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TextCell.java
@@ -6,8 +6,6 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.regex.Pattern;
-import java.util.*;
import org.dgfoundation.amp.ar.workers.TextColWorker;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.kernel.util.DgUtil;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TotalCommitmentsAmountCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TotalCommitmentsAmountCell.java
index 3126af910e3..05feb6bd3a2 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TotalCommitmentsAmountCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TotalCommitmentsAmountCell.java
@@ -3,13 +3,10 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.dgfoundation.amp.ar.ArConstants;
-import org.digijava.module.aim.logic.AmountCalculator;
import org.digijava.module.aim.logic.Logic;
+import java.util.Set;
+
/**
* @author mihai
*/
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TrnTextCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TrnTextCell.java
index ed837a4baf5..4d35bdfc684 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TrnTextCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/TrnTextCell.java
@@ -1,15 +1,7 @@
package org.dgfoundation.amp.ar.cell;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.workers.TrnTextColWorker;
-import org.digijava.kernel.entity.Locale;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.request.Site;
-import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.kernel.util.RequestUtils;
public class TrnTextCell extends TextCell{
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/XmlHierarchyCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/XmlHierarchyCell.java
index 2a5bdb0c398..04df11a6acc 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/XmlHierarchyCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/cell/XmlHierarchyCell.java
@@ -3,14 +3,13 @@
*/
package org.dgfoundation.amp.ar.cell;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.helper.HierarchycalItem;
-import org.dgfoundation.amp.ar.workers.ColumnWorker;
import org.dgfoundation.amp.ar.workers.XmlHierarchyColWorker;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.hbm.xml b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.hbm.xml
index 134b9b6bf34..965fb6d9b78 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.hbm.xml
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.hbm.xml
@@ -4,9 +4,15 @@
-
- AMP_FILTER_DATA_seq
-
+
+
+
+
+
+ none
+ 1
+ AMP_FILTER_DATA_seq
+
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.java
index 50b218e1539..796291c4f5d 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpFilterData.java
@@ -1,26 +1,20 @@
package org.dgfoundation.amp.ar.dbentity;
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.PropertyListable.PropertyListableIgnore;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.module.aim.annotations.reports.IgnorePersistence;
import org.digijava.module.aim.util.Identifiable;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
import org.hibernate.Session;
-import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import org.hibernate.type.LongType;
+
+import java.beans.PropertyDescriptor;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
public class AmpFilterData implements Serializable {
private static final long serialVersionUID = 1L;
@@ -106,14 +100,12 @@ public Object instantiateFilterObject (Class parentObjectClass) throws Exception
Object ret = session.load(myClass, Long.parseLong(this.value) );
return ret;
}
-
- Iterator iter = AmpFilterData.primitiveTypesList.iterator();
- while ( iter.hasNext() ) {
- String primitiveClassString = iter.next();
- if ( primitiveClassString.toLowerCase().contains(myClass.getName().toLowerCase()) ) {
- Class primitiveClass = Class.forName( primitiveClassString );
- Constructor constructor = primitiveClass.getConstructor( String.class );
- Object ret = constructor.newInstance( this.value );
+
+ for (String primitiveClassString : AmpFilterData.primitiveTypesList) {
+ if (primitiveClassString.toLowerCase().contains(myClass.getName().toLowerCase())) {
+ Class primitiveClass = Class.forName(primitiveClassString);
+ Constructor constructor = primitiveClass.getConstructor(String.class);
+ Object ret = constructor.newInstance(this.value);
return ret;
}
}
@@ -132,13 +124,19 @@ public static Set createFilterDataSet (FilterDataSetInterface fds
HashSet fdSet = new HashSet();
if ( fields != null && fields.length > 0 ) {
- for (int i=0; i skip
+ */
+ /**
+ * We check here if the field is actually a collection of objects, like sectors for example
+ */
+ for (Field field : fields) {
+ Class fieldClass = field.getType();
PropertyDescriptor pd;
Object fieldObj;
try {
- pd = new PropertyDescriptor(fields[i].getName(), srcObj.getClass() );
- fieldObj = pd.getReadMethod().invoke(srcObj, new Object[0]);
+ pd = new PropertyDescriptor(field.getName(), srcObj.getClass());
+ fieldObj = pd.getReadMethod().invoke(srcObj, new Object[0]);
if (fieldObj == null)
continue;
} catch (Exception e) {
@@ -149,47 +147,42 @@ public static Set createFilterDataSet (FilterDataSetInterface fds
/**
* We check here if this field's getter is annotated with PropertyListableIgnore. On true -> skip
*/
- Method readMethod = pd.getReadMethod();
- if ( readMethod.getAnnotation(PropertyListableIgnore.class) != null ||
- readMethod.getAnnotation(IgnorePersistence.class) != null )
+ Method readMethod = pd.getReadMethod();
+ if (readMethod.getAnnotation(PropertyListableIgnore.class) != null ||
+ readMethod.getAnnotation(IgnorePersistence.class) != null)
continue;
- /**
+ /**
* We check here if the field is actually a collection of objects, like sectors for example
*/
- if ( fieldObj instanceof Collection ) {
- Iterator iter = ((Collection)fieldObj).iterator();
- while (iter.hasNext()) {
- Object element = iter.next();
+ if (fieldObj instanceof Collection) {
+ for (Object element : (Collection) fieldObj) {
if (element != null) {
- String elClassName = element.getClass().getName();
- int indexOfDollar = elClassName.indexOf("_$$");
- if ( indexOfDollar < 0)
- indexOfDollar = elClassName.indexOf("$$");
-
- if ( indexOfDollar >= 0 )
- elClassName = elClassName.substring(0, indexOfDollar);
-
- AmpFilterData fd = fds.newAmpFilterData( fds, fields[i].getName(),
- fieldObj.getClass().getName(), elClassName,
- objectValue(element) );
- fdSet.add( fd );
+ String elClassName = element.getClass().getName();
+ int indexOfDollar = elClassName.indexOf("_$$");
+ if (indexOfDollar < 0)
+ indexOfDollar = elClassName.indexOf("$$");
+
+ if (indexOfDollar >= 0)
+ elClassName = elClassName.substring(0, indexOfDollar);
+
+ AmpFilterData fd = fds.newAmpFilterData(fds, field.getName(),
+ fieldObj.getClass().getName(), elClassName,
+ objectValue(element));
+ fdSet.add(fd);
}
}
}
-
- if ( fieldObj instanceof Identifiable) {
- AmpFilterData fd = fds.newAmpFilterData ( fds, fields[i].getName(), fieldObj.getClass().getName(),
- null, objectValue(fieldObj) ) ;
- fdSet.add( fd );
+
+ if (fieldObj instanceof Identifiable) {
+ AmpFilterData fd = fds.newAmpFilterData(fds, field.getName(), fieldObj.getClass().getName(),
+ null, objectValue(fieldObj));
+ fdSet.add(fd);
+ } else if (primitiveTypesList.contains(fieldObj.getClass().getName())) {
+ AmpFilterData fd = fds.newAmpFilterData(fds, field.getName(), fieldObj.getClass().getName(),
+ null, objectValue(fieldObj));
+ fdSet.add(fd);
}
-
- else
- if ( primitiveTypesList.contains(fieldObj.getClass().getName()) ) {
- AmpFilterData fd = fds.newAmpFilterData ( fds, fields[i].getName(), fieldObj.getClass().getName(),
- null, objectValue(fieldObj) ) ;
- fdSet.add( fd );
- }
-
+
}
}
return fdSet;
@@ -213,7 +206,7 @@ public static void deleteOldFilterData ( Long ampReportId ) {
String qryStr = "select a from "
+ AmpFilterData.class.getName() + " a "
+ "where (a.filterRelObj=:report)";
- Query query = PersistenceManager.getSession().createQuery(qryStr).setLong("report", ampReportId);
+ Query query = PersistenceManager.getSession().createQuery(qryStr).setParameter("report", ampReportId, LongType.INSTANCE);
List results = query.list();
boolean cleared = false;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.hbm.xml b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.hbm.xml
index c140ecf8ea1..12f958e48aa 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.hbm.xml
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.hbm.xml
@@ -4,8 +4,8 @@
-
- AMP_TEAM_FILTER_DATA_seq
+
+ AMP_TEAM_FILTER_DATA_seq
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.java
index ca0a0229f67..95b0b46427d 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dbentity/AmpTeamFilterData.java
@@ -1,14 +1,13 @@
package org.dgfoundation.amp.ar.dbentity;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.digijava.kernel.persistence.PersistenceManager;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+
+import java.util.Iterator;
+import java.util.List;
public class AmpTeamFilterData extends AmpFilterData {
private static final long serialVersionUID = 1L;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/ARDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/ARDimension.java
index e69039a1970..983caa6e86a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/ARDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/ARDimension.java
@@ -4,15 +4,6 @@
*/
package org.dgfoundation.amp.ar.dimension;
-import java.lang.reflect.Constructor;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.ARUtil;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.CellColumn;
@@ -21,6 +12,11 @@
import org.digijava.module.aim.util.AdvancedReportUtil;
import org.hibernate.HibernateException;
+import java.lang.reflect.Constructor;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.Map.Entry;
+
public abstract class ARDimension {
public static final Map COLUMN_DB_TYPE=new Hashtable();
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorDimension.java
index cf40fd453d8..143edfff426 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorDimension.java
@@ -4,18 +4,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.module.aim.dbentity.AmpOrgGroup;
import org.digijava.module.aim.dbentity.AmpOrgType;
import org.digijava.module.aim.dbentity.AmpOrganisation;
import org.hibernate.HibernateException;
-import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.query.Query;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
/**
* DonorDimension.java
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorGroupDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorGroupDimension.java
index b62783b4866..ef87f6afd0c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorGroupDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorGroupDimension.java
@@ -3,19 +3,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpOrgType;
+import org.digijava.module.aim.dbentity.AmpOrganisation;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpOrgType;
-import org.digijava.module.aim.dbentity.AmpOrganisation;
-
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorTypeDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorTypeDimension.java
index b08115e1cd5..bbc9d716aa6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorTypeDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/DonorTypeDimension.java
@@ -3,19 +3,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpOrgType;
+import org.digijava.module.aim.dbentity.AmpOrganisation;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpOrgType;
-import org.digijava.module.aim.dbentity.AmpOrganisation;
-
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/LocationsDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/LocationsDimension.java
index 81dbfc1fdae..59d708e8011 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/LocationsDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/LocationsDimension.java
@@ -3,18 +3,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
/**
* @author Alex Gartner
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/NPODimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/NPODimension.java
index 08fe1b2c7af..52e03dfc1c8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/NPODimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/NPODimension.java
@@ -3,18 +3,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpTheme;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpTheme;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
/**
* @author Alex Gartner
*/
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/SectorDimension.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/SectorDimension.java
index dbf9d2bf47c..6c136909d75 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/SectorDimension.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dimension/SectorDimension.java
@@ -3,19 +3,18 @@
*/
package org.dgfoundation.amp.ar.dimension;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.digijava.module.aim.dbentity.AmpSector;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
-
-import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpSector;
-
/**
* SectorDimension.java TODO description here
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/ColumnSavingEngine.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/ColumnSavingEngine.java
index c4be58c5f48..e90c1ac790e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/ColumnSavingEngine.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/ColumnSavingEngine.java
@@ -3,9 +3,6 @@
*/
package org.dgfoundation.amp.ar.dyn;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.visibility.AmpTreeVisibility;
import org.digijava.kernel.exception.DgException;
@@ -17,6 +14,9 @@
import org.digijava.module.aim.util.FeaturesUtil;
import org.hibernate.Session;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
/**
* @author Alex Gartner
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/DynamicColumnsUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/DynamicColumnsUtil.java
index f178a3c1faa..7303f88cdb1 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/DynamicColumnsUtil.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/dyn/DynamicColumnsUtil.java
@@ -3,19 +3,6 @@
*/
package org.dgfoundation.amp.ar.dyn;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
import org.digijava.kernel.persistence.PersistenceManager;
@@ -23,9 +10,11 @@
import org.digijava.module.aim.dbentity.AmpFundingMTEFProjection;
import org.digijava.module.aim.dbentity.AmpMeasures;
import org.digijava.module.aim.util.AdvancedReportUtil;
-import org.hibernate.Query;
import org.hibernate.Session;
+import javax.servlet.ServletContext;
+import java.util.*;
+
/**
* @author Alex Gartner
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FastFilterCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FastFilterCacher.java
index 66a7e5ae5af..6fdd5e828c9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FastFilterCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FastFilterCacher.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.ar.filtercacher;
+import org.apache.log4j.Logger;
+import org.dgfoundation.amp.ar.AmpARFilter;
+
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.AmpARFilter;
-
/**
*
* Chuck Norris doesn't need technical documentation.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FilterCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FilterCacher.java
index 5caf4908bb2..72c341c31ff 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FilterCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/FilterCacher.java
@@ -1,11 +1,10 @@
package org.dgfoundation.amp.ar.filtercacher;
-import java.sql.Connection;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.AmpARFilter;
import org.digijava.kernel.persistence.PersistenceManager;
+import java.sql.Connection;
+
/**
* class which caches AmpARFilter generatedFilterQuery results
* all the queries
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/NopFilterCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/NopFilterCacher.java
index b860aa5b5aa..17d79974181 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/NopFilterCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/filtercacher/NopFilterCacher.java
@@ -1,7 +1,5 @@
package org.dgfoundation.amp.ar.filtercacher;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.AmpARFilter;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellColumnPDF.java
index ca867bf8809..fd3cae4c9a6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellColumnPDF.java
@@ -6,11 +6,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellPDF.java
index 2607067d9cd..9254009854e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/AmountCellPDF.java
@@ -6,17 +6,17 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CategAmountCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CategAmountCellPDF.java
index 1200cd3cbfb..4c03554504d 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CategAmountCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CategAmountCellPDF.java
@@ -6,11 +6,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
@@ -28,7 +27,7 @@ public CategAmountCellPDF(Exporter parent, Viewable item) {
* @param table
* @param item
*/
- public CategAmountCellPDF(PdfPTable table, Viewable item,Long ownerId) {
+ public CategAmountCellPDF(PdfPTable table, Viewable item, Long ownerId) {
super(table, item,ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CellColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CellColumnPDF.java
index 16175c513b4..53ec3442cf0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CellColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/CellColumnPDF.java
@@ -6,17 +6,17 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.CellColumn;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.Cell;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
@@ -48,8 +48,13 @@ public void generate() {
{
c.invokeExporter(this);
}
- else
+ else
+ {
+ Font myfont = new Font(Font.FontFamily.valueOf("Verdana"), Font.ITALIC, 13);
+
table.addCell(new PdfPCell(new Paragraph(" ",new Font(ExportActivityToPDF.basefont, 10, Font.NORMAL))));
+
+ }
}
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java
index ae3611f0605..dc64ee32520 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ColumnReportDataPDF.java
@@ -6,27 +6,19 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.commons.lang.StringUtils;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.ColumnReportData;
-import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.ReportData;
-import org.dgfoundation.amp.ar.Viewable;
-import org.digijava.kernel.persistence.WorkerException;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import org.dgfoundation.amp.ar.*;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import org.digijava.module.aim.action.PDFExportAction;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.ArrayList;
+import java.util.List;
/**
*
@@ -108,7 +100,7 @@ public void generate() {
translatedName += columnReport.getName().substring(columnReport.getName().indexOf(":"));
}
- PdfPCell pdfc;
+ PdfPCell pdfc;
if("".equals(translatedName))
pdfc= new PdfPCell(new Paragraph(ExportActivityToPDF.postprocessText(columnReport.getName()),titleFont));
else
@@ -120,7 +112,7 @@ public void generate() {
// headings
Font font = new Font(ExportActivityToPDF.basefont, 9, Font.BOLD);
- font.setColor(new Color(255,255,255));
+ font.setColor(new BaseColor(255,255,255));
if(! columnReport.getGlobalHeadingsDisplayed()) {
getExportState().headingCells = new ArrayList();
columnReport.setGlobalHeadingsDisplayed(true);
@@ -156,7 +148,7 @@ public void generate() {
pdfc.setColspan(colsp);
pdfc.setRowspan(rowsp);
- pdfc.setBackgroundColor(new Color(51,102,153));
+ pdfc.setBackgroundColor(new BaseColor(51,102,153));
//table.addCell(pdfc);
getExportState().headingCells.add(pdfc);
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedAmountCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedAmountCellPDF.java
index 81f75cc176e..f4cd26ca781 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedAmountCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedAmountCellPDF.java
@@ -1,18 +1,8 @@
package org.dgfoundation.amp.ar.view.pdf;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.dgfoundation.amp.ar.ArConstants;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.workers.ComputedAmountColWorker;
-import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
-import org.dgfoundation.amp.exprlogic.TokenRepository;
-
-import com.lowagie.text.pdf.PdfPTable;
public class ComputedAmountCellPDF extends CategAmountCellPDF {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedDateCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedDateCellPDF.java
index 34644d24e72..fa90feb634a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedDateCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedDateCellPDF.java
@@ -1,19 +1,8 @@
package org.dgfoundation.amp.ar.view.pdf;
-import java.io.IOException;
-import java.io.StringReader;
-
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.cell.TextCell;
-import org.dgfoundation.amp.ar.workers.ComputedDateColWorker;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.module.aim.helper.Constants;
-import org.digijava.module.aim.util.Html2TextCallback;
-
-import com.lowagie.text.pdf.PdfPTable;
public class ComputedDateCellPDF extends TextCellPDF {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedMeasureCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedMeasureCellPDF.java
index e68bc2aa7e9..f156694db3b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedMeasureCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ComputedMeasureCellPDF.java
@@ -1,11 +1,10 @@
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Diego Dimunzio Ago 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/DateCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/DateCellPDF.java
index 6905231a480..2356880b2f0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/DateCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/DateCellPDF.java
@@ -6,16 +6,16 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.DateCell;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupColumnPDF.java
index 06077e0d948..d0816188346 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupColumnPDF.java
@@ -6,14 +6,13 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.util.Iterator;
-
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Column;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.GroupColumn;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.Iterator;
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java
index 73945fbd1e4..e6ba08bb02c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/GroupReportDataPDF.java
@@ -6,19 +6,17 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
-import java.util.Iterator;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.GroupReportData;
import org.dgfoundation.amp.ar.Viewable;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
@@ -33,8 +31,8 @@ public class GroupReportDataPDF extends PDFExporter
*/
public ReportPdfExportState state;
- private static Color alternateColorA = new Color(185,219,243);
- private static Color alternateColorB = new Color(0,156,205);
+ private static BaseColor alternateColorA = new BaseColor(185,219,243);
+ private static BaseColor alternateColorB = new BaseColor(0,156,205);
/**
* @param parent
@@ -74,11 +72,10 @@ public void generate() {
}
table.addCell(pdfc);
}
- Iterator i=grd.getItems().iterator();
- while (i.hasNext()) {
- Viewable element = (Viewable) i.next();
+ for (org.dgfoundation.amp.ar.ReportData reportData : grd.getItems()) {
+ Viewable element = (Viewable) reportData;
element.invokeExporter(this);
-
+
}
//add trail cells
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ListCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ListCellPDF.java
index c09f7d7c485..18b178963ed 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ListCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ListCellPDF.java
@@ -6,20 +6,18 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ListCell;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.Iterator;
/**
*
@@ -37,7 +35,7 @@ public ListCellPDF(Exporter parent,Viewable item) {
* @param table
* @param item
*/
- public ListCellPDF(PdfPTable table, Viewable item,Long ownerId) {
+ public ListCellPDF(PdfPTable table, Viewable item, Long ownerId) {
super(table, item,ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MetaTextCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MetaTextCellPDF.java
index 6b6d8e42c36..85bc25e302c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MetaTextCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MetaTextCellPDF.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MyPdfPCell.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MyPdfPCell.java
index 699c0c87263..80a1da1936f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MyPdfPCell.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/MyPdfPCell.java
@@ -1,9 +1,10 @@
package org.dgfoundation.amp.ar.view.pdf;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-public class MyPdfPCell extends PdfPCell
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+
+public class MyPdfPCell extends PdfPCell
{
public MyPdfPCell(Paragraph para)
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/PDFExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/PDFExporter.java
index 0bed36ac403..dcca2a8b02e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/PDFExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/PDFExporter.java
@@ -6,15 +6,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
-import java.util.ArrayList;
-
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java
index a77991056e2..0f3e6d0465e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/ReportPdfExportState.java
@@ -1,9 +1,10 @@
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
-import java.util.ArrayList;
-import com.lowagie.text.pdf.PdfPCell;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.pdf.PdfPCell;
+
+import java.util.ArrayList;
/**
* utility class for holding the global state of an export
@@ -16,10 +17,10 @@ public class ReportPdfExportState
* this static array will hold the heading cells that need to be displayed on the start of each page.
* it will get initialized only once and then used by onStartPage
*/
- public ArrayList headingCells;
+ public ArrayList headingCells;
public float[] widths;
- public Color currentBackColor;
- public Color lastedUsedColor;
+ public BaseColor currentBackColor;
+ public BaseColor lastedUsedColor;
public ReportPdfExportState(float[] widths)
{
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TextCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TextCellPDF.java
index 58cfe7aa67e..55e56d92f42 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TextCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TextCellPDF.java
@@ -6,21 +6,16 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.TextCell;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
@@ -37,7 +32,7 @@ public TextCellPDF(Exporter parent,Viewable item) {
* @param table
* @param item
*/
- public TextCellPDF(PdfPTable table, Viewable item,Long ownerId) {
+ public TextCellPDF(PdfPTable table, Viewable item, Long ownerId) {
super(table, item,ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalAmountColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalAmountColumnPDF.java
index cf6a176aa14..cfa971e9279 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalAmountColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalAmountColumnPDF.java
@@ -6,11 +6,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountCellPDF.java
index f5fc436ac1e..bb7101c4225 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountCellPDF.java
@@ -5,11 +5,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
* @author mihai
* @since 31.10.2006
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountColumnPDF.java
index f1e7c3e0175..f101238e7ab 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalCommitmentsAmountColumnPDF.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
* @author mihai
*
@@ -29,7 +28,7 @@ public TotalCommitmentsAmountColumnPDF(Exporter parent, Viewable item) {
* @param ownerId
*/
public TotalCommitmentsAmountColumnPDF(PdfPTable table, Viewable item,
- Long ownerId) {
+ Long ownerId) {
super(table, item, ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedAmountColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedAmountColumnPDF.java
index 894247631f9..2865943cd97 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedAmountColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedAmountColumnPDF.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Sebastian Dimunzio Apr 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedMeasureColumnPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedMeasureColumnPDF.java
index 3f43e2138d2..19dbc4948e9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedMeasureColumnPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TotalComputedMeasureColumnPDF.java
@@ -3,11 +3,10 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
*
* @author Diego Dimunzio Ago 15, 2009
@@ -20,7 +19,7 @@ public TotalComputedMeasureColumnPDF(Exporter parent, Viewable item) {
}
public TotalComputedMeasureColumnPDF(PdfPTable table, Viewable item,
- Long ownerId) {
+ Long ownerId) {
super(table, item, ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrailCellsPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrailCellsPDF.java
index 257ed591731..3e91c5f06fc 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrailCellsPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrailCellsPDF.java
@@ -6,26 +6,22 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
-import java.awt.Color;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.ColumnReportData;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.GroupReportData;
import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.Cell;
-import org.digijava.kernel.persistence.WorkerException;
import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.module.aim.dbentity.AmpReports;
import org.digijava.module.aim.action.ExportActivityToPDF;
+import org.digijava.module.aim.dbentity.AmpReports;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.List;
/**
*
@@ -135,7 +131,7 @@ public void generate() {
PdfPCell pdfc2 = new PdfPCell(new Paragraph(ExportActivityToPDF.postprocessText(result+" ("+grd.getTotalUniqueRows()+")"),totalFont));
pdfc2.setColspan(grd.getTotalDepth());
table.addCell(pdfc2);
- getExportState().currentBackColor = new Color(235,235,235);
+ getExportState().currentBackColor = new BaseColor(235,235,235);
pdfc2.setBackgroundColor(getExportState().currentBackColor);
}else{
pdfc = new PdfPCell(new Paragraph(ExportActivityToPDF.postprocessText(result+" ("+grd.getTotalUniqueRows()+")"),totalFont));
@@ -147,7 +143,7 @@ public void generate() {
// pdfc.setColspan(span);
// }
// }
- getExportState().currentBackColor = new Color(235,235,235);
+ getExportState().currentBackColor = new BaseColor(235,235,235);
pdfc.setBackgroundColor(getExportState().currentBackColor);
table.addCell(pdfc);
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrnTextCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrnTextCellPDF.java
index a888f18415f..f27ff2f680b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrnTextCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/TrnTextCellPDF.java
@@ -1,10 +1,9 @@
package org.dgfoundation.amp.ar.view.pdf;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import com.lowagie.text.pdf.PdfPTable;
-
public class TrnTextCellPDF extends TextCellPDF {
public TrnTextCellPDF(Exporter parent, Viewable item) {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/XmlHierarchyCellPDF.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/XmlHierarchyCellPDF.java
index 9bc65238ea2..923fe903f1c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/XmlHierarchyCellPDF.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/pdf/XmlHierarchyCellPDF.java
@@ -3,21 +3,16 @@
*/
package org.dgfoundation.amp.ar.view.pdf;
+
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.cell.TextCell;
import org.dgfoundation.amp.ar.cell.XmlHierarchyCell;
import org.dgfoundation.amp.ar.helper.HierarchycalItem;
import org.digijava.module.aim.action.ExportActivityToPDF;
-import com.lowagie.text.Chunk;
-import com.lowagie.text.Font;
-import com.lowagie.text.List;
-import com.lowagie.text.ListItem;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-
/**
* @author Alex
*
@@ -31,7 +26,7 @@ public XmlHierarchyCellPDF(Exporter parent,Viewable item) {
* @param table
* @param item
*/
- public XmlHierarchyCellPDF(PdfPTable table, Viewable item,Long ownerId) {
+ public XmlHierarchyCellPDF(PdfPTable table, Viewable item, Long ownerId) {
super(table, item,ownerId);
// TODO Auto-generated constructor stub
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/AmountCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/AmountCellXLS.java
index ec19a85eb73..dc81e159d31 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/AmountCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/AmountCellXLS.java
@@ -6,20 +6,10 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.dgfoundation.amp.ar.AmpARFilter;
+import org.apache.poi.hssf.usermodel.*;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.AmountCell;
-import org.digijava.module.aim.helper.FormatHelper;
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ColumnReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ColumnReportDataXLS.java
index 5216f395b6a..1d494b6255b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ColumnReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ColumnReportDataXLS.java
@@ -6,17 +6,12 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.dgfoundation.amp.ar.ColumnReportData;
import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedAmountCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedAmountCellXLS.java
index 8c38a8e354e..2c8fca2611b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedAmountCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedAmountCellXLS.java
@@ -1,19 +1,10 @@
package org.dgfoundation.amp.ar.view.xls;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Set;
-
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.workers.ComputedAmountColWorker;
-import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
-import org.dgfoundation.amp.exprlogic.TokenRepository;
public class ComputedAmountCellXLS extends CategAmountCellXLS {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedDateCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedDateCellXLS.java
index 2c1cab63b8c..a0ff15f0cb4 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedDateCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ComputedDateCellXLS.java
@@ -1,8 +1,5 @@
package org.dgfoundation.amp.ar.view.xls;
-import java.io.IOException;
-import java.io.StringReader;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -11,12 +8,13 @@
import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.TextCell;
-import org.dgfoundation.amp.ar.workers.ComputedDateColWorker;
-import org.digijava.kernel.persistence.WorkerException;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.util.Html2TextCallback;
+import java.io.IOException;
+import java.io.StringReader;
+
public class ComputedDateCellXLS extends TextCellXLS {
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupColumnXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupColumnXLS.java
index f814f325461..701ca152ec5 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupColumnXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupColumnXLS.java
@@ -6,8 +6,6 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.Iterator;
-
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -16,6 +14,8 @@
import org.dgfoundation.amp.ar.GroupColumn;
import org.dgfoundation.amp.ar.Viewable;
+import java.util.Iterator;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupReportDataXLS.java
index f116a5564d4..f70f22912d5 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/GroupReportDataXLS.java
@@ -6,43 +6,24 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.io.IOUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
-import org.dgfoundation.amp.ar.AmpARFilter;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.GroupReportData;
-import org.dgfoundation.amp.ar.ReportContextData;
-import org.dgfoundation.amp.ar.Viewable;
-import org.digijava.kernel.entity.Locale;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.request.Site;
+import org.dgfoundation.amp.ar.*;
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.kernel.util.RequestUtils;
-import org.digijava.module.aim.dbentity.AmpReports;
import org.digijava.module.aim.form.AdvancedReportForm;
-import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.util.FeaturesUtil;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.TreeMap;
+
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ListCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ListCellXLS.java
index 25d62690cda..a56dddf92a0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ListCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ListCellXLS.java
@@ -6,10 +6,6 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -19,6 +15,8 @@
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ListCell;
+import java.util.Iterator;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainColumnReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainColumnReportDataXLS.java
index 5b9e1616faf..fbfd8fbb344 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainColumnReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainColumnReportDataXLS.java
@@ -3,20 +3,15 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.dgfoundation.amp.ar.ColumnReportData;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author mmoras
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainGroupReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainGroupReportDataXLS.java
index e30bc9da84c..5ef1eded15b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainGroupReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainGroupReportDataXLS.java
@@ -3,8 +3,6 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -13,6 +11,8 @@
import org.dgfoundation.amp.ar.Viewable;
import org.digijava.module.aim.form.AdvancedReportForm;
+import javax.servlet.http.HttpServletRequest;
+
/**
* @author mmoras
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainReportHeadingsXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainReportHeadingsXLS.java
index bc03f238ccf..01b2cc2bfd7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainReportHeadingsXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainReportHeadingsXLS.java
@@ -5,18 +5,13 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.Iterator;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.dgfoundation.amp.ar.Column;
import org.dgfoundation.amp.ar.ColumnReportData;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.dbentity.AmpReportHierarchy;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainTrailCellsXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainTrailCellsXLS.java
index 97cc269a7eb..a31197f0fa7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainTrailCellsXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/PlainTrailCellsXLS.java
@@ -3,23 +3,19 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.dgfoundation.amp.ar.ColumnReportData;
-import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.GroupReportData;
-import org.dgfoundation.amp.ar.ReportData;
-import org.dgfoundation.amp.ar.Viewable;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.cell.Cell;
import org.digijava.module.aim.dbentity.AmpReportHierarchy;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
/**
* @author mmoras
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ReportHeadingsXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ReportHeadingsXLS.java
index 0af13c83a10..da3dffadd0c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ReportHeadingsXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/ReportHeadingsXLS.java
@@ -5,24 +5,14 @@
*/
package org.dgfoundation.amp.ar.view.xls;
+import org.apache.poi.hssf.usermodel.*;
+import org.dgfoundation.amp.ar.*;
+import org.digijava.kernel.translator.TranslatorWorker;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.ColumnReportData;
-import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.Viewable;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.translator.TranslatorWorker;
-
/**
* @author mihai
* @since 22.06.2007
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichColumnReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichColumnReportDataXLS.java
index c390b812f8e..9f8452bc0e4 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichColumnReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichColumnReportDataXLS.java
@@ -3,23 +3,10 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.CellStyle;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.ColumnReportData;
-import org.dgfoundation.amp.ar.Exporter;
-import org.dgfoundation.amp.ar.ReportData;
-import org.dgfoundation.amp.ar.Viewable;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.cell.AmountCell;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichGroupReportDataXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichGroupReportDataXLS.java
index 719296ca7ee..27ec74cf076 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichGroupReportDataXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/RichGroupReportDataXLS.java
@@ -3,26 +3,7 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.CellStyle;
import org.dgfoundation.amp.ar.Exporter;
@@ -30,10 +11,9 @@
import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.AmountCell;
-import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.kernel.util.RequestUtils;
-import org.digijava.module.aim.form.AdvancedReportForm;
-import org.digijava.module.aim.util.FeaturesUtil;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TextCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TextCellXLS.java
index dfbef7b6207..bbd1768bcce 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TextCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TextCellXLS.java
@@ -6,12 +6,6 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -23,6 +17,12 @@
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.util.Html2TextCallback;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TrailCellsXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TrailCellsXLS.java
index 3394ed75a02..cf7499af260 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TrailCellsXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/TrailCellsXLS.java
@@ -6,24 +6,16 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.math.BigDecimal;
-import java.util.Iterator;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.ReportData;
import org.dgfoundation.amp.ar.Viewable;
-import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
-import org.digijava.kernel.persistence.WorkerException;
-import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.helper.Constants;
+import java.util.Iterator;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XLSExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XLSExporter.java
index 2e427918da5..8552337b783 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XLSExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XLSExporter.java
@@ -8,15 +8,9 @@
import org.apache.log4j.Logger;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormat;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFRegionUtil;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.hssf.util.HSSFRegionUtil;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.util.CellRangeAddress;
import org.dgfoundation.amp.ar.Exporter;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XmlHierarchyCellXLS.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XmlHierarchyCellXLS.java
index 91a252d0a17..ff8d65658d2 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XmlHierarchyCellXLS.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/view/xls/XmlHierarchyCellXLS.java
@@ -3,26 +3,20 @@
*/
package org.dgfoundation.amp.ar.view.xls;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
import org.dgfoundation.amp.ar.Exporter;
import org.dgfoundation.amp.ar.Viewable;
import org.dgfoundation.amp.ar.cell.XmlHierarchyCell;
import org.dgfoundation.amp.ar.helper.HierarchycalItem;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
/**
* @author Alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/AmpPostgresDialect.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/AmpPostgresDialect.java
index bb4d7f0e334..8664c8b5d94 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/AmpPostgresDialect.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/AmpPostgresDialect.java
@@ -1,9 +1,10 @@
package org.dgfoundation.amp.ar.viewfetcher;
import org.hibernate.dialect.function.VarArgsSQLFunction;
+import org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect;
import org.hibernate.type.StringType;
-public class AmpPostgresDialect extends org.hibernate.spatial.dialect.postgis.PostgisDialect {
+public class AmpPostgresDialect extends PostgisPG95Dialect {
private static final long serialVersionUID = 1L;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValueTranslator.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValueTranslator.java
index 31febd14016..5b8fd6f3342 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValueTranslator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValueTranslator.java
@@ -1,12 +1,11 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.kernel.util.SiteUtils;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* a column-in-a-view translator which does a translateText() call on the input for its outputs
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValuesCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValuesCacher.java
index d4f813eeb9a..80081082af0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValuesCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ColumnValuesCacher.java
@@ -1,8 +1,7 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
/**
* a class which holds the cached i18n values for a (model, field)
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DatabaseViewFetcher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DatabaseViewFetcher.java
index 1186b157e36..4f064556d18 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DatabaseViewFetcher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DatabaseViewFetcher.java
@@ -1,24 +1,16 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.function.Consumer;
-
-import org.dgfoundation.amp.Util;
+import org.apache.log4j.Logger;
import org.dgfoundation.amp.algo.ExceptionConsumer;
import org.dgfoundation.amp.ar.FilterParam;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.kernel.request.TLSUtils;
-import org.apache.log4j.Logger;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.function.Consumer;
/**
* a {@link ViewFetcher} for fetching data from a real database, either with or without postprocessing
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DelegResultSet.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DelegResultSet.java
index d3767dee1b2..0e60caa7bb1 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DelegResultSet.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DelegResultSet.java
@@ -1,27 +1,11 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.ResultSet;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
import java.io.InputStream;
-import java.sql.SQLWarning;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
import java.io.Reader;
-import java.sql.Statement;
-import java.util.Map;
-import java.sql.Connection;
-import java.sql.Ref;
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Array;
+import java.math.BigDecimal;
+import java.sql.*;
import java.util.Calendar;
-
-import java.sql.NClob;
-import java.sql.RowId;
-import java.sql.SQLXML;
+import java.util.Map;
/**
* A base delegating implementation of {@link ResultSet}.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DgEditorPropertyDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DgEditorPropertyDescription.java
index cf89d872a5e..81727a0fba8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DgEditorPropertyDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/DgEditorPropertyDescription.java
@@ -1,6 +1,5 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.lang.reflect.Field;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/GeneratedPropertyDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/GeneratedPropertyDescription.java
index 9faa83ed187..42774b3e580 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/GeneratedPropertyDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/GeneratedPropertyDescription.java
@@ -1,11 +1,10 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.kernel.translator.TranslatorWorker;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.Map;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nDatabaseViewFetcher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nDatabaseViewFetcher.java
index 71a8ecd7c0e..97b673df80a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nDatabaseViewFetcher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nDatabaseViewFetcher.java
@@ -1,14 +1,13 @@
package org.dgfoundation.amp.ar.viewfetcher;
+import com.google.common.base.Function;
+import org.dgfoundation.amp.ar.FilterParam;
+
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
-import org.dgfoundation.amp.ar.FilterParam;
-
-import com.google.common.base.Function;
-
/**
* fetches a view which contains internationalized String columns; feeds to the consumer the query result (plus translated values)
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nViewDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nViewDescription.java
index 6e7e00b783d..17b52a8b205 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nViewDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/I18nViewDescription.java
@@ -1,9 +1,12 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.util.*;
-
import org.dgfoundation.amp.Util;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
/**
* description of an i18n view: contains a description of all the columns which should be overridden by the translation
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java
index 62086863fb2..5966e9f3751 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedModelDescription.java
@@ -1,79 +1,94 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.lang.reflect.Field;
-import java.sql.SQLException;
-import java.util.*;
-
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.module.aim.annotations.translation.TranslatableClass;
import org.digijava.module.aim.annotations.translation.TranslatableField;
-import org.digijava.module.aim.dbentity.AmpIndicator;
import org.digijava.module.translation.util.ContentTranslationUtil;
-import org.hibernate.mapping.Column;
-import org.hibernate.mapping.PersistentClass;
+import org.hibernate.Session;
+import org.hibernate.metamodel.internal.MetamodelImpl;
+import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import java.lang.reflect.Field;
+import java.util.*;
/**
* class holding the description of the i18n fields from a Hibernate model (identified by class name)
- * the constructor scans the Hibernate configuration and reflects on the class name
- * @author Dolghier Constantin
+ * the constructor scans the Hibernate configuration and reflects on the class name
*
+ * @author Dolghier Constantin
*/
public class InternationalizedModelDescription {
-
+ private static final Logger logger = LoggerFactory.getLogger(InternationalizedModelDescription.class);
+
public final String className;
-
+
public final HashMap properties = new HashMap();
-
- private InternationalizedModelDescription(Class modelClass)
- {
+
+ private InternationalizedModelDescription(Class modelClass) {
this.className = modelClass.getName();
scanClass(modelClass);
}
-// public static java.sql.Connection connection = initConnection();
-//
-// private static java.sql.Connection initConnection()
-// {
-// try
-// {
-// return PersistenceManager.getJdbcConnection();
-// }
-// catch(Exception e)
-// {
-// throw new RuntimeException("Could not get RAW JDBC Connection", e);
-// }
-// }
-
- protected void scanClass(Class modelClass)
- {
+
+ public static AbstractEntityPersister getPersister(final Class modelClazz, Session session) {
+ EntityManager entityManager = session.getEntityManagerFactory().createEntityManager();
+ final MetamodelImpl metamodel = (MetamodelImpl) entityManager.getMetamodel();
+ return (AbstractEntityPersister) metamodel.entityPersister(modelClazz);
+ }
+
+ public static boolean isEntity(final Class modelClazz) {
+ try {
+ getPersister(modelClazz, PersistenceManager.getRequestDBSession());
+ return true;
+ } catch (Exception e) {
+ logger.error("Seems this is not an entity: " + modelClazz);
+ return false;
+ }
+ }
+
+ public String getColumnNameByPropertyName(String propertyName, Class modelClazz) {
+ int propertyIndex = getPersister(modelClazz, PersistenceManager.getRequestDBSession()).getEntityMetamodel().getPropertyIndex(propertyName);
+ if (propertyIndex != -1) {
+ String[] columnNames = getPersister(modelClazz, PersistenceManager.getRequestDBSession()).getPropertyColumnNames(propertyIndex);
+ // In a single table inheritance strategy, typically there will be only one column name per property
+ if (columnNames.length > 0) {
+ return columnNames[0];
+ } else {
+ throw new IllegalArgumentException("Property does not have a column mapping: " + propertyName);
+ }
+ } else {
+ throw new IllegalArgumentException("Property name not found: " + propertyName);
+ }
+ }
+
+ protected void scanClass(Class modelClass) {
//System.out.println("IMD: scanning class " + modelClass);
-
+
if (modelClass.getAnnotation(TranslatableClass.class) == null)
throw new RuntimeException("asked to scan class " + modelClass + ", which is translatable");
-
- PersistentClass classMapping = PersistenceManager.getClassMapping(modelClass);
- Column keyColumn = (Column) (classMapping.getIdentifierProperty().getColumnIterator().next());
- String keyColumnName = keyColumn.getName();
- String modelTableName = classMapping.getTable().getName();
+
+ String keyColumnName = Arrays.stream(getPersister(modelClass, PersistenceManager.getRequestDBSession()).getKeyColumnNames()).iterator().next();
+ String modelTableName = getPersister(modelClass, PersistenceManager.getRequestDBSession()).getTableName();
Set existingColumns = SQLUtils.getTableColumns(modelTableName);
boolean idColumnExists = existingColumns.contains(keyColumnName);
-
+
if (!idColumnExists)
throw new RuntimeException(String.format("could not scan model %s: key column %s does not exist in table %s", modelClass, keyColumnName, modelTableName));
-
+
ArrayList fields = new ArrayList();
ContentTranslationUtil.getAllFields(fields, modelClass); // getting into _fields_ the list of all the fields of the class
-
- for(Field field:fields)
- {
- if (field.getAnnotation(TranslatableField.class) != null){
-
+
+ for (Field field : fields) {
+ if (field.getAnnotation(TranslatableField.class) != null) {
+
// field is translated, make an entry for it
if (!field.getType().getName().equals("java.lang.String"))
throw new RuntimeException(String.format("field %s of model %s should be a string", field.getName(), modelClass)); // we only allow translating String fields
String propertyName = field.getName();
- Column column = (Column) (classMapping.getProperty(propertyName).getColumnIterator().next());
- String columnName = column.getName();
+ String columnName = getColumnNameByPropertyName(propertyName, modelClass);
boolean dataColumnExists = existingColumns.contains(columnName); // sanity check of the Hibernate configuration - we are SERIOUSLY screwed if these are not correct - probably we are wrongly fetching the Hibernate conf
if (!dataColumnExists)
throw new RuntimeException(String.format("could not init property %s of model %s: data column %s does not exist in table %s", propertyName, modelClass, columnName, modelTableName));
@@ -82,17 +97,15 @@ protected void scanClass(Class modelClass)
}
}
}
-
+
/**
* global repository for models - used for caching the results of scanning a class
*/
private final static Map globalRepository = Collections.synchronizedMap(new HashMap());
private final static Object imdLock = new Object();
-
- public static InternationalizedModelDescription getForClass(Class clazz)
- {
- synchronized(imdLock)
- {
+
+ public static InternationalizedModelDescription getForClass(Class clazz) {
+ synchronized (imdLock) {
String className = clazz.getName();
if (!globalRepository.containsKey(className))
globalRepository.put(className, new InternationalizedModelDescription(clazz));
@@ -100,8 +113,7 @@ public static InternationalizedModelDescription getForClass(Class clazz)
}
}
- public static InternationalizedPropertyDescription getForProperty(Class clazz, String propertyName)
- {
+ public static InternationalizedPropertyDescription getForProperty(Class clazz, String propertyName) {
return getForClass(clazz).properties.get(propertyName);
}
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedPropertyDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedPropertyDescription.java
index 9c45328148a..5bc16c668a7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedPropertyDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedPropertyDescription.java
@@ -1,13 +1,14 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.lang.reflect.Field;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
import org.digijava.kernel.request.TLSUtils;
import org.digijava.module.translation.util.ContentTranslationUtil;
+import java.lang.reflect.Field;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* IMMUTABLEclass holding the data necessary reading the i18n value of a property of a Translatable model
* NEVER EVER MAKE THIS CLASS MUTABLE OR CONTAIN MUTABLE FIELDS
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedViewsRepository.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedViewsRepository.java
index b5124a9c9b3..f3fb96d82f4 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedViewsRepository.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/InternationalizedViewsRepository.java
@@ -1,5 +1,7 @@
package org.dgfoundation.amp.ar.viewfetcher;
+import org.digijava.module.aim.dbentity.*;
+
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collections;
@@ -7,28 +9,6 @@
import java.util.Map;
import java.util.Set;
-import org.digijava.module.aim.dbentity.AmpActivityVersion;
-import org.digijava.module.aim.dbentity.AmpActor;
-import org.digijava.module.aim.dbentity.AmpAgreement;
-import org.digijava.module.aim.dbentity.AmpCategoryValueLocations;
-import org.digijava.module.aim.dbentity.AmpComponent;
-import org.digijava.module.aim.dbentity.AmpComponentType;
-import org.digijava.module.aim.dbentity.AmpIndicator;
-import org.digijava.module.aim.dbentity.AmpLineMinistryObservation;
-import org.digijava.module.aim.dbentity.AmpLineMinistryObservationActor;
-import org.digijava.module.aim.dbentity.AmpLineMinistryObservationMeasure;
-import org.digijava.module.aim.dbentity.AmpMeasure;
-import org.digijava.module.aim.dbentity.AmpOrgGroup;
-import org.digijava.module.aim.dbentity.AmpOrgType;
-import org.digijava.module.aim.dbentity.AmpOrganisation;
-import org.digijava.module.aim.dbentity.AmpRegionalObservation;
-import org.digijava.module.aim.dbentity.AmpRegionalObservationActor;
-import org.digijava.module.aim.dbentity.AmpRegionalObservationMeasure;
-import org.digijava.module.aim.dbentity.AmpSector;
-import org.digijava.module.aim.dbentity.AmpStructure;
-import org.digijava.module.aim.dbentity.AmpTeam;
-import org.digijava.module.aim.dbentity.AmpTheme;
-
/**
* repository class holding the configuration for all the internationalized views' i18n columns
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/PropertyDescription.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/PropertyDescription.java
index 141cd51f8fe..7d2551203cb 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/PropertyDescription.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/PropertyDescription.java
@@ -1,7 +1,8 @@
package org.dgfoundation.amp.ar.viewfetcher;
import java.sql.SQLException;
-import java.util.*;
+import java.util.Collection;
+import java.util.Map;
/**
* these are indexed in the map by their hashCode() / equals() functions, so be sure to make those meaningful
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RawDatabaseViewFetcher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RawDatabaseViewFetcher.java
index 275bab15fcd..b41a859acce 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RawDatabaseViewFetcher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RawDatabaseViewFetcher.java
@@ -1,11 +1,10 @@
package org.dgfoundation.amp.ar.viewfetcher;
+import org.dgfoundation.amp.ar.FilterParam;
+
import java.sql.Connection;
-import java.sql.ResultSet;
import java.sql.SQLException;
-
import java.util.ArrayList;
-import org.dgfoundation.amp.ar.FilterParam;
/**
* a {@link ViewFetcher} which rawly fetches data from a view/table
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RsInfo.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RsInfo.java
index 35cca443c36..145f9631ba8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RsInfo.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/RsInfo.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.ar.viewfetcher;
+import org.digijava.kernel.persistence.PersistenceManager;
+
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.function.Consumer;
-import org.digijava.kernel.persistence.PersistenceManager;
-
/**
* a class which encapsulates a ResultSet and its generated statement and which closes them both
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/SQLUtils.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/SQLUtils.java
index b1262b85b03..bc30a64d3f3 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/SQLUtils.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/SQLUtils.java
@@ -1,23 +1,5 @@
package org.dgfoundation.amp.ar.viewfetcher;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
import org.dgfoundation.amp.Util;
import org.dgfoundation.amp.algo.AlgoUtils;
import org.dgfoundation.amp.ar.FilterParam;
@@ -28,9 +10,18 @@
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.MatchMode;
import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.PostgreSQL95Dialect;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.TypedValue;
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
public class SQLUtils {
public final static String SQL_UTILS_NULL = "###NULL###";
@@ -309,7 +300,11 @@ public static Criterion getUnaccentILikeExpression(final String propertyName, fi
@Override
public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- Dialect dialect = criteriaQuery.getFactory().getDialect();
+ SessionFactoryImplementor sessionFactoryImplementor = criteriaQuery.getFactory();
+ JdbcServices jdbcServices = sessionFactoryImplementor.getJdbcServices();
+
+ Dialect dialect = jdbcServices.getDialect();
+
String[] columns = criteriaQuery.findColumns(propertyName, criteria);
String entityName = criteriaQuery.getEntityName(criteria);
@@ -319,7 +314,7 @@ public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws
if (ids.length!=1)
throw new HibernateException("We do not support multiple identifiers just yet!");
- if ( dialect instanceof PostgreSQLDialect ) {
+ if ( dialect instanceof PostgreSQL95Dialect ) {
String ret = " " + ids[0] + " = any(contentmatch('" + entityName + "','" + propertyName + "','"
+ locale + "', ?)) OR ";
ret+=" unaccent(" + columns[0] + ") ilike " + "unaccent(?)";
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ViewFetcher.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ViewFetcher.java
index bbb8cd0000a..9060065c240 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ViewFetcher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/viewfetcher/ViewFetcher.java
@@ -1,13 +1,13 @@
package org.dgfoundation.amp.ar.viewfetcher;
+import org.dgfoundation.amp.algo.AlgoUtils;
+import org.dgfoundation.amp.ar.FilterParam;
+
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.function.Consumer;
-import org.dgfoundation.amp.algo.AlgoUtils;
-import org.dgfoundation.amp.ar.FilterParam;
-
/**
* a generic datasource for fetching a view. Could fetch data from a real database or from a dummy source (for testcases, for example)
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/AmountColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/AmountColWorker.java
index 584e63c4f90..741a4a8bd29 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/AmountColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/AmountColWorker.java
@@ -3,22 +3,20 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.Util;
import org.dgfoundation.amp.ar.AmpARFilter;
-import org.dgfoundation.amp.ar.CellColumn;
import org.dgfoundation.amp.ar.GroupColumn;
import org.dgfoundation.amp.ar.ReportContextData;
import org.dgfoundation.amp.ar.ReportGenerator;
-import org.dgfoundation.amp.ar.TotalAmountColumn;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/CategAmountColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/CategAmountColWorker.java
index 308d08697d0..f21efac1278 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/CategAmountColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/CategAmountColWorker.java
@@ -6,41 +6,24 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.Date;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.Util;
-import org.dgfoundation.amp.ar.AmountCellColumn;
-import org.dgfoundation.amp.ar.AmpARFilter;
-import org.dgfoundation.amp.ar.AmpReportGenerator;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.ar.FundingTypeSortedString;
-import org.dgfoundation.amp.ar.MetaInfo;
-import org.dgfoundation.amp.ar.ReportContextData;
-import org.dgfoundation.amp.ar.ReportGenerator;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
-import org.dgfoundation.amp.onepager.models.MTEFYearsModel;
import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.module.aim.dbentity.AmpReportHierarchy;
import org.digijava.module.aim.helper.Constants;
-import org.digijava.module.aim.helper.DateConversion;
-import org.digijava.module.aim.helper.FormatHelper;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
-import org.digijava.module.aim.helper.fiscalcalendar.GregorianBasedWorker;
import org.digijava.module.aim.helper.fiscalcalendar.ComparableMonth;
import org.digijava.module.aim.helper.fiscalcalendar.ICalendarWorker;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ColumnWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ColumnWorker.java
index f868d880b41..95637a3d1aa 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ColumnWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ColumnWorker.java
@@ -6,16 +6,6 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.servlet.http.HttpSession;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.CellColumn;
import org.dgfoundation.amp.ar.Column;
@@ -30,6 +20,15 @@
import org.digijava.module.aim.dbentity.AmpColumns;
import org.digijava.module.budgetexport.util.MappingEncoder;
+import javax.servlet.http.HttpSession;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+
/**
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedAmountColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedAmountColWorker.java
index 47cd8ff9ee0..d6a67aa1198 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedAmountColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedAmountColWorker.java
@@ -6,25 +6,8 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
import org.dgfoundation.amp.Util;
-import org.dgfoundation.amp.ar.AmpARFilter;
-import org.dgfoundation.amp.ar.AmpReportGenerator;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.Column;
-import org.dgfoundation.amp.ar.GroupColumn;
-import org.dgfoundation.amp.ar.MetaInfo;
-import org.dgfoundation.amp.ar.ReportContextData;
-import org.dgfoundation.amp.ar.ReportGenerator;
-import org.dgfoundation.amp.ar.TotalComputedAmountColumn;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ComputedAmountCell;
@@ -32,6 +15,12 @@
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Iterator;
+
public class ComputedAmountColWorker extends MetaCellColumnWorker {
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedDateColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedDateColWorker.java
index 74150aa9a5a..18035ef685e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedDateColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ComputedDateColWorker.java
@@ -6,16 +6,16 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.ComputedDateCell;
import org.dgfoundation.amp.exprlogic.MathExpressionRepository;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
public class ComputedDateColWorker extends ColumnWorker {
private static final String AMP_ACTIVITY_ID = "amp_activity_id";
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/DateColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/DateColWorker.java
index c0cf25086d4..d189b8d6b10 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/DateColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/DateColWorker.java
@@ -6,17 +6,16 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Date;
-
import org.dgfoundation.amp.ar.AmpARFilter;
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.DateCell;
-import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.fiscalcalendar.BaseCalendar;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Date;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ExpressionColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ExpressionColWorker.java
index 2e7b9b8fcff..772062437f9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ExpressionColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/ExpressionColWorker.java
@@ -6,14 +6,7 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.CellColumn;
-import org.dgfoundation.amp.ar.GroupColumn;
-import org.dgfoundation.amp.ar.ReportGenerator;
-import org.dgfoundation.amp.ar.TotalAmountColumn;
+import org.dgfoundation.amp.ar.*;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
@@ -21,6 +14,9 @@
import org.dgfoundation.amp.exprlogic.TokenExpression;
import org.dgfoundation.amp.exprlogic.TokenRepository;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaCellColumnWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaCellColumnWorker.java
index 23ddf3ec5bd..2911bd742b7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaCellColumnWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaCellColumnWorker.java
@@ -1,9 +1,5 @@
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.GroupColumn;
import org.dgfoundation.amp.ar.MetaInfo;
@@ -12,6 +8,10 @@
import org.digijava.kernel.translator.TranslatorWorker;
import org.digijava.module.aim.helper.Constants;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+
public abstract class MetaCellColumnWorker extends ColumnWorker {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaTextColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaTextColWorker.java
index aea52172bc1..d1c0750b3cf 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaTextColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/MetaTextColWorker.java
@@ -3,12 +3,6 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.dgfoundation.amp.ar.ARUtil;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.ReportGenerator;
@@ -16,6 +10,11 @@
import org.dgfoundation.amp.ar.cell.MetaTextCell;
import org.dgfoundation.amp.ar.cell.TextCell;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewMetaDateColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewMetaDateColWorker.java
index 67b83353141..3924458729c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewMetaDateColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewMetaDateColWorker.java
@@ -3,15 +3,14 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.DateCell;
import org.dgfoundation.amp.ar.cell.NewMetaDateCell;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* @author Alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewTextColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewTextColWorker.java
index 453b3a1155a..da05d3f7af0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewTextColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/NewTextColWorker.java
@@ -3,14 +3,14 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.NewTextCell;
import org.dgfoundation.amp.ar.cell.TextCell;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
* @author alex
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TextColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TextColWorker.java
index dcd99f46b3c..7aeca941847 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TextColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TextColWorker.java
@@ -6,21 +6,19 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import javax.sql.rowset.serial.SerialClob;
-import javax.sql.rowset.serial.SerialException;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.TextCell;
+import javax.sql.rowset.serial.SerialClob;
+import javax.sql.rowset.serial.SerialException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TotalAmountColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TotalAmountColWorker.java
index 6682729332f..0d2e033f11e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TotalAmountColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TotalAmountColWorker.java
@@ -6,14 +6,14 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.GroupColumn;
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.AmountCell;
import org.dgfoundation.amp.ar.cell.Cell;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
/**
*
* @author Mihai Postelnicu - mpostelnicu@dgfoundation.org
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TrnTextColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TrnTextColWorker.java
index 8c37182e2c3..c578e52d041 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TrnTextColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/TrnTextColWorker.java
@@ -1,19 +1,14 @@
package org.dgfoundation.amp.ar.workers;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
-import org.dgfoundation.amp.ar.cell.TextCell;
import org.dgfoundation.amp.ar.cell.TrnTextCell;
import org.dgfoundation.amp.ar.viewfetcher.DatabaseViewFetcher;
-import org.dgfoundation.amp.ar.viewfetcher.I18nDatabaseViewFetcher;
-import org.dgfoundation.amp.ar.viewfetcher.InternationalizedViewsRepository;
-import org.digijava.kernel.persistence.WorkerException;
import org.digijava.kernel.translator.TranslatorWorker;
-import org.digijava.module.aim.action.GetReports;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class TrnTextColWorker extends TextColWorker {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/XmlHierarchyColWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/XmlHierarchyColWorker.java
index ddfc4aa2c70..02b51c9a5a8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/XmlHierarchyColWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/ar/workers/XmlHierarchyColWorker.java
@@ -3,17 +3,6 @@
*/
package org.dgfoundation.amp.ar.workers;
-import java.io.Reader;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.dgfoundation.amp.ar.ReportGenerator;
import org.dgfoundation.amp.ar.cell.Cell;
import org.dgfoundation.amp.ar.cell.XmlHierarchyCell;
@@ -25,6 +14,16 @@
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.Reader;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+
/**
* @author Alex
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/asciidoc/ApiErrorAsciiDocCreator.java b/amp/WEB-INF/src/org/dgfoundation/amp/asciidoc/ApiErrorAsciiDocCreator.java
index 02cb96034c2..d140eedd0a4 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/asciidoc/ApiErrorAsciiDocCreator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/asciidoc/ApiErrorAsciiDocCreator.java
@@ -1,5 +1,10 @@
package org.dgfoundation.amp.asciidoc;
+import org.apache.commons.io.FileUtils;
+import org.digijava.kernel.ampapi.endpoints.errors.ApiError;
+import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorCollector;
+import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorMessage;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -7,11 +12,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
-import org.digijava.kernel.ampapi.endpoints.errors.ApiError;
-import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorCollector;
-import org.digijava.kernel.ampapi.endpoints.errors.ApiErrorMessage;
-
/**
* Class used to generate the ascii doc used in swagger documentation. The class is executed from mvn
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currency/ConstantCurrency.java b/amp/WEB-INF/src/org/dgfoundation/amp/currency/ConstantCurrency.java
index b18b8b0d14d..5ff0c53e719 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currency/ConstantCurrency.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currency/ConstantCurrency.java
@@ -3,12 +3,12 @@
*/
package org.dgfoundation.amp.currency;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.digijava.module.aim.dbentity.AmpCurrency;
import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Constant Currency
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currency/CurrencyInflationUtil.java b/amp/WEB-INF/src/org/dgfoundation/amp/currency/CurrencyInflationUtil.java
index dae466b3f92..dfba0d7cad1 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currency/CurrencyInflationUtil.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currency/CurrencyInflationUtil.java
@@ -3,22 +3,14 @@
*/
package org.dgfoundation.amp.currency;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.dbentity.AmpFilterData;
import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpCurrency;
-import org.digijava.module.aim.dbentity.AmpCurrencyRate;
-import org.digijava.module.aim.dbentity.AmpFiscalCalendar;
-import org.digijava.module.aim.dbentity.AmpInflationRate;
-import org.digijava.module.aim.dbentity.AmpInflationSource;
+import org.digijava.module.aim.dbentity.*;
import org.digijava.module.aim.util.CurrencyUtil;
+import java.util.*;
+
/**
* Common currency inflation rates utility methods
*
@@ -49,7 +41,7 @@ public static List getInflationRates(String currencyCode) {
}
public static void deleteAllInflationRates() {
- PersistenceManager.getSession().createSQLQuery("DELETE FROM amp_inflation_rates WHERE 1=1").executeUpdate();
+ PersistenceManager.getSession().createNativeQuery("DELETE FROM amp_inflation_rates WHERE 1=1").executeUpdate();
}
public static List getConstantAmpCurrencies() {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/CCExchangeRate.java b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/CCExchangeRate.java
index 333a394f1e6..3e1786850f0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/CCExchangeRate.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/CCExchangeRate.java
@@ -3,20 +3,6 @@
*/
package org.dgfoundation.amp.currency.inflation;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.currency.ConstantCurrency;
import org.dgfoundation.amp.currency.CurrencyInflationUtil;
@@ -31,6 +17,10 @@
import org.digijava.module.aim.util.caching.AmpCaching;
import org.hibernate.Session;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
/**
* Generates Exchange Rates for Constant Currencies
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/InflationRateGenerator.java b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/InflationRateGenerator.java
index 121f2032a34..a94b71f5956 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/InflationRateGenerator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/InflationRateGenerator.java
@@ -3,15 +3,6 @@
*/
package org.dgfoundation.amp.currency.inflation;
-import java.sql.Date;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.keyvalue.MultiKey;
import org.apache.commons.collections.map.MultiKeyMap;
@@ -19,6 +10,10 @@
import org.dgfoundation.amp.algo.AlgoUtils;
import org.digijava.module.aim.dbentity.AmpInflationRate;
+import java.sql.Date;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
/**
* Generates Inflation Rates
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/ds/FredDataSource.java b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/ds/FredDataSource.java
index 248e34739f9..61e67d9ac7b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/ds/FredDataSource.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currency/inflation/ds/FredDataSource.java
@@ -3,18 +3,6 @@
*/
package org.dgfoundation.amp.currency.inflation.ds;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.currency.IRFrequency;
import org.digijava.kernel.ampapi.endpoints.util.ObjectMapperUtils;
@@ -23,6 +11,11 @@
import org.digijava.module.aim.dbentity.AmpInflationRate;
import org.digijava.module.common.util.DateTimeUtil;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+
/**
* Use of FRED®API
* Based on Source: U.S. Bureau of Economic Analysis.
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/AmpCurrencyConvertor.java b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/AmpCurrencyConvertor.java
index 0ede6e2e08f..15316718324 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/AmpCurrencyConvertor.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/AmpCurrencyConvertor.java
@@ -1,16 +1,15 @@
package org.dgfoundation.amp.currencyconvertor;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.newreports.AmountsUnits;
import org.digijava.kernel.persistence.PersistenceManager;
-import org.digijava.module.aim.dbentity.AmpCurrency;
import org.digijava.module.aim.util.CurrencyUtil;
import org.digijava.module.common.util.DateTimeUtil;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.concurrent.ConcurrentHashMap;
+
/**
* the AMP schema currency convertor. Thread-safe
* @author Dolghier Constantin
@@ -37,7 +36,7 @@ public static AmpCurrencyConvertor getInstance() {
protected void checkCache() {
if (System.currentTimeMillis() - lastTimeTokenChecked > 5 * 1000 * 60) { // check ETL for changes no more frequently than once in 5 minutes
Long lastCurrencyChange = PersistenceManager.getLong(
- PersistenceManager.getSession().createSQLQuery("select max(event_id) from amp_etl_changelog where entity_name = 'exchange_rate'").uniqueResult());
+ PersistenceManager.getSession().createNativeQuery("select max(event_id) from amp_etl_changelog where entity_name = 'exchange_rate'").uniqueResult());
lastTimeTokenChecked = System.currentTimeMillis();
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/CurrencyConvertor.java b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/CurrencyConvertor.java
index e6a99cc48d3..22e9d63dc73 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/CurrencyConvertor.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/CurrencyConvertor.java
@@ -2,8 +2,6 @@
import java.time.LocalDate;
-import org.digijava.module.aim.dbentity.AmpCurrency;
-
/**
* a class which can convert amounts from one currency to another currency
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/OneCurrencyCalculator.java b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/OneCurrencyCalculator.java
index 459df9e6f8a..fb7d65220b3 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/OneCurrencyCalculator.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/currencyconvertor/OneCurrencyCalculator.java
@@ -1,16 +1,5 @@
package org.dgfoundation.amp.currencyconvertor;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-
import org.dgfoundation.amp.algo.AlgoUtils;
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.digijava.module.aim.dbentity.AmpCurrency;
@@ -18,6 +7,10 @@
import org.digijava.module.aim.util.CurrencyUtil;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.*;
+
/**
* a class which knows how to calculate the exchange rates (base, X) for exactly one currency
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ActivityInvalidationDetector.java b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ActivityInvalidationDetector.java
index 1a7a91d54b9..e9533c4c153 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ActivityInvalidationDetector.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ActivityInvalidationDetector.java
@@ -1,11 +1,11 @@
package org.dgfoundation.amp.diffcaching;
-import java.sql.Connection;
-import java.util.function.Supplier;
-
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.digijava.kernel.persistence.PersistenceManager;
+import java.sql.Connection;
+import java.util.function.Supplier;
+
/**
* a supplier for {@link ExpiringCacher} which triggers a cache invalidate when any kind of non-incremental mutating event is logged in the AMP in-db changelog
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/DatabaseChangedDetector.java b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/DatabaseChangedDetector.java
index 00e9e3785e4..9989fedad13 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/DatabaseChangedDetector.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/DatabaseChangedDetector.java
@@ -1,11 +1,11 @@
package org.dgfoundation.amp.diffcaching;
-import java.sql.Connection;
-import java.util.function.Supplier;
-
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.digijava.kernel.persistence.PersistenceManager;
+import java.sql.Connection;
+import java.util.function.Supplier;
+
/**
* a supplier for {@link ExpiringCacher} which triggers a cache invalidate when any kind of mutating event is logged in the AMP in-db changelog
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ExpiringCacher.java b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ExpiringCacher.java
index 1228829f4d7..dac36cce0b8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ExpiringCacher.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/diffcaching/ExpiringCacher.java
@@ -1,12 +1,11 @@
package org.dgfoundation.amp.diffcaching;
+import org.apache.log4j.Logger;
+
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;
-import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.log4j.Logger;
-
/**
* a cache which invalidates every time a timeout happens OR one of the resetting queries happens
* @author Dolghier Constantin
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPException.java b/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPException.java
index 7f3adcd6660..8f7009e0457 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPException.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPException.java
@@ -1,9 +1,9 @@
package org.dgfoundation.amp.error;
-import java.util.LinkedList;
-
import org.digijava.module.aim.helper.Constants;
+import java.util.LinkedList;
+
public class AMPException extends Exception implements AMPTaggedExceptions {
private static final int DEFAULT_ERROR_LEVEL = Constants.AMP_ERROR_LEVEL_ERROR;
private LinkedList tags;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPUncheckedException.java b/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPUncheckedException.java
index 6715b34d207..a36e46c7931 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPUncheckedException.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/error/AMPUncheckedException.java
@@ -1,9 +1,9 @@
package org.dgfoundation.amp.error;
-import java.util.LinkedList;
-
import org.digijava.module.aim.helper.Constants;
+import java.util.LinkedList;
+
public class AMPUncheckedException extends RuntimeException implements AMPTaggedExceptions {
private static final int DEFAULT_ERROR_LEVEL = Constants.AMP_ERROR_LEVEL_ERROR;
private LinkedList tags;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/ANDBinaryLogicalToken.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/ANDBinaryLogicalToken.java
index 9792c62cf2e..70d3f47c4cc 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/ANDBinaryLogicalToken.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/ANDBinaryLogicalToken.java
@@ -2,7 +2,6 @@
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
-import org.digijava.module.categorymanager.action.CategoryManager;
public class ANDBinaryLogicalToken extends BinaryLogicalToken {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/DateRangeLogicalToken.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/DateRangeLogicalToken.java
index 94e1723b8d6..befca91f499 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/DateRangeLogicalToken.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/DateRangeLogicalToken.java
@@ -1,13 +1,11 @@
package org.dgfoundation.amp.exprlogic;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.MetaInfo;
import org.dgfoundation.amp.ar.cell.CategAmountCell;
+import java.util.Date;
+
public class DateRangeLogicalToken extends LogicalToken {
private Date d1 = null;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpression.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpression.java
index 25f11a69d61..7ec32433739 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpression.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpression.java
@@ -1,12 +1,13 @@
package org.dgfoundation.amp.exprlogic;
+import org.joda.time.DateTime;
+import org.joda.time.Days;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.HashMap;
-import org.joda.time.DateTime;
-import org.joda.time.Days;
/**
* @author Sebastian Dimunzio Apr 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpressionRepository.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpressionRepository.java
index ef35ff20835..dd1ec1ae1ce 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpressionRepository.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/MathExpressionRepository.java
@@ -1,14 +1,14 @@
package org.dgfoundation.amp.exprlogic;
-import java.math.BigDecimal;
-import java.util.Hashtable;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.dyn.DynamicColumnsUtil;
import org.digijava.module.aim.dbentity.AmpColumns;
+import java.math.BigDecimal;
+import java.util.Hashtable;
+import java.util.List;
+
/**
*
* @author Sebastian Dimunzio Apr 15, 2009
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/TokenRepository.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/TokenRepository.java
index 6f9cbb06b6c..79b51a8c5b0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/TokenRepository.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/TokenRepository.java
@@ -1,15 +1,9 @@
package org.dgfoundation.amp.exprlogic;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
import org.dgfoundation.amp.ar.ArConstants;
+import java.util.*;
+
public class TokenRepository {
// // internally thread safe repository for tokens:
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/Values.java b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/Values.java
index 3770e975a13..99011b93612 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/Values.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/exprlogic/Values.java
@@ -1,11 +1,5 @@
package org.dgfoundation.amp.exprlogic;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ColumnReportData;
import org.dgfoundation.amp.ar.Viewable;
@@ -13,6 +7,12 @@
import org.dgfoundation.amp.ar.dyn.DynamicColumnsUtil;
import org.digijava.module.aim.dbentity.AmpColumns;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import static org.dgfoundation.amp.exprlogic.TokenRepository.tokens;
public class Values extends HashMap {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/forms/ItemGateKeeper.java b/amp/WEB-INF/src/org/dgfoundation/amp/forms/ItemGateKeeper.java
index 3a6a191c970..2aa272641cc 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/forms/ItemGateKeeper.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/forms/ItemGateKeeper.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.forms;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.log4j.Logger;
import org.digijava.module.aim.helper.TeamMember;
import org.digijava.module.aim.util.TeamMemberUtil;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.dgfoundation.amp.forms.LockVerificationResult.*;
public class ItemGateKeeper {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsTagClass.java b/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsTagClass.java
index 3de9845149a..5ae28d7da02 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsTagClass.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsTagClass.java
@@ -1,11 +1,10 @@
package org.dgfoundation.amp.globalsettings;
-import java.io.IOException;
+import org.digijava.module.aim.util.FeaturesUtil;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import org.digijava.module.aim.util.FeaturesUtil;
+import java.io.IOException;
public class GlobalSettingsTagClass extends BodyTagSupport{
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsValueTagClass.java b/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsValueTagClass.java
index 13ebf5b6bb0..9e177d194a7 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsValueTagClass.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/globalsettings/GlobalSettingsValueTagClass.java
@@ -1,10 +1,11 @@
package org.dgfoundation.amp.globalsettings;
-import java.io.IOException;
+import org.digijava.module.aim.util.FeaturesUtil;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import org.digijava.module.aim.util.FeaturesUtil;
+import java.io.IOException;
public class GlobalSettingsValueTagClass extends BodyTagSupport {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIAmount.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIAmount.java
index af22b04db3e..93365e31dda 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIAmount.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIAmount.java
@@ -1,13 +1,13 @@
package org.dgfoundation.amp.gpi.reports;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.time.LocalDate;
-
import org.dgfoundation.amp.nireports.MonetaryAmount;
import org.dgfoundation.amp.nireports.NiPrecisionSetting;
import org.dgfoundation.amp.nireports.TranslatedDate;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.time.LocalDate;
+
/**
* This class is deeply immutable
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport.java
index f93b2ba2cd3..79ee86d55db 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport.java
@@ -1,12 +1,12 @@
package org.dgfoundation.amp.gpi.reports;
-import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.dgfoundation.amp.newreports.ReportSpecification;
import org.digijava.kernel.ampapi.endpoints.gpi.GpiFormParameters;
import org.digijava.kernel.ampapi.endpoints.settings.Settings;
+import java.util.Map;
+
/**
* Report model used for GPI Reports
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output1Builder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output1Builder.java
index e132d9ec32b..067cc441b00 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output1Builder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output1Builder.java
@@ -1,19 +1,5 @@
package org.dgfoundation.amp.gpi.reports;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.viewfetcher.RsInfo;
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
@@ -23,6 +9,14 @@
import org.digijava.kernel.persistence.PersistenceManager;
import org.hibernate.jdbc.Work;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
/**
* A utility class to transform a GeneratedReport to GPI Report 1 Output 1
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output2Builder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output2Builder.java
index c18973e9ab0..7d5f6fde5a9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output2Builder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport1Output2Builder.java
@@ -1,21 +1,17 @@
package org.dgfoundation.amp.gpi.reports;
-import static java.util.stream.Collectors.groupingBy;
+import org.dgfoundation.amp.ar.ColumnConstants;
+import org.dgfoundation.amp.newreports.GeneratedReport;
+import org.dgfoundation.amp.nireports.formulas.NiFormula;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.nireports.formulas.NiFormula;
+import static java.util.stream.Collectors.groupingBy;
/**
* A utility class to transform a GeneratedReport to GPI Report 1 Output 2
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5aOutputBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5aOutputBuilder.java
index 3ce3ce88c1e..5de50920b5c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5aOutputBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5aOutputBuilder.java
@@ -1,31 +1,10 @@
package org.dgfoundation.amp.gpi.reports;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
import org.apache.commons.lang3.StringUtils;
import org.dgfoundation.amp.algo.BooleanWrapper;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
-import org.dgfoundation.amp.newreports.AmountCell;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.ReportSpecification;
-import org.dgfoundation.amp.newreports.TextCell;
+import org.dgfoundation.amp.newreports.*;
import org.dgfoundation.amp.nireports.NiReportsEngine;
import org.dgfoundation.amp.nireports.formulas.NiFormula;
import org.digijava.kernel.ampapi.endpoints.gpi.GPIUtils;
@@ -33,6 +12,13 @@
import org.digijava.module.aim.dbentity.AmpGPINiDonorNotes;
import org.digijava.module.common.util.DateTimeUtil;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* A utility class to transform a GeneratedReport to GPI Report 5a
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5bOutputBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5bOutputBuilder.java
index 51b022e1bbe..e0b09008e25 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5bOutputBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport5bOutputBuilder.java
@@ -2,26 +2,14 @@
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
-import org.dgfoundation.amp.newreports.AmountCell;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.TextCell;
+import org.dgfoundation.amp.newreports.*;
import org.dgfoundation.amp.nireports.formulas.NiFormula;
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport6OutputBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport6OutputBuilder.java
index 272e77d66cf..1b28067932e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport6OutputBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport6OutputBuilder.java
@@ -1,44 +1,13 @@
package org.dgfoundation.amp.gpi.reports;
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
-import static java.util.stream.Collectors.reducing;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
import org.dgfoundation.amp.ar.AmpARFilter;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
import org.dgfoundation.amp.ar.viewfetcher.RsInfo;
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.dgfoundation.amp.currencyconvertor.AmpCurrencyConvertor;
-import org.dgfoundation.amp.newreports.AmountCell;
-import org.dgfoundation.amp.newreports.CalendarConverter;
-import org.dgfoundation.amp.newreports.FilterRule;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportElement;
+import org.dgfoundation.amp.newreports.*;
import org.dgfoundation.amp.newreports.ReportElement.ElementType;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.TextCell;
import org.dgfoundation.amp.nireports.MonetaryAmount;
import org.dgfoundation.amp.nireports.NiPrecisionSetting;
import org.dgfoundation.amp.nireports.NiReportsEngine;
@@ -51,6 +20,18 @@
import org.digijava.module.common.util.DateTimeUtil;
import org.hibernate.jdbc.Work;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+import static java.util.stream.Collectors.*;
+
/**
* A utility class to transform a GeneratedReport to GPI Report 6
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport9bOutputBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport9bOutputBuilder.java
index aa4470b4f5f..586a695ee2d 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport9bOutputBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReport9bOutputBuilder.java
@@ -1,30 +1,17 @@
package org.dgfoundation.amp.gpi.reports;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
import org.dgfoundation.amp.algo.BooleanWrapper;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
-import org.dgfoundation.amp.newreports.AmountCell;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.TextCell;
+import org.dgfoundation.amp.newreports.*;
import org.dgfoundation.amp.nireports.NiReportsEngine;
import org.dgfoundation.amp.nireports.formulas.NiFormula;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
/**
* A utility class to transform a GeneratedReport to GPI Report 9b
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportBuilder.java
index cb61a127234..c3e83315355 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportBuilder.java
@@ -1,11 +1,11 @@
package org.dgfoundation.amp.gpi.reports;
-import java.util.Map;
-
import org.dgfoundation.amp.newreports.GeneratedReport;
import org.digijava.kernel.ampapi.endpoints.settings.Settings;
import org.digijava.kernel.ampapi.endpoints.settings.SettingsUtils;
+import java.util.Map;
+
/**
* A utility class to build a GPI Report from {@link GeneratedReport} generated
* report
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportConstants.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportConstants.java
index 3b23b8d72ad..c9a9e109e5c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportConstants.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportConstants.java
@@ -1,13 +1,13 @@
package org.dgfoundation.amp.gpi.reports;
+import org.dgfoundation.amp.ar.ColumnConstants;
+import org.dgfoundation.amp.ar.MeasureConstants;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.ar.MeasureConstants;
-
public class GPIReportConstants {
public static final String REPORT_1 = "1";
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportOutputBuilder.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportOutputBuilder.java
index a4b8a69a0bf..a88fd860b7a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportOutputBuilder.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportOutputBuilder.java
@@ -1,16 +1,5 @@
package org.dgfoundation.amp.gpi.reports;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.newreports.AmountsUnits;
import org.dgfoundation.amp.newreports.GeneratedReport;
@@ -18,8 +7,14 @@
import org.dgfoundation.amp.newreports.ReportSettings;
import org.dgfoundation.amp.nireports.formulas.NiFormula;
import org.digijava.kernel.ampapi.endpoints.gpi.GpiFormParameters;
-import org.digijava.module.categorymanager.util.CategoryConstants;
import org.digijava.kernel.translator.TranslatorWorker;
+import org.digijava.module.categorymanager.util.CategoryConstants;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* A utility class to transform a GeneratedReport to GPI Report Output (headers, report data, summary)
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportUtils.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportUtils.java
index fd670967439..6edb0da40c9 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportUtils.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GPIReportUtils.java
@@ -1,35 +1,11 @@
package org.dgfoundation.amp.gpi.reports;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
import org.apache.commons.lang3.StringUtils;
import org.dgfoundation.amp.ar.ArConstants;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.MeasureConstants;
-import org.dgfoundation.amp.newreports.AmpReportFilters;
-import org.dgfoundation.amp.newreports.CalendarConverter;
-import org.dgfoundation.amp.newreports.FilterRule;
-import org.dgfoundation.amp.newreports.GeneratedReport;
-import org.dgfoundation.amp.newreports.GroupingCriteria;
-import org.dgfoundation.amp.newreports.ReportAreaImpl;
-import org.dgfoundation.amp.newreports.ReportColumn;
-import org.dgfoundation.amp.newreports.ReportElement;
+import org.dgfoundation.amp.newreports.*;
import org.dgfoundation.amp.newreports.ReportElement.ElementType;
-import org.dgfoundation.amp.newreports.ReportMeasure;
-import org.dgfoundation.amp.newreports.ReportSettingsImpl;
-import org.dgfoundation.amp.newreports.ReportSpecification;
-import org.dgfoundation.amp.newreports.ReportSpecificationImpl;
import org.dgfoundation.amp.reports.ReportUtils;
import org.digijava.kernel.ampapi.endpoints.common.EndpointUtils;
import org.digijava.kernel.ampapi.endpoints.filters.FiltersConstants;
@@ -47,6 +23,13 @@
import org.digijava.module.common.util.DateTimeUtil;
import org.joda.time.DateTime;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
public class GPIReportUtils {
private static final int MTEF_YEARS_SIZE = 3;
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output1Visitor.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output1Visitor.java
index 40f177f92e8..8d4b75b64d0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output1Visitor.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output1Visitor.java
@@ -1,5 +1,10 @@
package org.dgfoundation.amp.gpi.reports;
+import org.apache.commons.lang3.StringUtils;
+import org.dgfoundation.amp.ar.ColumnConstants;
+import org.dgfoundation.amp.ar.MeasureConstants;
+import org.dgfoundation.amp.newreports.*;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
@@ -7,17 +12,6 @@
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.commons.lang3.StringUtils;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.ar.MeasureConstants;
-import org.dgfoundation.amp.newreports.AmountCell;
-import org.dgfoundation.amp.newreports.DateCell;
-import org.dgfoundation.amp.newreports.IdentifiedReportCell;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.ReportVisitor;
-
/**
* An implementation of ReportVisitor for fetching items used in GPI report 1 output 2
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output2Visitor.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output2Visitor.java
index d7ba18563ac..9ae075b23d2 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output2Visitor.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/GpiReport1Output2Visitor.java
@@ -1,18 +1,14 @@
package org.dgfoundation.amp.gpi.reports;
+import org.apache.commons.lang3.StringUtils;
+import org.dgfoundation.amp.ar.ColumnConstants;
+import org.dgfoundation.amp.newreports.*;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.newreports.DateCell;
-import org.dgfoundation.amp.newreports.ReportArea;
-import org.dgfoundation.amp.newreports.ReportCell;
-import org.dgfoundation.amp.newreports.ReportOutputColumn;
-import org.dgfoundation.amp.newreports.ReportVisitor;
-
/**
* An implementation of ReportVisitor for fetching items used in GPI report 1 output 2
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExportType.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExportType.java
index 261bf21cf14..6137f685b82 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExportType.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExportType.java
@@ -1,19 +1,7 @@
package org.dgfoundation.amp.gpi.reports.export;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator1Output1XlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator1Output2XlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator5aXlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator5bXlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator6XlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportIndicator9bXlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.excel.GPIReportXlsxExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator1Output1PdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator1Output2PdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator5aPdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator5bPdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator6PdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportIndicator9bPdfExporter;
-import org.dgfoundation.amp.gpi.reports.export.pdf.GPIReportPdfExporter;
+import org.dgfoundation.amp.gpi.reports.export.excel.*;
+import org.dgfoundation.amp.gpi.reports.export.pdf.*;
/**
* Enum that holds the gpi report exporters
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExporter.java
index fe658630003..0ca3e1ff82b 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/GPIReportExporter.java
@@ -1,14 +1,14 @@
package org.dgfoundation.amp.gpi.reports.export;
+import org.dgfoundation.amp.gpi.reports.GPIReport;
+import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
+import org.digijava.kernel.translator.TranslatorWorker;
+
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import org.dgfoundation.amp.gpi.reports.GPIReport;
-import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
-import org.digijava.kernel.translator.TranslatorWorker;
-
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportExcelTemplate.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportExcelTemplate.java
index 5c1cf499782..b57f05db9af 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportExcelTemplate.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportExcelTemplate.java
@@ -1,17 +1,13 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.RegionUtil;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Class containing the styles for the excel file. See {@link GPIReportXlsxExporter}
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output1XlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output1XlsxExporter.java
index 29072c69e2a..b1db23326d8 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output1XlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output1XlsxExporter.java
@@ -1,37 +1,22 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import static java.util.stream.Collectors.groupingBy;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.ar.view.xls.IntWrapper;
-import org.dgfoundation.amp.gpi.reports.GPIDocument;
-import org.dgfoundation.amp.gpi.reports.GPIDonorActivityDocument;
-import org.dgfoundation.amp.gpi.reports.GPIRemark;
-import org.dgfoundation.amp.gpi.reports.GPIReport;
-import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
-import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
-import org.dgfoundation.amp.gpi.reports.GPIReportUtils;
+import org.dgfoundation.amp.gpi.reports.*;
import org.digijava.kernel.ampapi.endpoints.gpi.GPIDataService;
import org.digijava.kernel.translator.TranslatorWorker;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.groupingBy;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output2XlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output2XlsxExporter.java
index b9b6b486841..85b535d61af 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output2XlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator1Output2XlsxExporter.java
@@ -1,14 +1,6 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -17,6 +9,10 @@
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
import org.dgfoundation.amp.gpi.reports.export.GPIReportMessages;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5aXlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5aXlsxExporter.java
index 1d291ac39c3..4bda6eeee7c 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5aXlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5aXlsxExporter.java
@@ -1,16 +1,6 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.dgfoundation.amp.ar.MeasureConstants;
@@ -19,6 +9,12 @@
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
import org.dgfoundation.amp.gpi.reports.GPIReportUtils;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5bXlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5bXlsxExporter.java
index 4c7ff5f5d2a..2d5f641e5ce 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5bXlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator5bXlsxExporter.java
@@ -1,9 +1,5 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -15,6 +11,10 @@
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator6XlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator6XlsxExporter.java
index f50fb9681b2..1d586af6bb5 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator6XlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator6XlsxExporter.java
@@ -1,9 +1,5 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -15,6 +11,10 @@
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator9bXlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator9bXlsxExporter.java
index 1d8ddbd166d..5dc250f4874 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator9bXlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportIndicator9bXlsxExporter.java
@@ -1,13 +1,5 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -19,6 +11,14 @@
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportXlsxExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportXlsxExporter.java
index 610c68b226b..f5b286cc1c0 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportXlsxExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/excel/GPIReportXlsxExporter.java
@@ -1,18 +1,7 @@
package org.dgfoundation.amp.gpi.reports.export.excel;
-import java.io.ByteArrayOutputStream;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.log4j.Logger;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -30,6 +19,13 @@
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
+import java.io.ByteArrayOutputStream;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java
index 813ca695fc6..2449c209667 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output1PdfExporter.java
@@ -1,42 +1,25 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import static java.util.stream.Collectors.groupingBy;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
import org.apache.commons.lang3.StringUtils;
import org.dgfoundation.amp.ar.AmpARFilter;
import org.dgfoundation.amp.ar.ColumnConstants;
-import org.dgfoundation.amp.gpi.reports.GPIDocument;
-import org.dgfoundation.amp.gpi.reports.GPIDonorActivityDocument;
-import org.dgfoundation.amp.gpi.reports.GPIRemark;
-import org.dgfoundation.amp.gpi.reports.GPIReport;
-import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
-import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
-import org.dgfoundation.amp.gpi.reports.GPIReportUtils;
+import org.dgfoundation.amp.gpi.reports.*;
import org.dgfoundation.amp.newreports.CalendarConverter;
import org.dgfoundation.amp.newreports.ReportSettings;
import org.digijava.kernel.ampapi.endpoints.gpi.GPIDataService;
import org.digijava.kernel.translator.TranslatorWorker;
-import com.lowagie.text.Chunk;
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.FontFactory;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.Phrase;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-import com.lowagie.text.pdf.PdfWriter;
+import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.groupingBy;
/**
* @author Viorel Chihai
@@ -84,8 +67,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
// set table width a percentage of the page width
table.setWidthPercentage(100f);
- Font bfBold14 = new Font(Font.HELVETICA, 11, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.ORANGE;
+ Font bfBold14 = new Font(Font.FontFamily.HELVETICA, 11, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.ORANGE;
Map columns = report.getSummary().keySet().stream()
.collect(Collectors.toMap(GPIReportOutputColumn::getOriginalColumnName, Function.identity()));
@@ -107,7 +90,7 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
* @param columns
* @param columnName
*/
- private void insertSummaryCell(GPIReport report, PdfPTable table, Font bfBold14, Color bkgColor,
+ private void insertSummaryCell(GPIReport report, PdfPTable table, Font bfBold14, BaseColor bkgColor,
Map columns, String columnName) {
String summaryValue = report.getSummary().get(columns.get(columnName));
@@ -120,8 +103,8 @@ private void insertSummaryCell(GPIReport report, PdfPTable table, Font bfBold14,
@Override
public void renderReportTableHeader(GPIReport report, PdfPTable table) {
- Font bfBold11 = new Font(Font.HELVETICA, 7, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.LIGHT_GRAY;
+ Font bfBold11 = new Font(Font.FontFamily.HELVETICA, 7, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.LIGHT_GRAY;
insertCell(table, getHeaderColumnLabel(GPIReportConstants.COLUMN_YEAR), Element.ALIGN_CENTER, 1, 1,
bfBold11, bkgColor);
@@ -165,8 +148,8 @@ public void renderReportTableHeader(GPIReport report, PdfPTable table) {
@Override
protected void renderReportTableData(GPIReport report, PdfPTable table) {
- Font bf7 = new Font(Font.HELVETICA, 7);
- Color bkgColor = Color.WHITE;
+ Font bf7 = new Font(Font.FontFamily.HELVETICA, 7);
+ BaseColor bkgColor = BaseColor.WHITE;
Map columns = new HashMap<>();
@@ -201,7 +184,7 @@ protected void renderReportTableData(GPIReport report, PdfPTable table) {
}
}
- private void insertDataCell(PdfPTable table, Font font, Color bkgColor, GPIReportOutputColumn column,
+ private void insertDataCell(PdfPTable table, Font font, BaseColor bkgColor, GPIReportOutputColumn column,
Map rowData) {
String value = rowData.get(column);
@@ -218,7 +201,7 @@ private void insertDataCell(PdfPTable table, Font font, Color bkgColor, GPIRepor
insertCell(table, value, getCellAlignment(column.originalColumnName), 1, 1, font, bkgColor);
}
- private void insertPrimarySectorsCells(PdfPTable table, Font font, Color bkgColor, GPIReportOutputColumn column,
+ private void insertPrimarySectorsCells(PdfPTable table, Font font, BaseColor bkgColor, GPIReportOutputColumn column,
Map rowData) {
String sectors = rowData.get(column);
@@ -233,11 +216,11 @@ private void insertPrimarySectorsCells(PdfPTable table, Font font, Color bkgColo
}
}
- private void insertSupportiveDocumentsCells(PdfPTable table, Color bkgColor,
+ private void insertSupportiveDocumentsCells(PdfPTable table, BaseColor bkgColor,
Map columns, Map rowData) {
- Font urlFont = new Font(Font.HELVETICA, 7);
- urlFont.setColor(Color.BLUE);
+ Font urlFont = new Font(Font.FontFamily.HELVETICA, 7);
+ urlFont.setColor(BaseColor.BLUE);
urlFont.setStyle(Font.UNDERLINE);
String donorId = rowData.get(columns.get(ColumnConstants.DONOR_ID));
@@ -255,7 +238,7 @@ private void insertSupportiveDocumentsCells(PdfPTable table, Color bkgColor,
insertDocumentCell(table, urlFont, bkgColor, documentsMap, GPIReportConstants.GPI_1_Q11c);
}
- private void insertDocumentCell(PdfPTable table, Font font, Color bkgColor,
+ private void insertDocumentCell(PdfPTable table, Font font, BaseColor bkgColor,
Map> documentsMap, String columnName) {
Phrase cellPhrase = new Phrase("", font);
@@ -289,8 +272,8 @@ public void renderReportRemarks(GPIReport report, Paragraph body) {
// set table width a percentage of the page width
table.setWidthPercentage(100f);
- Font bfBold10 = new Font(Font.HELVETICA, 10, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.LIGHT_GRAY;
+ Font bfBold10 = new Font(Font.FontFamily.HELVETICA, 10, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.LIGHT_GRAY;
insertCell(table, TranslatorWorker.translateText("Date"), Element.ALIGN_CENTER, 1, 1, bfBold10, bkgColor);
insertCell(table, TranslatorWorker.translateText("Donor"), Element.ALIGN_CENTER, 1, 1, bfBold10, bkgColor);
@@ -298,8 +281,8 @@ public void renderReportRemarks(GPIReport report, Paragraph body) {
table.setHeaderRows(1);
- Font font = new Font(Font.HELVETICA, 9);
- bkgColor = Color.WHITE;
+ Font font = new Font(Font.FontFamily.HELVETICA, 9);
+ bkgColor = BaseColor.WHITE;
List remarks = GPIReportUtils.getRemarksForIndicator1(report);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java
index e37d6661281..82362bc29b5 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator1Output2PdfExporter.java
@@ -1,17 +1,16 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import java.awt.Color;
-import java.util.Map;
-
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.gpi.reports.GPIReport;
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
import org.dgfoundation.amp.gpi.reports.export.GPIReportMessages;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.Map;
/**
* @author Viorel Chihai
@@ -29,8 +28,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
@Override
public void renderReportTableHeader(GPIReport report, PdfPTable table) {
- Font bfBold11 = new Font(Font.HELVETICA, 10, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.LIGHT_GRAY;
+ Font bfBold11 = new Font(Font.FontFamily.HELVETICA, 10, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.LIGHT_GRAY;
insertCell(table, GPIReportConstants.COLUMN_YEAR, Element.ALIGN_CENTER, 1, bfBold11, bkgColor);
insertCell(table, COLUMN_QUESTION, Element.ALIGN_CENTER, 1, bfBold11, bkgColor);
@@ -42,8 +41,8 @@ public void renderReportTableHeader(GPIReport report, PdfPTable table) {
@Override
public void renderReportTableData(GPIReport report, PdfPTable table) {
- Font bf11 = new Font(Font.HELVETICA, 10);
- Color bkgColor = Color.WHITE;
+ Font bf11 = new Font(Font.FontFamily.HELVETICA, 10);
+ BaseColor bkgColor = BaseColor.WHITE;
GPIReportOutputColumn yearColumn = report.getPage().getHeaders().get(0);
for (int i = 0; i < report.getPage().getContents().size(); i++) {
@@ -62,11 +61,9 @@ public void renderReportTableData(GPIReport report, PdfPTable table) {
@Override
public int getCellAlignment(String columnName) {
- switch (columnName) {
- case COLUMN_QUESTION:
+ if (columnName.equals(COLUMN_QUESTION)) {
return Element.ALIGN_LEFT;
- default:
- return Element.ALIGN_CENTER;
}
+ return Element.ALIGN_CENTER;
}
}
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java
index 98fd580bfa4..dd62948d491 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5aPdfExporter.java
@@ -1,19 +1,15 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import java.awt.Color;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.gpi.reports.GPIReport;
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
import org.dgfoundation.amp.gpi.reports.GPIReportUtils;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.Phrase;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
/**
* @author Viorel Chihai
@@ -40,8 +36,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
table.setWidthPercentage(50f);
table.setHorizontalAlignment(0);
- Font bfBold14 = new Font(Font.HELVETICA, 12, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.ORANGE;
+ Font bfBold14 = new Font(Font.FontFamily.HELVETICA, 12, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.ORANGE;
for (int i = 0; i < report.getPage().getHeaders().size(); i++) {
GPIReportOutputColumn column = report.getPage().getHeaders().get(i);
@@ -60,10 +56,10 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
}
public void renderReportTableHeader(GPIReport report, PdfPTable table) {
- Font bfBold11 = new Font(Font.HELVETICA, 9, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.LIGHT_GRAY;
+ Font bfBold11 = new Font(Font.FontFamily.HELVETICA, 9, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.LIGHT_GRAY;
- report.getPage().getHeaders().stream().forEach(
+ report.getPage().getHeaders().forEach(
column -> insertCell(table, getHeaderColumnName(column), Element.ALIGN_CENTER, 1, bfBold11, bkgColor));
table.setHeaderRows(1);
@@ -72,8 +68,8 @@ public void renderReportTableHeader(GPIReport report, PdfPTable table) {
@Override
protected void renderReportTableData(GPIReport report, PdfPTable table) {
- Font bf11 = new Font(Font.HELVETICA, 9);
- Color bkgColor = Color.WHITE;
+ Font bf11 = new Font(Font.FontFamily.HELVETICA, 9);
+ BaseColor bkgColor = BaseColor.WHITE;
report.getPage().getContents().forEach(row -> {
report.getPage().getHeaders().forEach(col -> {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java
index 24e414cba25..4ca62fe3629 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator5bPdfExporter.java
@@ -1,17 +1,13 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import java.awt.Color;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.ColumnConstants;
import org.dgfoundation.amp.gpi.reports.GPIReport;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.Phrase;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
/**
* @author Viorel Chihai
@@ -31,8 +27,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
table.setWidthPercentage(45f);
table.setHorizontalAlignment(0);
- Font bfBold14 = new Font(Font.HELVETICA, 13, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.ORANGE;
+ Font bfBold14 = new Font(com.itextpdf.text.Font.FontFamily.HELVETICA, 13, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.ORANGE;
for (int i = 0; i < report.getPage().getHeaders().size(); i++) {
GPIReportOutputColumn column = report.getPage().getHeaders().get(i);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator6PdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator6PdfExporter.java
index d8bb22ba2ed..3df8101130f 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator6PdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator6PdfExporter.java
@@ -1,10 +1,9 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
+import com.itextpdf.text.Element;
import org.dgfoundation.amp.ar.MeasureConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
-import com.lowagie.text.Element;
-
/**
* @author Viorel Chihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java
index 84934506469..e0d5e9afd35 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportIndicator9bPdfExporter.java
@@ -1,20 +1,20 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import java.awt.Color;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+import com.itextpdf.text.BaseColor;
+import com.itextpdf.text.Element;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Paragraph;
+import com.itextpdf.text.pdf.PdfPTable;
import org.dgfoundation.amp.ar.MeasureConstants;
import org.dgfoundation.amp.gpi.reports.GPIReport;
import org.dgfoundation.amp.gpi.reports.GPIReportConstants;
import org.dgfoundation.amp.gpi.reports.GPIReportOutputColumn;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.pdf.PdfPTable;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
/**
* @author Viorel Chihai
@@ -36,8 +36,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
// set table width a percentage of the page width
table.setWidthPercentage(DEFAULT_TABLE_WIDTH_PERCENTAGE);
- Font bfBold14 = new Font(Font.HELVETICA, FONT_SIZE_SUMMARY, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.ORANGE;
+ Font bfBold14 = new Font(com.itextpdf.text.Font.FontFamily.HELVETICA, FONT_SIZE_SUMMARY, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.ORANGE;
Map columns = report.getSummary().keySet().stream()
.collect(Collectors.toMap(GPIReportOutputColumn::getOriginalColumnName, Function.identity()));
@@ -65,7 +65,7 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
* @param bkgColor
* @param colspan
*/
- public void addSummaryPdfCell(GPIReport report, PdfPTable table, Font bfBold14, Color bkgColor, int colspan,
+ public void addSummaryPdfCell(GPIReport report, PdfPTable table, Font bfBold14, BaseColor bkgColor, int colspan,
GPIReportOutputColumn ind9BColumn) {
String cellValue = String.format("%s\n%s", report.getSummary().get(ind9BColumn), ind9BColumn.columnName);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java
index d4fcd81c66f..dfd2cad9aed 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/gpi/reports/export/pdf/GPIReportPdfExporter.java
@@ -1,12 +1,10 @@
package org.dgfoundation.amp.gpi.reports.export.pdf;
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
import org.apache.log4j.Logger;
import org.dgfoundation.amp.currency.ConstantCurrency;
import org.dgfoundation.amp.gpi.reports.GPIReport;
@@ -15,18 +13,11 @@
import org.digijava.module.aim.helper.GlobalSettingsConstants;
import org.digijava.module.aim.util.FeaturesUtil;
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Element;
-import com.lowagie.text.Font;
-import com.lowagie.text.FontFactory;
-import com.lowagie.text.PageSize;
-import com.lowagie.text.Paragraph;
-import com.lowagie.text.Phrase;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.pdf.PdfPCell;
-import com.lowagie.text.pdf.PdfPTable;
-import com.lowagie.text.pdf.PdfWriter;
+import java.io.ByteArrayOutputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
/**
* @author Viorel Chihai
@@ -105,7 +96,7 @@ public void renderReportTitle(GPIReport report, Paragraph body) {
}
public void renderReportSettings(GPIReport report, Paragraph body) {
- Font bf10 = new Font(Font.HELVETICA, FONT_SIZE_SETTINGS);
+ Font bf10 = new Font(Font.FontFamily.HELVETICA, FONT_SIZE_SETTINGS);
String units = report.getSpec().getSettings().getUnitsOption().userMessage;
String currency = report.getSettings().getCurrencyCode();
@@ -124,8 +115,8 @@ public void renderReportTableSummary(GPIReport report, Paragraph body) {
// set table width a percentage of the page width
table.setWidthPercentage(100f);
- Font bfBold14 = new Font(Font.HELVETICA, FONT_SIZE_SUMMARY, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.ORANGE;
+ Font bfBold14 = new Font(Font.FontFamily.HELVETICA, FONT_SIZE_SUMMARY, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.ORANGE;
for (int i = 0; i < report.getPage().getHeaders().size(); i++) {
GPIReportOutputColumn column = report.getPage().getHeaders().get(i);
@@ -155,8 +146,8 @@ public void renderReportTable(GPIReport report, Paragraph body) {
}
public void renderReportTableHeader(GPIReport report, PdfPTable table) {
- Font bfBold11 = new Font(Font.HELVETICA, 10, Font.BOLD, new Color(0, 0, 0));
- Color bkgColor = Color.LIGHT_GRAY;
+ Font bfBold11 = new Font(Font.FontFamily.HELVETICA, 10, Font.BOLD, new BaseColor(0, 0, 0));
+ BaseColor bkgColor = BaseColor.LIGHT_GRAY;
List columns = getDataTableColumns(report);
columns.forEach(column -> insertCell(table, getHeaderColumnName(column),
@@ -167,8 +158,8 @@ public void renderReportTableHeader(GPIReport report, PdfPTable table) {
}
protected void renderReportTableData(GPIReport report, PdfPTable table) {
- Font bf10 = new Font(Font.HELVETICA, 10);
- Color bkgColor = Color.WHITE;
+ Font bf10 = new Font(Font.FontFamily.HELVETICA, 10);
+ BaseColor bkgColor = BaseColor.WHITE;
List columns = getDataTableColumns(report);
report.getPage().getContents().forEach(row -> {
@@ -222,12 +213,12 @@ protected Rectangle calculateDocumentSize(int resultWidth) {
return size;
}
- protected void insertCell(PdfPTable table, String text, int align, int colspan, Font font, Color bkgColor) {
+ protected void insertCell(PdfPTable table, String text, int align, int colspan, Font font, BaseColor bkgColor) {
insertCell(table, text, align, colspan, 1, font, bkgColor);
}
protected void insertCell(PdfPTable table, String text, int align, int colspan, int rowspan, Font font,
- Color bkgColor) {
+ BaseColor bkgColor) {
text = text == null ? "" : text.trim();
Phrase phrase = new Phrase(text, font);
@@ -245,7 +236,7 @@ protected void insertCell(PdfPTable table, PdfPCell cell, float height) {
table.addCell(cell);
}
- protected PdfPCell generatePdfCell(Phrase phrase, int align, int valign, int colspan, int rowspan, Color bkgColor) {
+ protected PdfPCell generatePdfCell(Phrase phrase, int align, int valign, int colspan, int rowspan, BaseColor bkgColor) {
PdfPCell cell = new PdfPCell(phrase);
cell.setHorizontalAlignment(align);
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/importers/AmpImporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/importers/AmpImporter.java
index a95a6d60fce..17de6773a7a 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/importers/AmpImporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/importers/AmpImporter.java
@@ -3,20 +3,17 @@
*/
package org.dgfoundation.amp.importers;
+import org.apache.log4j.Logger;
+import org.digijava.kernel.persistence.PersistenceManager;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
-import java.sql.SQLException;
import java.util.Map;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-
-import org.apache.log4j.Logger;
-import org.dgfoundation.amp.ar.MetaInfo;
-import org.digijava.kernel.persistence.PersistenceManager;
-
/**
* @author mihai
*
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/importers/CSVImporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/importers/CSVImporter.java
index 454bb3cc7a9..4848351fff6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/importers/CSVImporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/importers/CSVImporter.java
@@ -9,7 +9,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.StringTokenizer;
/**
* @author mihai
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/importers/GazeteerCSVImporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/importers/GazeteerCSVImporter.java
index f1bfc75cbfd..bbc35e0bbf6 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/importers/GazeteerCSVImporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/importers/GazeteerCSVImporter.java
@@ -1,17 +1,16 @@
package org.dgfoundation.amp.importers;
-import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.log4j.Logger;
import org.dgfoundation.amp.ar.viewfetcher.SQLUtils;
import org.digijava.kernel.ampapi.postgis.entity.AmpLocator;
import org.digijava.kernel.persistence.PersistenceManager;
import org.hibernate.HibernateException;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Map;
+import java.util.Properties;
/**
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/importers/ImporterWorker.java b/amp/WEB-INF/src/org/dgfoundation/amp/importers/ImporterWorker.java
index d3ff78208aa..78a86c8dabb 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/importers/ImporterWorker.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/importers/ImporterWorker.java
@@ -3,22 +3,13 @@
*/
package org.dgfoundation.amp.importers;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
import javax.servlet.ServletContext;
-
-import org.apache.log4j.Logger;
+import java.io.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
/**
* @author mihai
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/importers/OrganizationCSVImporter.java b/amp/WEB-INF/src/org/dgfoundation/amp/importers/OrganizationCSVImporter.java
index e2d9ef77bed..44f8a742a99 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/importers/OrganizationCSVImporter.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/importers/OrganizationCSVImporter.java
@@ -3,18 +3,18 @@
*/
package org.dgfoundation.amp.importers;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.log4j.Logger;
import org.digijava.module.aim.dbentity.AmpOrgGroup;
import org.digijava.module.aim.dbentity.AmpOrgType;
import org.digijava.module.aim.dbentity.AmpOrganisation;
import org.hibernate.HibernateException;
-import org.hibernate.Query;
+import org.hibernate.query.Query;
import org.hibernate.type.StringType;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @author mihai
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuItemsProcessor.java b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuItemsProcessor.java
index d4f0f521e47..5d30cdc9e6e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuItemsProcessor.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuItemsProcessor.java
@@ -3,19 +3,8 @@
*/
package org.dgfoundation.amp.menu;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.commons.collections.CollectionUtils;
-import org.dgfoundation.amp.menu.dynamic.DynamicMenu;
-import org.dgfoundation.amp.menu.dynamic.EmailMenu;
-import org.dgfoundation.amp.menu.dynamic.LanguageMenu;
-import org.dgfoundation.amp.menu.dynamic.PublicSiteMenu;
-import org.dgfoundation.amp.menu.dynamic.WorkspaceMenu;
+import org.dgfoundation.amp.menu.dynamic.*;
import org.dgfoundation.amp.visibility.data.FMSettingsMediator;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.kernel.translator.TranslatorWorker;
@@ -26,6 +15,8 @@
import org.digijava.module.aim.util.FeaturesUtil;
import org.digijava.module.aim.util.TeamMemberUtil;
+import java.util.*;
+
/**
* Updates current menu structure based on the current user & state
*
@@ -60,7 +51,7 @@ private MenuItemsProcessor(AmpView view) {
currentUserGroupKeys.add(Group.PLEDGERS);
}
if (tm != null && tm.getMemberId() != null) {
- AmpTeamMember atm = TeamMemberUtil.getAmpTeamMember(tm.getMemberId());
+ AmpTeamMember atm = TeamMemberUtil.getAmpTeamMember(tm.getMemberId());
Set userGroups = atm != null && atm.getUser() != null ? atm.getUser().getGroups() : null;
if (userGroups != null) {
for(Group group : userGroups) {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuStructure.java b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuStructure.java
index da386dd170b..da9ece408aa 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuStructure.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuStructure.java
@@ -3,18 +3,13 @@
*/
package org.dgfoundation.amp.menu;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.log4j.Logger;
import org.dgfoundation.amp.visibility.data.DataVisibility;
import org.digijava.kernel.user.Group;
import org.digijava.module.aim.dbentity.AmpMenuEntryInView;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
/**
* Keeps all possible menu entries for a specific public/admin/team view,
@@ -23,16 +18,20 @@
* @author Nadejda Mandrescu
*/
public class MenuStructure {
- private static Logger logger = Logger.getLogger(MenuStructure.class);
+ private static Logger logger = LoggerFactory.getLogger(MenuStructure.class);
private static Map structurePerView = initViews();
private static Map initViews() {
- Map viewsMap = new TreeMap();
- for (AmpView view : AmpView.values()) {
- viewsMap.put(view, new MenuStructure(MenuUtils.getMenuEntries(view, true), view));
- }
- return Collections.synchronizedMap(viewsMap);
+
+ Map viewsMap = new TreeMap();
+ for (AmpView view : AmpView.values()) {
+ viewsMap.put(view, new MenuStructure(MenuUtils.getMenuEntries(view, true), view));
+ }
+ return Collections.synchronizedMap(viewsMap);
+
+
+
}
/**
@@ -64,6 +63,7 @@ private MenuStructure(List orderedEntries, AmpView view) {
Map itemsMap = new HashMap();
itemsMap.put(null, root);
for (T t : orderedEntries) {
+
AmpMenuEntryInView ame = (AmpMenuEntryInView) t;
Set groupKeys = new HashSet();
for (Group group : ame.getGroups()) {
diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuUtils.java b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuUtils.java
index 36b61712d13..8bb239ba60e 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuUtils.java
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/menu/MenuUtils.java
@@ -3,14 +3,16 @@
*/
package org.dgfoundation.amp.menu;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.digijava.kernel.persistence.PersistenceManager;
import org.digijava.kernel.request.TLSUtils;
import org.digijava.module.aim.dbentity.AmpMenuEntryInView;
import org.digijava.module.aim.helper.Constants;
import org.digijava.module.aim.helper.TeamMember;
+import org.hibernate.query.Query;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
/**
* Menu utility methods
@@ -27,17 +29,22 @@ public static List getMenuEntries(AmpView view, boolean orde
String query = "select ame from " + AmpMenuEntryInView.class.getName()
+ " ame where ame.viewType=:viewType"
+ (orderByPosition ? " order by ame.position asc" : "");
-
- List entries = PersistenceManager.getSession().createQuery(query)
- .setParameter("viewType", view).list();
- return entries;
+// String nativeQuery = "SELECT * FROM AMP_MENU_ENTRY_VIEW ame WHERE ame.view_type = :viewType";
+ Query q ;
+ q=PersistenceManager.getRequestDBSession().createQuery(query, AmpMenuEntryInView.class);
+ q.setParameter("viewType", view);
+ List res = q.list();
+ System.out.println(res);
+ return res;
}
/**
* @return detects current view type (Public, Team, Admin)
*/
public static AmpView getCurrentView() {
- TeamMember tm = (TeamMember) TLSUtils.getRequest().getSession().getAttribute(Constants.CURRENT_MEMBER);
+ HttpSession session =TLSUtils.getRequest().getSession();
+ TeamMember tm = (TeamMember) session.getAttribute(Constants.CURRENT_MEMBER);
+ System.out.println(tm);
if (tm == null) {
return AmpView.PUBLIC;
}
@@ -55,11 +62,20 @@ public static boolean isAmpAdmin() {
* @return current menu items list
*/
public static List