作者 shenhailong

前端导出excel

@@ -24,7 +24,8 @@ module.exports = { @@ -24,7 +24,8 @@ module.exports = {
24 alias: { 24 alias: {
25 'vue$': 'vue/dist/vue.esm.js', 25 'vue$': 'vue/dist/vue.esm.js',
26 '@': resolve('src'), 26 '@': resolve('src'),
27 - 'scss_vars': '@/styles/vars.scss' 27 + 'scss_vars': '@/styles/vars.scss',
  28 + 'vendor': path.resolve(__dirname,'../src/views/excel/vendor')
28 } 29 }
29 }, 30 },
30 module: { 31 module: {
@@ -51,9 +51,9 @@ @@ -51,9 +51,9 @@
51 } 51 }
52 }, 52 },
53 "acorn": { 53 "acorn": {
54 - "version": "6.3.0",  
55 - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",  
56 - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" 54 + "version": "6.4.1",
  55 + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
  56 + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="
57 }, 57 },
58 "acorn-dynamic-import": { 58 "acorn-dynamic-import": {
59 "version": "2.0.2", 59 "version": "2.0.2",
@@ -164,6 +164,7 @@ @@ -164,6 +164,7 @@
164 "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", 164 "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
165 "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", 165 "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
166 "dev": true, 166 "dev": true,
  167 + "optional": true,
167 "requires": { 168 "requires": {
168 "micromatch": "^3.1.4", 169 "micromatch": "^3.1.4",
169 "normalize-path": "^2.1.1" 170 "normalize-path": "^2.1.1"
@@ -173,19 +174,22 @@ @@ -173,19 +174,22 @@
173 "version": "4.0.0", 174 "version": "4.0.0",
174 "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", 175 "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
175 "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", 176 "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
176 - "dev": true 177 + "dev": true,
  178 + "optional": true
177 }, 179 },
178 "array-unique": { 180 "array-unique": {
179 "version": "0.3.2", 181 "version": "0.3.2",
180 "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", 182 "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
181 "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", 183 "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
182 - "dev": true 184 + "dev": true,
  185 + "optional": true
183 }, 186 },
184 "braces": { 187 "braces": {
185 "version": "2.3.2", 188 "version": "2.3.2",
186 "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", 189 "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
187 "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", 190 "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
188 "dev": true, 191 "dev": true,
  192 + "optional": true,
189 "requires": { 193 "requires": {
190 "arr-flatten": "^1.1.0", 194 "arr-flatten": "^1.1.0",
191 "array-unique": "^0.3.2", 195 "array-unique": "^0.3.2",
@@ -204,6 +208,7 @@ @@ -204,6 +208,7 @@
204 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 208 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
205 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 209 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
206 "dev": true, 210 "dev": true,
  211 + "optional": true,
207 "requires": { 212 "requires": {
208 "is-extendable": "^0.1.0" 213 "is-extendable": "^0.1.0"
209 } 214 }
@@ -215,6 +220,7 @@ @@ -215,6 +220,7 @@
215 "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", 220 "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
216 "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", 221 "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
217 "dev": true, 222 "dev": true,
  223 + "optional": true,
218 "requires": { 224 "requires": {
219 "debug": "^2.3.3", 225 "debug": "^2.3.3",
220 "define-property": "^0.2.5", 226 "define-property": "^0.2.5",
@@ -230,6 +236,7 @@ @@ -230,6 +236,7 @@
230 "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", 236 "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
231 "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", 237 "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
232 "dev": true, 238 "dev": true,
  239 + "optional": true,
233 "requires": { 240 "requires": {
234 "is-descriptor": "^0.1.0" 241 "is-descriptor": "^0.1.0"
235 } 242 }
@@ -239,6 +246,7 @@ @@ -239,6 +246,7 @@
239 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 246 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
240 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 247 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
241 "dev": true, 248 "dev": true,
  249 + "optional": true,
242 "requires": { 250 "requires": {
243 "is-extendable": "^0.1.0" 251 "is-extendable": "^0.1.0"
244 } 252 }
@@ -248,6 +256,7 @@ @@ -248,6 +256,7 @@
248 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", 256 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
249 "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", 257 "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
250 "dev": true, 258 "dev": true,
  259 + "optional": true,
251 "requires": { 260 "requires": {
252 "kind-of": "^3.0.2" 261 "kind-of": "^3.0.2"
253 }, 262 },
@@ -257,6 +266,7 @@ @@ -257,6 +266,7 @@
257 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 266 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
258 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 267 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
259 "dev": true, 268 "dev": true,
  269 + "optional": true,
260 "requires": { 270 "requires": {
261 "is-buffer": "^1.1.5" 271 "is-buffer": "^1.1.5"
262 } 272 }
@@ -268,6 +278,7 @@ @@ -268,6 +278,7 @@
268 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", 278 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
269 "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", 279 "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
270 "dev": true, 280 "dev": true,
  281 + "optional": true,
271 "requires": { 282 "requires": {
272 "kind-of": "^3.0.2" 283 "kind-of": "^3.0.2"
273 }, 284 },
@@ -277,6 +288,7 @@ @@ -277,6 +288,7 @@
277 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 288 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
278 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 289 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
279 "dev": true, 290 "dev": true,
  291 + "optional": true,
280 "requires": { 292 "requires": {
281 "is-buffer": "^1.1.5" 293 "is-buffer": "^1.1.5"
282 } 294 }
@@ -288,6 +300,7 @@ @@ -288,6 +300,7 @@
288 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", 300 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
289 "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", 301 "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
290 "dev": true, 302 "dev": true,
  303 + "optional": true,
291 "requires": { 304 "requires": {
292 "is-accessor-descriptor": "^0.1.6", 305 "is-accessor-descriptor": "^0.1.6",
293 "is-data-descriptor": "^0.1.4", 306 "is-data-descriptor": "^0.1.4",
@@ -298,7 +311,8 @@ @@ -298,7 +311,8 @@
298 "version": "5.1.0", 311 "version": "5.1.0",
299 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", 312 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
300 "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", 313 "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
301 - "dev": true 314 + "dev": true,
  315 + "optional": true
302 } 316 }
303 } 317 }
304 }, 318 },
@@ -307,6 +321,7 @@ @@ -307,6 +321,7 @@
307 "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", 321 "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
308 "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", 322 "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
309 "dev": true, 323 "dev": true,
  324 + "optional": true,
310 "requires": { 325 "requires": {
311 "array-unique": "^0.3.2", 326 "array-unique": "^0.3.2",
312 "define-property": "^1.0.0", 327 "define-property": "^1.0.0",
@@ -323,6 +338,7 @@ @@ -323,6 +338,7 @@
323 "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", 338 "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
324 "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", 339 "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
325 "dev": true, 340 "dev": true,
  341 + "optional": true,
326 "requires": { 342 "requires": {
327 "is-descriptor": "^1.0.0" 343 "is-descriptor": "^1.0.0"
328 } 344 }
@@ -332,6 +348,7 @@ @@ -332,6 +348,7 @@
332 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 348 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
333 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 349 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
334 "dev": true, 350 "dev": true,
  351 + "optional": true,
335 "requires": { 352 "requires": {
336 "is-extendable": "^0.1.0" 353 "is-extendable": "^0.1.0"
337 } 354 }
@@ -343,6 +360,7 @@ @@ -343,6 +360,7 @@
343 "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", 360 "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
344 "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", 361 "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
345 "dev": true, 362 "dev": true,
  363 + "optional": true,
346 "requires": { 364 "requires": {
347 "extend-shallow": "^2.0.1", 365 "extend-shallow": "^2.0.1",
348 "is-number": "^3.0.0", 366 "is-number": "^3.0.0",
@@ -355,6 +373,7 @@ @@ -355,6 +373,7 @@
355 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 373 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
356 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 374 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
357 "dev": true, 375 "dev": true,
  376 + "optional": true,
358 "requires": { 377 "requires": {
359 "is-extendable": "^0.1.0" 378 "is-extendable": "^0.1.0"
360 } 379 }
@@ -366,6 +385,7 @@ @@ -366,6 +385,7 @@
366 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", 385 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
367 "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", 386 "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
368 "dev": true, 387 "dev": true,
  388 + "optional": true,
369 "requires": { 389 "requires": {
370 "kind-of": "^6.0.0" 390 "kind-of": "^6.0.0"
371 } 391 }
@@ -375,6 +395,7 @@ @@ -375,6 +395,7 @@
375 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", 395 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
376 "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", 396 "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
377 "dev": true, 397 "dev": true,
  398 + "optional": true,
378 "requires": { 399 "requires": {
379 "kind-of": "^6.0.0" 400 "kind-of": "^6.0.0"
380 } 401 }
@@ -384,6 +405,7 @@ @@ -384,6 +405,7 @@
384 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", 405 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
385 "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", 406 "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
386 "dev": true, 407 "dev": true,
  408 + "optional": true,
387 "requires": { 409 "requires": {
388 "is-accessor-descriptor": "^1.0.0", 410 "is-accessor-descriptor": "^1.0.0",
389 "is-data-descriptor": "^1.0.0", 411 "is-data-descriptor": "^1.0.0",
@@ -395,6 +417,7 @@ @@ -395,6 +417,7 @@
395 "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", 417 "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
396 "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", 418 "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
397 "dev": true, 419 "dev": true,
  420 + "optional": true,
398 "requires": { 421 "requires": {
399 "kind-of": "^3.0.2" 422 "kind-of": "^3.0.2"
400 }, 423 },
@@ -404,6 +427,7 @@ @@ -404,6 +427,7 @@
404 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 427 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
405 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 428 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
406 "dev": true, 429 "dev": true,
  430 + "optional": true,
407 "requires": { 431 "requires": {
408 "is-buffer": "^1.1.5" 432 "is-buffer": "^1.1.5"
409 } 433 }
@@ -414,19 +438,22 @@ @@ -414,19 +438,22 @@
414 "version": "3.0.1", 438 "version": "3.0.1",
415 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", 439 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
416 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", 440 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
417 - "dev": true 441 + "dev": true,
  442 + "optional": true
418 }, 443 },
419 "kind-of": { 444 "kind-of": {
420 - "version": "6.0.2",  
421 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
422 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",  
423 - "dev": true 445 + "version": "6.0.3",
  446 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  447 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
  448 + "dev": true,
  449 + "optional": true
424 }, 450 },
425 "micromatch": { 451 "micromatch": {
426 "version": "3.1.10", 452 "version": "3.1.10",
427 "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", 453 "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
428 "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", 454 "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
429 "dev": true, 455 "dev": true,
  456 + "optional": true,
430 "requires": { 457 "requires": {
431 "arr-diff": "^4.0.0", 458 "arr-diff": "^4.0.0",
432 "array-unique": "^0.3.2", 459 "array-unique": "^0.3.2",
@@ -597,7 +624,8 @@ @@ -597,7 +624,8 @@
597 "version": "1.0.3", 624 "version": "1.0.3",
598 "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", 625 "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
599 "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", 626 "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
600 - "dev": true 627 + "dev": true,
  628 + "optional": true
601 }, 629 },
602 "async-foreach": { 630 "async-foreach": {
603 "version": "0.1.3", 631 "version": "0.1.3",
@@ -652,9 +680,9 @@ @@ -652,9 +680,9 @@
652 "dev": true 680 "dev": true
653 }, 681 },
654 "aws4": { 682 "aws4": {
655 - "version": "1.8.0",  
656 - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",  
657 - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", 683 + "version": "1.10.0",
  684 + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
  685 + "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
658 "dev": true 686 "dev": true
659 }, 687 },
660 "axios": { 688 "axios": {
@@ -1604,8 +1632,7 @@ @@ -1604,8 +1632,7 @@
1604 }, 1632 },
1605 "kind-of": { 1633 "kind-of": {
1606 "version": "6.0.2", 1634 "version": "6.0.2",
1607 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
1608 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 1635 + "resolved": "",
1609 "dev": true 1636 "dev": true
1610 } 1637 }
1611 } 1638 }
@@ -1646,7 +1673,8 @@ @@ -1646,7 +1673,8 @@
1646 "version": "1.13.1", 1673 "version": "1.13.1",
1647 "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", 1674 "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
1648 "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", 1675 "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
1649 - "dev": true 1676 + "dev": true,
  1677 + "optional": true
1650 }, 1678 },
1651 "block-stream": { 1679 "block-stream": {
1652 "version": "0.0.9", 1680 "version": "0.0.9",
@@ -1989,9 +2017,9 @@ @@ -1989,9 +2017,9 @@
1989 } 2017 }
1990 }, 2018 },
1991 "cfb": { 2019 "cfb": {
1992 - "version": "1.1.3",  
1993 - "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.3.tgz",  
1994 - "integrity": "sha512-joXBW0nMuwV9no7UTMiyVJnQL6XIU3ThXVjFUDHgl9MpILPOomyfaGqC290VELZ48bbQKZXnQ81UT5HouTxHsw==", 2020 + "version": "1.1.4",
  2021 + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.4.tgz",
  2022 + "integrity": "sha512-rwFkl3aFO3f+ljR27YINwC0x8vPjyiEVbYbrTCKzspEf7Q++3THdfHVgJYNUbxNcupJECrLX+L40Mjm9hm/Bgw==",
1995 "requires": { 2023 "requires": {
1996 "adler-32": "~1.2.0", 2024 "adler-32": "~1.2.0",
1997 "commander": "^2.16.0", 2025 "commander": "^2.16.0",
@@ -2052,115 +2080,6 @@ @@ -2052,115 +2080,6 @@
2052 "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==", 2080 "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
2053 "dev": true 2081 "dev": true
2054 }, 2082 },
2055 - "chokidar": {  
2056 - "version": "2.1.6",  
2057 - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",  
2058 - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",  
2059 - "dev": true,  
2060 - "requires": {  
2061 - "anymatch": "^2.0.0",  
2062 - "async-each": "^1.0.1",  
2063 - "braces": "^2.3.2",  
2064 - "fsevents": "^1.2.7",  
2065 - "glob-parent": "^3.1.0",  
2066 - "inherits": "^2.0.3",  
2067 - "is-binary-path": "^1.0.0",  
2068 - "is-glob": "^4.0.0",  
2069 - "normalize-path": "^3.0.0",  
2070 - "path-is-absolute": "^1.0.0",  
2071 - "readdirp": "^2.2.1",  
2072 - "upath": "^1.1.1"  
2073 - },  
2074 - "dependencies": {  
2075 - "array-unique": {  
2076 - "version": "0.3.2",  
2077 - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",  
2078 - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",  
2079 - "dev": true  
2080 - },  
2081 - "braces": {  
2082 - "version": "2.3.2",  
2083 - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",  
2084 - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",  
2085 - "dev": true,  
2086 - "requires": {  
2087 - "arr-flatten": "^1.1.0",  
2088 - "array-unique": "^0.3.2",  
2089 - "extend-shallow": "^2.0.1",  
2090 - "fill-range": "^4.0.0",  
2091 - "isobject": "^3.0.1",  
2092 - "repeat-element": "^1.1.2",  
2093 - "snapdragon": "^0.8.1",  
2094 - "snapdragon-node": "^2.0.1",  
2095 - "split-string": "^3.0.2",  
2096 - "to-regex": "^3.0.1"  
2097 - }  
2098 - },  
2099 - "extend-shallow": {  
2100 - "version": "2.0.1",  
2101 - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",  
2102 - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",  
2103 - "dev": true,  
2104 - "requires": {  
2105 - "is-extendable": "^0.1.0"  
2106 - }  
2107 - },  
2108 - "fill-range": {  
2109 - "version": "4.0.0",  
2110 - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",  
2111 - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",  
2112 - "dev": true,  
2113 - "requires": {  
2114 - "extend-shallow": "^2.0.1",  
2115 - "is-number": "^3.0.0",  
2116 - "repeat-string": "^1.6.1",  
2117 - "to-regex-range": "^2.1.0"  
2118 - }  
2119 - },  
2120 - "glob-parent": {  
2121 - "version": "3.1.0",  
2122 - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",  
2123 - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",  
2124 - "dev": true,  
2125 - "requires": {  
2126 - "is-glob": "^3.1.0",  
2127 - "path-dirname": "^1.0.0"  
2128 - },  
2129 - "dependencies": {  
2130 - "is-glob": {  
2131 - "version": "3.1.0",  
2132 - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",  
2133 - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",  
2134 - "dev": true,  
2135 - "requires": {  
2136 - "is-extglob": "^2.1.0"  
2137 - }  
2138 - }  
2139 - }  
2140 - },  
2141 - "is-number": {  
2142 - "version": "3.0.0",  
2143 - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",  
2144 - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",  
2145 - "dev": true,  
2146 - "requires": {  
2147 - "kind-of": "^3.0.2"  
2148 - }  
2149 - },  
2150 - "isobject": {  
2151 - "version": "3.0.1",  
2152 - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",  
2153 - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",  
2154 - "dev": true  
2155 - },  
2156 - "normalize-path": {  
2157 - "version": "3.0.0",  
2158 - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",  
2159 - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",  
2160 - "dev": true  
2161 - }  
2162 - }  
2163 - },  
2164 "chownr": { 2083 "chownr": {
2165 "version": "1.1.2", 2084 "version": "1.1.2",
2166 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", 2085 "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
@@ -2252,49 +2171,57 @@ @@ -2252,49 +2171,57 @@
2252 "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" 2171 "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
2253 }, 2172 },
2254 "cliui": { 2173 "cliui": {
2255 - "version": "3.2.0",  
2256 - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",  
2257 - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", 2174 + "version": "5.0.0",
  2175 + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
  2176 + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
2258 "dev": true, 2177 "dev": true,
2259 "requires": { 2178 "requires": {
2260 - "string-width": "^1.0.1",  
2261 - "strip-ansi": "^3.0.1",  
2262 - "wrap-ansi": "^2.0.0" 2179 + "string-width": "^3.1.0",
  2180 + "strip-ansi": "^5.2.0",
  2181 + "wrap-ansi": "^5.1.0"
2263 }, 2182 },
2264 "dependencies": { 2183 "dependencies": {
2265 - "ansi-regex": {  
2266 - "version": "2.1.1",  
2267 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",  
2268 - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", 2184 + "emoji-regex": {
  2185 + "version": "7.0.3",
  2186 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  2187 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
2269 "dev": true 2188 "dev": true
2270 }, 2189 },
2271 "is-fullwidth-code-point": { 2190 "is-fullwidth-code-point": {
2272 - "version": "1.0.0",  
2273 - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",  
2274 - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", 2191 + "version": "2.0.0",
  2192 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
  2193 + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
  2194 + "dev": true
  2195 + },
  2196 + "string-width": {
  2197 + "version": "3.1.0",
  2198 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  2199 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
2275 "dev": true, 2200 "dev": true,
2276 "requires": { 2201 "requires": {
2277 - "number-is-nan": "^1.0.0" 2202 + "emoji-regex": "^7.0.1",
  2203 + "is-fullwidth-code-point": "^2.0.0",
  2204 + "strip-ansi": "^5.1.0"
2278 } 2205 }
2279 }, 2206 },
2280 - "string-width": {  
2281 - "version": "1.0.2",  
2282 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",  
2283 - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", 2207 + "strip-ansi": {
  2208 + "version": "5.2.0",
  2209 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  2210 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
2284 "dev": true, 2211 "dev": true,
2285 "requires": { 2212 "requires": {
2286 - "code-point-at": "^1.0.0",  
2287 - "is-fullwidth-code-point": "^1.0.0",  
2288 - "strip-ansi": "^3.0.0" 2213 + "ansi-regex": "^4.1.0"
2289 } 2214 }
2290 }, 2215 },
2291 - "strip-ansi": {  
2292 - "version": "3.0.1",  
2293 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",  
2294 - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", 2216 + "wrap-ansi": {
  2217 + "version": "5.1.0",
  2218 + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
  2219 + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
2295 "dev": true, 2220 "dev": true,
2296 "requires": { 2221 "requires": {
2297 - "ansi-regex": "^2.0.0" 2222 + "ansi-styles": "^3.2.0",
  2223 + "string-width": "^3.0.0",
  2224 + "strip-ansi": "^5.0.0"
2298 } 2225 }
2299 } 2226 }
2300 } 2227 }
@@ -2327,9 +2254,9 @@ @@ -2327,9 +2254,9 @@
2327 } 2254 }
2328 }, 2255 },
2329 "kind-of": { 2256 "kind-of": {
2330 - "version": "6.0.2",  
2331 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
2332 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 2257 + "version": "6.0.3",
  2258 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  2259 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
2333 "dev": true 2260 "dev": true
2334 } 2261 }
2335 } 2262 }
@@ -2640,8 +2567,7 @@ @@ -2640,8 +2567,7 @@
2640 }, 2567 },
2641 "minimist": { 2568 "minimist": {
2642 "version": "1.2.0", 2569 "version": "1.2.0",
2643 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
2644 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 2570 + "resolved": "",
2645 "dev": true 2571 "dev": true
2646 }, 2572 },
2647 "pkg-dir": { 2573 "pkg-dir": {
@@ -2681,9 +2607,9 @@ @@ -2681,9 +2607,9 @@
2681 }, 2607 },
2682 "dependencies": { 2608 "dependencies": {
2683 "minimist": { 2609 "minimist": {
2684 - "version": "1.2.0",  
2685 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
2686 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 2610 + "version": "1.2.5",
  2611 + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
  2612 + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
2687 "dev": true 2613 "dev": true
2688 } 2614 }
2689 } 2615 }
@@ -2819,8 +2745,7 @@ @@ -2819,8 +2745,7 @@
2819 }, 2745 },
2820 "minimist": { 2746 "minimist": {
2821 "version": "1.2.0", 2747 "version": "1.2.0",
2822 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
2823 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 2748 + "resolved": "",
2824 "dev": true 2749 "dev": true
2825 } 2750 }
2826 } 2751 }
@@ -3041,9 +2966,9 @@ @@ -3041,9 +2966,9 @@
3041 "dev": true 2966 "dev": true
3042 }, 2967 },
3043 "kind-of": { 2968 "kind-of": {
3044 - "version": "6.0.2",  
3045 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
3046 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 2969 + "version": "6.0.3",
  2970 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  2971 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
3047 "dev": true 2972 "dev": true
3048 } 2973 }
3049 } 2974 }
@@ -3450,11 +3375,11 @@ @@ -3450,11 +3375,11 @@
3450 } 3375 }
3451 }, 3376 },
3452 "eslint-utils": { 3377 "eslint-utils": {
3453 - "version": "1.4.0",  
3454 - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",  
3455 - "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", 3378 + "version": "1.4.3",
  3379 + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
  3380 + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
3456 "requires": { 3381 "requires": {
3457 - "eslint-visitor-keys": "^1.0.0" 3382 + "eslint-visitor-keys": "^1.1.0"
3458 } 3383 }
3459 }, 3384 },
3460 "eslint-visitor-keys": { 3385 "eslint-visitor-keys": {
@@ -3509,12 +3434,6 @@ @@ -3509,12 +3434,6 @@
3509 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", 3434 "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
3510 "dev": true 3435 "dev": true
3511 }, 3436 },
3512 - "eventemitter3": {  
3513 - "version": "3.1.2",  
3514 - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",  
3515 - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",  
3516 - "dev": true  
3517 - },  
3518 "events": { 3437 "events": {
3519 "version": "3.0.0", 3438 "version": "3.0.0",
3520 "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", 3439 "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -3717,8 +3636,7 @@ @@ -3717,8 +3636,7 @@
3717 }, 3636 },
3718 "kind-of": { 3637 "kind-of": {
3719 "version": "6.0.2", 3638 "version": "6.0.2",
3720 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
3721 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 3639 + "resolved": "",
3722 "dev": true 3640 "dev": true
3723 } 3641 }
3724 } 3642 }
@@ -3763,8 +3681,7 @@ @@ -3763,8 +3681,7 @@
3763 }, 3681 },
3764 "minimist": { 3682 "minimist": {
3765 "version": "1.2.0", 3683 "version": "1.2.0",
3766 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
3767 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 3684 + "resolved": "",
3768 "dev": true 3685 "dev": true
3769 } 3686 }
3770 } 3687 }
@@ -3849,8 +3766,7 @@ @@ -3849,8 +3766,7 @@
3849 }, 3766 },
3850 "minimist": { 3767 "minimist": {
3851 "version": "1.2.0", 3768 "version": "1.2.0",
3852 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
3853 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 3769 + "resolved": "",
3854 "dev": true 3770 "dev": true
3855 } 3771 }
3856 } 3772 }
@@ -4757,6 +4673,16 @@ @@ -4757,6 +4673,16 @@
4757 "path-is-absolute": "^1.0.0" 4673 "path-is-absolute": "^1.0.0"
4758 } 4674 }
4759 }, 4675 },
  4676 + "glob-parent": {
  4677 + "version": "5.1.1",
  4678 + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
  4679 + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
  4680 + "dev": true,
  4681 + "optional": true,
  4682 + "requires": {
  4683 + "is-glob": "^4.0.1"
  4684 + }
  4685 + },
4760 "globals": { 4686 "globals": {
4761 "version": "11.12.0", 4687 "version": "11.12.0",
4762 "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", 4688 "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -4785,9 +4711,9 @@ @@ -4785,9 +4711,9 @@
4785 } 4711 }
4786 }, 4712 },
4787 "globule": { 4713 "globule": {
4788 - "version": "1.2.1",  
4789 - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",  
4790 - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", 4714 + "version": "1.3.2",
  4715 + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
  4716 + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
4791 "dev": true, 4717 "dev": true,
4792 "requires": { 4718 "requires": {
4793 "glob": "~7.1.1", 4719 "glob": "~7.1.1",
@@ -5093,14 +5019,22 @@ @@ -5093,14 +5019,22 @@
5093 } 5019 }
5094 }, 5020 },
5095 "http-proxy": { 5021 "http-proxy": {
5096 - "version": "1.17.0",  
5097 - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",  
5098 - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", 5022 + "version": "1.18.1",
  5023 + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
  5024 + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
5099 "dev": true, 5025 "dev": true,
5100 "requires": { 5026 "requires": {
5101 - "eventemitter3": "^3.0.0", 5027 + "eventemitter3": "^4.0.0",
5102 "follow-redirects": "^1.0.0", 5028 "follow-redirects": "^1.0.0",
5103 "requires-port": "^1.0.0" 5029 "requires-port": "^1.0.0"
  5030 + },
  5031 + "dependencies": {
  5032 + "eventemitter3": {
  5033 + "version": "4.0.4",
  5034 + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
  5035 + "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
  5036 + "dev": true
  5037 + }
5104 } 5038 }
5105 }, 5039 },
5106 "http-proxy-middleware": { 5040 "http-proxy-middleware": {
@@ -5182,9 +5116,9 @@ @@ -5182,9 +5116,9 @@
5182 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" 5116 "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
5183 }, 5117 },
5184 "in-publish": { 5118 "in-publish": {
5185 - "version": "2.0.0",  
5186 - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",  
5187 - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", 5119 + "version": "2.0.1",
  5120 + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz",
  5121 + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==",
5188 "dev": true 5122 "dev": true
5189 }, 5123 },
5190 "indent-string": { 5124 "indent-string": {
@@ -5320,6 +5254,7 @@ @@ -5320,6 +5254,7 @@
5320 "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", 5254 "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
5321 "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", 5255 "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
5322 "dev": true, 5256 "dev": true,
  5257 + "optional": true,
5323 "requires": { 5258 "requires": {
5324 "binary-extensions": "^1.0.0" 5259 "binary-extensions": "^1.0.0"
5325 } 5260 }
@@ -5486,9 +5421,9 @@ @@ -5486,9 +5421,9 @@
5486 "dev": true 5421 "dev": true
5487 }, 5422 },
5488 "jquery": { 5423 "jquery": {
5489 - "version": "3.4.1",  
5490 - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",  
5491 - "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==", 5424 + "version": "3.5.1",
  5425 + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
  5426 + "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==",
5492 "dev": true 5427 "dev": true
5493 }, 5428 },
5494 "js-base64": { 5429 "js-base64": {
@@ -5498,22 +5433,28 @@ @@ -5498,22 +5433,28 @@
5498 "dev": true 5433 "dev": true
5499 }, 5434 },
5500 "js-beautify": { 5435 "js-beautify": {
5501 - "version": "1.10.2",  
5502 - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz",  
5503 - "integrity": "sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==", 5436 + "version": "1.11.0",
  5437 + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz",
  5438 + "integrity": "sha512-a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A==",
5504 "dev": true, 5439 "dev": true,
5505 "requires": { 5440 "requires": {
5506 "config-chain": "^1.1.12", 5441 "config-chain": "^1.1.12",
5507 "editorconfig": "^0.15.3", 5442 "editorconfig": "^0.15.3",
5508 "glob": "^7.1.3", 5443 "glob": "^7.1.3",
5509 - "mkdirp": "~0.5.1",  
5510 - "nopt": "~4.0.1" 5444 + "mkdirp": "~1.0.3",
  5445 + "nopt": "^4.0.3"
5511 }, 5446 },
5512 "dependencies": { 5447 "dependencies": {
  5448 + "mkdirp": {
  5449 + "version": "1.0.4",
  5450 + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
  5451 + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
  5452 + "dev": true
  5453 + },
5513 "nopt": { 5454 "nopt": {
5514 - "version": "4.0.1",  
5515 - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",  
5516 - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", 5455 + "version": "4.0.3",
  5456 + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
  5457 + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
5517 "dev": true, 5458 "dev": true,
5518 "requires": { 5459 "requires": {
5519 "abbrev": "1", 5460 "abbrev": "1",
@@ -5894,15 +5835,7 @@ @@ -5894,15 +5835,7 @@
5894 "read-pkg-up": "^1.0.1", 5835 "read-pkg-up": "^1.0.1",
5895 "redent": "^1.0.0", 5836 "redent": "^1.0.0",
5896 "trim-newlines": "^1.0.0" 5837 "trim-newlines": "^1.0.0"
5897 - },  
5898 - "dependencies": {  
5899 - "minimist": {  
5900 - "version": "1.2.0",  
5901 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
5902 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",  
5903 - "dev": true  
5904 - }  
5905 - } 5838 + }
5906 }, 5839 },
5907 "merge-descriptors": { 5840 "merge-descriptors": {
5908 "version": "1.0.1", 5841 "version": "1.0.1",
@@ -5938,9 +5871,9 @@ @@ -5938,9 +5871,9 @@
5938 }, 5871 },
5939 "dependencies": { 5872 "dependencies": {
5940 "kind-of": { 5873 "kind-of": {
5941 - "version": "6.0.2",  
5942 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
5943 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 5874 + "version": "6.0.3",
  5875 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  5876 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
5944 "dev": true 5877 "dev": true
5945 } 5878 }
5946 } 5879 }
@@ -6002,9 +5935,9 @@ @@ -6002,9 +5935,9 @@
6002 } 5935 }
6003 }, 5936 },
6004 "minimist": { 5937 "minimist": {
6005 - "version": "0.0.8",  
6006 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",  
6007 - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" 5938 + "version": "1.2.5",
  5939 + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
  5940 + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
6008 }, 5941 },
6009 "mississippi": { 5942 "mississippi": {
6010 "version": "2.0.0", 5943 "version": "2.0.0",
@@ -6064,11 +5997,11 @@ @@ -6064,11 +5997,11 @@
6064 } 5997 }
6065 }, 5998 },
6066 "mkdirp": { 5999 "mkdirp": {
6067 - "version": "0.5.1",  
6068 - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",  
6069 - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", 6000 + "version": "0.5.5",
  6001 + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
  6002 + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
6070 "requires": { 6003 "requires": {
6071 - "minimist": "0.0.8" 6004 + "minimist": "^1.2.5"
6072 } 6005 }
6073 }, 6006 },
6074 "mockjs": { 6007 "mockjs": {
@@ -6147,9 +6080,9 @@ @@ -6147,9 +6080,9 @@
6147 "dev": true 6080 "dev": true
6148 }, 6081 },
6149 "kind-of": { 6082 "kind-of": {
6150 - "version": "6.0.2",  
6151 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
6152 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 6083 + "version": "6.0.3",
  6084 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  6085 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
6153 "dev": true 6086 "dev": true
6154 } 6087 }
6155 } 6088 }
@@ -6253,9 +6186,9 @@ @@ -6253,9 +6186,9 @@
6253 } 6186 }
6254 }, 6187 },
6255 "node-sass": { 6188 "node-sass": {
6256 - "version": "4.12.0",  
6257 - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",  
6258 - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", 6189 + "version": "4.14.1",
  6190 + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
  6191 + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
6259 "dev": true, 6192 "dev": true,
6260 "requires": { 6193 "requires": {
6261 "async-foreach": "^0.1.3", 6194 "async-foreach": "^0.1.3",
@@ -6265,14 +6198,14 @@ @@ -6265,14 +6198,14 @@
6265 "get-stdin": "^4.0.1", 6198 "get-stdin": "^4.0.1",
6266 "glob": "^7.0.3", 6199 "glob": "^7.0.3",
6267 "in-publish": "^2.0.0", 6200 "in-publish": "^2.0.0",
6268 - "lodash": "^4.17.11", 6201 + "lodash": "^4.17.15",
6269 "meow": "^3.7.0", 6202 "meow": "^3.7.0",
6270 "mkdirp": "^0.5.1", 6203 "mkdirp": "^0.5.1",
6271 "nan": "^2.13.2", 6204 "nan": "^2.13.2",
6272 "node-gyp": "^3.8.0", 6205 "node-gyp": "^3.8.0",
6273 "npmlog": "^4.0.0", 6206 "npmlog": "^4.0.0",
6274 "request": "^2.88.0", 6207 "request": "^2.88.0",
6275 - "sass-graph": "^2.2.4", 6208 + "sass-graph": "2.2.5",
6276 "stdout-stream": "^1.4.0", 6209 "stdout-stream": "^1.4.0",
6277 "true-case-path": "^1.0.2" 6210 "true-case-path": "^1.0.2"
6278 }, 6211 },
@@ -6315,6 +6248,7 @@ @@ -6315,6 +6248,7 @@
6315 "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", 6248 "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
6316 "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", 6249 "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
6317 "dev": true, 6250 "dev": true,
  6251 + "optional": true,
6318 "requires": { 6252 "requires": {
6319 "remove-trailing-separator": "^1.0.1" 6253 "remove-trailing-separator": "^1.0.1"
6320 } 6254 }
@@ -6343,9 +6277,9 @@ @@ -6343,9 +6277,9 @@
6343 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" 6277 "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
6344 }, 6278 },
6345 "npm": { 6279 "npm": {
6346 - "version": "6.10.3",  
6347 - "resolved": "https://registry.npmjs.org/npm/-/npm-6.10.3.tgz",  
6348 - "integrity": "sha512-AH2uhSRaIMll7xz1JuLA6XbZu5k6DMSc77U6uWfuyBch4EzwpEc5dd54/OsX4Njioi7fSL7YmuPQbqKE2qiklw==", 6280 + "version": "6.14.5",
  6281 + "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz",
  6282 + "integrity": "sha512-CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA==",
6349 "requires": { 6283 "requires": {
6350 "JSONStream": "^1.3.5", 6284 "JSONStream": "^1.3.5",
6351 "abbrev": "~1.1.1", 6285 "abbrev": "~1.1.1",
@@ -6353,16 +6287,16 @@ @@ -6353,16 +6287,16 @@
6353 "ansistyles": "~0.1.3", 6287 "ansistyles": "~0.1.3",
6354 "aproba": "^2.0.0", 6288 "aproba": "^2.0.0",
6355 "archy": "~1.0.0", 6289 "archy": "~1.0.0",
6356 - "bin-links": "^1.1.2", 6290 + "bin-links": "^1.1.7",
6357 "bluebird": "^3.5.5", 6291 "bluebird": "^3.5.5",
6358 "byte-size": "^5.0.1", 6292 "byte-size": "^5.0.1",
6359 - "cacache": "^12.0.2", 6293 + "cacache": "^12.0.3",
6360 "call-limit": "^1.1.1", 6294 "call-limit": "^1.1.1",
6361 - "chownr": "^1.1.2", 6295 + "chownr": "^1.1.4",
6362 "ci-info": "^2.0.0", 6296 "ci-info": "^2.0.0",
6363 "cli-columns": "^3.1.2", 6297 "cli-columns": "^3.1.2",
6364 "cli-table3": "^0.5.1", 6298 "cli-table3": "^0.5.1",
6365 - "cmd-shim": "~2.0.2", 6299 + "cmd-shim": "^3.0.3",
6366 "columnify": "~1.5.4", 6300 "columnify": "~1.5.4",
6367 "config-chain": "^1.1.12", 6301 "config-chain": "^1.1.12",
6368 "debuglog": "*", 6302 "debuglog": "*",
@@ -6374,11 +6308,11 @@ @@ -6374,11 +6308,11 @@
6374 "find-npm-prefix": "^1.0.2", 6308 "find-npm-prefix": "^1.0.2",
6375 "fs-vacuum": "~1.2.10", 6309 "fs-vacuum": "~1.2.10",
6376 "fs-write-stream-atomic": "~1.0.10", 6310 "fs-write-stream-atomic": "~1.0.10",
6377 - "gentle-fs": "^2.0.1",  
6378 - "glob": "^7.1.4",  
6379 - "graceful-fs": "^4.2.0", 6311 + "gentle-fs": "^2.3.0",
  6312 + "glob": "^7.1.6",
  6313 + "graceful-fs": "^4.2.4",
6380 "has-unicode": "~2.0.1", 6314 "has-unicode": "~2.0.1",
6381 - "hosted-git-info": "^2.8.2", 6315 + "hosted-git-info": "^2.8.8",
6382 "iferr": "^1.0.2", 6316 "iferr": "^1.0.2",
6383 "imurmurhash": "*", 6317 "imurmurhash": "*",
6384 "infer-owner": "^1.0.4", 6318 "infer-owner": "^1.0.4",
@@ -6389,14 +6323,14 @@ @@ -6389,14 +6323,14 @@
6389 "is-cidr": "^3.0.0", 6323 "is-cidr": "^3.0.0",
6390 "json-parse-better-errors": "^1.0.2", 6324 "json-parse-better-errors": "^1.0.2",
6391 "lazy-property": "~1.0.0", 6325 "lazy-property": "~1.0.0",
6392 - "libcipm": "^4.0.0", 6326 + "libcipm": "^4.0.7",
6393 "libnpm": "^3.0.1", 6327 "libnpm": "^3.0.1",
6394 "libnpmaccess": "^3.0.2", 6328 "libnpmaccess": "^3.0.2",
6395 "libnpmhook": "^5.0.3", 6329 "libnpmhook": "^5.0.3",
6396 "libnpmorg": "^1.0.1", 6330 "libnpmorg": "^1.0.1",
6397 "libnpmsearch": "^2.0.2", 6331 "libnpmsearch": "^2.0.2",
6398 "libnpmteam": "^1.0.2", 6332 "libnpmteam": "^1.0.2",
6399 - "libnpx": "^10.2.0", 6333 + "libnpx": "^10.2.2",
6400 "lock-verify": "^2.1.0", 6334 "lock-verify": "^2.1.0",
6401 "lockfile": "^1.0.4", 6335 "lockfile": "^1.0.4",
6402 "lodash._baseindexof": "*", 6336 "lodash._baseindexof": "*",
@@ -6413,50 +6347,50 @@ @@ -6413,50 +6347,50 @@
6413 "lru-cache": "^5.1.1", 6347 "lru-cache": "^5.1.1",
6414 "meant": "~1.0.1", 6348 "meant": "~1.0.1",
6415 "mississippi": "^3.0.0", 6349 "mississippi": "^3.0.0",
6416 - "mkdirp": "~0.5.1", 6350 + "mkdirp": "^0.5.5",
6417 "move-concurrently": "^1.0.1", 6351 "move-concurrently": "^1.0.1",
6418 - "node-gyp": "^5.0.3",  
6419 - "nopt": "~4.0.1", 6352 + "node-gyp": "^5.1.0",
  6353 + "nopt": "^4.0.3",
6420 "normalize-package-data": "^2.5.0", 6354 "normalize-package-data": "^2.5.0",
6421 "npm-audit-report": "^1.3.2", 6355 "npm-audit-report": "^1.3.2",
6422 "npm-cache-filename": "~1.0.2", 6356 "npm-cache-filename": "~1.0.2",
6423 - "npm-install-checks": "~3.0.0",  
6424 - "npm-lifecycle": "^3.1.2",  
6425 - "npm-package-arg": "^6.1.0",  
6426 - "npm-packlist": "^1.4.4",  
6427 - "npm-pick-manifest": "^2.2.3",  
6428 - "npm-profile": "^4.0.2",  
6429 - "npm-registry-fetch": "^4.0.0", 6357 + "npm-install-checks": "^3.0.2",
  6358 + "npm-lifecycle": "^3.1.4",
  6359 + "npm-package-arg": "^6.1.1",
  6360 + "npm-packlist": "^1.4.8",
  6361 + "npm-pick-manifest": "^3.0.2",
  6362 + "npm-profile": "^4.0.4",
  6363 + "npm-registry-fetch": "^4.0.4",
6430 "npm-user-validate": "~1.0.0", 6364 "npm-user-validate": "~1.0.0",
6431 "npmlog": "~4.1.2", 6365 "npmlog": "~4.1.2",
6432 "once": "~1.4.0", 6366 "once": "~1.4.0",
6433 "opener": "^1.5.1", 6367 "opener": "^1.5.1",
6434 "osenv": "^0.1.5", 6368 "osenv": "^0.1.5",
6435 - "pacote": "^9.5.4", 6369 + "pacote": "^9.5.12",
6436 "path-is-inside": "~1.0.2", 6370 "path-is-inside": "~1.0.2",
6437 "promise-inflight": "~1.0.1", 6371 "promise-inflight": "~1.0.1",
6438 "qrcode-terminal": "^0.12.0", 6372 "qrcode-terminal": "^0.12.0",
6439 "query-string": "^6.8.2", 6373 "query-string": "^6.8.2",
6440 "qw": "~1.0.1", 6374 "qw": "~1.0.1",
6441 "read": "~1.0.7", 6375 "read": "~1.0.7",
6442 - "read-cmd-shim": "~1.0.1", 6376 + "read-cmd-shim": "^1.0.5",
6443 "read-installed": "~4.0.3", 6377 "read-installed": "~4.0.3",
6444 - "read-package-json": "^2.0.13", 6378 + "read-package-json": "^2.1.1",
6445 "read-package-tree": "^5.3.1", 6379 "read-package-tree": "^5.3.1",
6446 - "readable-stream": "^3.4.0", 6380 + "readable-stream": "^3.6.0",
6447 "readdir-scoped-modules": "^1.1.0", 6381 "readdir-scoped-modules": "^1.1.0",
6448 "request": "^2.88.0", 6382 "request": "^2.88.0",
6449 "retry": "^0.12.0", 6383 "retry": "^0.12.0",
6450 - "rimraf": "^2.6.3", 6384 + "rimraf": "^2.7.1",
6451 "safe-buffer": "^5.1.2", 6385 "safe-buffer": "^5.1.2",
6452 - "semver": "^5.7.0", 6386 + "semver": "^5.7.1",
6453 "sha": "^3.0.0", 6387 "sha": "^3.0.0",
6454 "slide": "~1.1.6", 6388 "slide": "~1.1.6",
6455 "sorted-object": "~2.0.1", 6389 "sorted-object": "~2.0.1",
6456 "sorted-union-stream": "~2.1.3", 6390 "sorted-union-stream": "~2.1.3",
6457 "ssri": "^6.0.1", 6391 "ssri": "^6.0.1",
6458 - "stringify-package": "^1.0.0",  
6459 - "tar": "^4.4.10", 6392 + "stringify-package": "^1.0.1",
  6393 + "tar": "^4.4.13",
6460 "text-table": "~0.2.0", 6394 "text-table": "~0.2.0",
6461 "tiny-relative-date": "^1.3.0", 6395 "tiny-relative-date": "^1.3.0",
6462 "uid-number": "0.0.6", 6396 "uid-number": "0.0.6",
@@ -6464,7 +6398,7 @@ @@ -6464,7 +6398,7 @@
6464 "unique-filename": "^1.1.1", 6398 "unique-filename": "^1.1.1",
6465 "unpipe": "~1.0.0", 6399 "unpipe": "~1.0.0",
6466 "update-notifier": "^2.5.0", 6400 "update-notifier": "^2.5.0",
6467 - "uuid": "^3.3.2", 6401 + "uuid": "^3.3.3",
6468 "validate-npm-package-license": "^3.0.4", 6402 "validate-npm-package-license": "^3.0.4",
6469 "validate-npm-package-name": "~3.0.0", 6403 "validate-npm-package-name": "~3.0.0",
6470 "which": "^1.3.1", 6404 "which": "^1.3.1",
@@ -6612,13 +6546,14 @@ @@ -6612,13 +6546,14 @@
6612 } 6546 }
6613 }, 6547 },
6614 "bin-links": { 6548 "bin-links": {
6615 - "version": "1.1.2", 6549 + "version": "1.1.7",
6616 "bundled": true, 6550 "bundled": true,
6617 "requires": { 6551 "requires": {
6618 - "bluebird": "^3.5.0",  
6619 - "cmd-shim": "^2.0.2",  
6620 - "gentle-fs": "^2.0.0",  
6621 - "graceful-fs": "^4.1.11", 6552 + "bluebird": "^3.5.3",
  6553 + "cmd-shim": "^3.0.0",
  6554 + "gentle-fs": "^2.3.0",
  6555 + "graceful-fs": "^4.1.15",
  6556 + "npm-normalize-package-bin": "^1.0.0",
6622 "write-file-atomic": "^2.3.0" 6557 "write-file-atomic": "^2.3.0"
6623 } 6558 }
6624 }, 6559 },
@@ -6664,7 +6599,7 @@ @@ -6664,7 +6599,7 @@
6664 "bundled": true 6599 "bundled": true
6665 }, 6600 },
6666 "cacache": { 6601 "cacache": {
6667 - "version": "12.0.2", 6602 + "version": "12.0.3",
6668 "bundled": true, 6603 "bundled": true,
6669 "requires": { 6604 "requires": {
6670 "bluebird": "^3.5.5", 6605 "bluebird": "^3.5.5",
@@ -6710,7 +6645,7 @@ @@ -6710,7 +6645,7 @@
6710 } 6645 }
6711 }, 6646 },
6712 "chownr": { 6647 "chownr": {
6713 - "version": "1.1.2", 6648 + "version": "1.1.4",
6714 "bundled": true 6649 "bundled": true
6715 }, 6650 },
6716 "ci-info": { 6651 "ci-info": {
@@ -6772,7 +6707,7 @@ @@ -6772,7 +6707,7 @@
6772 "bundled": true 6707 "bundled": true
6773 }, 6708 },
6774 "cmd-shim": { 6709 "cmd-shim": {
6775 - "version": "2.0.2", 6710 + "version": "3.0.3",
6776 "bundled": true, 6711 "bundled": true,
6777 "requires": { 6712 "requires": {
6778 "graceful-fs": "^4.1.2", 6713 "graceful-fs": "^4.1.2",
@@ -6975,7 +6910,7 @@ @@ -6975,7 +6910,7 @@
6975 "bundled": true 6910 "bundled": true
6976 }, 6911 },
6977 "deep-extend": { 6912 "deep-extend": {
6978 - "version": "0.5.1", 6913 + "version": "0.6.0",
6979 "bundled": true 6914 "bundled": true
6980 }, 6915 },
6981 "defaults": { 6916 "defaults": {
@@ -7091,7 +7026,7 @@ @@ -7091,7 +7026,7 @@
7091 } 7026 }
7092 }, 7027 },
7093 "env-paths": { 7028 "env-paths": {
7094 - "version": "1.0.0", 7029 + "version": "2.2.0",
7095 "bundled": true 7030 "bundled": true
7096 }, 7031 },
7097 "err-code": { 7032 "err-code": {
@@ -7264,10 +7199,20 @@ @@ -7264,10 +7199,20 @@
7264 } 7199 }
7265 }, 7200 },
7266 "fs-minipass": { 7201 "fs-minipass": {
7267 - "version": "1.2.6", 7202 + "version": "1.2.7",
7268 "bundled": true, 7203 "bundled": true,
7269 "requires": { 7204 "requires": {
7270 - "minipass": "^2.2.1" 7205 + "minipass": "^2.6.0"
  7206 + },
  7207 + "dependencies": {
  7208 + "minipass": {
  7209 + "version": "2.9.0",
  7210 + "bundled": true,
  7211 + "requires": {
  7212 + "safe-buffer": "^5.1.2",
  7213 + "yallist": "^3.0.0"
  7214 + }
  7215 + }
7271 } 7216 }
7272 }, 7217 },
7273 "fs-vacuum": { 7218 "fs-vacuum": {
@@ -7357,13 +7302,16 @@ @@ -7357,13 +7302,16 @@
7357 "bundled": true 7302 "bundled": true
7358 }, 7303 },
7359 "gentle-fs": { 7304 "gentle-fs": {
7360 - "version": "2.0.1", 7305 + "version": "2.3.0",
7361 "bundled": true, 7306 "bundled": true,
7362 "requires": { 7307 "requires": {
7363 "aproba": "^1.1.2", 7308 "aproba": "^1.1.2",
  7309 + "chownr": "^1.1.2",
  7310 + "cmd-shim": "^3.0.3",
7364 "fs-vacuum": "^1.2.10", 7311 "fs-vacuum": "^1.2.10",
7365 "graceful-fs": "^4.1.11", 7312 "graceful-fs": "^4.1.11",
7366 "iferr": "^0.1.5", 7313 "iferr": "^0.1.5",
  7314 + "infer-owner": "^1.0.4",
7367 "mkdirp": "^0.5.1", 7315 "mkdirp": "^0.5.1",
7368 "path-is-inside": "^1.0.2", 7316 "path-is-inside": "^1.0.2",
7369 "read-cmd-shim": "^1.0.1", 7317 "read-cmd-shim": "^1.0.1",
@@ -7381,7 +7329,7 @@ @@ -7381,7 +7329,7 @@
7381 } 7329 }
7382 }, 7330 },
7383 "get-caller-file": { 7331 "get-caller-file": {
7384 - "version": "1.0.2", 7332 + "version": "1.0.3",
7385 "bundled": true 7333 "bundled": true
7386 }, 7334 },
7387 "get-stream": { 7335 "get-stream": {
@@ -7399,7 +7347,7 @@ @@ -7399,7 +7347,7 @@
7399 } 7347 }
7400 }, 7348 },
7401 "glob": { 7349 "glob": {
7402 - "version": "7.1.4", 7350 + "version": "7.1.6",
7403 "bundled": true, 7351 "bundled": true,
7404 "requires": { 7352 "requires": {
7405 "fs.realpath": "^1.0.0", 7353 "fs.realpath": "^1.0.0",
@@ -7441,7 +7389,7 @@ @@ -7441,7 +7389,7 @@
7441 } 7389 }
7442 }, 7390 },
7443 "graceful-fs": { 7391 "graceful-fs": {
7444 - "version": "4.2.0", 7392 + "version": "4.2.4",
7445 "bundled": true 7393 "bundled": true
7446 }, 7394 },
7447 "har-schema": { 7395 "har-schema": {
@@ -7476,11 +7424,8 @@ @@ -7476,11 +7424,8 @@
7476 "bundled": true 7424 "bundled": true
7477 }, 7425 },
7478 "hosted-git-info": { 7426 "hosted-git-info": {
7479 - "version": "2.8.2",  
7480 - "bundled": true,  
7481 - "requires": {  
7482 - "lru-cache": "^5.1.1"  
7483 - } 7427 + "version": "2.8.8",
  7428 + "bundled": true
7484 }, 7429 },
7485 "http-cache-semantics": { 7430 "http-cache-semantics": {
7486 "version": "3.8.1", 7431 "version": "3.8.1",
@@ -7504,7 +7449,7 @@ @@ -7504,7 +7449,7 @@
7504 } 7449 }
7505 }, 7450 },
7506 "https-proxy-agent": { 7451 "https-proxy-agent": {
7507 - "version": "2.2.2", 7452 + "version": "2.2.4",
7508 "bundled": true, 7453 "bundled": true,
7509 "requires": { 7454 "requires": {
7510 "agent-base": "^4.3.0", 7455 "agent-base": "^4.3.0",
@@ -7530,7 +7475,7 @@ @@ -7530,7 +7475,7 @@
7530 "bundled": true 7475 "bundled": true
7531 }, 7476 },
7532 "ignore-walk": { 7477 "ignore-walk": {
7533 - "version": "3.0.1", 7478 + "version": "3.0.3",
7534 "bundled": true, 7479 "bundled": true,
7535 "requires": { 7480 "requires": {
7536 "minimatch": "^3.0.4" 7481 "minimatch": "^3.0.4"
@@ -7579,7 +7524,7 @@ @@ -7579,7 +7524,7 @@
7579 } 7524 }
7580 }, 7525 },
7581 "invert-kv": { 7526 "invert-kv": {
7582 - "version": "1.0.0", 7527 + "version": "2.0.0",
7583 "bundled": true 7528 "bundled": true
7584 }, 7529 },
7585 "ip": { 7530 "ip": {
@@ -7595,10 +7540,10 @@ @@ -7595,10 +7540,10 @@
7595 "bundled": true 7540 "bundled": true
7596 }, 7541 },
7597 "is-ci": { 7542 "is-ci": {
7598 - "version": "1.1.0", 7543 + "version": "1.2.1",
7599 "bundled": true, 7544 "bundled": true,
7600 "requires": { 7545 "requires": {
7601 - "ci-info": "^1.0.0" 7546 + "ci-info": "^1.5.0"
7602 }, 7547 },
7603 "dependencies": { 7548 "dependencies": {
7604 "ci-info": { 7549 "ci-info": {
@@ -7660,7 +7605,7 @@ @@ -7660,7 +7605,7 @@
7660 } 7605 }
7661 }, 7606 },
7662 "is-retry-allowed": { 7607 "is-retry-allowed": {
7663 - "version": "1.1.0", 7608 + "version": "1.2.0",
7664 "bundled": true 7609 "bundled": true
7665 }, 7610 },
7666 "is-stream": { 7611 "is-stream": {
@@ -7737,14 +7682,14 @@ @@ -7737,14 +7682,14 @@
7737 "bundled": true 7682 "bundled": true
7738 }, 7683 },
7739 "lcid": { 7684 "lcid": {
7740 - "version": "1.0.0", 7685 + "version": "2.0.0",
7741 "bundled": true, 7686 "bundled": true,
7742 "requires": { 7687 "requires": {
7743 - "invert-kv": "^1.0.0" 7688 + "invert-kv": "^2.0.0"
7744 } 7689 }
7745 }, 7690 },
7746 "libcipm": { 7691 "libcipm": {
7747 - "version": "4.0.0", 7692 + "version": "4.0.7",
7748 "bundled": true, 7693 "bundled": true,
7749 "requires": { 7694 "requires": {
7750 "bin-links": "^1.1.2", 7695 "bin-links": "^1.1.2",
@@ -7899,7 +7844,7 @@ @@ -7899,7 +7844,7 @@
7899 } 7844 }
7900 }, 7845 },
7901 "libnpx": { 7846 "libnpx": {
7902 - "version": "10.2.0", 7847 + "version": "10.2.2",
7903 "bundled": true, 7848 "bundled": true,
7904 "requires": { 7849 "requires": {
7905 "dotenv": "^5.0.1", 7850 "dotenv": "^5.0.1",
@@ -8013,14 +7958,14 @@ @@ -8013,14 +7958,14 @@
8013 } 7958 }
8014 }, 7959 },
8015 "make-fetch-happen": { 7960 "make-fetch-happen": {
8016 - "version": "5.0.0", 7961 + "version": "5.0.2",
8017 "bundled": true, 7962 "bundled": true,
8018 "requires": { 7963 "requires": {
8019 "agentkeepalive": "^3.4.1", 7964 "agentkeepalive": "^3.4.1",
8020 "cacache": "^12.0.0", 7965 "cacache": "^12.0.0",
8021 "http-cache-semantics": "^3.8.1", 7966 "http-cache-semantics": "^3.8.1",
8022 "http-proxy-agent": "^2.1.0", 7967 "http-proxy-agent": "^2.1.0",
8023 - "https-proxy-agent": "^2.2.1", 7968 + "https-proxy-agent": "^2.2.3",
8024 "lru-cache": "^5.1.1", 7969 "lru-cache": "^5.1.1",
8025 "mississippi": "^3.0.0", 7970 "mississippi": "^3.0.0",
8026 "node-fetch-npm": "^2.0.2", 7971 "node-fetch-npm": "^2.0.2",
@@ -8029,15 +7974,30 @@ @@ -8029,15 +7974,30 @@
8029 "ssri": "^6.0.0" 7974 "ssri": "^6.0.0"
8030 } 7975 }
8031 }, 7976 },
  7977 + "map-age-cleaner": {
  7978 + "version": "0.1.3",
  7979 + "bundled": true,
  7980 + "requires": {
  7981 + "p-defer": "^1.0.0"
  7982 + }
  7983 + },
8032 "meant": { 7984 "meant": {
8033 "version": "1.0.1", 7985 "version": "1.0.1",
8034 "bundled": true 7986 "bundled": true
8035 }, 7987 },
8036 "mem": { 7988 "mem": {
8037 - "version": "1.1.0", 7989 + "version": "4.3.0",
8038 "bundled": true, 7990 "bundled": true,
8039 "requires": { 7991 "requires": {
8040 - "mimic-fn": "^1.0.0" 7992 + "map-age-cleaner": "^0.1.1",
  7993 + "mimic-fn": "^2.0.0",
  7994 + "p-is-promise": "^2.0.0"
  7995 + },
  7996 + "dependencies": {
  7997 + "mimic-fn": {
  7998 + "version": "2.1.0",
  7999 + "bundled": true
  8000 + }
8041 } 8001 }
8042 }, 8002 },
8043 "mime-db": { 8003 "mime-db": {
@@ -8051,10 +8011,6 @@ @@ -8051,10 +8011,6 @@
8051 "mime-db": "~1.35.0" 8011 "mime-db": "~1.35.0"
8052 } 8012 }
8053 }, 8013 },
8054 - "mimic-fn": {  
8055 - "version": "1.2.0",  
8056 - "bundled": true  
8057 - },  
8058 "minimatch": { 8014 "minimatch": {
8059 "version": "3.0.4", 8015 "version": "3.0.4",
8060 "bundled": true, 8016 "bundled": true,
@@ -8062,29 +8018,21 @@ @@ -8062,29 +8018,21 @@
8062 "brace-expansion": "^1.1.7" 8018 "brace-expansion": "^1.1.7"
8063 } 8019 }
8064 }, 8020 },
8065 - "minimist": {  
8066 - "version": "0.0.8",  
8067 - "bundled": true 8021 + "minizlib": {
  8022 + "version": "1.3.3",
  8023 + "bundled": true,
  8024 + "requires": {
  8025 + "minipass": "^2.9.0"
8068 }, 8026 },
  8027 + "dependencies": {
8069 "minipass": { 8028 "minipass": {
8070 - "version": "2.3.3", 8029 + "version": "2.9.0",
8071 "bundled": true, 8030 "bundled": true,
8072 "requires": { 8031 "requires": {
8073 "safe-buffer": "^5.1.2", 8032 "safe-buffer": "^5.1.2",
8074 "yallist": "^3.0.0" 8033 "yallist": "^3.0.0"
8075 - },  
8076 - "dependencies": {  
8077 - "yallist": {  
8078 - "version": "3.0.2",  
8079 - "bundled": true  
8080 } 8034 }
8081 } 8035 }
8082 - },  
8083 - "minizlib": {  
8084 - "version": "1.2.1",  
8085 - "bundled": true,  
8086 - "requires": {  
8087 - "minipass": "^2.2.1"  
8088 } 8036 }
8089 }, 8037 },
8090 "mississippi": { 8038 "mississippi": {
@@ -8104,10 +8052,16 @@ @@ -8104,10 +8052,16 @@
8104 } 8052 }
8105 }, 8053 },
8106 "mkdirp": { 8054 "mkdirp": {
8107 - "version": "0.5.1", 8055 + "version": "0.5.5",
8108 "bundled": true, 8056 "bundled": true,
8109 "requires": { 8057 "requires": {
8110 - "minimist": "0.0.8" 8058 + "minimist": "^1.2.5"
  8059 + },
  8060 + "dependencies": {
  8061 + "minimist": {
  8062 + "version": "1.2.5",
  8063 + "bundled": true
  8064 + }
8111 } 8065 }
8112 }, 8066 },
8113 "move-concurrently": { 8067 "move-concurrently": {
@@ -8136,6 +8090,10 @@ @@ -8136,6 +8090,10 @@
8136 "version": "0.0.7", 8090 "version": "0.0.7",
8137 "bundled": true 8091 "bundled": true
8138 }, 8092 },
  8093 + "nice-try": {
  8094 + "version": "1.0.5",
  8095 + "bundled": true
  8096 + },
8139 "node-fetch-npm": { 8097 "node-fetch-npm": {
8140 "version": "2.0.2", 8098 "version": "2.0.2",
8141 "bundled": true, 8099 "bundled": true,
@@ -8146,37 +8104,24 @@ @@ -8146,37 +8104,24 @@
8146 } 8104 }
8147 }, 8105 },
8148 "node-gyp": { 8106 "node-gyp": {
8149 - "version": "5.0.3",  
8150 - "bundled": true,  
8151 - "requires": {  
8152 - "env-paths": "^1.0.0",  
8153 - "glob": "^7.0.3",  
8154 - "graceful-fs": "^4.1.2",  
8155 - "mkdirp": "^0.5.0",  
8156 - "nopt": "2 || 3",  
8157 - "npmlog": "0 || 1 || 2 || 3 || 4",  
8158 - "request": "^2.87.0",  
8159 - "rimraf": "2",  
8160 - "semver": "~5.3.0",  
8161 - "tar": "^4.4.8",  
8162 - "which": "1"  
8163 - },  
8164 - "dependencies": {  
8165 - "nopt": {  
8166 - "version": "3.0.6", 8107 + "version": "5.1.0",
8167 "bundled": true, 8108 "bundled": true,
8168 "requires": { 8109 "requires": {
8169 - "abbrev": "1"  
8170 - }  
8171 - },  
8172 - "semver": {  
8173 - "version": "5.3.0",  
8174 - "bundled": true  
8175 - } 8110 + "env-paths": "^2.2.0",
  8111 + "glob": "^7.1.4",
  8112 + "graceful-fs": "^4.2.2",
  8113 + "mkdirp": "^0.5.1",
  8114 + "nopt": "^4.0.1",
  8115 + "npmlog": "^4.1.2",
  8116 + "request": "^2.88.0",
  8117 + "rimraf": "^2.6.3",
  8118 + "semver": "^5.7.1",
  8119 + "tar": "^4.4.12",
  8120 + "which": "^1.3.1"
8176 } 8121 }
8177 }, 8122 },
8178 "nopt": { 8123 "nopt": {
8179 - "version": "4.0.1", 8124 + "version": "4.0.3",
8180 "bundled": true, 8125 "bundled": true,
8181 "requires": { 8126 "requires": {
8182 "abbrev": "1", 8127 "abbrev": "1",
@@ -8211,22 +8156,25 @@ @@ -8211,22 +8156,25 @@
8211 } 8156 }
8212 }, 8157 },
8213 "npm-bundled": { 8158 "npm-bundled": {
8214 - "version": "1.0.6",  
8215 - "bundled": true 8159 + "version": "1.1.1",
  8160 + "bundled": true,
  8161 + "requires": {
  8162 + "npm-normalize-package-bin": "^1.0.1"
  8163 + }
8216 }, 8164 },
8217 "npm-cache-filename": { 8165 "npm-cache-filename": {
8218 "version": "1.0.2", 8166 "version": "1.0.2",
8219 "bundled": true 8167 "bundled": true
8220 }, 8168 },
8221 "npm-install-checks": { 8169 "npm-install-checks": {
8222 - "version": "3.0.0", 8170 + "version": "3.0.2",
8223 "bundled": true, 8171 "bundled": true,
8224 "requires": { 8172 "requires": {
8225 "semver": "^2.3.0 || 3.x || 4 || 5" 8173 "semver": "^2.3.0 || 3.x || 4 || 5"
8226 } 8174 }
8227 }, 8175 },
8228 "npm-lifecycle": { 8176 "npm-lifecycle": {
8229 - "version": "3.1.2", 8177 + "version": "3.1.4",
8230 "bundled": true, 8178 "bundled": true,
8231 "requires": { 8179 "requires": {
8232 "byline": "^5.0.0", 8180 "byline": "^5.0.0",
@@ -8243,26 +8191,31 @@ @@ -8243,26 +8191,31 @@
8243 "version": "1.2.1", 8191 "version": "1.2.1",
8244 "bundled": true 8192 "bundled": true
8245 }, 8193 },
  8194 + "npm-normalize-package-bin": {
  8195 + "version": "1.0.1",
  8196 + "bundled": true
  8197 + },
8246 "npm-package-arg": { 8198 "npm-package-arg": {
8247 - "version": "6.1.0", 8199 + "version": "6.1.1",
8248 "bundled": true, 8200 "bundled": true,
8249 "requires": { 8201 "requires": {
8250 - "hosted-git-info": "^2.6.0", 8202 + "hosted-git-info": "^2.7.1",
8251 "osenv": "^0.1.5", 8203 "osenv": "^0.1.5",
8252 - "semver": "^5.5.0", 8204 + "semver": "^5.6.0",
8253 "validate-npm-package-name": "^3.0.0" 8205 "validate-npm-package-name": "^3.0.0"
8254 } 8206 }
8255 }, 8207 },
8256 "npm-packlist": { 8208 "npm-packlist": {
8257 - "version": "1.4.4", 8209 + "version": "1.4.8",
8258 "bundled": true, 8210 "bundled": true,
8259 "requires": { 8211 "requires": {
8260 "ignore-walk": "^3.0.1", 8212 "ignore-walk": "^3.0.1",
8261 - "npm-bundled": "^1.0.1" 8213 + "npm-bundled": "^1.0.1",
  8214 + "npm-normalize-package-bin": "^1.0.1"
8262 } 8215 }
8263 }, 8216 },
8264 "npm-pick-manifest": { 8217 "npm-pick-manifest": {
8265 - "version": "2.2.3", 8218 + "version": "3.0.2",
8266 "bundled": true, 8219 "bundled": true,
8267 "requires": { 8220 "requires": {
8268 "figgy-pudding": "^3.5.1", 8221 "figgy-pudding": "^3.5.1",
@@ -8271,7 +8224,7 @@ @@ -8271,7 +8224,7 @@
8271 } 8224 }
8272 }, 8225 },
8273 "npm-profile": { 8226 "npm-profile": {
8274 - "version": "4.0.2", 8227 + "version": "4.0.4",
8275 "bundled": true, 8228 "bundled": true,
8276 "requires": { 8229 "requires": {
8277 "aproba": "^1.1.2 || 2", 8230 "aproba": "^1.1.2 || 2",
@@ -8280,7 +8233,7 @@ @@ -8280,7 +8233,7 @@
8280 } 8233 }
8281 }, 8234 },
8282 "npm-registry-fetch": { 8235 "npm-registry-fetch": {
8283 - "version": "4.0.0", 8236 + "version": "4.0.4",
8284 "bundled": true, 8237 "bundled": true,
8285 "requires": { 8238 "requires": {
8286 "JSONStream": "^1.3.4", 8239 "JSONStream": "^1.3.4",
@@ -8288,7 +8241,14 @@ @@ -8288,7 +8241,14 @@
8288 "figgy-pudding": "^3.4.1", 8241 "figgy-pudding": "^3.4.1",
8289 "lru-cache": "^5.1.1", 8242 "lru-cache": "^5.1.1",
8290 "make-fetch-happen": "^5.0.0", 8243 "make-fetch-happen": "^5.0.0",
8291 - "npm-package-arg": "^6.1.0" 8244 + "npm-package-arg": "^6.1.0",
  8245 + "safe-buffer": "^5.2.0"
  8246 + },
  8247 + "dependencies": {
  8248 + "safe-buffer": {
  8249 + "version": "5.2.0",
  8250 + "bundled": true
  8251 + }
8292 } 8252 }
8293 }, 8253 },
8294 "npm-run-path": { 8254 "npm-run-path": {
@@ -8352,12 +8312,38 @@ @@ -8352,12 +8312,38 @@
8352 "bundled": true 8312 "bundled": true
8353 }, 8313 },
8354 "os-locale": { 8314 "os-locale": {
8355 - "version": "2.1.0", 8315 + "version": "3.1.0",
  8316 + "bundled": true,
  8317 + "requires": {
  8318 + "execa": "^1.0.0",
  8319 + "lcid": "^2.0.0",
  8320 + "mem": "^4.0.0"
  8321 + },
  8322 + "dependencies": {
  8323 + "cross-spawn": {
  8324 + "version": "6.0.5",
  8325 + "bundled": true,
  8326 + "requires": {
  8327 + "nice-try": "^1.0.4",
  8328 + "path-key": "^2.0.1",
  8329 + "semver": "^5.5.0",
  8330 + "shebang-command": "^1.2.0",
  8331 + "which": "^1.2.9"
  8332 + }
  8333 + },
  8334 + "execa": {
  8335 + "version": "1.0.0",
8356 "bundled": true, 8336 "bundled": true,
8357 "requires": { 8337 "requires": {
8358 - "execa": "^0.7.0",  
8359 - "lcid": "^1.0.0",  
8360 - "mem": "^1.1.0" 8338 + "cross-spawn": "^6.0.0",
  8339 + "get-stream": "^4.0.0",
  8340 + "is-stream": "^1.1.0",
  8341 + "npm-run-path": "^2.0.0",
  8342 + "p-finally": "^1.0.0",
  8343 + "signal-exit": "^3.0.0",
  8344 + "strip-eof": "^1.0.0"
  8345 + }
  8346 + }
8361 } 8347 }
8362 }, 8348 },
8363 "os-tmpdir": { 8349 "os-tmpdir": {
@@ -8372,10 +8358,18 @@ @@ -8372,10 +8358,18 @@
8372 "os-tmpdir": "^1.0.0" 8358 "os-tmpdir": "^1.0.0"
8373 } 8359 }
8374 }, 8360 },
  8361 + "p-defer": {
  8362 + "version": "1.0.0",
  8363 + "bundled": true
  8364 + },
8375 "p-finally": { 8365 "p-finally": {
8376 "version": "1.0.0", 8366 "version": "1.0.0",
8377 "bundled": true 8367 "bundled": true
8378 }, 8368 },
  8369 + "p-is-promise": {
  8370 + "version": "2.1.0",
  8371 + "bundled": true
  8372 + },
8379 "p-limit": { 8373 "p-limit": {
8380 "version": "1.2.0", 8374 "version": "1.2.0",
8381 "bundled": true, 8375 "bundled": true,
@@ -8405,14 +8399,16 @@ @@ -8405,14 +8399,16 @@
8405 } 8399 }
8406 }, 8400 },
8407 "pacote": { 8401 "pacote": {
8408 - "version": "9.5.4", 8402 + "version": "9.5.12",
8409 "bundled": true, 8403 "bundled": true,
8410 "requires": { 8404 "requires": {
8411 "bluebird": "^3.5.3", 8405 "bluebird": "^3.5.3",
8412 - "cacache": "^12.0.0", 8406 + "cacache": "^12.0.2",
  8407 + "chownr": "^1.1.2",
8413 "figgy-pudding": "^3.5.1", 8408 "figgy-pudding": "^3.5.1",
8414 "get-stream": "^4.1.0", 8409 "get-stream": "^4.1.0",
8415 "glob": "^7.1.3", 8410 "glob": "^7.1.3",
  8411 + "infer-owner": "^1.0.4",
8416 "lru-cache": "^5.1.1", 8412 "lru-cache": "^5.1.1",
8417 "make-fetch-happen": "^5.0.0", 8413 "make-fetch-happen": "^5.0.0",
8418 "minimatch": "^3.0.4", 8414 "minimatch": "^3.0.4",
@@ -8420,9 +8416,10 @@ @@ -8420,9 +8416,10 @@
8420 "mississippi": "^3.0.0", 8416 "mississippi": "^3.0.0",
8421 "mkdirp": "^0.5.1", 8417 "mkdirp": "^0.5.1",
8422 "normalize-package-data": "^2.4.0", 8418 "normalize-package-data": "^2.4.0",
  8419 + "npm-normalize-package-bin": "^1.0.0",
8423 "npm-package-arg": "^6.1.0", 8420 "npm-package-arg": "^6.1.0",
8424 "npm-packlist": "^1.1.12", 8421 "npm-packlist": "^1.1.12",
8425 - "npm-pick-manifest": "^2.2.3", 8422 + "npm-pick-manifest": "^3.0.0",
8426 "npm-registry-fetch": "^4.0.0", 8423 "npm-registry-fetch": "^4.0.0",
8427 "osenv": "^0.1.5", 8424 "osenv": "^0.1.5",
8428 "promise-inflight": "^1.0.1", 8425 "promise-inflight": "^1.0.1",
@@ -8432,13 +8429,13 @@ @@ -8432,13 +8429,13 @@
8432 "safe-buffer": "^5.1.2", 8429 "safe-buffer": "^5.1.2",
8433 "semver": "^5.6.0", 8430 "semver": "^5.6.0",
8434 "ssri": "^6.0.1", 8431 "ssri": "^6.0.1",
8435 - "tar": "^4.4.8", 8432 + "tar": "^4.4.10",
8436 "unique-filename": "^1.1.1", 8433 "unique-filename": "^1.1.1",
8437 "which": "^1.3.1" 8434 "which": "^1.3.1"
8438 }, 8435 },
8439 "dependencies": { 8436 "dependencies": {
8440 "minipass": { 8437 "minipass": {
8441 - "version": "2.3.5", 8438 + "version": "2.9.0",
8442 "bundled": true, 8439 "bundled": true,
8443 "requires": { 8440 "requires": {
8444 "safe-buffer": "^5.1.2", 8441 "safe-buffer": "^5.1.2",
@@ -8615,17 +8612,17 @@ @@ -8615,17 +8612,17 @@
8615 "bundled": true 8612 "bundled": true
8616 }, 8613 },
8617 "rc": { 8614 "rc": {
8618 - "version": "1.2.7", 8615 + "version": "1.2.8",
8619 "bundled": true, 8616 "bundled": true,
8620 "requires": { 8617 "requires": {
8621 - "deep-extend": "^0.5.1", 8618 + "deep-extend": "^0.6.0",
8622 "ini": "~1.3.0", 8619 "ini": "~1.3.0",
8623 "minimist": "^1.2.0", 8620 "minimist": "^1.2.0",
8624 "strip-json-comments": "~2.0.1" 8621 "strip-json-comments": "~2.0.1"
8625 }, 8622 },
8626 "dependencies": { 8623 "dependencies": {
8627 "minimist": { 8624 "minimist": {
8628 - "version": "1.2.0", 8625 + "version": "1.2.5",
8629 "bundled": true 8626 "bundled": true
8630 } 8627 }
8631 } 8628 }
@@ -8638,7 +8635,7 @@ @@ -8638,7 +8635,7 @@
8638 } 8635 }
8639 }, 8636 },
8640 "read-cmd-shim": { 8637 "read-cmd-shim": {
8641 - "version": "1.0.1", 8638 + "version": "1.0.5",
8642 "bundled": true, 8639 "bundled": true,
8643 "requires": { 8640 "requires": {
8644 "graceful-fs": "^4.1.2" 8641 "graceful-fs": "^4.1.2"
@@ -8658,14 +8655,14 @@ @@ -8658,14 +8655,14 @@
8658 } 8655 }
8659 }, 8656 },
8660 "read-package-json": { 8657 "read-package-json": {
8661 - "version": "2.0.13", 8658 + "version": "2.1.1",
8662 "bundled": true, 8659 "bundled": true,
8663 "requires": { 8660 "requires": {
8664 "glob": "^7.1.1", 8661 "glob": "^7.1.1",
8665 "graceful-fs": "^4.1.2", 8662 "graceful-fs": "^4.1.2",
8666 "json-parse-better-errors": "^1.0.1", 8663 "json-parse-better-errors": "^1.0.1",
8667 "normalize-package-data": "^2.0.0", 8664 "normalize-package-data": "^2.0.0",
8668 - "slash": "^1.0.0" 8665 + "npm-normalize-package-bin": "^1.0.0"
8669 } 8666 }
8670 }, 8667 },
8671 "read-package-tree": { 8668 "read-package-tree": {
@@ -8678,7 +8675,7 @@ @@ -8678,7 +8675,7 @@
8678 } 8675 }
8679 }, 8676 },
8680 "readable-stream": { 8677 "readable-stream": {
8681 - "version": "3.4.0", 8678 + "version": "3.6.0",
8682 "bundled": true, 8679 "bundled": true,
8683 "requires": { 8680 "requires": {
8684 "inherits": "^2.0.3", 8681 "inherits": "^2.0.3",
@@ -8697,7 +8694,7 @@ @@ -8697,7 +8694,7 @@
8697 } 8694 }
8698 }, 8695 },
8699 "registry-auth-token": { 8696 "registry-auth-token": {
8700 - "version": "3.3.2", 8697 + "version": "3.4.0",
8701 "bundled": true, 8698 "bundled": true,
8702 "requires": { 8699 "requires": {
8703 "rc": "^1.1.6", 8700 "rc": "^1.1.6",
@@ -8754,7 +8751,7 @@ @@ -8754,7 +8751,7 @@
8754 "bundled": true 8751 "bundled": true
8755 }, 8752 },
8756 "rimraf": { 8753 "rimraf": {
8757 - "version": "2.6.3", 8754 + "version": "2.7.1",
8758 "bundled": true, 8755 "bundled": true,
8759 "requires": { 8756 "requires": {
8760 "glob": "^7.1.3" 8757 "glob": "^7.1.3"
@@ -8782,7 +8779,7 @@ @@ -8782,7 +8779,7 @@
8782 "bundled": true 8779 "bundled": true
8783 }, 8780 },
8784 "semver": { 8781 "semver": {
8785 - "version": "5.7.0", 8782 + "version": "5.7.1",
8786 "bundled": true 8783 "bundled": true
8787 }, 8784 },
8788 "semver-diff": { 8785 "semver-diff": {
@@ -8818,24 +8815,20 @@ @@ -8818,24 +8815,20 @@
8818 "version": "3.0.2", 8815 "version": "3.0.2",
8819 "bundled": true 8816 "bundled": true
8820 }, 8817 },
8821 - "slash": {  
8822 - "version": "1.0.0",  
8823 - "bundled": true  
8824 - },  
8825 "slide": { 8818 "slide": {
8826 "version": "1.1.6", 8819 "version": "1.1.6",
8827 "bundled": true 8820 "bundled": true
8828 }, 8821 },
8829 "smart-buffer": { 8822 "smart-buffer": {
8830 - "version": "4.0.2", 8823 + "version": "4.1.0",
8831 "bundled": true 8824 "bundled": true
8832 }, 8825 },
8833 "socks": { 8826 "socks": {
8834 - "version": "2.3.2", 8827 + "version": "2.3.3",
8835 "bundled": true, 8828 "bundled": true,
8836 "requires": { 8829 "requires": {
8837 - "ip": "^1.1.5",  
8838 - "smart-buffer": "4.0.2" 8830 + "ip": "1.1.5",
  8831 + "smart-buffer": "^4.1.0"
8839 } 8832 }
8840 }, 8833 },
8841 "socks-proxy-agent": { 8834 "socks-proxy-agent": {
@@ -9017,14 +9010,20 @@ @@ -9017,14 +9010,20 @@
9017 } 9010 }
9018 }, 9011 },
9019 "string_decoder": { 9012 "string_decoder": {
9020 - "version": "1.2.0", 9013 + "version": "1.3.0",
9021 "bundled": true, 9014 "bundled": true,
9022 "requires": { 9015 "requires": {
9023 - "safe-buffer": "~5.1.0"  
9024 - } 9016 + "safe-buffer": "~5.2.0"
9025 }, 9017 },
9026 - "stringify-package": {  
9027 - "version": "1.0.0", 9018 + "dependencies": {
  9019 + "safe-buffer": {
  9020 + "version": "5.2.0",
  9021 + "bundled": true
  9022 + }
  9023 + }
  9024 + },
  9025 + "stringify-package": {
  9026 + "version": "1.0.1",
9028 "bundled": true 9027 "bundled": true
9029 }, 9028 },
9030 "strip-ansi": { 9029 "strip-ansi": {
@@ -9050,12 +9049,12 @@ @@ -9050,12 +9049,12 @@
9050 } 9049 }
9051 }, 9050 },
9052 "tar": { 9051 "tar": {
9053 - "version": "4.4.10", 9052 + "version": "4.4.13",
9054 "bundled": true, 9053 "bundled": true,
9055 "requires": { 9054 "requires": {
9056 "chownr": "^1.1.1", 9055 "chownr": "^1.1.1",
9057 "fs-minipass": "^1.2.5", 9056 "fs-minipass": "^1.2.5",
9058 - "minipass": "^2.3.5", 9057 + "minipass": "^2.8.6",
9059 "minizlib": "^1.2.1", 9058 "minizlib": "^1.2.1",
9060 "mkdirp": "^0.5.0", 9059 "mkdirp": "^0.5.0",
9061 "safe-buffer": "^5.1.2", 9060 "safe-buffer": "^5.1.2",
@@ -9063,16 +9062,12 @@ @@ -9063,16 +9062,12 @@
9063 }, 9062 },
9064 "dependencies": { 9063 "dependencies": {
9065 "minipass": { 9064 "minipass": {
9066 - "version": "2.3.5", 9065 + "version": "2.9.0",
9067 "bundled": true, 9066 "bundled": true,
9068 "requires": { 9067 "requires": {
9069 "safe-buffer": "^5.1.2", 9068 "safe-buffer": "^5.1.2",
9070 "yallist": "^3.0.0" 9069 "yallist": "^3.0.0"
9071 } 9070 }
9072 - },  
9073 - "yallist": {  
9074 - "version": "3.0.3",  
9075 - "bundled": true  
9076 } 9071 }
9077 } 9072 }
9078 }, 9073 },
@@ -9229,7 +9224,7 @@ @@ -9229,7 +9224,7 @@
9229 } 9224 }
9230 }, 9225 },
9231 "uuid": { 9226 "uuid": {
9232 - "version": "3.3.2", 9227 + "version": "3.3.3",
9233 "bundled": true 9228 "bundled": true
9234 }, 9229 },
9235 "validate-npm-package-license": { 9230 "validate-npm-package-license": {
@@ -9293,7 +9288,7 @@ @@ -9293,7 +9288,7 @@
9293 } 9288 }
9294 }, 9289 },
9295 "widest-line": { 9290 "widest-line": {
9296 - "version": "2.0.0", 9291 + "version": "2.0.1",
9297 "bundled": true, 9292 "bundled": true,
9298 "requires": { 9293 "requires": {
9299 "string-width": "^2.1.1" 9294 "string-width": "^2.1.1"
@@ -9355,14 +9350,14 @@ @@ -9355,14 +9350,14 @@
9355 "bundled": true 9350 "bundled": true
9356 }, 9351 },
9357 "yargs": { 9352 "yargs": {
9358 - "version": "11.0.0", 9353 + "version": "11.1.1",
9359 "bundled": true, 9354 "bundled": true,
9360 "requires": { 9355 "requires": {
9361 "cliui": "^4.0.0", 9356 "cliui": "^4.0.0",
9362 "decamelize": "^1.1.1", 9357 "decamelize": "^1.1.1",
9363 "find-up": "^2.1.0", 9358 "find-up": "^2.1.0",
9364 "get-caller-file": "^1.0.1", 9359 "get-caller-file": "^1.0.1",
9365 - "os-locale": "^2.0.0", 9360 + "os-locale": "^3.1.0",
9366 "require-directory": "^2.1.1", 9361 "require-directory": "^2.1.1",
9367 "require-main-filename": "^1.0.1", 9362 "require-main-filename": "^1.0.1",
9368 "set-blocking": "^2.0.0", 9363 "set-blocking": "^2.0.0",
@@ -9767,7 +9762,8 @@ @@ -9767,7 +9762,8 @@
9767 "version": "1.0.2", 9762 "version": "1.0.2",
9768 "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", 9763 "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
9769 "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", 9764 "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
9770 - "dev": true 9765 + "dev": true,
  9766 + "optional": true
9771 }, 9767 },
9772 "path-exists": { 9768 "path-exists": {
9773 "version": "2.1.0", 9769 "version": "2.1.0",
@@ -9833,6 +9829,13 @@ @@ -9833,6 +9829,13 @@
9833 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", 9829 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
9834 "dev": true 9830 "dev": true
9835 }, 9831 },
  9832 + "picomatch": {
  9833 + "version": "2.2.2",
  9834 + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
  9835 + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
  9836 + "dev": true,
  9837 + "optional": true
  9838 + },
9836 "pify": { 9839 "pify": {
9837 "version": "3.0.0", 9840 "version": "3.0.0",
9838 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", 9841 "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -10460,9 +10463,9 @@ @@ -10460,9 +10463,9 @@
10460 "dev": true 10463 "dev": true
10461 }, 10464 },
10462 "psl": { 10465 "psl": {
10463 - "version": "1.3.0",  
10464 - "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",  
10465 - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==", 10466 + "version": "1.8.0",
  10467 + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
  10468 + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
10466 "dev": true 10469 "dev": true
10467 }, 10470 },
10468 "public-encrypt": { 10471 "public-encrypt": {
@@ -10751,7 +10754,8 @@ @@ -10751,7 +10754,8 @@
10751 "raw-loader": { 10754 "raw-loader": {
10752 "version": "0.5.1", 10755 "version": "0.5.1",
10753 "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", 10756 "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
10754 - "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=" 10757 + "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
  10758 + "dev": true
10755 }, 10759 },
10756 "read-pkg": { 10760 "read-pkg": {
10757 "version": "1.1.0", 10761 "version": "1.1.0",
@@ -10812,6 +10816,7 @@ @@ -10812,6 +10816,7 @@
10812 "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", 10816 "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
10813 "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", 10817 "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
10814 "dev": true, 10818 "dev": true,
  10819 + "optional": true,
10815 "requires": { 10820 "requires": {
10816 "graceful-fs": "^4.1.11", 10821 "graceful-fs": "^4.1.11",
10817 "micromatch": "^3.1.10", 10822 "micromatch": "^3.1.10",
@@ -10822,19 +10827,22 @@ @@ -10822,19 +10827,22 @@
10822 "version": "4.0.0", 10827 "version": "4.0.0",
10823 "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", 10828 "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
10824 "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", 10829 "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
10825 - "dev": true 10830 + "dev": true,
  10831 + "optional": true
10826 }, 10832 },
10827 "array-unique": { 10833 "array-unique": {
10828 "version": "0.3.2", 10834 "version": "0.3.2",
10829 "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", 10835 "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
10830 "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", 10836 "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
10831 - "dev": true 10837 + "dev": true,
  10838 + "optional": true
10832 }, 10839 },
10833 "braces": { 10840 "braces": {
10834 "version": "2.3.2", 10841 "version": "2.3.2",
10835 "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", 10842 "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
10836 "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", 10843 "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
10837 "dev": true, 10844 "dev": true,
  10845 + "optional": true,
10838 "requires": { 10846 "requires": {
10839 "arr-flatten": "^1.1.0", 10847 "arr-flatten": "^1.1.0",
10840 "array-unique": "^0.3.2", 10848 "array-unique": "^0.3.2",
@@ -10853,6 +10861,7 @@ @@ -10853,6 +10861,7 @@
10853 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 10861 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
10854 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 10862 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
10855 "dev": true, 10863 "dev": true,
  10864 + "optional": true,
10856 "requires": { 10865 "requires": {
10857 "is-extendable": "^0.1.0" 10866 "is-extendable": "^0.1.0"
10858 } 10867 }
@@ -10864,6 +10873,7 @@ @@ -10864,6 +10873,7 @@
10864 "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", 10873 "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
10865 "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", 10874 "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
10866 "dev": true, 10875 "dev": true,
  10876 + "optional": true,
10867 "requires": { 10877 "requires": {
10868 "debug": "^2.3.3", 10878 "debug": "^2.3.3",
10869 "define-property": "^0.2.5", 10879 "define-property": "^0.2.5",
@@ -10879,6 +10889,7 @@ @@ -10879,6 +10889,7 @@
10879 "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", 10889 "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
10880 "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", 10890 "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
10881 "dev": true, 10891 "dev": true,
  10892 + "optional": true,
10882 "requires": { 10893 "requires": {
10883 "is-descriptor": "^0.1.0" 10894 "is-descriptor": "^0.1.0"
10884 } 10895 }
@@ -10888,6 +10899,7 @@ @@ -10888,6 +10899,7 @@
10888 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 10899 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
10889 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 10900 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
10890 "dev": true, 10901 "dev": true,
  10902 + "optional": true,
10891 "requires": { 10903 "requires": {
10892 "is-extendable": "^0.1.0" 10904 "is-extendable": "^0.1.0"
10893 } 10905 }
@@ -10897,6 +10909,7 @@ @@ -10897,6 +10909,7 @@
10897 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", 10909 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
10898 "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", 10910 "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
10899 "dev": true, 10911 "dev": true,
  10912 + "optional": true,
10900 "requires": { 10913 "requires": {
10901 "kind-of": "^3.0.2" 10914 "kind-of": "^3.0.2"
10902 }, 10915 },
@@ -10906,6 +10919,7 @@ @@ -10906,6 +10919,7 @@
10906 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 10919 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
10907 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 10920 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
10908 "dev": true, 10921 "dev": true,
  10922 + "optional": true,
10909 "requires": { 10923 "requires": {
10910 "is-buffer": "^1.1.5" 10924 "is-buffer": "^1.1.5"
10911 } 10925 }
@@ -10917,6 +10931,7 @@ @@ -10917,6 +10931,7 @@
10917 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", 10931 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
10918 "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", 10932 "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
10919 "dev": true, 10933 "dev": true,
  10934 + "optional": true,
10920 "requires": { 10935 "requires": {
10921 "kind-of": "^3.0.2" 10936 "kind-of": "^3.0.2"
10922 }, 10937 },
@@ -10926,6 +10941,7 @@ @@ -10926,6 +10941,7 @@
10926 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 10941 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
10927 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 10942 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
10928 "dev": true, 10943 "dev": true,
  10944 + "optional": true,
10929 "requires": { 10945 "requires": {
10930 "is-buffer": "^1.1.5" 10946 "is-buffer": "^1.1.5"
10931 } 10947 }
@@ -10937,6 +10953,7 @@ @@ -10937,6 +10953,7 @@
10937 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", 10953 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
10938 "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", 10954 "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
10939 "dev": true, 10955 "dev": true,
  10956 + "optional": true,
10940 "requires": { 10957 "requires": {
10941 "is-accessor-descriptor": "^0.1.6", 10958 "is-accessor-descriptor": "^0.1.6",
10942 "is-data-descriptor": "^0.1.4", 10959 "is-data-descriptor": "^0.1.4",
@@ -10947,7 +10964,8 @@ @@ -10947,7 +10964,8 @@
10947 "version": "5.1.0", 10964 "version": "5.1.0",
10948 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", 10965 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
10949 "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", 10966 "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
10950 - "dev": true 10967 + "dev": true,
  10968 + "optional": true
10951 } 10969 }
10952 } 10970 }
10953 }, 10971 },
@@ -10956,6 +10974,7 @@ @@ -10956,6 +10974,7 @@
10956 "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", 10974 "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
10957 "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", 10975 "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
10958 "dev": true, 10976 "dev": true,
  10977 + "optional": true,
10959 "requires": { 10978 "requires": {
10960 "array-unique": "^0.3.2", 10979 "array-unique": "^0.3.2",
10961 "define-property": "^1.0.0", 10980 "define-property": "^1.0.0",
@@ -10972,6 +10991,7 @@ @@ -10972,6 +10991,7 @@
10972 "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", 10991 "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
10973 "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", 10992 "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
10974 "dev": true, 10993 "dev": true,
  10994 + "optional": true,
10975 "requires": { 10995 "requires": {
10976 "is-descriptor": "^1.0.0" 10996 "is-descriptor": "^1.0.0"
10977 } 10997 }
@@ -10981,6 +11001,7 @@ @@ -10981,6 +11001,7 @@
10981 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 11001 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
10982 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 11002 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
10983 "dev": true, 11003 "dev": true,
  11004 + "optional": true,
10984 "requires": { 11005 "requires": {
10985 "is-extendable": "^0.1.0" 11006 "is-extendable": "^0.1.0"
10986 } 11007 }
@@ -10992,6 +11013,7 @@ @@ -10992,6 +11013,7 @@
10992 "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", 11013 "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
10993 "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", 11014 "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
10994 "dev": true, 11015 "dev": true,
  11016 + "optional": true,
10995 "requires": { 11017 "requires": {
10996 "extend-shallow": "^2.0.1", 11018 "extend-shallow": "^2.0.1",
10997 "is-number": "^3.0.0", 11019 "is-number": "^3.0.0",
@@ -11004,6 +11026,7 @@ @@ -11004,6 +11026,7 @@
11004 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", 11026 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
11005 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", 11027 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
11006 "dev": true, 11028 "dev": true,
  11029 + "optional": true,
11007 "requires": { 11030 "requires": {
11008 "is-extendable": "^0.1.0" 11031 "is-extendable": "^0.1.0"
11009 } 11032 }
@@ -11015,6 +11038,7 @@ @@ -11015,6 +11038,7 @@
11015 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", 11038 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
11016 "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", 11039 "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
11017 "dev": true, 11040 "dev": true,
  11041 + "optional": true,
11018 "requires": { 11042 "requires": {
11019 "kind-of": "^6.0.0" 11043 "kind-of": "^6.0.0"
11020 } 11044 }
@@ -11024,6 +11048,7 @@ @@ -11024,6 +11048,7 @@
11024 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", 11048 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
11025 "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", 11049 "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
11026 "dev": true, 11050 "dev": true,
  11051 + "optional": true,
11027 "requires": { 11052 "requires": {
11028 "kind-of": "^6.0.0" 11053 "kind-of": "^6.0.0"
11029 } 11054 }
@@ -11033,6 +11058,7 @@ @@ -11033,6 +11058,7 @@
11033 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", 11058 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
11034 "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", 11059 "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
11035 "dev": true, 11060 "dev": true,
  11061 + "optional": true,
11036 "requires": { 11062 "requires": {
11037 "is-accessor-descriptor": "^1.0.0", 11063 "is-accessor-descriptor": "^1.0.0",
11038 "is-data-descriptor": "^1.0.0", 11064 "is-data-descriptor": "^1.0.0",
@@ -11044,6 +11070,7 @@ @@ -11044,6 +11070,7 @@
11044 "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", 11070 "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
11045 "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", 11071 "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
11046 "dev": true, 11072 "dev": true,
  11073 + "optional": true,
11047 "requires": { 11074 "requires": {
11048 "kind-of": "^3.0.2" 11075 "kind-of": "^3.0.2"
11049 }, 11076 },
@@ -11053,6 +11080,7 @@ @@ -11053,6 +11080,7 @@
11053 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", 11080 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
11054 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", 11081 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
11055 "dev": true, 11082 "dev": true,
  11083 + "optional": true,
11056 "requires": { 11084 "requires": {
11057 "is-buffer": "^1.1.5" 11085 "is-buffer": "^1.1.5"
11058 } 11086 }
@@ -11063,19 +11091,22 @@ @@ -11063,19 +11091,22 @@
11063 "version": "3.0.1", 11091 "version": "3.0.1",
11064 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", 11092 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
11065 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", 11093 "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
11066 - "dev": true 11094 + "dev": true,
  11095 + "optional": true
11067 }, 11096 },
11068 "kind-of": { 11097 "kind-of": {
11069 - "version": "6.0.2",  
11070 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
11071 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",  
11072 - "dev": true 11098 + "version": "6.0.3",
  11099 + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
  11100 + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
  11101 + "dev": true,
  11102 + "optional": true
11073 }, 11103 },
11074 "micromatch": { 11104 "micromatch": {
11075 "version": "3.1.10", 11105 "version": "3.1.10",
11076 "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", 11106 "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
11077 "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", 11107 "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
11078 "dev": true, 11108 "dev": true,
  11109 + "optional": true,
11079 "requires": { 11110 "requires": {
11080 "arr-diff": "^4.0.0", 11111 "arr-diff": "^4.0.0",
11081 "array-unique": "^0.3.2", 11112 "array-unique": "^0.3.2",
@@ -11230,7 +11261,8 @@ @@ -11230,7 +11261,8 @@
11230 "version": "1.1.0", 11261 "version": "1.1.0",
11231 "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", 11262 "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
11232 "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", 11263 "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
11233 - "dev": true 11264 + "dev": true,
  11265 + "optional": true
11234 }, 11266 },
11235 "renderkid": { 11267 "renderkid": {
11236 "version": "2.0.3", 11268 "version": "2.0.3",
@@ -11284,9 +11316,9 @@ @@ -11284,9 +11316,9 @@
11284 } 11316 }
11285 }, 11317 },
11286 "request": { 11318 "request": {
11287 - "version": "2.88.0",  
11288 - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",  
11289 - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", 11319 + "version": "2.88.2",
  11320 + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
  11321 + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
11290 "dev": true, 11322 "dev": true,
11291 "requires": { 11323 "requires": {
11292 "aws-sign2": "~0.7.0", 11324 "aws-sign2": "~0.7.0",
@@ -11296,7 +11328,7 @@ @@ -11296,7 +11328,7 @@
11296 "extend": "~3.0.2", 11328 "extend": "~3.0.2",
11297 "forever-agent": "~0.6.1", 11329 "forever-agent": "~0.6.1",
11298 "form-data": "~2.3.2", 11330 "form-data": "~2.3.2",
11299 - "har-validator": "~5.1.0", 11331 + "har-validator": "~5.1.3",
11300 "http-signature": "~1.2.0", 11332 "http-signature": "~1.2.0",
11301 "is-typedarray": "~1.0.0", 11333 "is-typedarray": "~1.0.0",
11302 "isstream": "~0.1.2", 11334 "isstream": "~0.1.2",
@@ -11306,7 +11338,7 @@ @@ -11306,7 +11338,7 @@
11306 "performance-now": "^2.1.0", 11338 "performance-now": "^2.1.0",
11307 "qs": "~6.5.2", 11339 "qs": "~6.5.2",
11308 "safe-buffer": "^5.1.2", 11340 "safe-buffer": "^5.1.2",
11309 - "tough-cookie": "~2.4.3", 11341 + "tough-cookie": "~2.5.0",
11310 "tunnel-agent": "^0.6.0", 11342 "tunnel-agent": "^0.6.0",
11311 "uuid": "^3.3.2" 11343 "uuid": "^3.3.2"
11312 }, 11344 },
@@ -11454,15 +11486,15 @@ @@ -11454,15 +11486,15 @@
11454 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" 11486 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
11455 }, 11487 },
11456 "sass-graph": { 11488 "sass-graph": {
11457 - "version": "2.2.4",  
11458 - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",  
11459 - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", 11489 + "version": "2.2.5",
  11490 + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
  11491 + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
11460 "dev": true, 11492 "dev": true,
11461 "requires": { 11493 "requires": {
11462 "glob": "^7.0.0", 11494 "glob": "^7.0.0",
11463 "lodash": "^4.0.0", 11495 "lodash": "^4.0.0",
11464 "scss-tokenizer": "^0.2.3", 11496 "scss-tokenizer": "^0.2.3",
11465 - "yargs": "^7.0.0" 11497 + "yargs": "^13.3.2"
11466 } 11498 }
11467 }, 11499 },
11468 "sass-loader": { 11500 "sass-loader": {
@@ -11506,8 +11538,7 @@ @@ -11506,8 +11538,7 @@
11506 }, 11538 },
11507 "minimist": { 11539 "minimist": {
11508 "version": "1.2.0", 11540 "version": "1.2.0",
11509 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
11510 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 11541 + "resolved": "",
11511 "dev": true 11542 "dev": true
11512 } 11543 }
11513 } 11544 }
@@ -11557,6 +11588,7 @@ @@ -11557,6 +11588,7 @@
11557 "version": "0.7.2", 11588 "version": "0.7.2",
11558 "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz", 11589 "resolved": "https://registry.npmjs.org/script-loader/-/script-loader-0.7.2.tgz",
11559 "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==", 11590 "integrity": "sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA==",
  11591 + "dev": true,
11560 "requires": { 11592 "requires": {
11561 "raw-loader": "~0.5.1" 11593 "raw-loader": "~0.5.1"
11562 } 11594 }
@@ -11859,8 +11891,7 @@ @@ -11859,8 +11891,7 @@
11859 }, 11891 },
11860 "kind-of": { 11892 "kind-of": {
11861 "version": "6.0.2", 11893 "version": "6.0.2",
11862 - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",  
11863 - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", 11894 + "resolved": "",
11864 "dev": true 11895 "dev": true
11865 } 11896 }
11866 } 11897 }
@@ -11970,9 +12001,9 @@ @@ -11970,9 +12001,9 @@
11970 "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" 12001 "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
11971 }, 12002 },
11972 "ssf": { 12003 "ssf": {
11973 - "version": "0.10.2",  
11974 - "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",  
11975 - "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==", 12004 + "version": "0.10.3",
  12005 + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
  12006 + "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
11976 "requires": { 12007 "requires": {
11977 "frac": "~1.1.2" 12008 "frac": "~1.1.2"
11978 } 12009 }
@@ -12370,21 +12401,13 @@ @@ -12370,21 +12401,13 @@
12370 "dev": true 12401 "dev": true
12371 }, 12402 },
12372 "tough-cookie": { 12403 "tough-cookie": {
12373 - "version": "2.4.3",  
12374 - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",  
12375 - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", 12404 + "version": "2.5.0",
  12405 + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
  12406 + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
12376 "dev": true, 12407 "dev": true,
12377 "requires": { 12408 "requires": {
12378 - "psl": "^1.1.24",  
12379 - "punycode": "^1.4.1"  
12380 - },  
12381 - "dependencies": {  
12382 - "punycode": {  
12383 - "version": "1.4.1",  
12384 - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",  
12385 - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",  
12386 - "dev": true  
12387 - } 12409 + "psl": "^1.1.28",
  12410 + "punycode": "^2.1.1"
12388 } 12411 }
12389 }, 12412 },
12390 "trim-newlines": { 12413 "trim-newlines": {
@@ -12604,7 +12627,8 @@ @@ -12604,7 +12627,8 @@
12604 "version": "1.1.2", 12627 "version": "1.1.2",
12605 "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", 12628 "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
12606 "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", 12629 "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
12607 - "dev": true 12630 + "dev": true,
  12631 + "optional": true
12608 }, 12632 },
12609 "upper-case": { 12633 "upper-case": {
12610 "version": "1.1.3", 12634 "version": "1.1.3",
@@ -12688,8 +12712,7 @@ @@ -12688,8 +12712,7 @@
12688 }, 12712 },
12689 "minimist": { 12713 "minimist": {
12690 "version": "1.2.0", 12714 "version": "1.2.0",
12691 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
12692 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 12715 + "resolved": "",
12693 "dev": true 12716 "dev": true
12694 } 12717 }
12695 } 12718 }
@@ -12735,9 +12758,9 @@ @@ -12735,9 +12758,9 @@
12735 "dev": true 12758 "dev": true
12736 }, 12759 },
12737 "uuid": { 12760 "uuid": {
12738 - "version": "3.3.2",  
12739 - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",  
12740 - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", 12761 + "version": "3.4.0",
  12762 + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
  12763 + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
12741 "dev": true 12764 "dev": true
12742 }, 12765 },
12743 "validate-npm-package-license": { 12766 "validate-npm-package-license": {
@@ -12843,8 +12866,7 @@ @@ -12843,8 +12866,7 @@
12843 }, 12866 },
12844 "minimist": { 12867 "minimist": {
12845 "version": "1.2.0", 12868 "version": "1.2.0",
12846 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
12847 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 12869 + "resolved": "",
12848 "dev": true 12870 "dev": true
12849 } 12871 }
12850 } 12872 }
@@ -12897,8 +12919,7 @@ @@ -12897,8 +12919,7 @@
12897 }, 12919 },
12898 "minimist": { 12920 "minimist": {
12899 "version": "1.2.0", 12921 "version": "1.2.0",
12900 - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",  
12901 - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", 12922 + "resolved": "",
12902 "dev": true 12923 "dev": true
12903 } 12924 }
12904 } 12925 }
@@ -12925,14 +12946,186 @@ @@ -12925,14 +12946,186 @@
12925 "integrity": "sha512-5oJPOJySBgSgSzoeO+gZB/BbN/XsapgIF6tz34UwJqnGZMQurzIO3B4KIBf862gfc9ya+oduY5sSkq+5/oOilQ==" 12946 "integrity": "sha512-5oJPOJySBgSgSzoeO+gZB/BbN/XsapgIF6tz34UwJqnGZMQurzIO3B4KIBf862gfc9ya+oduY5sSkq+5/oOilQ=="
12926 }, 12947 },
12927 "watchpack": { 12948 "watchpack": {
12928 - "version": "1.6.0",  
12929 - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",  
12930 - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", 12949 + "version": "1.7.2",
  12950 + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
  12951 + "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
12931 "dev": true, 12952 "dev": true,
12932 "requires": { 12953 "requires": {
12933 - "chokidar": "^2.0.2", 12954 + "chokidar": "^3.4.0",
12934 "graceful-fs": "^4.1.2", 12955 "graceful-fs": "^4.1.2",
12935 - "neo-async": "^2.5.0" 12956 + "neo-async": "^2.5.0",
  12957 + "watchpack-chokidar2": "^2.0.0"
  12958 + },
  12959 + "dependencies": {
  12960 + "anymatch": {
  12961 + "version": "3.1.1",
  12962 + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
  12963 + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
  12964 + "dev": true,
  12965 + "optional": true,
  12966 + "requires": {
  12967 + "normalize-path": "^3.0.0",
  12968 + "picomatch": "^2.0.4"
  12969 + }
  12970 + },
  12971 + "binary-extensions": {
  12972 + "version": "2.1.0",
  12973 + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
  12974 + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
  12975 + "dev": true,
  12976 + "optional": true
  12977 + },
  12978 + "braces": {
  12979 + "version": "3.0.2",
  12980 + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
  12981 + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
  12982 + "dev": true,
  12983 + "optional": true,
  12984 + "requires": {
  12985 + "fill-range": "^7.0.1"
  12986 + }
  12987 + },
  12988 + "chokidar": {
  12989 + "version": "3.4.0",
  12990 + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
  12991 + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
  12992 + "dev": true,
  12993 + "optional": true,
  12994 + "requires": {
  12995 + "anymatch": "~3.1.1",
  12996 + "braces": "~3.0.2",
  12997 + "fsevents": "~2.1.2",
  12998 + "glob-parent": "~5.1.0",
  12999 + "is-binary-path": "~2.1.0",
  13000 + "is-glob": "~4.0.1",
  13001 + "normalize-path": "~3.0.0",
  13002 + "readdirp": "~3.4.0"
  13003 + }
  13004 + },
  13005 + "fill-range": {
  13006 + "version": "7.0.1",
  13007 + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
  13008 + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
  13009 + "dev": true,
  13010 + "optional": true,
  13011 + "requires": {
  13012 + "to-regex-range": "^5.0.1"
  13013 + }
  13014 + },
  13015 + "fsevents": {
  13016 + "version": "2.1.3",
  13017 + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
  13018 + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
  13019 + "dev": true,
  13020 + "optional": true
  13021 + },
  13022 + "is-binary-path": {
  13023 + "version": "2.1.0",
  13024 + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
  13025 + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
  13026 + "dev": true,
  13027 + "optional": true,
  13028 + "requires": {
  13029 + "binary-extensions": "^2.0.0"
  13030 + }
  13031 + },
  13032 + "is-number": {
  13033 + "version": "7.0.0",
  13034 + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
  13035 + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
  13036 + "dev": true,
  13037 + "optional": true
  13038 + },
  13039 + "normalize-path": {
  13040 + "version": "3.0.0",
  13041 + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
  13042 + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
  13043 + "dev": true,
  13044 + "optional": true
  13045 + },
  13046 + "readdirp": {
  13047 + "version": "3.4.0",
  13048 + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
  13049 + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
  13050 + "dev": true,
  13051 + "optional": true,
  13052 + "requires": {
  13053 + "picomatch": "^2.2.1"
  13054 + }
  13055 + },
  13056 + "to-regex-range": {
  13057 + "version": "5.0.1",
  13058 + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
  13059 + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
  13060 + "dev": true,
  13061 + "optional": true,
  13062 + "requires": {
  13063 + "is-number": "^7.0.0"
  13064 + }
  13065 + }
  13066 + }
  13067 + },
  13068 + "watchpack-chokidar2": {
  13069 + "version": "2.0.0",
  13070 + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
  13071 + "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
  13072 + "dev": true,
  13073 + "optional": true,
  13074 + "requires": {
  13075 + "chokidar": "^2.1.8"
  13076 + },
  13077 + "dependencies": {
  13078 + "chokidar": {
  13079 + "version": "2.1.8",
  13080 + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
  13081 + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
  13082 + "dev": true,
  13083 + "optional": true,
  13084 + "requires": {
  13085 + "anymatch": "^2.0.0",
  13086 + "async-each": "^1.0.1",
  13087 + "braces": "^2.3.2",
  13088 + "fsevents": "^1.2.7",
  13089 + "glob-parent": "^3.1.0",
  13090 + "inherits": "^2.0.3",
  13091 + "is-binary-path": "^1.0.0",
  13092 + "is-glob": "^4.0.0",
  13093 + "normalize-path": "^3.0.0",
  13094 + "path-is-absolute": "^1.0.0",
  13095 + "readdirp": "^2.2.1",
  13096 + "upath": "^1.1.1"
  13097 + }
  13098 + },
  13099 + "glob-parent": {
  13100 + "version": "3.1.0",
  13101 + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
  13102 + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
  13103 + "dev": true,
  13104 + "optional": true,
  13105 + "requires": {
  13106 + "is-glob": "^3.1.0",
  13107 + "path-dirname": "^1.0.0"
  13108 + },
  13109 + "dependencies": {
  13110 + "is-glob": {
  13111 + "version": "3.1.0",
  13112 + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
  13113 + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
  13114 + "dev": true,
  13115 + "optional": true,
  13116 + "requires": {
  13117 + "is-extglob": "^2.1.0"
  13118 + }
  13119 + }
  13120 + }
  13121 + },
  13122 + "normalize-path": {
  13123 + "version": "3.0.0",
  13124 + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
  13125 + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
  13126 + "dev": true,
  13127 + "optional": true
  13128 + }
12936 } 13129 }
12937 }, 13130 },
12938 "webpack": { 13131 "webpack": {
@@ -12965,9 +13158,9 @@ @@ -12965,9 +13158,9 @@
12965 }, 13158 },
12966 "dependencies": { 13159 "dependencies": {
12967 "acorn": { 13160 "acorn": {
12968 - "version": "5.7.3",  
12969 - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",  
12970 - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", 13161 + "version": "5.7.4",
  13162 + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
  13163 + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
12971 "dev": true 13164 "dev": true
12972 }, 13165 },
12973 "ajv": { 13166 "ajv": {
@@ -13311,6 +13504,11 @@ @@ -13311,6 +13504,11 @@
13311 "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", 13504 "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
13312 "dev": true 13505 "dev": true
13313 }, 13506 },
  13507 + "wmf": {
  13508 + "version": "1.0.2",
  13509 + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
  13510 + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
  13511 + },
13314 "wordwrap": { 13512 "wordwrap": {
13315 "version": "1.0.0", 13513 "version": "1.0.0",
13316 "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", 13514 "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -13386,17 +13584,18 @@ @@ -13386,17 +13584,18 @@
13386 } 13584 }
13387 }, 13585 },
13388 "xlsx": { 13586 "xlsx": {
13389 - "version": "0.15.1",  
13390 - "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.1.tgz",  
13391 - "integrity": "sha512-z+o4+QPMc32EPboLCzJAz94o0Zyy+8jrmWTsVpfzwknFln9qDO6/HN1KrGGVC4//sGA7dh4R3HA4fhbGIKCDOA==", 13587 + "version": "0.15.6",
  13588 + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz",
  13589 + "integrity": "sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ==",
13392 "requires": { 13590 "requires": {
13393 "adler-32": "~1.2.0", 13591 "adler-32": "~1.2.0",
13394 - "cfb": "^1.1.3", 13592 + "cfb": "^1.1.4",
13395 "codepage": "~1.14.0", 13593 "codepage": "~1.14.0",
13396 "commander": "~2.17.1", 13594 "commander": "~2.17.1",
13397 "crc-32": "~1.2.0", 13595 "crc-32": "~1.2.0",
13398 "exit-on-epipe": "~1.0.1", 13596 "exit-on-epipe": "~1.0.1",
13399 - "ssf": "~0.10.2" 13597 + "ssf": "~0.10.3",
  13598 + "wmf": "~1.0.1"
13400 } 13599 }
13401 }, 13600 },
13402 "xtend": { 13601 "xtend": {
@@ -13417,88 +13616,138 @@ @@ -13417,88 +13616,138 @@
13417 "dev": true 13616 "dev": true
13418 }, 13617 },
13419 "yargs": { 13618 "yargs": {
13420 - "version": "7.1.0",  
13421 - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",  
13422 - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", 13619 + "version": "13.3.2",
  13620 + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
  13621 + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
13423 "dev": true, 13622 "dev": true,
13424 "requires": { 13623 "requires": {
13425 - "camelcase": "^3.0.0",  
13426 - "cliui": "^3.2.0",  
13427 - "decamelize": "^1.1.1",  
13428 - "get-caller-file": "^1.0.1",  
13429 - "os-locale": "^1.4.0",  
13430 - "read-pkg-up": "^1.0.1", 13624 + "cliui": "^5.0.0",
  13625 + "find-up": "^3.0.0",
  13626 + "get-caller-file": "^2.0.1",
13431 "require-directory": "^2.1.1", 13627 "require-directory": "^2.1.1",
13432 - "require-main-filename": "^1.0.1", 13628 + "require-main-filename": "^2.0.0",
13433 "set-blocking": "^2.0.0", 13629 "set-blocking": "^2.0.0",
13434 - "string-width": "^1.0.2",  
13435 - "which-module": "^1.0.0",  
13436 - "y18n": "^3.2.1",  
13437 - "yargs-parser": "^5.0.0" 13630 + "string-width": "^3.0.0",
  13631 + "which-module": "^2.0.0",
  13632 + "y18n": "^4.0.0",
  13633 + "yargs-parser": "^13.1.2"
13438 }, 13634 },
13439 "dependencies": { 13635 "dependencies": {
13440 - "ansi-regex": {  
13441 - "version": "2.1.1",  
13442 - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",  
13443 - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", 13636 + "emoji-regex": {
  13637 + "version": "7.0.3",
  13638 + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
  13639 + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
13444 "dev": true 13640 "dev": true
13445 }, 13641 },
13446 - "camelcase": { 13642 + "find-up": {
13447 "version": "3.0.0", 13643 "version": "3.0.0",
13448 - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",  
13449 - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", 13644 + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
  13645 + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
  13646 + "dev": true,
  13647 + "requires": {
  13648 + "locate-path": "^3.0.0"
  13649 + }
  13650 + },
  13651 + "get-caller-file": {
  13652 + "version": "2.0.5",
  13653 + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
  13654 + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
13450 "dev": true 13655 "dev": true
13451 }, 13656 },
13452 "is-fullwidth-code-point": { 13657 "is-fullwidth-code-point": {
13453 - "version": "1.0.0",  
13454 - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",  
13455 - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", 13658 + "version": "2.0.0",
  13659 + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
  13660 + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
  13661 + "dev": true
  13662 + },
  13663 + "locate-path": {
  13664 + "version": "3.0.0",
  13665 + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
  13666 + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
13456 "dev": true, 13667 "dev": true,
13457 "requires": { 13668 "requires": {
13458 - "number-is-nan": "^1.0.0" 13669 + "p-locate": "^3.0.0",
  13670 + "path-exists": "^3.0.0"
  13671 + }
  13672 + },
  13673 + "p-limit": {
  13674 + "version": "2.3.0",
  13675 + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
  13676 + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
  13677 + "dev": true,
  13678 + "requires": {
  13679 + "p-try": "^2.0.0"
  13680 + }
  13681 + },
  13682 + "p-locate": {
  13683 + "version": "3.0.0",
  13684 + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
  13685 + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
  13686 + "dev": true,
  13687 + "requires": {
  13688 + "p-limit": "^2.0.0"
13459 } 13689 }
13460 }, 13690 },
  13691 + "p-try": {
  13692 + "version": "2.2.0",
  13693 + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
  13694 + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
  13695 + "dev": true
  13696 + },
  13697 + "path-exists": {
  13698 + "version": "3.0.0",
  13699 + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
  13700 + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
  13701 + "dev": true
  13702 + },
  13703 + "require-main-filename": {
  13704 + "version": "2.0.0",
  13705 + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
  13706 + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
  13707 + "dev": true
  13708 + },
13461 "string-width": { 13709 "string-width": {
13462 - "version": "1.0.2",  
13463 - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",  
13464 - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", 13710 + "version": "3.1.0",
  13711 + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
  13712 + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
13465 "dev": true, 13713 "dev": true,
13466 "requires": { 13714 "requires": {
13467 - "code-point-at": "^1.0.0",  
13468 - "is-fullwidth-code-point": "^1.0.0",  
13469 - "strip-ansi": "^3.0.0" 13715 + "emoji-regex": "^7.0.1",
  13716 + "is-fullwidth-code-point": "^2.0.0",
  13717 + "strip-ansi": "^5.1.0"
13470 } 13718 }
13471 }, 13719 },
13472 "strip-ansi": { 13720 "strip-ansi": {
13473 - "version": "3.0.1",  
13474 - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",  
13475 - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", 13721 + "version": "5.2.0",
  13722 + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
  13723 + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
13476 "dev": true, 13724 "dev": true,
13477 "requires": { 13725 "requires": {
13478 - "ansi-regex": "^2.0.0" 13726 + "ansi-regex": "^4.1.0"
13479 } 13727 }
13480 }, 13728 },
13481 - "y18n": {  
13482 - "version": "3.2.1",  
13483 - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",  
13484 - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", 13729 + "which-module": {
  13730 + "version": "2.0.0",
  13731 + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
  13732 + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
13485 "dev": true 13733 "dev": true
13486 } 13734 }
13487 } 13735 }
13488 }, 13736 },
13489 "yargs-parser": { 13737 "yargs-parser": {
13490 - "version": "5.0.0",  
13491 - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",  
13492 - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", 13738 + "version": "13.1.2",
  13739 + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
  13740 + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
13493 "dev": true, 13741 "dev": true,
13494 "requires": { 13742 "requires": {
13495 - "camelcase": "^3.0.0" 13743 + "camelcase": "^5.0.0",
  13744 + "decamelize": "^1.2.0"
13496 }, 13745 },
13497 "dependencies": { 13746 "dependencies": {
13498 "camelcase": { 13747 "camelcase": {
13499 - "version": "3.0.0",  
13500 - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",  
13501 - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", 13748 + "version": "5.3.1",
  13749 + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
  13750 + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
13502 "dev": true 13751 "dev": true
13503 } 13752 }
13504 } 13753 }
@@ -20,17 +20,16 @@ @@ -20,17 +20,16 @@
20 "js-cookie": "^2.2.1", 20 "js-cookie": "^2.2.1",
21 "jszip": "^3.2.2", 21 "jszip": "^3.2.2",
22 "moment": "^2.24.0", 22 "moment": "^2.24.0",
23 - "npm": "^6.8.0", 23 + "npm": "^6.14.5",
24 "nprogress": "^0.2.0", 24 "nprogress": "^0.2.0",
25 "qrcode": "^1.4.4", 25 "qrcode": "^1.4.4",
26 "qrcodejs2": "^0.0.2", 26 "qrcodejs2": "^0.0.2",
27 - "script-loader": "^0.7.2",  
28 "vue": "^2.2.2", 27 "vue": "^2.2.2",
29 "vue-i18n": "^8.14.0", 28 "vue-i18n": "^8.14.0",
30 "vue-qriously": "^1.1.1", 29 "vue-qriously": "^1.1.1",
31 "vue-router": "^2.3.0", 30 "vue-router": "^2.3.0",
32 "vuex": "^2.0.0-rc.6", 31 "vuex": "^2.0.0-rc.6",
33 - "xlsx": "^0.15.1" 32 + "xlsx": "^0.15.6"
34 }, 33 },
35 "devDependencies": { 34 "devDependencies": {
36 "autoprefixer": "^6.7.2", 35 "autoprefixer": "^6.7.2",
@@ -58,16 +57,17 @@ @@ -58,16 +57,17 @@
58 "function-bind": "^1.0.2", 57 "function-bind": "^1.0.2",
59 "html-webpack-plugin": "^2.28.0", 58 "html-webpack-plugin": "^2.28.0",
60 "http-proxy-middleware": "^0.19.1", 59 "http-proxy-middleware": "^0.19.1",
61 - "jquery": "^3.4.1", 60 + "jquery": "^3.5.1",
62 "json-loader": "^0.5.4", 61 "json-loader": "^0.5.4",
63 "mockjs": "^1.0.1-beta3", 62 "mockjs": "^1.0.1-beta3",
64 - "node-sass": "^4.5.0", 63 + "node-sass": "^4.14.1",
65 "opn": "^4.0.2", 64 "opn": "^4.0.2",
66 "optimize-css-assets-webpack-plugin": "^1.3.0", 65 "optimize-css-assets-webpack-plugin": "^1.3.0",
67 "ora": "^1.0.0", 66 "ora": "^1.0.0",
68 "qs": "^6.7.0", 67 "qs": "^6.7.0",
69 "rimraf": "^2.6.0", 68 "rimraf": "^2.6.0",
70 "sass-loader": "^6.0.0", 69 "sass-loader": "^6.0.0",
  70 + "script-loader": "^0.7.2",
71 "semver": "^5.3.0", 71 "semver": "^5.3.0",
72 "shelljs": "^0.7.6", 72 "shelljs": "^0.7.6",
73 "url-loader": "^0.5.8", 73 "url-loader": "^0.5.8",
1 import Vue from 'vue' 1 import Vue from 'vue'
2 import App from './App' 2 import App from './App'
3 import 'element-ui/lib/theme-chalk/index.css' 3 import 'element-ui/lib/theme-chalk/index.css'
4 -//import './assets/theme/theme-green/index.css'  
5 import VueRouter from 'vue-router' 4 import VueRouter from 'vue-router'
6 import store from './vuex/store' 5 import store from './vuex/store'
7 import Vuex from 'vuex' 6 import Vuex from 'vuex'
@@ -20,8 +20,26 @@ @@ -20,8 +20,26 @@
20 </div> 20 </div>
21 </el-form-item> 21 </el-form-item>
22 <el-form-item> 22 <el-form-item>
  23 +<!-- <el-radio-group v-model="filters.payType">-->
  24 +<!-- <el-radio v-model="radio" label="0">水</el-radio>-->
  25 +<!-- <el-radio label="1">电</el-radio>-->
  26 +<!-- <el-radio label="">水电全部</el-radio>-->
  27 +<!-- </el-radio-group>-->
  28 + <el-select v-model="filters.payType" placeholder="请选择">
  29 + <el-option
  30 + v-for="item in optionList"
  31 + :key="item.value"
  32 + :label="item.label"
  33 + :value="item.value">
  34 + </el-option>
  35 + </el-select>
  36 + </el-form-item>
  37 + <el-form-item>
23 <el-button type="primary" v-on:click="QueryOrder()">查询</el-button> 38 <el-button type="primary" v-on:click="QueryOrder()">查询</el-button>
24 </el-form-item> 39 </el-form-item>
  40 + <el-form-item>
  41 + <el-button type="primary" v-on:click="exportClick()">导出excel</el-button>
  42 + </el-form-item>
25 </el-form> 43 </el-form>
26 </el-col> 44 </el-col>
27 <el-table 45 <el-table
@@ -52,17 +70,17 @@ @@ -52,17 +70,17 @@
52 70
53 <el-table-column prop="paytype" label="充值类型" width="100"> 71 <el-table-column prop="paytype" label="充值类型" width="100">
54 <template slot-scope="scope"> 72 <template slot-scope="scope">
55 - <div v-if="scope.row.paytype === false" style="color:#20a0ff">水</div>  
56 - <div v-else="scope.row.paytype === true" style="color: #42d885">电</div> 73 + <div v-if="scope.row.paytype === false" style="color:#20a0ff">水费</div>
  74 + <div v-else="scope.row.paytype === true" style="color: #42d885">电费</div>
57 </template> 75 </template>
58 </el-table-column> 76 </el-table-column>
59 <el-table-column prop="paystatus" label="支付状态" width="100"> 77 <el-table-column prop="paystatus" label="支付状态" width="100">
60 <template slot-scope="scope"> 78 <template slot-scope="scope">
61 - <div v-if="scope.row.paystatus === false" style="color:#ff4d51">未完成</div>  
62 - <div v-else="scope.row.paystatus === true" style="color: #42d885">已完成</div> 79 + <div v-if="scope.row.paystatus === false" style="color:#ff4d51">未支付</div>
  80 + <div v-else="scope.row.paystatus === true" style="color: #42d885">已支付</div>
63 </template> 81 </template>
64 </el-table-column> 82 </el-table-column>
65 - <el-table-column prop="reamke3" label="充值操作" width="150"> 83 + <el-table-column prop="reamke3" label="充值状态" width="150">
66 <template slot-scope="scope"> 84 <template slot-scope="scope">
67 <div v-if="scope.row.reamke3 === '1'" style="color:#42d885">充值成功</div> 85 <div v-if="scope.row.reamke3 === '1'" style="color:#42d885">充值成功</div>
68 <div v-else="scope.row.reamke3 === '0'" style="color: #ff4d51">充值失败</div> 86 <div v-else="scope.row.reamke3 === '0'" style="color: #ff4d51">充值失败</div>
@@ -79,10 +97,10 @@ @@ -79,10 +97,10 @@
79 <el-button type="primary" v-else="" disabled @click="payDelete(scope.$index,scope.row)" 97 <el-button type="primary" v-else="" disabled @click="payDelete(scope.$index,scope.row)"
80 size="small">移除订单 98 size="small">移除订单
81 </el-button> 99 </el-button>
82 - <el-button type="primary" v-if="username == 'admin'" @click="defeatedOrders(scope.$index,scope.row)" 100 + <el-button type="primary" v-if="username == 'admin' && scope.row.paystatus == true && scope.row.reamke3 == '0' " @click="defeatedOrders(scope.$index,scope.row)"
83 size="small">处理订单充值 101 size="small">处理订单充值
84 </el-button> 102 </el-button>
85 - <el-button type="primary" v-else="" style="display: none" @click="defeatedOrders(scope.$index,scope.row)" 103 + <el-button type="primary" v-else-if="username == 'admin'" disabled @click="defeatedOrders(scope.$index,scope.row)"
86 size="small">处理订单充值 104 size="small">处理订单充值
87 </el-button> 105 </el-button>
88 106
@@ -103,6 +121,9 @@ @@ -103,6 +121,9 @@
103 import {getOrder, addOrder, ediOrder, remove, defeatedOrder} from '../../api/empt/PayOrder'; 121 import {getOrder, addOrder, ediOrder, remove, defeatedOrder} from '../../api/empt/PayOrder';
104 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue"; 122 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
105 import moment from 'moment' 123 import moment from 'moment'
  124 + // 引入插件
  125 + import fileSaver from 'file-saver'
  126 + import xlsx from 'xlsx'
106 127
107 export default { 128 export default {
108 components: {ElButton}, 129 components: {ElButton},
@@ -110,8 +131,10 @@ @@ -110,8 +131,10 @@
110 return { 131 return {
111 filters: { 132 filters: {
112 orderNumber: '', 133 orderNumber: '',
113 - payTime: '' 134 + payTime: '',
  135 + payType: ''
114 }, 136 },
  137 + radio:'水',
115 username: JSON.parse(sessionStorage.getItem('user')).username, 138 username: JSON.parse(sessionStorage.getItem('user')).username,
116 total: 0, 139 total: 0,
117 pageNum: 1, 140 pageNum: 1,
@@ -150,6 +173,16 @@ @@ -150,6 +173,16 @@
150 173
151 }, 174 },
152 tableData: [], 175 tableData: [],
  176 + optionList: [{
  177 + value: '0',
  178 + label: '水表'
  179 + }, {
  180 + value: '1',
  181 + label: '电表'
  182 + }, {
  183 + value: '',
  184 + label: '水电表'
  185 + }]
153 } 186 }
154 }, 187 },
155 mounted() { 188 mounted() {
@@ -176,7 +209,8 @@ @@ -176,7 +209,8 @@
176 pageSize: this.pageSize, 209 pageSize: this.pageSize,
177 orderNumber: this.filters.orderNumber, 210 orderNumber: this.filters.orderNumber,
178 payTime: payTimes, 211 payTime: payTimes,
179 - username: this.username 212 + username: this.username,
  213 + payType: this.filters.payType
180 214
181 }; 215 };
182 this.listLoading = true; 216 this.listLoading = true;
@@ -259,7 +293,106 @@ @@ -259,7 +293,106 @@
259 293
260 return moment(date).format("YYYY-MM-DD HH:mm:ss") 294 return moment(date).format("YYYY-MM-DD HH:mm:ss")
261 295
  296 + },
  297 + // 导出excel
  298 + exportClick(){
  299 +
  300 + // 清空后为null 问题
  301 + var payTimes = '';
  302 + if (this.filters.payTime !== null) {
  303 + payTimes = this.filters.payTime[0] + ',' + this.filters.payTime[1]
262 } 304 }
  305 + if (this.$route.params.orderNumber != undefined) {
  306 + this.filters.orderNumber = this.$route.params.orderNumber;
  307 + }
  308 +
  309 + let params = {
  310 + pageNum: this.pageNum,
  311 + pageSize: this.pageSize,
  312 + orderNumber: this.filters.orderNumber,
  313 + payTime: payTimes,
  314 + username: this.username,
  315 + payType: this.filters.payType
  316 +
  317 + };
  318 + this.listLoading = true;//缓冲条加载
  319 +
  320 + //此代码实现向后台异步请求数据
  321 +
  322 + getOrder(params).then(response => {
  323 +
  324 + this.listLoading = false;
  325 +
  326 + const data = response.data.list;//声明常量data用来接收后台返回的数据data
  327 +
  328 + this.tableData = data;//将接受到的data数据赋给exportList这个列表,用于当作导出Excel的数据源
  329 +
  330 + //开始执行导出方法,此方法要放在括号里面,因为是异步请求数据,请求完才能执行导出
  331 +
  332 + this.export2Excel()
  333 +
  334 + }).catch(error => {
  335 +
  336 + debugger;
  337 +
  338 + this.listLoading = false
  339 +
  340 + console.log(error)
  341 +
  342 + })
  343 +
  344 + },
  345 +
  346 + export2Excel() {
  347 +
  348 + require.ensure([], () => {
  349 +
  350 + const { export_json_to_excel } = require('vendor/Export2Excel');
  351 +
  352 + const tHeader =
  353 +
  354 + ['订单编号', '用户编号', '缴费用户','房间号码',
  355 +
  356 + '水电表编号','充值日期','充值金额', '充值类型',
  357 +
  358 + '支付状态','充值状态'
  359 +
  360 + ];
  361 +
  362 + const filterVal =
  363 +
  364 + ['ordernumber', 'payuserid','payusername','paylocationname',
  365 +
  366 + 'paytypeaddress','stringDate', 'payfees', 'stringType', 'stringStatus',
  367 +
  368 + 'stringReamke3'
  369 +
  370 + ];
  371 +
  372 +
  373 +
  374 + const list = this.tableData;
  375 +
  376 + const data = this.formatJson(filterVal, list);
  377 + if (this.filters.payType === '1'){
  378 + export_json_to_excel(tHeader, data, '电表账单报表'+moment(new Date()).format('YYYY-MM-DD HH:mm:ss'));
  379 + }else if (this.filters.payType === '0'){
  380 + export_json_to_excel(tHeader, data, '水表账单报表'+moment(new Date()).format('YYYY-MM-DD HH:mm:ss'));
  381 + }else {
  382 + export_json_to_excel(tHeader, data, '水电表账单报表'+moment(new Date()).format('YYYY-MM-DD HH:mm:ss'));
  383 + }
  384 +
  385 +
  386 + })
  387 +
  388 + },
  389 +
  390 + formatJson(filterVal, jsonData) {
  391 +
  392 + return jsonData.map(v => filterVal.map(j => v[j]))
  393 +
  394 + },
  395 +
263 }, 396 },
264 397
265 } 398 }
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 </el-form-item> 59 </el-form-item>
60 </el-col> 60 </el-col>
61 <el-col :span="24"> 61 <el-col :span="24">
62 - <el-form-item label="剩余水费"> 62 + <el-form-item label="水费可用余额">
63 <el-input disabled="" 63 <el-input disabled=""
64 style="width: 200px; -webkit-text-fill-color: #070A08; margin-right: 100px;" 64 style="width: 200px; -webkit-text-fill-color: #070A08; margin-right: 100px;"
65 v-model="waterForm.subtraction"></el-input> 65 v-model="waterForm.subtraction"></el-input>
  1 +/* eslint-disable */
  2 +/* Blob.js
  3 + * A Blob implementation.
  4 + * 2014-05-27
  5 + *
  6 + * By Eli Grey, http://eligrey.com
  7 + * By Devin Samarin, https://github.com/eboyjr
  8 + * License: X11/MIT
  9 + * See LICENSE.md
  10 + */
  11 +
  12 +/*global self, unescape */
  13 +/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
  14 + plusplus: true */
  15 +
  16 +/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
  17 +
  18 +(function (view) {
  19 + "use strict";
  20 +
  21 + view.URL = view.URL || view.webkitURL;
  22 +
  23 + if (view.Blob && view.URL) {
  24 + try {
  25 + new Blob;
  26 + return;
  27 + } catch (e) {}
  28 + }
  29 +
  30 + // Internally we use a BlobBuilder implementation to base Blob off of
  31 + // in order to support older browsers that only have BlobBuilder
  32 + var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
  33 + var
  34 + get_class = function(object) {
  35 + return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
  36 + }
  37 + , FakeBlobBuilder = function BlobBuilder() {
  38 + this.data = [];
  39 + }
  40 + , FakeBlob = function Blob(data, type, encoding) {
  41 + this.data = data;
  42 + this.size = data.length;
  43 + this.type = type;
  44 + this.encoding = encoding;
  45 + }
  46 + , FBB_proto = FakeBlobBuilder.prototype
  47 + , FB_proto = FakeBlob.prototype
  48 + , FileReaderSync = view.FileReaderSync
  49 + , FileException = function(type) {
  50 + this.code = this[this.name = type];
  51 + }
  52 + , file_ex_codes = (
  53 + "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
  54 + + "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
  55 + ).split(" ")
  56 + , file_ex_code = file_ex_codes.length
  57 + , real_URL = view.URL || view.webkitURL || view
  58 + , real_create_object_URL = real_URL.createObjectURL
  59 + , real_revoke_object_URL = real_URL.revokeObjectURL
  60 + , URL = real_URL
  61 + , btoa = view.btoa
  62 + , atob = view.atob
  63 +
  64 + , ArrayBuffer = view.ArrayBuffer
  65 + , Uint8Array = view.Uint8Array
  66 + ;
  67 + FakeBlob.fake = FB_proto.fake = true;
  68 + while (file_ex_code--) {
  69 + FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
  70 + }
  71 + if (!real_URL.createObjectURL) {
  72 + URL = view.URL = {};
  73 + }
  74 + URL.createObjectURL = function(blob) {
  75 + var
  76 + type = blob.type
  77 + , data_URI_header
  78 + ;
  79 + if (type === null) {
  80 + type = "application/octet-stream";
  81 + }
  82 + if (blob instanceof FakeBlob) {
  83 + data_URI_header = "data:" + type;
  84 + if (blob.encoding === "base64") {
  85 + return data_URI_header + ";base64," + blob.data;
  86 + } else if (blob.encoding === "URI") {
  87 + return data_URI_header + "," + decodeURIComponent(blob.data);
  88 + } if (btoa) {
  89 + return data_URI_header + ";base64," + btoa(blob.data);
  90 + } else {
  91 + return data_URI_header + "," + encodeURIComponent(blob.data);
  92 + }
  93 + } else if (real_create_object_URL) {
  94 + return real_create_object_URL.call(real_URL, blob);
  95 + }
  96 + };
  97 + URL.revokeObjectURL = function(object_URL) {
  98 + if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
  99 + real_revoke_object_URL.call(real_URL, object_URL);
  100 + }
  101 + };
  102 + FBB_proto.append = function(data/*, endings*/) {
  103 + var bb = this.data;
  104 + // decode data to a binary string
  105 + if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
  106 + var
  107 + str = ""
  108 + , buf = new Uint8Array(data)
  109 + , i = 0
  110 + , buf_len = buf.length
  111 + ;
  112 + for (; i < buf_len; i++) {
  113 + str += String.fromCharCode(buf[i]);
  114 + }
  115 + bb.push(str);
  116 + } else if (get_class(data) === "Blob" || get_class(data) === "File") {
  117 + if (FileReaderSync) {
  118 + var fr = new FileReaderSync;
  119 + bb.push(fr.readAsBinaryString(data));
  120 + } else {
  121 + // async FileReader won't work as BlobBuilder is sync
  122 + throw new FileException("NOT_READABLE_ERR");
  123 + }
  124 + } else if (data instanceof FakeBlob) {
  125 + if (data.encoding === "base64" && atob) {
  126 + bb.push(atob(data.data));
  127 + } else if (data.encoding === "URI") {
  128 + bb.push(decodeURIComponent(data.data));
  129 + } else if (data.encoding === "raw") {
  130 + bb.push(data.data);
  131 + }
  132 + } else {
  133 + if (typeof data !== "string") {
  134 + data += ""; // convert unsupported types to strings
  135 + }
  136 + // decode UTF-16 to binary string
  137 + bb.push(unescape(encodeURIComponent(data)));
  138 + }
  139 + };
  140 + FBB_proto.getBlob = function(type) {
  141 + if (!arguments.length) {
  142 + type = null;
  143 + }
  144 + return new FakeBlob(this.data.join(""), type, "raw");
  145 + };
  146 + FBB_proto.toString = function() {
  147 + return "[object BlobBuilder]";
  148 + };
  149 + FB_proto.slice = function(start, end, type) {
  150 + var args = arguments.length;
  151 + if (args < 3) {
  152 + type = null;
  153 + }
  154 + return new FakeBlob(
  155 + this.data.slice(start, args > 1 ? end : this.data.length)
  156 + , type
  157 + , this.encoding
  158 + );
  159 + };
  160 + FB_proto.toString = function() {
  161 + return "[object Blob]";
  162 + };
  163 + FB_proto.close = function() {
  164 + this.size = this.data.length = 0;
  165 + };
  166 + return FakeBlobBuilder;
  167 + }(view));
  168 +
  169 + view.Blob = function Blob(blobParts, options) {
  170 + var type = options ? (options.type || "") : "";
  171 + var builder = new BlobBuilder();
  172 + if (blobParts) {
  173 + for (var i = 0, len = blobParts.length; i < len; i++) {
  174 + builder.append(blobParts[i]);
  175 + }
  176 + }
  177 + return builder.getBlob(type);
  178 + };
  179 +}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
  1 +/* eslint-disable */
  2 +require('script-loader!file-saver');
  3 +require('script-loader!vendor/Blob');
  4 +require('script-loader!xlsx/dist/xlsx.core.min');
  5 +function generateArray(table) {
  6 + var out = [];
  7 + var rows = table.querySelectorAll('tr');
  8 + var ranges = [];
  9 + for (var R = 0; R < rows.length; ++R) {
  10 + var outRow = [];
  11 + var row = rows[R];
  12 + var columns = row.querySelectorAll('td');
  13 + for (var C = 0; C < columns.length; ++C) {
  14 + var cell = columns[C];
  15 + var colspan = cell.getAttribute('colspan');
  16 + var rowspan = cell.getAttribute('rowspan');
  17 + var cellValue = cell.innerText;
  18 + if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
  19 +
  20 + //Skip ranges
  21 + ranges.forEach(function (range) {
  22 + if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
  23 + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
  24 + }
  25 + });
  26 +
  27 + //Handle Row Span
  28 + if (rowspan || colspan) {
  29 + rowspan = rowspan || 1;
  30 + colspan = colspan || 1;
  31 + ranges.push({s: {r: R, c: outRow.length}, e: {r: R + rowspan - 1, c: outRow.length + colspan - 1}});
  32 + }
  33 + ;
  34 +
  35 + //Handle Value
  36 + outRow.push(cellValue !== "" ? cellValue : null);
  37 +
  38 + //Handle Colspan
  39 + if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
  40 + }
  41 + out.push(outRow);
  42 + }
  43 + return [out, ranges];
  44 +};
  45 +
  46 +function datenum(v, date1904) {
  47 + if (date1904) v += 1462;
  48 + var epoch = Date.parse(v);
  49 + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
  50 +}
  51 +
  52 +function sheet_from_array_of_arrays(data, opts) {
  53 + var ws = {};
  54 + var range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
  55 + for (var R = 0; R != data.length; ++R) {
  56 + for (var C = 0; C != data[R].length; ++C) {
  57 + if (range.s.r > R) range.s.r = R;
  58 + if (range.s.c > C) range.s.c = C;
  59 + if (range.e.r < R) range.e.r = R;
  60 + if (range.e.c < C) range.e.c = C;
  61 + var cell = {v: data[R][C]};
  62 + if (cell.v == null) continue;
  63 + var cell_ref = XLSX.utils.encode_cell({c: C, r: R});
  64 +
  65 + if (typeof cell.v === 'number') cell.t = 'n';
  66 + else if (typeof cell.v === 'boolean') cell.t = 'b';
  67 + else if (cell.v instanceof Date) {
  68 + cell.t = 'n';
  69 + cell.z = XLSX.SSF._table[14];
  70 + cell.v = datenum(cell.v);
  71 + }
  72 + else cell.t = 's';
  73 +
  74 + ws[cell_ref] = cell;
  75 + }
  76 + }
  77 + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
  78 + return ws;
  79 +}
  80 +
  81 +function Workbook() {
  82 + if (!(this instanceof Workbook)) return new Workbook();
  83 + this.SheetNames = [];
  84 + this.Sheets = {};
  85 +}
  86 +
  87 +function s2ab(s) {
  88 + var buf = new ArrayBuffer(s.length);
  89 + var view = new Uint8Array(buf);
  90 + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
  91 + return buf;
  92 +}
  93 +
  94 +export function export_table_to_excel(id) {
  95 + var theTable = document.getElementById(id);
  96 + console.log('a')
  97 + var oo = generateArray(theTable);
  98 + var ranges = oo[1];
  99 +
  100 + /* original data */
  101 + var data = oo[0];
  102 + var ws_name = "SheetJS";
  103 + console.log(data);
  104 +
  105 + var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
  106 +
  107 + /* add ranges to worksheet */
  108 + // ws['!cols'] = ['apple', 'banan'];
  109 + ws['!merges'] = ranges;
  110 +
  111 + /* add worksheet to workbook */
  112 + wb.SheetNames.push(ws_name);
  113 + wb.Sheets[ws_name] = ws;
  114 +
  115 + var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
  116 +
  117 + saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
  118 +}
  119 +
  120 +function formatJson(jsonData) {
  121 + console.log(jsonData)
  122 +}
  123 +export function export_json_to_excel(th, jsonData, defaultTitle) {
  124 +
  125 + /* original data */
  126 +
  127 + var data = jsonData;
  128 + data.unshift(th);
  129 + var ws_name = "SheetJS";
  130 +
  131 + var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
  132 +
  133 +
  134 + /* add worksheet to workbook */
  135 + wb.SheetNames.push(ws_name);
  136 + wb.Sheets[ws_name] = ws;
  137 +
  138 + var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
  139 + var title = defaultTitle || '列表'
  140 + saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
  141 +}